index 08d1bc06c94ecf2f1b8aa594a4020ec88bf325b9..c6a8918c09b25089f228bfb8b41a0d0e168e96b9 100644 (file)
char *str_html = html_escape (str);
if (field_name != NULL)
char *str_html = html_escape (str);
if (field_name != NULL)
- printf ("<a href=\"%s?action=list_graphs;q=%s:%s\">%s</a>",
+ printf ("<a href=\"%s?action=search;q=%s:%s\">%s</a>",
script_name (), field_name, str_html, str_html);
else
script_name (), field_name, str_html, str_html);
else
- printf ("<a href=\"%s?action=list_graphs;q=%s\">%s</a>",
+ printf ("<a href=\"%s?action=search;q=%s\">%s</a>",
script_name (), str_html, str_html);
free (str_html);
script_name (), str_html, str_html);
free (str_html);
@@ -142,60 +142,47 @@ static int show_time_selector (__attribute__((unused)) void *user_data) /* {{{ *
return (0);
} /* }}} int show_time_selector */
return (0);
} /* }}} int show_time_selector */
-static int show_instance_list_cb (graph_instance_t *inst, /* {{{ */
- void *user_data)
-{
- show_graph_data_t *data = user_data;
- char descr[128];
- char params[1024];
-
- memset (descr, 0, sizeof (descr));
- inst_describe (data->cfg, inst, descr, sizeof (descr));
- html_escape_buffer (descr, sizeof (descr));
-
- if (inst == data->inst)
- {
- printf (" <li class=\"instance\"><strong>%s</strong></li>\n", descr);
- return (0);
- }
-
- memset (params, 0, sizeof (params));
- inst_get_params (data->cfg, inst, params, sizeof (params));
- html_escape_buffer (params, sizeof (params));
-
- printf (" <li class=\"instance\">"
- "<a href=\"%s?action=show_instance;%s\">%s</a></li>\n",
- script_name (), params, descr);
-
- return (0);
-} /* }}} int show_instance_list_cb */
-
-static int show_instance_list (void *user_data) /* {{{ */
+static int left_menu (void *user_data) /* {{{ */
{
show_graph_data_t *data = user_data;
{
show_graph_data_t *data = user_data;
- char title[128];
char params[1024];
char params[1024];
-
- memset (title, 0, sizeof (title));
- graph_get_title (data->cfg, title, sizeof (title));
- html_escape_buffer (title, sizeof (title));
+ graph_instance_t *inst;
+ graph_ident_t *ident;
+ const char *host;
memset (params, 0, sizeof (params));
graph_get_params (data->cfg, params, sizeof (params));
html_escape_buffer (params, sizeof (params));
memset (params, 0, sizeof (params));
graph_get_params (data->cfg, params, sizeof (params));
html_escape_buffer (params, sizeof (params));
- printf ("<ul class=\"graph_list\">\n"
- " <li class=\"graph\"><a href=\"%s?action=show_instance;%s\">%s</a>\n"
- " <ul class=\"instance_list\">\n",
- script_name (), params, title);
+ inst = inst_get_selected (data->cfg);
+ ident = inst_get_selector (inst);
+ host = ident_get_host (ident);
+ if (IS_ANY (host))
+ host = NULL;
+
+ printf ("\n<ul class=\"menu left\">\n"
+ " <li><a href=\"%s?action=show_graph;%s\">All instances</a></li>\n"
+ " <li><a href=\"%s?action=list_graphs\">All graphs</a></li>\n",
+ script_name (), params,
+ script_name ());
+ if (host != NULL)
+ {
+ char host_html[1024];
+ char host_uri[1024];
+
+ html_escape_copy (host_html, host, sizeof (host_html));
+ uri_escape_copy (host_uri, host, sizeof (host_uri));
- graph_inst_foreach (data->cfg, show_instance_list_cb, user_data);
+ printf (" <li><a href=\"%s?action=search;q=host:%s\">Host "%s"</a></li>\n",
+ script_name (), host_uri, host_html);
+ }
+ printf ("</ul>\n");
- printf (" </ul>\n"
- "</ul>\n");
+ host = NULL;
+ ident_destroy (ident);
return (0);
return (0);
-} /* }}} int show_instance_list */
+} /* }}} int left_menu */
static int show_instance_cb (graph_config_t *cfg, /* {{{ */
graph_instance_t *inst,
static int show_instance_cb (graph_config_t *cfg, /* {{{ */
graph_instance_t *inst,
time_params[sizeof (time_params) - 1] = 0;
}
time_params[sizeof (time_params) - 1] = 0;
}
- printf ("<h3>Instance "%s"</h3>\n", descr);
+ printf ("<h2>Instance "%s"</h2>\n", descr);
show_breadcrump (cfg, inst);
if (data->graph_count < MAX_SHOW_GRAPHS)
show_breadcrump (cfg, inst);
if (data->graph_count < MAX_SHOW_GRAPHS)
+ {
printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s%s\" "
"title=\"%s / %s\" /></div>\n",
script_name (), params, time_params, title, descr);
printf ("<div class=\"graph-img\"><img src=\"%s?action=graph;%s%s\" "
"title=\"%s / %s\" /></div>\n",
script_name (), params, time_params, title, descr);
+ printf ("<div style=\"clear: both;\"><a href=\"%s?action=graph_data_json;%s%s\">"
+ "Get graph data as JSON</a></div>\n",
+ script_name (), params, time_params);
+ }
else
printf ("<a href=\"%s?action=show_instance;%s\">Show graph "
""%s / %s"</a>\n",
else
printf ("<a href=\"%s?action=show_instance;%s\">Show graph "
""%s / %s"</a>\n",
static int show_instance (void *user_data) /* {{{ */
{
show_graph_data_t *data = user_data;
static int show_instance (void *user_data) /* {{{ */
{
show_graph_data_t *data = user_data;
+ char params[1024];
int status;
int status;
- fprintf (stderr, "show_instance: Calling inst_get_all_selected()\n");
status = inst_get_all_selected (data->cfg,
/* callback = */ show_instance_cb, /* user data = */ data);
if (status != 0)
fprintf (stderr, "show_instance: inst_get_all_selected failed "
"with status %i\n", status);
status = inst_get_all_selected (data->cfg,
/* callback = */ show_instance_cb, /* user data = */ data);
if (status != 0)
fprintf (stderr, "show_instance: inst_get_all_selected failed "
"with status %i\n", status);
+ memset (params, 0, sizeof (params));
+ graph_get_params (data->cfg, params, sizeof (params));
+ html_escape_buffer (params, sizeof (params));
+
+ printf ("<div style=\"clear: both;\"><a href=\"%s?action=graph_def_json;%s\">"
+ "Get graph definition as JSON</a></div>\n",
+ script_name (), params);
+
return (0);
} /* }}} int show_instance */
return (0);
} /* }}} int show_instance */
pg_callbacks.top_right = html_print_search_box;
pg_callbacks.middle_center = show_instance;
pg_callbacks.top_right = html_print_search_box;
pg_callbacks.middle_center = show_instance;
- pg_callbacks.middle_left = show_instance_list;
+ pg_callbacks.middle_left = left_menu;
pg_callbacks.middle_right = show_time_selector;
html_print_page (title, &pg_callbacks, &pg_data);
pg_callbacks.middle_right = show_time_selector;
html_print_page (title, &pg_callbacks, &pg_data);