From c654becad6e0a53380390a2394139971e7a06933 Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 6 Jul 2010 16:24:58 +0200 Subject: [PATCH] "show instance" action: Don't show a list of instances on the left side. Rather show a link to the "show graph" action, titled "all instances". --- share/style.css | 6 +++++ src/action_show_instance.c | 55 +++++++++------------------------------------- 2 files changed, 16 insertions(+), 45 deletions(-) diff --git a/share/style.css b/share/style.css index a1964d2..9e8668b 100644 --- a/share/style.css +++ b/share/style.css @@ -74,6 +74,12 @@ a:hover font-style: italic; } +ul.menu +{ + border: 1px solid silver; + background-color: #fcfcfc; +} + #search-form { position: relative; diff --git a/src/action_show_instance.c b/src/action_show_instance.c index 08d1bc0..b0033f9 100644 --- a/src/action_show_instance.c +++ b/src/action_show_instance.c @@ -142,60 +142,25 @@ static int show_time_selector (__attribute__((unused)) void *user_data) /* {{{ * 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 ("
  • %s
  • \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 ("
  • " - "%s
  • \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; - char title[128]; char params[1024]; - memset (title, 0, sizeof (title)); - graph_get_title (data->cfg, title, sizeof (title)); - html_escape_buffer (title, sizeof (title)); - memset (params, 0, sizeof (params)); graph_get_params (data->cfg, params, sizeof (params)); html_escape_buffer (params, sizeof (params)); - printf ("\n"); + printf ("\n\n", + script_name (), params, + script_name ()); return (0); -} /* }}} int show_instance_list */ +} /* }}} int left_menu */ static int show_instance_cb (graph_config_t *cfg, /* {{{ */ graph_instance_t *inst, @@ -288,7 +253,7 @@ int action_show_instance (void) /* {{{ */ 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); -- 2.11.0