diff options
23 files changed, 121 insertions, 116 deletions
diff --git a/openo-portal/portal-auth/src/main/webapp/user/changePassword.html b/openo-portal/portal-auth/src/main/webapp/user/changePassword.html index 1cf987be..2baf87fc 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/changePassword.html +++ b/openo-portal/portal-auth/src/main/webapp/user/changePassword.html @@ -18,11 +18,11 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/component.css"> - <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/user.css"> + <link rel="stylesheet" type="text/css" href="/openoui/user/css/component.css"> + <link rel="stylesheet" type="text/css" href="/openoui/user/css/user.css"> <script type="text/javascript" src="/openoui/common/thirdparty/jquery/jquery-1.11.2.min.js"></script> - <script type="text/javascript" src="/openoui/auth/v1/user/js/userTools.js"></script> - <script type="text/javascript" src="/openoui/auth/v1/user/js/changePassword.js"></script> + <script type="text/javascript" src="/openoui/user/js/userTools.js"></script> + <script type="text/javascript" src="/openoui/user/js/changePassword.js"></script> </head> <body class="hw_body"> diff --git a/openo-portal/portal-auth/src/main/webapp/user/createUser.html b/openo-portal/portal-auth/src/main/webapp/user/createUser.html index 14283fd1..5b3cbbae 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/createUser.html +++ b/openo-portal/portal-auth/src/main/webapp/user/createUser.html @@ -19,11 +19,11 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/component.css"> - <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/user.css"> + <link rel="stylesheet" type="text/css" href="/openoui/user/css/component.css"> + <link rel="stylesheet" type="text/css" href="/openoui/user/css/user.css"> <script type="text/javascript" src="/openoui/common/thirdparty/jquery/jquery-1.11.2.min.js"></script> - <script type="text/javascript" src="/openoui/auth/v1/user/js/userTools.js"></script> - <script type="text/javascript" src="/openoui/auth/v1/user/js/createUser.js"></script> + <script type="text/javascript" src="/openoui/user/js/userTools.js"></script> + <script type="text/javascript" src="/openoui/user/js/createUser.js"></script> </head> <body class="hw_body"> diff --git a/openo-portal/portal-auth/src/main/webapp/user/css/component.css b/openo-portal/portal-auth/src/main/webapp/user/css/component.css index 9c81d666..13566b98 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/css/component.css +++ b/openo-portal/portal-auth/src/main/webapp/user/css/component.css @@ -33,7 +33,7 @@ background: -webkit-gradient(linear,left top,left bottom,color-stop(0,#fff),color-stop(100%,#fafafa)); background: -webkit-linear-gradient(top,#fff,#fafafa); background: linear-gradient(to bottom,#fff,#fafafa); - border-radius: 6px; + border-radius: 6px!important; } .fk_button:hover { color: #009ae7; @@ -48,10 +48,10 @@ margin-right: 10px; } .add_imag { - background-image: url(/openoui/auth/v1/user/images/add.png); + background-image: url(/openoui/user/images/add.png); } .delete_imag { - background-image: url(/openoui/auth/v1/user/images/delete.png); + background-image: url(/openoui/user/images/delete.png); } .button_imag { padding-left: 25px; diff --git a/openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js b/openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js index afe96b3d..f499bfc2 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js +++ b/openo-portal/portal-auth/src/main/webapp/user/js/changePassword.js @@ -38,7 +38,7 @@ $(document).ready(function() { var data = getModifyUser(); changePsd(data).done(function() { top.bootbox.alert("Password change successfully.", function(e) { - Rest.turn2URI("/openoui/auth/v1/user/html/user.html"); + Rest.turn2URI("/openoui/user/user.html"); }) }).fail(function(e) { if (e.statusText == "Unauthorized") { @@ -49,7 +49,7 @@ $(document).ready(function() { }) }) $("#cancel").click(function(e) { - window.document.location = "/openoui/auth/v1/user/html/user.html"; + window.document.location = "/openoui/user/user.html"; }) } diff --git a/openo-portal/portal-auth/src/main/webapp/user/js/createUser.js b/openo-portal/portal-auth/src/main/webapp/user/js/createUser.js index 7a95a8ee..f27214a6 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/js/createUser.js +++ b/openo-portal/portal-auth/src/main/webapp/user/js/createUser.js @@ -30,11 +30,11 @@ $(document).ready(function() { } var data = getCreateUser(); createUser(data).done(function() { - window.document.location = "/openoui/auth/v1/user/html/user.html"; + window.document.location = "/openoui/user/user.html"; }) }) $("#cancel").click(function(e) { - window.document.location = "/openoui/auth/v1/user/html/user.html"; + window.document.location = "/openoui/user/user.html"; }) } diff --git a/openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js b/openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js index b01cebe4..e75e9779 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js +++ b/openo-portal/portal-auth/src/main/webapp/user/js/modifyUser.js @@ -26,11 +26,11 @@ $(document).ready(function() { $("#confirm").click(function(e) { var data = getModifyUser(); modifyUser(data).done(function() { - window.document.location = "/openoui/auth/v1/user/html/user.html"; + window.document.location = "/openoui/user/user.html"; }) }) $("#cancel").click(function(e) { - window.document.location = "/openoui/auth/v1/user/html/user.html"; + window.document.location = "/openoui/user/user.html"; }) } diff --git a/openo-portal/portal-auth/src/main/webapp/user/js/user.js b/openo-portal/portal-auth/src/main/webapp/user/js/user.js index bc442616..11f2326c 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/js/user.js +++ b/openo-portal/portal-auth/src/main/webapp/user/js/user.js @@ -15,8 +15,8 @@ */ $(document).ready(function() { var USER_SERVICE = "/openoapi/auth/v1/users"; - var deleteEditOpt = "<img class='edit' title='edit' src='/openoui/auth/v1/user/images/edit.png'><img class='changePsd' title='Change Password' src='/openoui/auth/v1/user/images/reset.png'><img class='delete' title='delete' src='/openoui/auth/v1/user/images/delete.png'>"; - var editOpt = "<img class='edit' title='edit' src='/openoui/auth/v1/user/images/edit.png'><img class='changePsd' title='Change Password' src='/openoui/auth/v1/user/images/reset.png'>"; + var deleteEditOpt = "<img class='edit' title='edit' src='/openoui/user/images/edit.png'><img class='changePsd' title='Change Password' src='/openoui/user/images/reset.png'><img class='delete' title='delete' src='/openoui/user/images/delete.png'>"; + var editOpt = "<img class='edit' title='edit' src='/openoui/user/images/edit.png'><img class='changePsd' title='Change Password' src='/openoui/user/images/reset.png'>"; var userListHeader = [ { title: "User", data: "User",width: "20%"}, @@ -54,14 +54,14 @@ $(document).ready(function() { } }) } else if (classname == "edit") { - window.document.location = "/openoui/auth/v1/user/html/modifyUser.html" + "?id=" + id; + window.document.location = "/openoui/user/modifyUser.html" + "?id=" + id; } else if (classname == "changePsd") { - window.document.location = "/openoui/auth/v1/user/html/changePassword.html" + "?id=" + id; + window.document.location = "/openoui/user/changePassword.html" + "?id=" + id; } }) $("#create").click(function(e) { - window.document.location = "/openoui/auth/v1/user/html/createUser.html"; + window.document.location = "/openoui/user/createUser.html"; }) } diff --git a/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html b/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html index 6a4abba9..6e55303d 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html +++ b/openo-portal/portal-auth/src/main/webapp/user/modifyUser.html @@ -19,11 +19,11 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/component.css"> - <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/user.css"> + <link rel="stylesheet" type="text/css" href="/openoui/user/css/component.css"> + <link rel="stylesheet" type="text/css" href="/openoui/user/css/user.css"> <script type="text/javascript" src="/openoui/common/thirdparty/jquery/jquery-1.11.2.min.js"></script> - <script type="text/javascript" src="/openoui/auth/v1/user/js/userTools.js"></script> - <script type="text/javascript" src="/openoui/auth/v1/user/js/modifyUser.js"></script> + <script type="text/javascript" src="/openoui/user/js/userTools.js"></script> + <script type="text/javascript" src="/openoui/user/js/modifyUser.js"></script> </head> diff --git a/openo-portal/portal-auth/src/main/webapp/user/user.html b/openo-portal/portal-auth/src/main/webapp/user/user.html index dbd0adc9..58ef9df9 100644 --- a/openo-portal/portal-auth/src/main/webapp/user/user.html +++ b/openo-portal/portal-auth/src/main/webapp/user/user.html @@ -19,14 +19,14 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - <link rel="stylesheet" type="text/css" href="/openoui/common/thirdparty/data-table/jquery.dataTables.min.css"> + <link rel="stylesheet" type="text/css" href="/openoui/common/thirdparty/data-tables/jquery.dataTables.min.css"> <script type="text/javascript" src="/openoui/common/thirdparty/jquery/jquery-1.11.2.min.js"></script> <script type="text/javascript" src="/openoui/common/thirdparty/bootbox/bootbox.min.js"></script> - <script type="text/javascript" charset="utf8" src="/openoui/common/thirdparty/data-table/jquery.dataTables.min.js"></script> - <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/component.css"> - <script type="text/javascript" src="/openoui/auth/v1/user/js/userTools.js"></script> - <script type="text/javascript" src="/openoui/auth/v1/user/js/user.js"></script> - <link rel="stylesheet" type="text/css" href="/openoui/auth/v1/user/css/user.css"> + <script type="text/javascript" charset="utf8" src="/openoui/common/thirdparty/data-tables/jquery.dataTables.min.js"></script> + <link rel="stylesheet" type="text/css" href="/openoui/user/css/component.css"> + <script type="text/javascript" src="/openoui/user/js/userTools.js"></script> + <script type="text/javascript" src="/openoui/user/js/user.js"></script> + <link rel="stylesheet" type="text/css" href="/openoui/user/css/user.css"> </head> <body class="hw_body" style="visibility: hidden;"> @@ -34,7 +34,7 @@ <button class="fk_button add_imag button_imag" id="create">Create</button> </div> <div> - <table id="table_id" class="display" style="table-layout: fixed"></table> + <table id="table_id"></table> </div> </body> diff --git a/openo-portal/portal-common/src/main/webapp/common/about.html b/openo-portal/portal-common/src/main/webapp/common/about.html deleted file mode 100644 index 1f273218..00000000 --- a/openo-portal/portal-common/src/main/webapp/common/about.html +++ /dev/null @@ -1,52 +0,0 @@ -<!-- - Copyright 2016, CMCC Technologies Co., Ltd. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<div class="about aboutmain"> - <div> - <a href="#" onclick="link_click('info')"> - <span id="com_zte_ums_ict_framework_about_detail" name_i18n="com_zte_ums_ict_framework_ui_i18n"></span> - <i class = "fa fa-angle-right"></i> - </a> - <a href="#" class="about_close" onclick="ict_about_dlg_close()"> - × - </a> - </div> - <div class="info"> - <img src="image/integration/openo_logo_white.png" alt=""/> - <div class="ict_main_productname"> - <span id="com_zte_ums_ict_framework_ui_main_title" name_i18n="com_zte_ums_ict_framework_ui_i18n"></span> - </div> - <div class="ict_main_version"> - <span id="com_zte_ums_ict_framework_about_version" name_i18n="com_zte_ums_ict_framework_ui_i18n"></span> - </div> - <div class="copyright"> - <span id="com_zte_ums_ict_portal_login_companyName" name_i18n="com_zte_ums_ict_framework_ui_i18n"></span>. - </div> - </div> -</div> -<div class="about aboutinfo" style="display:none"> - <div> - <a href="#" onclick="link_click('about')"> - <span id="com_zte_ums_ict_framework_moudle_about" name_i18n="com_zte_ums_ict_framework_ui_i18n"></span> - <i class = "fa fa-angle-right"></i> - </a> - <a href="#" class="about_close" onclick="ict_about_dlg_close()"> - × - </a> - </div> - <div class="row-fluid" data-name="table_zone"> - <div class="col-xs-12" id = 'ict_about_table_div' style=""></div> - </div> -</div> diff --git a/openo-portal/portal-common/src/main/webapp/common/thirdparty/data-tables/jquery.dataTables.min.css b/openo-portal/portal-common/src/main/webapp/common/thirdparty/data-tables/jquery.dataTables.min.css new file mode 100644 index 00000000..b6fb7378 --- /dev/null +++ b/openo-portal/portal-common/src/main/webapp/common/thirdparty/data-tables/jquery.dataTables.min.css @@ -0,0 +1 @@ +table.dataTable{width:100%;margin:0 auto;clear:both;border-collapse:separate;border-spacing:0}table.dataTable thead th,table.dataTable tfoot th{font-weight:bold}table.dataTable thead th,table.dataTable thead td{padding:10px 18px;border-bottom:1px solid #111}table.dataTable thead th:active,table.dataTable thead td:active{outline:none}table.dataTable tfoot th,table.dataTable tfoot td{padding:10px 18px 6px 18px;border-top:1px solid #111}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc{cursor:pointer;*cursor:hand}table.dataTable thead .sorting,table.dataTable thead .sorting_asc,table.dataTable thead .sorting_desc,table.dataTable thead .sorting_asc_disabled,table.dataTable thead .sorting_desc_disabled{background-repeat:no-repeat;background-position:center right}table.dataTable thead .sorting{background-image:url("../images/sort_both.png")}table.dataTable thead .sorting_asc{background-image:url("../images/sort_asc.png")}table.dataTable thead .sorting_desc{background-image:url("../images/sort_desc.png")}table.dataTable thead .sorting_asc_disabled{background-image:url("../images/sort_asc_disabled.png")}table.dataTable thead .sorting_desc_disabled{background-image:url("../images/sort_desc_disabled.png")}table.dataTable tbody tr{background-color:#ffffff}table.dataTable tbody tr.selected{background-color:#B0BED9}table.dataTable tbody th,table.dataTable tbody td{padding:8px 10px}table.dataTable.row-border tbody th,table.dataTable.row-border tbody td,table.dataTable.display tbody th,table.dataTable.display tbody td{border-top:1px solid #ddd}table.dataTable.row-border tbody tr:first-child th,table.dataTable.row-border tbody tr:first-child td,table.dataTable.display tbody tr:first-child th,table.dataTable.display tbody tr:first-child td{border-top:none}table.dataTable.cell-border tbody th,table.dataTable.cell-border tbody td{border-top:1px solid #ddd;border-right:1px solid #ddd}table.dataTable.cell-border tbody tr th:first-child,table.dataTable.cell-border tbody tr td:first-child{border-left:1px solid #ddd}table.dataTable.cell-border tbody tr:first-child th,table.dataTable.cell-border tbody tr:first-child td{border-top:none}table.dataTable.stripe tbody tr.odd,table.dataTable.display tbody tr.odd{background-color:#f9f9f9}table.dataTable.stripe tbody tr.odd.selected,table.dataTable.display tbody tr.odd.selected{background-color:#acbad4}table.dataTable.hover tbody tr:hover,table.dataTable.display tbody tr:hover{background-color:#f6f6f6}table.dataTable.hover tbody tr:hover.selected,table.dataTable.display tbody tr:hover.selected{background-color:#aab7d1}table.dataTable.order-column tbody tr>.sorting_1,table.dataTable.order-column tbody tr>.sorting_2,table.dataTable.order-column tbody tr>.sorting_3,table.dataTable.display tbody tr>.sorting_1,table.dataTable.display tbody tr>.sorting_2,table.dataTable.display tbody tr>.sorting_3{background-color:#fafafa}table.dataTable.order-column tbody tr.selected>.sorting_1,table.dataTable.order-column tbody tr.selected>.sorting_2,table.dataTable.order-column tbody tr.selected>.sorting_3,table.dataTable.display tbody tr.selected>.sorting_1,table.dataTable.display tbody tr.selected>.sorting_2,table.dataTable.display tbody tr.selected>.sorting_3{background-color:#acbad5}table.dataTable.display tbody tr.odd>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd>.sorting_1{background-color:#f1f1f1}table.dataTable.display tbody tr.odd>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd>.sorting_2{background-color:#f3f3f3}table.dataTable.display tbody tr.odd>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd>.sorting_3{background-color:whitesmoke}table.dataTable.display tbody tr.odd.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_1{background-color:#a6b4cd}table.dataTable.display tbody tr.odd.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_2{background-color:#a8b5cf}table.dataTable.display tbody tr.odd.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.odd.selected>.sorting_3{background-color:#a9b7d1}table.dataTable.display tbody tr.even>.sorting_1,table.dataTable.order-column.stripe tbody tr.even>.sorting_1{background-color:#fafafa}table.dataTable.display tbody tr.even>.sorting_2,table.dataTable.order-column.stripe tbody tr.even>.sorting_2{background-color:#fcfcfc}table.dataTable.display tbody tr.even>.sorting_3,table.dataTable.order-column.stripe tbody tr.even>.sorting_3{background-color:#fefefe}table.dataTable.display tbody tr.even.selected>.sorting_1,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_1{background-color:#acbad5}table.dataTable.display tbody tr.even.selected>.sorting_2,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_2{background-color:#aebcd6}table.dataTable.display tbody tr.even.selected>.sorting_3,table.dataTable.order-column.stripe tbody tr.even.selected>.sorting_3{background-color:#afbdd8}table.dataTable.display tbody tr:hover>.sorting_1,table.dataTable.order-column.hover tbody tr:hover>.sorting_1{background-color:#eaeaea}table.dataTable.display tbody tr:hover>.sorting_2,table.dataTable.order-column.hover tbody tr:hover>.sorting_2{background-color:#ececec}table.dataTable.display tbody tr:hover>.sorting_3,table.dataTable.order-column.hover tbody tr:hover>.sorting_3{background-color:#efefef}table.dataTable.display tbody tr:hover.selected>.sorting_1,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_1{background-color:#a2aec7}table.dataTable.display tbody tr:hover.selected>.sorting_2,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_2{background-color:#a3b0c9}table.dataTable.display tbody tr:hover.selected>.sorting_3,table.dataTable.order-column.hover tbody tr:hover.selected>.sorting_3{background-color:#a5b2cb}table.dataTable.no-footer{border-bottom:1px solid #111}table.dataTable.nowrap th,table.dataTable.nowrap td{white-space:nowrap}table.dataTable.compact thead th,table.dataTable.compact thead td{padding:4px 17px 4px 4px}table.dataTable.compact tfoot th,table.dataTable.compact tfoot td{padding:4px}table.dataTable.compact tbody th,table.dataTable.compact tbody td{padding:4px}table.dataTable th.dt-left,table.dataTable td.dt-left{text-align:left}table.dataTable th.dt-center,table.dataTable td.dt-center,table.dataTable td.dataTables_empty{text-align:center}table.dataTable th.dt-right,table.dataTable td.dt-right{text-align:right}table.dataTable th.dt-justify,table.dataTable td.dt-justify{text-align:justify}table.dataTable th.dt-nowrap,table.dataTable td.dt-nowrap{white-space:nowrap}table.dataTable thead th.dt-head-left,table.dataTable thead td.dt-head-left,table.dataTable tfoot th.dt-head-left,table.dataTable tfoot td.dt-head-left{text-align:left}table.dataTable thead th.dt-head-center,table.dataTable thead td.dt-head-center,table.dataTable tfoot th.dt-head-center,table.dataTable tfoot td.dt-head-center{text-align:center}table.dataTable thead th.dt-head-right,table.dataTable thead td.dt-head-right,table.dataTable tfoot th.dt-head-right,table.dataTable tfoot td.dt-head-right{text-align:right}table.dataTable thead th.dt-head-justify,table.dataTable thead td.dt-head-justify,table.dataTable tfoot th.dt-head-justify,table.dataTable tfoot td.dt-head-justify{text-align:justify}table.dataTable thead th.dt-head-nowrap,table.dataTable thead td.dt-head-nowrap,table.dataTable tfoot th.dt-head-nowrap,table.dataTable tfoot td.dt-head-nowrap{white-space:nowrap}table.dataTable tbody th.dt-body-left,table.dataTable tbody td.dt-body-left{text-align:left}table.dataTable tbody th.dt-body-center,table.dataTable tbody td.dt-body-center{text-align:center}table.dataTable tbody th.dt-body-right,table.dataTable tbody td.dt-body-right{text-align:right}table.dataTable tbody th.dt-body-justify,table.dataTable tbody td.dt-body-justify{text-align:justify}table.dataTable tbody th.dt-body-nowrap,table.dataTable tbody td.dt-body-nowrap{white-space:nowrap}table.dataTable,table.dataTable th,table.dataTable td{-webkit-box-sizing:content-box;box-sizing:content-box}.dataTables_wrapper{position:relative;clear:both;*zoom:1;zoom:1}.dataTables_wrapper .dataTables_length{float:left}.dataTables_wrapper .dataTables_filter{float:right;text-align:right}.dataTables_wrapper .dataTables_filter input{margin-left:0.5em}.dataTables_wrapper .dataTables_info{clear:both;float:left;padding-top:0.755em}.dataTables_wrapper .dataTables_paginate{float:right;text-align:right;padding-top:0.25em}.dataTables_wrapper .dataTables_paginate .paginate_button{box-sizing:border-box;display:inline-block;min-width:1.5em;padding:0.5em 1em;margin-left:2px;text-align:center;text-decoration:none !important;cursor:pointer;*cursor:hand;color:#333 !important;border:1px solid transparent;border-radius:2px}.dataTables_wrapper .dataTables_paginate .paginate_button.current,.dataTables_wrapper .dataTables_paginate .paginate_button.current:hover{color:#333 !important;border:1px solid #979797;background-color:white;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #fff), color-stop(100%, #dcdcdc));background:-webkit-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-moz-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-ms-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:-o-linear-gradient(top, #fff 0%, #dcdcdc 100%);background:linear-gradient(to bottom, #fff 0%, #dcdcdc 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button.disabled,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:hover,.dataTables_wrapper .dataTables_paginate .paginate_button.disabled:active{cursor:default;color:#666 !important;border:1px solid transparent;background:transparent;box-shadow:none}.dataTables_wrapper .dataTables_paginate .paginate_button:hover{color:white !important;border:1px solid #111;background-color:#585858;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #585858), color-stop(100%, #111));background:-webkit-linear-gradient(top, #585858 0%, #111 100%);background:-moz-linear-gradient(top, #585858 0%, #111 100%);background:-ms-linear-gradient(top, #585858 0%, #111 100%);background:-o-linear-gradient(top, #585858 0%, #111 100%);background:linear-gradient(to bottom, #585858 0%, #111 100%)}.dataTables_wrapper .dataTables_paginate .paginate_button:active{outline:none;background-color:#2b2b2b;background:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #2b2b2b), color-stop(100%, #0c0c0c));background:-webkit-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-moz-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-ms-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:-o-linear-gradient(top, #2b2b2b 0%, #0c0c0c 100%);background:linear-gradient(to bottom, #2b2b2b 0%, #0c0c0c 100%);box-shadow:inset 0 0 3px #111}.dataTables_wrapper .dataTables_paginate .ellipsis{padding:0 1em}.dataTables_wrapper .dataTables_processing{position:absolute;top:50%;left:50%;width:100%;height:40px;margin-left:-50%;margin-top:-25px;padding-top:20px;text-align:center;font-size:1.2em;background-color:white;background:-webkit-gradient(linear, left top, right top, color-stop(0%, rgba(255,255,255,0)), color-stop(25%, rgba(255,255,255,0.9)), color-stop(75%, rgba(255,255,255,0.9)), color-stop(100%, rgba(255,255,255,0)));background:-webkit-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-moz-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-ms-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:-o-linear-gradient(left, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%);background:linear-gradient(to right, rgba(255,255,255,0) 0%, rgba(255,255,255,0.9) 25%, rgba(255,255,255,0.9) 75%, rgba(255,255,255,0) 100%)}.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter,.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_processing,.dataTables_wrapper .dataTables_paginate{color:#333}.dataTables_wrapper .dataTables_scroll{clear:both}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody{*margin-top:-1px;-webkit-overflow-scrolling:touch}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td{vertical-align:middle}.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody th>div.dataTables_sizing,.dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody td>div.dataTables_sizing{height:0;overflow:hidden;margin:0 !important;padding:0 !important}.dataTables_wrapper.no-footer .dataTables_scrollBody{border-bottom:1px solid #111}.dataTables_wrapper.no-footer div.dataTables_scrollHead table,.dataTables_wrapper.no-footer div.dataTables_scrollBody table{border-bottom:none}.dataTables_wrapper:after{visibility:hidden;display:block;content:"";clear:both;height:0}@media screen and (max-width: 767px){.dataTables_wrapper .dataTables_info,.dataTables_wrapper .dataTables_paginate{float:none;text-align:center}.dataTables_wrapper .dataTables_paginate{margin-top:0.5em}}@media screen and (max-width: 640px){.dataTables_wrapper .dataTables_length,.dataTables_wrapper .dataTables_filter{float:none;text-align:center}.dataTables_wrapper .dataTables_filter{margin-top:0.5em}}
\ No newline at end of file diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js index 30231fca..37cb05f3 100644 --- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js +++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js @@ -357,7 +357,7 @@ function formatDate(date) { function deleteNe(rowId, row) { var instanceId = row.serviceId; var serviceType = row.serviceType; - var gatewayService = '/openoapi/servicegateway/v1/services'; + var gatewayService = '/openoapi/servicegateway/v1/services/' + instanceId + '/terminate'; var remove = function () { $('#sai').bootstrapTable('remove', {field: 'serviceId', values: [instanceId]}); }; @@ -404,7 +404,7 @@ function deleteNetworkServiceInstance(gatewayService, nsUri, instanceId) { 'gatewayUri': instanceUri }; return $.ajax({ - type: "DELETE", + type: "POST", url: gatewayService, contentType: "application/json", dataType: "json", @@ -423,7 +423,7 @@ function terminateNetworkServiceInstance(gatewayService, nsUri, instanceId) { 'gatewayUri': nsTerminateUri }; return $.ajax({ - type: "DELETE", + type: "POST", url: gatewayService, contentType: "application/json", dataType: "json", diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json new file mode 100644 index 00000000..20ce9a54 --- /dev/null +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/conf/globalconfig.json @@ -0,0 +1,5 @@ +{ + "url": "http://127.0.0.1", + "port": "8080", + "context_name":"resmgr" +}
\ No newline at end of file diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/datacenter.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/datacenter.html index 451d2f4c..f0ae9679 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/datacenter.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/datacenter.html @@ -13,7 +13,8 @@ <script type="text/javascript" src="js/bootstrap-table.min.js"></script> <script type="text/javascript" src="js/bootbox.min.js"></script> <script type="text/javascript" src="js/jquery.validate.min.js"></script> - + + <script type="text/javascript" src="js/gconf.js"></script> <script type="text/javascript" src="js/datacenter.js"></script> <style type="text/css"> diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js index e3ff681a..8e77f0cf 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/datacenter.js @@ -4,7 +4,7 @@ function hideFirstCol() { } function deleteDatacenter(objectId) { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/datacenters/" + objectId; + var requestUrl = app_url+ "/openoapi/resmgr/v1/datacenters/" + objectId; $.ajax({ type: "DELETE", url: requestUrl, @@ -23,7 +23,7 @@ function deleteDatacenter(objectId) { } function loadDatacenterData() { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/datacenters"; + var requestUrl = app_url+"/openoapi/resmgr/v1/datacenters"; $.ajax({ type: "GET", url: requestUrl, @@ -46,7 +46,7 @@ function loadDatacenterData() { }); } function loadNetWorkData() { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/networks"; + var requestUrl = app_url+"/openoapi/resmgr/v1/networks"; $.ajax({ type: "GET", url: requestUrl, @@ -62,7 +62,7 @@ function loadNetWorkData() { }); } function loadPortData() { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/ports"; + var requestUrl = app_url+"/openoapi/resmgr/v1/ports"; $.ajax({ type: "GET", url: requestUrl, @@ -78,7 +78,7 @@ function loadPortData() { }); } function loadHostData() { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/hosts"; + var requestUrl = app_url+"/openoapi/resmgr/v1/hosts"; $.ajax({ type: "GET", url: requestUrl, @@ -97,7 +97,7 @@ function loadHostData() { function fillCountryData() { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/locations/country"; + var requestUrl = app_url+"/openoapi/resmgr/v1/locations/country"; var htmlContent = ""; $.ajax({ type: "GET", @@ -119,7 +119,7 @@ function fillCountryData() { function fillVimNameData() { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/locations/cloudservice"; + var requestUrl = app_url+"/openoapi/resmgr/v1/locations/cloudservice"; var htmlContent = ""; $.ajax({ type: "GET", @@ -198,7 +198,7 @@ $(function () { var formData = JSON.stringify($("#vmAppForm").serializeObject()); var jsonobj = JSON.parse(formData); - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/datacenters"; + var requestUrl = app_url+"/openoapi/resmgr/v1/datacenters"; $.ajax({ type: "POST", url: requestUrl, @@ -220,7 +220,7 @@ $(function () { $('#country').change(function () { var country = $(this).children('option:selected').val(); - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/locations/locationbycountry?country=" + country; + var requestUrl = app_url+"/openoapi/resmgr/v1/locations/locationbycountry?country=" + country; var htmlContent = "<option value=''>--select--</option>"; $.ajax({ diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js new file mode 100644 index 00000000..df55a1d0 --- /dev/null +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/gconf.js @@ -0,0 +1,31 @@ +/* Copyright 2016, Huawei Technologies Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +var app_url; +function getUrl(){ + var url=""; + $.ajax({ + url:"./conf/globalconfig.json", + async:false, + dataType:"json", + success:function(jsonData) { + url = jsonData.url + ":" + jsonData.port +"/"+jsonData.context_name; + console.log("url = " + url); + } + }); + return url; +} +app_url = getUrl(); diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/resmgr.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/resmgr.js index a0ad9921..5a6e66cb 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/resmgr.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/resmgr.js @@ -3,7 +3,7 @@ function hideFirstCol() { // $('table tr').find('td:eq(0)').hide(); } function deleteLocation(objectId) { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/locations/" + objectId; + var requestUrl = app_url+"/openoapi/resmgr/v1/locations/" + objectId; $.ajax({ type: "DELETE", url: requestUrl, @@ -34,7 +34,7 @@ function editLocation(row) { } function loadLocationData() { - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/locations"; + var requestUrl = app_url+"/openoapi/resmgr/v1/locations"; $.ajax({ type: "GET", url: requestUrl, @@ -146,8 +146,8 @@ $(function () { function () { var formData = JSON.stringify($("#vmAppForm").serializeObject()); var jsonobj = JSON.parse(formData); - var requestUrl = "/resmgr/rest/openoapi/resmgr/v1/locations"; - var requestUrl_query = "/resmgr/rest/openoapi/resmgr/v1/locations"; + var requestUrl = app_url+"/openoapi/resmgr/v1/locations"; + var requestUrl_query = app_url+"/openoapi/resmgr/v1/locations"; if ($('#id').val().length === 0) {//create diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/vim.js b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/vim.js index 6de43718..68ffe3f3 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/vim.js +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/js/vim.js @@ -1,5 +1,5 @@ function loadVimData() { - var requestUrl = "/resmgr/rest/v1/resmanage/vim/vimInfo"; + var requestUrl = app_url+"/v1/resmanage/vim/vimInfo"; $.ajax({ type: "GET", url: requestUrl, diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/location.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/location.html index 187bee32..b6647abc 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/location.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/location.html @@ -15,7 +15,8 @@ <script type="text/javascript" src="js/bootbox.min.js"></script> <script type="text/javascript" src="js/jquery.validate.min.js"></script> <script type="text/javascript" src="js/validateset.js"></script> - + + <script type="text/javascript" src="js/gconf.js"></script> <script type="text/javascript" src="js/resmgr.js"></script> <style type="text/css"> diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/vim.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/vim.html index d4697da3..f917489e 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/vim.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-nfv/vim.html @@ -15,6 +15,7 @@ <script type="text/javascript" src="js/jquery.validate.min.js"></script> <script type="text/javascript" src="js/chart.min.js"></script> + <script type="text/javascript" src="js/gconf.js"></script> <script type="text/javascript" src="js/vim.js"></script> <style type="text/css"> diff --git a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/resource.html b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/resource.html index 0625f70c..0e0f1ec3 100644 --- a/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/resource.html +++ b/openo-portal/portal-resmgr/src/main/webapp/resmgr-sdn/resource.html @@ -69,6 +69,16 @@ $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_3_brAppTlMenuID').click(function () {
$('#accordionContent').attr('src', 'link.html');
});
+
+ $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_4_locationID').click(function () {
+ $('#accordionContent').attr('src', '../resmgr-nfv/location.html');
+ });
+ $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_5_vimID').click(function () {
+ $('#accordionContent').attr('src', '../resmgr-nfv/vim.html');
+ });
+ $('#accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_6_datacenterID').click(function () {
+ $('#accordionContent').attr('src', '../resmgr-nfv/datacenter.html');
+ });
})
</script>
@@ -117,6 +127,19 @@ nodeid="brAppTlMenuID" style="display: list-item;">
<a title="Link" style="padding-left: 62px;">Link</a>
</li>
+
+ <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_4_locationID"
+ nodeid="brAppSiteMenuID" class="" style="display: list-item;">
+ <a title="Click to visit location" class="" style="padding-left: 62px;">Location</a>
+ </li>
+ <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_5_vimID"
+ nodeid="brAppMeMenuID" style="display: list-item;">
+ <a title="Click to visit vim" style="padding-left: 62px;">Vim</a>
+ </li>
+ <li id="accordionmenuid_ul_0_0_brAppTopMenuID_UL_1_6_datacenterID"
+ nodeid="brAppTpMenuID" style="display: list-item;">
+ <a title="Click to visit datacenter" style="padding-left: 62px;">DataCenter</a>
+ </li>
</ul>
</li>
</ul>
diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java index 302b2bd9..0e8b03ce 100644 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java +++ b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/roa/inf/IServiceGatewayRoaModule.java @@ -18,7 +18,6 @@ package org.openo.gso.gui.servicegateway.roa.inf; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; @@ -63,10 +62,10 @@ public interface IServiceGatewayRoaModule { * @throws ServiceException when operate database or parameter is wrong. * @since GSO 0.5 */ - @DELETE + @POST @Produces({"application/json"}) @Consumes({"application/json"}) - @Path("/{serviceId}") + @Path("/{serviceId}/terminate") Response deleteService(@PathParam("serviceId") String serviceId, @Context HttpServletRequest servletReq) throws ServiceException; diff --git a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java index c3dee4a3..3ff4f89b 100644 --- a/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java +++ b/servicegateway/service/src/main/java/org/openo/gso/gui/servicegateway/service/impl/ServiceGatewayImpl.java @@ -139,21 +139,16 @@ public class ServiceGatewayImpl implements IServiceGateway { // Parse request String reqContent = RestUtils.getRequestBody(httpRequest); Map<String, Object> requestBody = JsonUtil.unMarshal(reqContent, Map.class); - Map<String, Object> service = (Map<String, Object>)requestBody.get(Constant.SERVICE_INDENTIFY); - if(null == service) - { - service = requestBody; - } ValidateUtil.assertObjectNotNull(requestBody); // Validate data - String gatewayUri = (String)service.get(Constant.SERVICE_GATEWAY_URI); + String gatewayUri = (String)requestBody.get(Constant.SERVICE_GATEWAY_URI); ValidateUtil.assertStringNotNull(gatewayUri); - service.remove(Constant.SERVICE_GATEWAY_URI); + requestBody.remove(Constant.SERVICE_GATEWAY_URI); - String operation = (String) service.get(Constant.SERVICE_OPERATION); + String operation = (String) requestBody.get(Constant.SERVICE_OPERATION); ValidateUtil.assertStringNotNull(operation); - service.remove(Constant.SERVICE_OPERATION); + requestBody.remove(Constant.SERVICE_OPERATION); // call the restful try { |