From 0263f456ad667e47b609e2958f38aab01c195f3b Mon Sep 17 00:00:00 2001 From: swsiyu Date: Sun, 27 Dec 2015 17:00:50 +0800 Subject: [PATCH 1/1] Modify nemo-ui(table style changes) Change-Id: If35f3c88ed7aca181b42ba474efc955730b8d53a Signed-off-by: swsiyu --- .../src/main/resources/nemo/css/nemo_main.css | 41 ++++- .../resources/nemo/css/nemo_user_main.css | 28 ++- .../src/main/resources/nemo/js/intentTopo.js | 26 +-- .../src/main/resources/nemo/js/phyNetwork.js | 4 +- nemo-ui/src/main/resources/nemo/js/svg.xml | 36 ++++ .../src/main/resources/nemo/js/virNetwork.js | 9 +- .../src/main/resources/nemo/js/vnMapping.js | 13 +- .../nemo/module/test/bod_userJson.js | 10 +- nemo-ui/src/main/resources/nemo/nemo.tpl.html | 168 +++++++++++++++--- .../main/resources/nemo/nemo.tpl.user.html | 42 +++-- nemo-ui/src/main/resources/nemo/register.html | 69 +++---- 11 files changed, 335 insertions(+), 111 deletions(-) diff --git a/nemo-ui/src/main/resources/nemo/css/nemo_main.css b/nemo-ui/src/main/resources/nemo/css/nemo_main.css index 49ccef4..908c4e6 100644 --- a/nemo-ui/src/main/resources/nemo/css/nemo_main.css +++ b/nemo-ui/src/main/resources/nemo/css/nemo_main.css @@ -104,18 +104,21 @@ margin-bottom: 20px; width:923px !important; line-height: 10px; } -#physicalTables{ - +#mappingTable{ + width: 850px; + margin: 0px auto; } .group table{ border-collapse:collapse; - margin: 10px auto; + /*margin: 10px auto;*/ border-spacing:0; /* border-left:1px solid #888; border-top:1px solid #888;*/ background:#efefef; - width: 100%; - margin-bottom: 20px; + /*width: 100%;*/ + width: 820px; + margin-bottom: 2px; + table-layout: fixed; } .group caption{ font-size: 18px; @@ -128,17 +131,39 @@ margin-bottom: 20px; } .group table th{ border:1px solid black; + padding:2px 0px; font-weight: bold; background-color: #ccc; - } .group table th,.group table td{ - padding:2px 5px; text-align: center; + font-size: 15px; +} +table#virNodeTab,table#virLinkTab{ + table-layout: fixed; +} +table#virNodeTab td,table#virLinkTab td{ + white-space: nowrap; + overflow: hidden; + text-overflow:ellipsis; +} +table.tableHead{ + margin-bottom: 5px !important; +} +div.tableBodyContainer{ + height: 200px; + width: 835px; + overflow: auto; + margin-bottom: 20px; +} +div.nodetableBodyContainer{ + height: 150px; + overflow: auto; + margin-bottom: 20px; } div#pageContent { - height: 1020px; + /*height: 1020px;*/ } body { diff --git a/nemo-ui/src/main/resources/nemo/css/nemo_user_main.css b/nemo-ui/src/main/resources/nemo/css/nemo_user_main.css index 429965d..71b3b91 100644 --- a/nemo-ui/src/main/resources/nemo/css/nemo_user_main.css +++ b/nemo-ui/src/main/resources/nemo/css/nemo_user_main.css @@ -2,7 +2,7 @@ body{ /*width:1200px;*/ height: 1000px; - background-color: rgb(57,57,57); + /*background-color: rgb(65, 64, 66);*/ color: black; font-size: 18px; } @@ -24,9 +24,26 @@ div{border-radius: 5px;} /*background:-moz-linear-gradient(left,#eee, #aaa);*/ /*background:-webkit-gradient(linear, 20% 0%, 100% 0%, color-stop(0.3,#aaa),color-stop(0.5,#bbb),color-stop(1,#444444));*/ } +.header p{ + float: left; +} +.header span{ + color:#000 !important; + text-shadow:0 0 0 #fff; + text-decoration: underline; + /*text-decoration-color:green;*/ + /*border-bottom:1px solid green;*/ + font-weight: normal; + font-size: 18px; + line-height: 30px; + display: inline-block; + margin-left: 20px; + cursor: pointer; + font-family:'cursive','-webkit-pictograp',sans-serif,Verdana; +} .group{ width:1000px; - height: 700px; + /*height: 700px;*/ margin: 0px auto; background: #ccc; /*border: 2px solid yellow;*/ @@ -73,7 +90,7 @@ svg{ /*margin-left: 5px;*/ } #nemo_str_show span.keyWords{ - color:red; + color:deeppink; } /*jquery ui tab css start*/ @@ -91,7 +108,8 @@ svg{ } .ui-widget-header { border: 1px solid #ccc; - background: #ccc url("../images/ui-bg_gloss-wave_35_f6a828_500x100.png") 50% 50% repeat-x; + background: #aaa url("../images/ui-bg_gloss-wave_35_f6a828_500x100.png") 50% 50% repeat-x; + background:#aaa; color: #fff; font-weight: bold; } @@ -115,5 +133,5 @@ li.ui-state-default.ui-corner-top.ui-tabs-active.ui-state-active a{ } /*jquery ui tab css end*/ div#pageContent { - height: 1000px; + /*height: 1000px;*/ } \ No newline at end of file diff --git a/nemo-ui/src/main/resources/nemo/js/intentTopo.js b/nemo-ui/src/main/resources/nemo/js/intentTopo.js index 306b09e..6d0ffc5 100644 --- a/nemo-ui/src/main/resources/nemo/js/intentTopo.js +++ b/nemo-ui/src/main/resources/nemo/js/intentTopo.js @@ -26,7 +26,7 @@ function getIntentInfos(){ if(!Datas){ Datas=userinfo; } - // IntentInfos=Datas; + IntentInfos=Datas; //return virtualDatas; } @@ -54,7 +54,7 @@ getIntentInfos(); } function getIntentInfoByName(user_name,Data){ - //console.log(1); + console.log(Data); if(typeof(Data)=='string'){ var user_json = JSON.parse(Data); } @@ -256,14 +256,14 @@ getIntentInfos(); //get Radio - var cir_r = parseInt(jQuery("#" + src_group + " circle:eq(0)").attr("r")); + var cir_r = parseInt(jQuery("[id='" + src_group + "'] circle:eq(0)").attr("r")); //get circle cx cy - src_cx = parseInt(jQuery("#" + src_group + " circle:eq(0)").attr("cx")); - src_cy = parseInt(jQuery("#" + src_group + " circle:eq(0)").attr("cy")); - dest_cx = parseInt(jQuery("#" + dest_group + " circle:eq(0)").attr("cx")); - dest_cy = parseInt(jQuery("#" + dest_group + " circle:eq(0)").attr("cy")); + src_cx = parseInt(jQuery("[id='" + src_group + "'] circle:eq(0)").attr("cx")); + src_cy = parseInt(jQuery("[id='" + src_group + "'] circle:eq(0)").attr("cy")); + dest_cx = parseInt(jQuery("[id='" + dest_group + "'] circle:eq(0)").attr("cx")); + dest_cy = parseInt(jQuery("[id='" + dest_group + "'] circle:eq(0)").attr("cy")); console.log(src_cx + " " + src_cy + " " + dest_cx + " " + dest_cy); //calculate deg @@ -358,10 +358,10 @@ getIntentInfos(); if (conn_name != null && typeof(conn_name) != "undefined") jQuery("#" + conn_name).remove(); try { - var node_cx_1 = jQuery("#" + node_name_1 + "_group").attr("cx"); - var node_cy_1 = jQuery("#" + node_name_1 + "_group").attr("cy"); - var node_cx_2 = jQuery("#" + node_name_2 + "_group").attr("cx"); - var node_cy_2 = jQuery("#" + node_name_2 + "_group").attr("cy"); + var node_cx_1 = jQuery("[id='" + node_name_1 + "_group']").attr("cx"); + var node_cy_1 = jQuery("[id='" + node_name_1 + "_group']").attr("cy"); + var node_cx_2 = jQuery("[id='" + node_name_2 + "_group']").attr("cx"); + var node_cy_2 = jQuery("[id='" + node_name_2 + "_group']").attr("cy"); // console.log(node_cx_1); // console.log(node_cy_1); // console.log(node_cx_2); @@ -903,8 +903,8 @@ getIntentInfos(); if(myTarget!='go-through') continue; var flow_name = flow_list[user_data["operations"]["operation"][operation_cursor]["target-object"]]; var chain_name = node_list[user_data["operations"]["operation"][operation_cursor]["action"][0]["parameter-values"]["string-value"][0]["value"]]; - var node_start = jQuery("#" + flow_name).attr("node_start"); - var node_end = jQuery("#" + flow_name).attr("node_end"); + var node_start = jQuery("[id='" + flow_name+"']").attr("node_start"); + var node_end = jQuery("[id='" + flow_name+"']").attr("node_end"); var c1_flag = 0; var c2_flag = 0; for (var i = 0; i < jQuery("#service_svg2 path").length; i++) { diff --git a/nemo-ui/src/main/resources/nemo/js/phyNetwork.js b/nemo-ui/src/main/resources/nemo/js/phyNetwork.js index da12a7b..0b78798 100644 --- a/nemo-ui/src/main/resources/nemo/js/phyNetwork.js +++ b/nemo-ui/src/main/resources/nemo/js/phyNetwork.js @@ -433,7 +433,7 @@ createPhyicalNodeTable:function (id,Data){ physicalnodes[Mynode[i]['node-id']].push([interPort,exterPort]); } console.log(physicalnodes); - jQuery("#"+id).find('tr:gt(1)').empty(); + jQuery("#"+id).find('tr:gt(0)').empty(); for(var item in physicalnodes){ var $tr=''+item+''+physicalnodes[item][0]+'' $tr+=''+physicalnodes[item][1][0]+''+physicalnodes[item][1][1]+'' @@ -454,7 +454,7 @@ createPhyicalLinkTable:function (id,Data){ } console.log(physaicallinks); - jQuery("#"+id).find('tr:gt(1)').empty(); + jQuery("#"+id).find('tr:gt(0)').empty(); for(var item in physaicallinks){ var $tr=''+item+''+physaicallinks[item][0]+'' $tr+=''+physaicallinks[item][1]+''+physaicallinks[item][2]+''; diff --git a/nemo-ui/src/main/resources/nemo/js/svg.xml b/nemo-ui/src/main/resources/nemo/js/svg.xml index b005ac8..cd3aeda 100644 --- a/nemo-ui/src/main/resources/nemo/js/svg.xml +++ b/nemo-ui/src/main/resources/nemo/js/svg.xml @@ -32,4 +32,40 @@ ext-group internet + + + + + + + + + text + + + + + + dmz1.n2 + l2-group + vm2 + server1 + + + + + dmz1_n1 + chain-group + dmz1.fw1 + + + + interior + ext-group + + + + internet + ext-group + \ No newline at end of file diff --git a/nemo-ui/src/main/resources/nemo/js/virNetwork.js b/nemo-ui/src/main/resources/nemo/js/virNetwork.js index d437eab..4e05705 100644 --- a/nemo-ui/src/main/resources/nemo/js/virNetwork.js +++ b/nemo-ui/src/main/resources/nemo/js/virNetwork.js @@ -21,7 +21,8 @@ var VirtualDatas=''; alert("No Virtual Data"); }, error:function(data){ - alert("Get Virtual Data Error!"); + // alert("Get Virtual Data Error!"); + console.log("Get Virtual Data Error!"); } }); return virData; @@ -36,7 +37,7 @@ var VirtualDatas=''; // console.log(VirtualDatas); //return virtualDatas; } - +//getVirtualDatas(); function getVirtualInfoById(user_id,Data){ if(!Data) Data=VirtualDatas; if(!Data) return; @@ -286,7 +287,7 @@ createVirtualNodeTable:function (id,Data){ for(var item in virtualnodes){ // if(virtualnodes[item][1]!='external-node'){} - var $tr=''+virtualnodes[item].virtual_node_id+''+virtualnodes[item].virtual_node_name+'' + var $tr=''+virtualnodes[item].virtual_node_id+''+virtualnodes[item].virtual_node_name+'' $tr+=''+'virtual '+virtualnodes[item].virtual_node_name.substring(1,virtualnodes[item].virtual_node_name.length-1)+'' $tr+=''+virtualnodes[item].internal_port_number+''+virtualnodes[item].external_port_number+'' $tr+='' @@ -310,7 +311,7 @@ createVirtualLinkTable:function (id,Data){ console.log(virtuallinks); jQuery("#"+id).find('tr:gt(1)').empty(); for(var item in virtuallinks){ - var $tr=''+item+''+virtual_nodes[virtuallinks[item][0]][1]+'-'+virtual_nodes[virtuallinks[item][1]][1]+'' + var $tr=''+item+''+virtual_nodes[virtuallinks[item][0]][1]+'-'+virtual_nodes[virtuallinks[item][1]][1]+'' $tr+=''+virtual_nodes[virtuallinks[item][0]][1]+''+virtual_nodes[virtuallinks[item][1]][1]+''; $tr+=''+virtuallinks[item][3]+'kbps'+''+virtuallinks[item][4]+'ms'+''; $tr+='' diff --git a/nemo-ui/src/main/resources/nemo/js/vnMapping.js b/nemo-ui/src/main/resources/nemo/js/vnMapping.js index fb20300..dd02eb6 100644 --- a/nemo-ui/src/main/resources/nemo/js/vnMapping.js +++ b/nemo-ui/src/main/resources/nemo/js/vnMapping.js @@ -26,14 +26,14 @@ function getMappingResults() { function getMappingDatas() { var Datas = getMappingResults(); if (!Datas) { - Datas = MappingResults; + Datas = VnMappingJson; } MappingResults = Datas; //return virtualDatas; } getMappingResults(); - +//getMappingDatas(); function getMappingResultById(user_id, Data) { if (!Data) Data = MappingResults; if (!Data) return; @@ -105,7 +105,7 @@ var createMappingTables = { virtualnodes[Mynode[i]['node-id']] = Mynode[i]['physical-resource-requirement'][0]['attribute-value']['string-value']; } console.log(virtualnodes); - jQuery("#" + id).find('tr:gt(1)').empty(); + // jQuery("#" + id).find('tr:gt(0)').empty(); var count=0; for(var x in virtual_nodes){count++;} if(count==0) return; @@ -138,7 +138,7 @@ var createMappingTables = { for(var x in virtual_nodes){count++;} if(count==0) return; for (var i in virtuallinks) { - var $tr = '' + virtual_nodes[virtuallinks[i][0]][1] + '-' + virtual_nodes[virtuallinks[i][1]][1] + '' + virtual_nodes[virtuallinks[i][0]][1] + '' + virtual_nodes[virtuallinks[i][1]][1] + '' + PathId[i] + '' + var $tr = '' + virtual_nodes[virtuallinks[i][0]][1] + '-' + virtual_nodes[virtuallinks[i][1]][1] + '' + virtual_nodes[virtuallinks[i][0]][1] + '' + virtual_nodes[virtuallinks[i][1]][1] + '' + PathId[i].substring(0,14)+'...' + '' var pathsNode = '' for (var nodesPath in paths[PathId[i]]) { pathsNode += paths[PathId[i]][nodesPath] + '-'; @@ -166,7 +166,10 @@ var createMappingTables = { } console.log(PathId); var Paths = []; - var sourcePaths = physicalData['physical-network']['physical-paths']['physical-path']; + var sourcePaths = physicalData['physical-network']['physical-paths']; + if(!sourcePaths) return Paths; + + sourcePaths = physicalData['physical-network']['physical-paths']['physical-path']; // console.log(sourcePaths); for (var path in PathId) { for (var sp in sourcePaths) { diff --git a/nemo-ui/src/main/resources/nemo/module/test/bod_userJson.js b/nemo-ui/src/main/resources/nemo/module/test/bod_userJson.js index 294b000..6b983d3 100644 --- a/nemo-ui/src/main/resources/nemo/module/test/bod_userJson.js +++ b/nemo-ui/src/main/resources/nemo/module/test/bod_userJson.js @@ -339,7 +339,7 @@ userinfo={ } ], "node-type": "fw", - "node-name": "dmz1_fw1" + "node-name": "dmz1.fw1" }, { "node-id": "ae83ca1d-43ef-4d02-a48b-6c250bb084bd", @@ -430,7 +430,7 @@ userinfo={ } ], "node-type": "l2-group", - "node-name": "dmz1_n2", + "node-name": "dmz1.n2", "sub-node": [ { "node-id": "6c787caa-156a-49ed-8546-547bdccf283c", @@ -501,7 +501,7 @@ userinfo={ { "node-id": "0dc22c0a-8ff0-448f-afc3-86fa22976242", "node-type": "chain-group", - "node-name": "dmz1_n1", + "node-name": "dmz1.n1", "sub-node": [ { "node-id": "9d6f5343-f38e-4101-ab60-309e6322ace3", @@ -539,7 +539,7 @@ userinfo={ } ], "connection-type": "p2p", - "connection-name": "dmz1_c1" + "connection-name": "dmz1.c1" }, { "connection-id": "06c60ef9-f16d-4368-9697-aa6b1cf1340a", @@ -580,7 +580,7 @@ userinfo={ } } ], - "flow-name": "dmz1_f1" + "flow-name": "dmz1.f1" } ] }, diff --git a/nemo-ui/src/main/resources/nemo/nemo.tpl.html b/nemo-ui/src/main/resources/nemo/nemo.tpl.html index 40350c2..b3550a5 100644 --- a/nemo-ui/src/main/resources/nemo/nemo.tpl.html +++ b/nemo-ui/src/main/resources/nemo/nemo.tpl.html @@ -74,7 +74,7 @@ // SFC //userId='af4fc2be-e3f4-4388-a8ef-3aabae872f2b'; //Bod - //userId='14ce424a-3e50-4a2a-ad5c-b29845158c8b' + //var userId='14ce424a-3e50-4a2a-ad5c-b29845158c8b' //if(userId=='0') userId='14ce424a-3e50-4a2a-ad5c-b29845158c8b'; $('#service_svg2').empty(); $("#nemo_str_show").empty(); @@ -98,8 +98,8 @@ // var virtualData=getVirtualJson(); var userId=$("#selectUser option:selected").val(); jQuery('#vir_graph').empty(); - jQuery("#virNodeTab").find('tr:gt(1)').empty(); - jQuery("#virLinkTab").find('tr:gt(1)').empty(); + jQuery("#virNodeTab").find('tr:gt(0)').empty(); + jQuery("#virLinkTab").find('tr:gt(0)').empty(); // SFC //userId='af4fc2be-e3f4-4388-a8ef-3aabae872f2b'; //Bod @@ -117,14 +117,15 @@ // $(".tabs ul li[aria-controls='Mapping']").click(); $(".tabs ul li[aria-controls='Mapping']").click(function(){ var userId=$("#selectUser option:selected").val(); - //if(userId=='0') userId='14ce424a-3e50-4a2a-ad5c-b29845158c8b'; - jQuery("#mapVirNodeTab").find('tr:gt(1)').empty(); - jQuery("#mapVirLinkTab").find('tr:gt(1)').empty(); + userId='14ce424a-3e50-4a2a-ad5c-b29845158c8b'; + jQuery("#mapVirNodeTab").find('tr:gt(0)').empty(); + jQuery("#mapVirLinkTab").find('tr:gt(0)').empty(); if(!physicalData||!PnMappingResults||!VirtualDatas) return; var virtualData = getVirtualInfoById(userId); if(!virtualData) return; if(!getPnMappingResultById(userId)) return; // console.log(createMappingTables); + console.log(virtualData); createMappingTables.createVirtualNodeTable('mapVirNodeTab',virtualData); // console.log(linkArray); createMappingTables.createVirtualLinkTable('mapVirLinkTab',virtualData,getPnMappingResultById(userId),physicalData); @@ -141,13 +142,14 @@ //Bod //userId='14ce424a-3e50-4a2a-ad5c-b29845158c8b' - //if(userId=='0') userId='14ce424a-3e50-4a2a-ad5c-b29845158c8b'; - if(!intent_info) return; + if(!IntentInfos) return; var user_data = getIntentInfoById(userId); if(!user_data) return; + analyjson_topo(user_data); parseNemoLan(user_data); - //set keyWords style + + //set keyWords style $("#nemo_str_show p").each(function(){ var $res=$(this); keyWords.forEach(function(item,index,array){ @@ -159,11 +161,9 @@ }); $('#logout').click(function(){ - // alert(1); setCookie('nemo_userpwd','',-1); $("#pageContent").empty(); $("#pageContent").load('src/app/nemo/register.html'); - // alert(2); }); }); @@ -190,22 +190,61 @@
- - - +
Physical Node
+ + + + + + + + -
Physical Node
Physical Node IDPhysical Node Type Internal Physical Port NumberExternal Physical Port Number
+ - - - +
+
Physical Link
+ + + + + + +
+
+ + + + + + + + + + + + - - - -
Physical Link
Physical Link IDSource Physical NodeDestination Physical NodeMetricBandwidth Delay
+ Destination Physical NodeMetric + BandwidthDelay + + + +
+ + + + + + + + + +
+
+
@@ -231,8 +270,16 @@
- + +
+ + + + + + + @@ -240,8 +287,28 @@
Virtual Node
Virtual Node IDVirtual Node Name Virtual Node Type
- +
+
+ + + + + + + +
+
+ + + + + + + + + + @@ -250,22 +317,71 @@
Virtual Link
Virtual Link IDVirtual Link Name Source Virtual NodeBandwidth Delay
+ + +
+ + + + + + + + + +
+
- + +
+
+ + + +
Virtual Node Mapping Table
Virtual NodePhysical Node
+ +
+ + + + + +
+
- +
+ + + + + + +
Virtual Link Mapping Table
Virtual LinkSource Virtual Node Destination Virtual NodePhysical Path Physical Nodes passed by Path
+ +
+ + + + + + + + +
+
+
diff --git a/nemo-ui/src/main/resources/nemo/nemo.tpl.user.html b/nemo-ui/src/main/resources/nemo/nemo.tpl.user.html index d1a1aae..949520e 100644 --- a/nemo-ui/src/main/resources/nemo/nemo.tpl.user.html +++ b/nemo-ui/src/main/resources/nemo/nemo.tpl.user.html @@ -6,9 +6,11 @@ + - + + @@ -18,30 +20,46 @@ var user_str = localStorage.getItem("nemo_userInfo"); console.log(user_str); jQuery(document).ready(function ($) { + + (function(){ if(user_str){ user_str=JSON.parse(user_str); var userName=user_str.userName; //get topo data + if(!userName) return true; $('.header p').html($('.header p').html().replace('xxx',userName)); var user_data=getIntentInfoByName(userName,IntentInfos); - analyjson_topo(user_data); - parseNemoLan(user_data); + // var user_data=getIntentInfoByName(userName,userinfo); + console.log(user_data); + analyjson_topo(user_data); + parseNemoLan(user_data); //set keyWords style - $("#nemo_str_show p").each(function(){ - var $res=$(this); - keyWords.forEach(function(item,index,array){ - // console.log(item); - $res.html($res.html().replace(item,""+item+"")); - }); - }); + $("#nemo_str_show p").each(function(){ + var $res=$(this); + keyWords.forEach(function(item,index,array){ + // console.log(item); + $res.html($res.html().replace(item,""+item+"")); + }); + }); + } + }()); + + $('#user_logout').click(function(){ + // console.log(1); + // alert(1); + setCookie('nemo_userpwd','',-1); + $("#pageContent").empty(); + $("#pageContent").load('src/app/nemo/register.html'); + // alert(2); + }); - } + }); -

Hello xxx!

+

Hello xxx!

Logout
diff --git a/nemo-ui/src/main/resources/nemo/register.html b/nemo-ui/src/main/resources/nemo/register.html index 17c43e5..ce2461b 100644 --- a/nemo-ui/src/main/resources/nemo/register.html +++ b/nemo-ui/src/main/resources/nemo/register.html @@ -62,6 +62,40 @@ function getCookie(name) }); return user_data; } + function userLogin(userName,userPassword){ + jQuery.ajax({ + url: "/restconf/config/nemo-intent:users/", + type: "GET", + async: false, + dataType: "json", + success: function(data) { + console.log(data); + //data=JSON.stringify(data); + var name_data_list=data["users"]["user"]; + for (var i in name_data_list) { + if (name_data_list[i]["user-name"] == userName) { + if (name_data_list[i]["user-password"]==userPassword) + { + userInfoStorage.userName=userName; + localStorage.setItem("nemo_userInfo",JSON.stringify(userInfoStorage)); + setCookie('nemo_username',userName); + setCookie('nemo_userpwd',userPassword); + $("#pageContent").empty(); + $("#pageContent").load('src/app/nemo/nemo.tpl.user.html'); + return; + } + else{ + alert("User's password is wrong!"); + return; + } + } + } + alert("There is no user named "+userName); + }, + error: function(data) {console.log(data);} + }); + } + //use cookie remember the last username and password ,and use them login (function(){ var cook_username=getCookie('nemo_username'); var cook_userpwd=getCookie('nemo_userpwd'); @@ -71,6 +105,9 @@ function getCookie(name) $("#pageContent").empty(); $("#pageContent").load('src/app/nemo/nemo.tpl.html'); } + else{ + userPassword(cook_username,cook_userpwd); + } }()); $("#usename").focus(); //add enter evevt @@ -96,37 +133,7 @@ function getCookie(name) $("#pageContent").load('src/app/nemo/nemo.tpl.html'); } else{ - jQuery.ajax({ - url: "/restconf/config/nemo-intent:users/", - type: "GET", - async: false, - dataType: "json", - success: function(data) { - console.log(data); - //data=JSON.stringify(data); - var name_data_list=data["users"]["user"]; - for (var i in name_data_list) { - if (name_data_list[i]["user-name"] == userName) { - if (name_data_list[i]["user-password"]==userPassword) - { - userInfoStorage.userName=userName; - localStorage.setItem("nemo_userInfo",JSON.stringify(userInfoStorage)); - // setCookie('username',userName); - // setCookie('username',userPassword); - $("#pageContent").empty(); - $("#pageContent").load('src/app/nemo/nemo.tpl.user.html'); - return; - } - else{ - alert("User's password is wrong!"); - return; - } - } - } - alert("There is no user named "+userName); - }, - error: function(data) {console.log(data);} - }); + userLogin(userName,userPassword); } }); -- 2.36.6