trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1059419 - in /trafficserver/traffic/trunk/proxy/mgmt: html2/images/ web2/
Date Sat, 15 Jan 2011 22:08:33 GMT
Author: igalic
Date: Sat Jan 15 22:08:32 2011
New Revision: 1059419

URL: http://svn.apache.org/viewvc?rev=1059419&view=rev
Log:
Removing a couple hardly gifs from html2 and reducing
functions from web2 [TS-641]
Trying to find a horrible failure of the build system.

Removed:
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_begin_off.gif
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_begin_on.gif
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_bg_off.gif
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_bg_on.gif
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_end_off.gif
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_end_on.gif
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_off_off.gif
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_off_on.gif
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/menu_separator_on_off.gif
Modified:
    trafficserver/traffic/trunk/proxy/mgmt/html2/images/Makefile.am
    trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.cc
    trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.cc
    trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.h

Modified: trafficserver/traffic/trunk/proxy/mgmt/html2/images/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/html2/images/Makefile.am?rev=1059419&r1=1059418&r2=1059419&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/html2/images/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/html2/images/Makefile.am Sat Jan 15 22:08:32 2011
@@ -19,13 +19,4 @@ dist_webui_DATA = \
 	blankIcon.gif \
 	configure_off.gif \
 	dot_clear.gif \
-	menu_begin_off.gif \
-	menu_begin_on.gif \
-	menu_bg_off.gif \
-	menu_bg_on.gif \
-	menu_end_off.gif \
-	menu_end_on.gif \
-	menu_separator_off_off.gif \
-	menu_separator_off_on.gif \
-	menu_separator_on_off.gif \
 	monitor_on.gif

Modified: trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.cc?rev=1059419&r1=1059418&r2=1059419&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpRender.cc Sat Jan 15 22:08:32 2011
@@ -786,26 +786,6 @@ handle_summary_object(WebHttpContext * w
 }
 
 //-------------------------------------------------------------------------
-// handle_tab_object
-//-------------------------------------------------------------------------
-
-static int
-handle_tab_object(WebHttpContext * whc, char *tag, char *arg)
-{
-  NOWARN_UNUSED(tag);
-  NOWARN_UNUSED(arg);
-  int err = WEB_HTTP_ERR_OKAY;
-  int active_mode;
-
-  // render main tab object
-  WebHttpGetIntFromQuery(whc, "mode", &active_mode);
-  if ((err = WebHttpRenderTabs(whc->response_bdy, active_mode)) != WEB_HTTP_ERR_OKAY)
{
-    mgmt_log(stderr, "[handle_tab_object] failed to render mode tabs");
-  }
-  return err;
-}
-
-//-------------------------------------------------------------------------
 // handle_html_tab_object
 //-------------------------------------------------------------------------
 
@@ -2296,7 +2276,6 @@ WebHttpRenderInit()
   ink_hash_table_insert(g_display_bindings_ht, "record", (void *) handle_record);
   ink_hash_table_insert(g_display_bindings_ht, "record_version", (void *) handle_record_version);
   ink_hash_table_insert(g_display_bindings_ht, "summary_object", (void *) handle_summary_object);
-  ink_hash_table_insert(g_display_bindings_ht, "tab_object", (void *) handle_tab_object);
   ink_hash_table_insert(g_display_bindings_ht, "html_tab_object", (void *) handle_html_tab_object);
   ink_hash_table_insert(g_display_bindings_ht, "vip_object", (void *) handle_vip_object);
   ink_hash_table_insert(g_display_bindings_ht, "checked", (void *) handle_checked);

Modified: trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.cc?rev=1059419&r1=1059418&r2=1059419&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.cc Sat Jan 15 22:08:32 2011
@@ -474,100 +474,6 @@ WebHttpRenderJsTree(textBuffer * output,
   return WEB_HTTP_ERR_OKAY;
 }
 
-//-------------------------------------------------------------------------
-// WebHttpRenderTabs
-//-------------------------------------------------------------------------
-
-int
-WebHttpRenderTabs(textBuffer * output, int active_mode)
-{
-  // render the stuff in c_tab.ink / m_tab.ink
-  int err = WEB_HTTP_ERR_OKAY;
-  char buf[WHT_MAX_BUF_LEN + 1];
-  char *default_link = NULL;
-  mode_node *a_mode = &g_modes[active_mode];
-  mode_node *mode = &g_modes[0];
-  int mode_index = 0;
-
-  if (active_mode == 0) {
-    HtmlRndrTdOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL, NULL,
0);
-    HtmlRndrImg(output, "/images/menu_begin_on.gif", NULL, NULL, NULL, NULL);
-    HtmlRndrTdClose(output);
-  } else {
-    HtmlRndrTdOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL, NULL,
0);
-    HtmlRndrImg(output, "/images/menu_begin_off.gif", NULL, NULL, NULL, NULL);
-    HtmlRndrTdClose(output);
-  }
-
-  while (mode->node.name) {
-
-    //HtmlRndrTdOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE, HTML_VALIGN_BOTTOM, "116", NULL,
0);
-
-    if (mode == a_mode) {       // active mode
-
-      HtmlRndrTdOpen(output, HTML_CSS_BLACK_ITEM, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL,
NULL, 0,
-                     "/images/menu_bg_on.gif");
-      output->copyFrom(mode->node.name, strlen(mode->node.name));
-
-    } else {                    // non-active mode
-
-      menu_node *menu = &mode->menus[0];
-      item_node *item = &menu->items[0];
-      link_node *link = &item->links[0];
-
-      snprintf(buf, WHT_MAX_BUF_LEN, "%s%s", link->file_name, link->query);
-
-      if (default_link)
-        xfree(default_link);
-      default_link = WebHttpGetLink_Xmalloc(buf);
-      if (strcmp(default_link, g_empty_string) == 0) {
-        err = WEB_HTTP_ERR_FAIL;
-        goto Ldone;
-      }
-
-      HtmlRndrTdOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL, NULL,
0,
-                     "/images/menu_bg_off.gif");
-      HtmlRndrAOpen(output, HTML_CSS_NONE, default_link, NULL);
-      output->copyFrom(mode->node.name, strlen(mode->node.name));
-      HtmlRndrAClose(output);
-    }
-    HtmlRndrTdClose(output);
-
-    mode++;
-    // if current mode is not the last mode, put correct separator
-    if (mode->node.name) {
-      HtmlRndrTdOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL, NULL,
0);
-      if (mode_index == active_mode) {
-        // if current mode is active, we need on-off separator
-        HtmlRndrImg(output, "/images/menu_separator_on_off.gif", NULL, NULL, NULL, NULL);
-      } else if (mode_index + 1 == active_mode) {
-        // if next mode is active, we need off-on separator
-        HtmlRndrImg(output, "/images/menu_separator_off_on.gif", NULL, NULL, NULL, NULL);
-      } else {
-        // otherwise we need off-off separator
-        HtmlRndrImg(output, "/images/menu_separator_off_off.gif", NULL, NULL, NULL, NULL);
-      }
-      HtmlRndrTdClose(output);
-    }
-    mode_index++;
-  }
-
-  if (mode_index - 1 == active_mode) {
-    HtmlRndrTdOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL, NULL,
0);
-    HtmlRndrImg(output, "/images/menu_end_on.gif", NULL, NULL, NULL, NULL);
-    HtmlRndrTdClose(output);
-  } else {
-    HtmlRndrTdOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL, NULL,
0);
-    HtmlRndrImg(output, "/images/menu_end_off.gif", NULL, NULL, NULL, NULL);
-    HtmlRndrTdClose(output);
-  }
-
-
-Ldone:
-  if (default_link)
-    xfree(default_link);
-  return err;
-}
 
 //-------------------------------------------------------------------------
 // WebHttpRenderHtmlTabs

Modified: trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.h?rev=1059419&r1=1059418&r2=1059419&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/web2/WebHttpTree.h Sat Jan 15 22:08:32 2011
@@ -35,7 +35,6 @@
 #include "WebHttpContext.h"
 
 int WebHttpRenderJsTree(textBuffer * output, char *file_link);
-int WebHttpRenderTabs(textBuffer * output, int active_mode);
 int WebHttpRenderHtmlTabs(textBuffer * output, char *file_link, int active_tab);
 bool WebHttpTreeReturnRefresh(char *file_link);
 char *WebHttpTreeReturnHelpLink(char *file_link);



Mime
View raw message