Changeset 11187

Timestamp:

12/14/08 09:33:39 (4 years ago)

Author:

eko

Message:

Move USB to own page

Location:

src/router/httpd

Files:

• modules/broadcom.c (modified) (2 diffs)
• visuals/dd-wrt.c (modified) (1 diff)
• visuals/ejs.c (modified) (3 diffs)

src/router/httpd/modules/broadcom.c

@@ -1124 +1124 @@
     {"PPPoE_Server", "services", 0, SERVICE_RESTART, NULL},
     {"PPTP", "services", 0, SERVICE_RESTART, NULL},
+    {"USB", "", 0, SYS_RESTART, NULL},     
+    {"NAS", "nassrv", 0, SERVICE_RESTART, NULL},  
     {"Hotspot", "hotspot", 0, SERVICE_RESTART, NULL},
     {"AnchorFree", "anchorfree", 0, SERVICE_RESTART, NULL},
@@ -1144 +1146 @@
     {"Firewall", "filters", 0, SERVICE_RESTART, NULL},
     {"VPN", "filters", 0, SERVICE_RESTART, NULL},
-    {"NAS", "nassrv", 0, SERVICE_RESTART, NULL},   
 #ifdef HAVE_MILKFISH
     {"Milkfish", "milkfish", 0, SERVICE_RESTART, NULL},

src/router/httpd/visuals/dd-wrt.c

@@ -1935 +1935 @@
     if( ( fp = fopen( "/tmp/disktype.dump", "r" ) ) )
     {
-
-        websWrite( wp, "<fieldset>\n"
-                                "<legend><script type=\"text/javascript\">Capture(service.usb_diskinfo)</script></legend>\n"
-                                "<div class=\"setting\">\n"
-                                "<span id=\"disk_info\">\n" );
-                                
         while( fgets( buff, sizeof( buff ), fp ) )
         {
                 if( strcmp( buff, "\n" ) )
-            websWrite( wp, "%s <br />", buff );
+            websWrite( wp, "%s<br />", buff );
         }
         fclose( fp );
-                                
-        websWrite( wp, "</span>&nbsp;\n"
-                                "</div>\n"
-                                "</fieldset><br />\n" );
-        }
+        }
+        else
+                websWrite( wp, "<script type=\"text/javascript\">Capture(status_router.notavail)</script>" );   
 
         return;

src/router/httpd/visuals/ejs.c

@@ -1505 +1505 @@
      "Wireless_MAC.asp", "Wireless_Advanced.asp", "Wireless_WDS.asp", "", "",
      ""},
-    {"Services.asp", "PPPoE_Server.asp", "PPTP.asp", "NAS.asp", "Hotspot.asp",
-     "Milkfish.asp", "eop-tunnel.asp", "AnchorFree.asp", "", "", ""},
+    {"Services.asp", "PPPoE_Server.asp", "PPTP.asp", "USB.asp", "NAS.asp", "Hotspot.asp",
+     "Milkfish.asp", "eop-tunnel.asp", "AnchorFree.asp", "", ""},
     {"Firewall.asp", "VPN.asp", "", "", "", "", "", "", "", "", ""},
     {"Filters.asp", "", "", "", "", "", "", "", "", "", ""},
@@ -1530 +1530 @@
      "wirelessRadius", "wirelessSecurity",
      "wirelessMac", "wirelessAdvanced", "wirelessWds", "", "", ""},
-    {"services", "servicesServices", "servicesPppoesrv", "servicesPptp", "servicesNAS", 
+    {"services", "servicesServices", "servicesPppoesrv", "servicesPptp", "servicesUSB", "servicesNAS", 
      "servicesHotspot", "servicesMilkfish", "setupeop", "servicesAnchorFree",
-     "", "", ""},
+     "", ""},
     {"security", "firwall", "vpn", "", "", "", "", "", "", "", "", ""},
     {"accrestriction", "webaccess", "", "", "", "", "", "", "", "", "", ""},
@@ -1677 +1677 @@
                 if( !strcmp( menu[i][j], "PPTP.asp" ) ) // jump over PPTP in
                                                         // micro build
+                    j++;
+#endif
+#ifndef HAVE_USB
+                if( !strcmp( menu[i][j], "USB.asp" ) )  // jump over USB
                     j++;
 #endif