fixed minor sorting bug in new sorted menu webui patch. This fixes #695.

jens-maus · Sep 2, 2019 · a5862c6 · a5862c6
1 parent 12c8868
commit a5862c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/buildroot-external/patches/occu/0061-WebUI-MenuSortedIcons.patch b/buildroot-external/patches/occu/0061-WebUI-MenuSortedIcons.patch
@@ -363,7 +363,7 @@
 
  	]},
    {id: "menuProgramsLinksPage", align: "left", action: function() { ConfigData.check(function() { WebUI.enter(LinksAndProgramsPage); }); }, submenu:
-@@ -24,19 +24,19 @@
+@@ -24,20 +24,20 @@
    ]},
    {id: "menuSettingsPage", align: "left", action: function() { ConfigData.check(function() { WebUI.enter(SystemConfigPage); }); }, submenu:
    [ 
@@ -385,11 +385,14 @@
 -    {id: "submenuDeviceFirmwareInformation"     , action: function() { ConfigData.check(function() { WebUI.enter(DeviceFirmwareInformation); } );  } },
 -
 -    {id: "submenuUserManagement"  , action: function() { WebUI.enter(UserAdminPageAdmin); }},
-     {id: "submenuSysVar"      , action: function() { ConfigData.check(function() { WebUI.enter(VariableListPage); }); }  },
+-    {id: "submenuSysVar"      , action: function() { ConfigData.check(function() { WebUI.enter(VariableListPage); }); }  },
 -    {id: "submenuFavorites"           , action: function() { ConfigData.check(function() { WebUI.enter(FavoriteListPage); } ); } },
-     {id: "submenuSysControl"     , action: function() { WebUI.enter(SystemControlPage);  } }
+-    {id: "submenuSysControl"     , action: function() { WebUI.enter(SystemControlPage);  } }
++    {id: "submenuSysControl"     , action: function() { WebUI.enter(SystemControlPage);  } },
++    {id: "submenuSysVar"      , action: function() { ConfigData.check(function() { WebUI.enter(VariableListPage); }); }  }
 
    ]},
+   {id: "menuHelpPage"          , align: "right", action: function() { WebUI.enter(HelpPage); }, submenu: [ ]},
 --- occu/WebUI/www/webui/js/mainmenu/user.js.orig
 +++ occu/WebUI/www/webui/js/mainmenu/user.js
 @@ -7,14 +7,14 @@

diff --git a/...xternal/patches/occu/0061-WebUI-MenuSortedIcons/occu/WebUI/www/webui/js/mainmenu/admin.js b/...xternal/patches/occu/0061-WebUI-MenuSortedIcons/occu/WebUI/www/webui/js/mainmenu/admin.js
@@ -36,8 +36,8 @@
 
     //{id: "submenuCreateTestPage"     , action: function() { ConfigData.check(function() { WebUI.enter(CreateTestPage); } );  } },
     //{id: "submenuDeviceFirmware"     , action: function() { ConfigData.check(function() { WebUI.enter(DeviceFirmware); } );  } },
-    {id: "submenuSysVar"      , action: function() { ConfigData.check(function() { WebUI.enter(VariableListPage); }); }  },
-    {id: "submenuSysControl"     , action: function() { WebUI.enter(SystemControlPage);  } }
+    {id: "submenuSysControl"     , action: function() { WebUI.enter(SystemControlPage);  } },
+    {id: "submenuSysVar"      , action: function() { ConfigData.check(function() { WebUI.enter(VariableListPage); }); }  }
 
   ]},
   {id: "menuHelpPage"          , align: "right", action: function() { WebUI.enter(HelpPage); }, submenu: [ ]},