diff --git a/trunk/user/www/n56u_ribbon_fixed/state.js b/trunk/user/www/n56u_ribbon_fixed/state.js index 374f2c72ce8..b8a403ccf44 100644 --- a/trunk/user/www/n56u_ribbon_fixed/state.js +++ b/trunk/user/www/n56u_ribbon_fixed/state.js @@ -461,51 +461,47 @@ var tabM=[tabM0,tabM1,tabM2,tabM3,tabM4,tabM5,tabM6,tabM7,tabM8,tabM9]; //Level 1 Menu in Gateway, Router mode //生成子菜单 /L1 sub 与 L2 sub对应 var menuL1=[ - {"title":"<#menu1#>","link":"index.asp","icon":"icon-home","sub":"main"}, - //{"title":"HDD","link":"","icon":"icon-hdd"}, - //{"title":"","link":"","icon":"icon-retweet"}, - //{"title":"","link":"","icon":"icon-globe"}, + {"title":"<#menu1#>","link":"index.asp","icon":"icon-home"}, {"title":"<#menu4#>","link":"Main_TrafficMonitor_realtime.asp","icon":"icon-tasks"}, - {"title":"<#menu5_8#>","link":"Advanced_System_Info.asp","icon":"icon-random","sub":"log"}, - {"title":"<#menu5#>","link":"as.asp","icon":"icon-wrench","sub":"adv"}, - {"title":"插件","link":"javascript:;","icon":"icon-wrench","sub":"plugin"} + {"title":"<#menu5_8#>","link":"Advanced_System_Info.asp","icon":"icon-random"}, + {"title":"<#menu5#>","link":"as.asp","icon":"icon-wrench"} ]; //Level 2 Menu //sub 与 L1的sub 对应,自动显示到L1下面 var menuL2=[ - {"title":"<#menu5_11#>","link":tabM[0][0].link,"sub":"main"}, - {"title":"<#menu5_12#>","link":tabM[1][0].link,"sub":"main"}, - {"title":"<#menu5_2#>","link":tabM[2][0].link,"sub":"main"}, - {"title":"<#menu5_3#>","link":tabM[3][0].link,"sub":"main"}, - {"title":"<#menu5_5#>","link":tabM[4][0].link,"sub":"adv"}, - {"title":"<#menu5_4#>","link":tabM[5][0].link,"sub":"adv"}, - {"title":"<#menu5_6#>","link":tabM[6][0].link,"sub":"adv"}, - {"title":"<#menu5_10#>","link":tabM[7][0].link,"sub":"adv"}, - {"title":"<#menu5_9#>","link":support_2g_radio() ? tabM[8][0].link : "Main_EStatus_Content.asp","sub":"log"}, - {"title":"<#menu5_7#>","link":tabM[9][0].link,"sub":"log"} + {"title":"<#menu5_11#>","link":tabM[0][0].link}, + {"title":"<#menu5_12#>","link":tabM[1][0].link}, + {"title":"<#menu5_2#>","link":tabM[2][0].link}, + {"title":"<#menu5_3#>","link":tabM[3][0].link}, + {"title":"<#menu5_5#>","link":tabM[4][0].link}, + {"title":"<#menu5_4#>","link":tabM[5][0].link}, + {"title":"<#menu5_6#>","link":tabM[6][0].link}, + {"title":"<#menu5_10#>","link":tabM[7][0].link}, + {"title":"<#menu5_9#>","link":support_2g_radio() ? tabM[8][0].link : "Main_EStatus_Content.asp"}, + {"title":"<#menu5_7#>","link":tabM[9][0].link} ]; /* plugin menu 插件菜单 */ if (found_app_scutclient()){ - var mx={"title":"<#menu5_13#>","link":"scutclient.asp","sub":"plugin"};//json格式 + var mx={"title":"<#menu5_13#>","link":"scutclient.asp"};//json格式 var mx2=[mx,{"title":"log","link":"scutclient_log.asp"}];//显示tab,多个页面 menuL2.push(mx);//必须写 tabM.push(mx2);//必须写 } if (found_app_dnsforwarder()){ - var mx={"title":"<#menu5_15#>","link":"dns-forwarder.asp","sub":"plugin"}; + var mx={"title":"<#menu5_15#>","link":"dns-forwarder.asp"}; var mx2=[mx]; menuL2.push(mx); tabM.push(mx2); } if (found_app_shadowsocks()){ - var mx={"title":"<#menu5_16#>","link":"Shadowsocks.asp","sub":"plugin"}; + var mx={"title":"<#menu5_16#>","link":"Shadowsocks.asp"}; var mx2=[mx,{"title":"log","link":"Shadowsocks_log.asp"}]; menuL2.push(mx); tabM.push(mx2); } if (found_app_mentohust()){ - var mx={"title":"mentohust","link":"mentohust.asp","sub":"plugin"}; + var mx={"title":"mentohust","link":"mentohust.asp"}; var mx2=[mx,{"title":"log","link":"mentohust_log.asp"}]; menuL2.push(mx); tabM.push(mx2); @@ -597,39 +593,33 @@ function show_menu(L1, L2, L3){ tabM[5].splice(3,1); } } - //showmenu(L1_id , L2_id , L3_id) //L1 var navL1="";var navL2S="";//submenu for(i = 0; i < menuL1.length; i++){ var navL2=""; var title1=menuL1[i].title; var link1=menuL1[i].link; - var sub1=menuL1[i].sub || ""; if(title1 == ""){continue;} - if(typeof sub1 !="undefined" && sub1 != ""){ - //L2 ,根据sub属性,显示到L1的下面 - for(var j = 0; j < menuL2.length; j++){ - console.log(menuL2[j].sub +"--" + sub1); - if (typeof menuL2[j].sub =='undefined' || menuL2[j].sub != sub1) {continue;} - var title2= menuL2[j].title; - var link2= menuL2[j].link; - if(title2 == ""){continue;} - else if(L2 == (j+1)) - navL2 += ' '+title2+''; - else - navL2 += ' '+title2+''; - } - $j('#subMenu').append(navL2); - navL2= '