From 1799c18416ccb7e2bac1fd6aabcb74521f65da24 Mon Sep 17 00:00:00 2001 From: “shentao” Date: Mon, 7 Nov 2016 13:30:31 +0800 Subject: GSO-102 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iabd63832ff4682eff83b37fa07481bcdd91c6b30 Signed-off-by: “shentao” --- openo-portal/pom.xml | 1 + .../src/main/webapp/common/css/login.css | 17 +- .../src/main/webapp/common/default.html | 130 +- .../i18n/web-framework-login-i18n-en-US.properties | 4 +- .../i18n/web-framework-menu-i18n-en-US.properties | 5 +- .../common/image/integration/netnumenLogo.png | Bin 4097 -> 0 bytes .../webapp/common/image/integration/openo_bg_1.jpg | Bin 143465 -> 152396 bytes .../webapp/common/image/integration/openo_bg_2.jpg | Bin 152396 -> 143465 bytes .../common/image/integration/openo_logo_black.png | Bin 0 -> 27249 bytes .../image/integration/openo_logo_pantone.png | Bin 0 -> 27702 bytes .../common/image/integration/openo_logo_white.png | Bin 5717 -> 26677 bytes .../src/main/webapp/common/js/core/const.js | 2 +- .../main/webapp/common/js/core/load_menuList.js | 3 +- .../main/webapp/common/js/core/openoFrameWork.js | 107 +- .../src/main/webapp/common/js/login.js | 150 +- .../src/main/webapp/common/js/security/security.js | 2 +- .../src/main/webapp/common/json/menu_list.json | 35 +- .../src/main/webapp/common/login.html | 73 +- .../src/main/webapp/common/main-page.html | 67 - .../data-tables/dataTables.bootstrap.css | 331 + .../webapp/common/thirdparty/echarts/echarts.js | 54502 +++++++++++++++++++ openo-portal/portal-monitor/pom.xml | 40 + .../src/main/webapp/monitor/css/dac.css | 220 + .../src/main/webapp/monitor/css/monitorSetting.css | 167 + .../src/main/webapp/monitor/dacList.html | 250 + .../i18n/umc-monitor-iui-i18n-en-US.properties | 102 + .../src/main/webapp/monitor/images/throbber.gif | Bin 0 -> 9257 bytes .../src/main/webapp/monitor/js/dacController.js | 275 + .../monitor/js/loadi18nApp_ngict-umc-monitor.js | 43 + .../webapp/monitor/js/monitorSettingController.js | 429 + .../main/webapp/monitor/js/monitorSettingUtil.js | 169 + .../src/main/webapp/monitor/monitorSetting.html | 480 + .../main/webapp/monitor/monitorSettingList.html | 103 + openo-portal/portal-package/pom.xml | 16 +- .../main/resources/portalConfig/msb_register.xml | 26 +- .../src/main/webapp/performance/alarm_view.html | 4 +- .../src/main/webapp/performance/js/alarmsUtil.js | 8 +- .../webapp/performance/js/curAlarmsController.js | 2 +- .../performance/js/performanceQueryController.js | 98 +- .../main/webapp/performance/performance_view.html | 4 +- 40 files changed, 57389 insertions(+), 476 deletions(-) delete mode 100644 openo-portal/portal-common/src/main/webapp/common/image/integration/netnumenLogo.png create mode 100644 openo-portal/portal-common/src/main/webapp/common/image/integration/openo_logo_black.png create mode 100644 openo-portal/portal-common/src/main/webapp/common/image/integration/openo_logo_pantone.png delete mode 100644 openo-portal/portal-common/src/main/webapp/common/main-page.html create mode 100644 openo-portal/portal-common/src/main/webapp/common/thirdparty/data-tables/dataTables.bootstrap.css create mode 100644 openo-portal/portal-common/src/main/webapp/common/thirdparty/echarts/echarts.js create mode 100644 openo-portal/portal-monitor/pom.xml create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/css/dac.css create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/css/monitorSetting.css create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/dacList.html create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/i18n/umc-monitor-iui-i18n-en-US.properties create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/images/throbber.gif create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/js/dacController.js create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/js/loadi18nApp_ngict-umc-monitor.js create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/js/monitorSettingController.js create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/js/monitorSettingUtil.js create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/monitorSetting.html create mode 100644 openo-portal/portal-monitor/src/main/webapp/monitor/monitorSettingList.html (limited to 'openo-portal') diff --git a/openo-portal/pom.xml b/openo-portal/pom.xml index 4ada0376..164ffc13 100644 --- a/openo-portal/pom.xml +++ b/openo-portal/pom.xml @@ -38,5 +38,6 @@ portal-auth portal-lifecyclemgr portal-performance + portal-monitor diff --git a/openo-portal/portal-common/src/main/webapp/common/css/login.css b/openo-portal/portal-common/src/main/webapp/common/css/login.css index 4894c02a..93fa8b1c 100644 --- a/openo-portal/portal-common/src/main/webapp/common/css/login.css +++ b/openo-portal/portal-common/src/main/webapp/common/css/login.css @@ -23,8 +23,7 @@ Login page } .login .logo { - margin: 0 auto; - margin-top:60px; + margin: 0 auto; padding: 15px; text-align: center; } @@ -33,14 +32,14 @@ Login page .login .content { background: url(../image/bg-white-lock.png) repeat; width: 360px; - margin: 0 auto; - margin-bottom: 0px; - padding: 30px; - padding-top: 20px; - padding-bottom: 15px; + margin: 0 auto; + margin-top: 150px; + padding: 30px; + padding-top: 20px; + padding-bottom: 15px; border-radius:5px; - -webkit-box-shadow: 2px 3px 3px #717171; - -moz-box-shadow: 2px 3px 3px #717171; + -webkit-box-shadow: 2px 3px 3px #717171; + -moz-box-shadow: 2px 3px 3px #717171; box-shadow: -1px 1px 1px rgba(255,255,255,0.6) inset,-3px 3px 5px rgba(0,0,0,0.2); } diff --git a/openo-portal/portal-common/src/main/webapp/common/default.html b/openo-portal/portal-common/src/main/webapp/common/default.html index 1ea020eb..dd197cce 100644 --- a/openo-portal/portal-common/src/main/webapp/common/default.html +++ b/openo-portal/portal-common/src/main/webapp/common/default.html @@ -19,6 +19,8 @@ + + @@ -37,31 +39,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -70,10 +47,7 @@ - - - -
  • - +
  • @@ -167,15 +83,12 @@
  • - +
  • - - - @@ -194,7 +107,7 @@ -