X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Faction_show_instance.c;h=86a565496c627344c85db68e614bf5eec3b29396;hb=8fca1d79d089342400381c3bd8e1c717d34ce9b1;hp=08d1bc06c94ecf2f1b8aa594a4020ec88bf325b9;hpb=b64e6b6983c49fa5924fa8558fe1d65f7ea5aea0;p=collection4.git
diff --git a/src/action_show_instance.c b/src/action_show_instance.c
index 08d1bc0..86a5654 100644
--- a/src/action_show_instance.c
+++ b/src/action_show_instance.c
@@ -142,60 +142,24 @@ 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"
- " - %s\n"
- "
\n",
- script_name (), params, title);
-
- graph_inst_foreach (data->cfg, show_instance_list_cb, user_data);
-
- printf ("
\n"
- "
\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,
@@ -235,7 +199,7 @@ static int show_instance_cb (graph_config_t *cfg, /* {{{ */
time_params[sizeof (time_params) - 1] = 0;
}
- printf ("Instance "%s"
\n", descr);
+ printf ("Instance "%s"
\n", descr);
show_breadcrump (cfg, inst);
@@ -288,7 +252,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);