From 8d5667415f9e6656fa7e22279bedd53a52dd6c27 Mon Sep 17 00:00:00 2001 From: “shentao” Date: Wed, 29 Mar 2017 20:37:22 +0800 Subject: add holmes modules into menu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue-id: CLIENT-175 Change-Id: Ic1616a80b9ded4ec6690ae24919b35f04acc238f Signed-off-by: “shentao” --- .../main/resources/portalConfig/msb_register.xml | 10 + login/src/main/webapp/login/html/login.html | 91 ++++--- login/src/main/webapp/login/html/menu.html | 246 ++++++++++-------- login/src/main/webapp/login/index.html | 126 ++++++--- login/src/main/webapp/login/js/app.js | 281 --------------------- login/src/main/webapp/login/js/loginApp.js | 53 ++++ login/src/main/webapp/login/js/menuApp.js | 55 ++++ login/src/main/webapp/login/js/rest.js | 58 ----- 8 files changed, 414 insertions(+), 506 deletions(-) delete mode 100644 login/src/main/webapp/login/js/app.js create mode 100644 login/src/main/webapp/login/js/loginApp.js create mode 100644 login/src/main/webapp/login/js/menuApp.js delete mode 100644 login/src/main/webapp/login/js/rest.js diff --git a/integration/src/main/resources/portalConfig/msb_register.xml b/integration/src/main/resources/portalConfig/msb_register.xml index 2f9c60ad..0f3777de 100644 --- a/integration/src/main/resources/portalConfig/msb_register.xml +++ b/integration/src/main/resources/portalConfig/msb_register.xml @@ -141,5 +141,15 @@ hash 0 + + 127.0.0.1 + 9150 + /openoui/holmes + holmes + UI + 1 + hash + 0 + diff --git a/login/src/main/webapp/login/html/login.html b/login/src/main/webapp/login/html/login.html index ee20f5ec..70c77684 100644 --- a/login/src/main/webapp/login/html/login.html +++ b/login/src/main/webapp/login/html/login.html @@ -14,36 +14,65 @@ limitations under the License. --> -

-
-
-
-
- -

{{error}}

-

- - -

-

- - -

-

- - -

- -
+ + + + + + + OPEN-O + + + + + + + + + + + + + + + + + + + + +

+
+
+
+
+ +

{{error}}

+

+ + +

+

+ + +

+

+ + +

+ +
+
+
+

+
+
+
+
+
-
-

-
-
-
-
-
-
+ + diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html index 2cdfd6f0..6908d056 100644 --- a/login/src/main/webapp/login/html/menu.html +++ b/login/src/main/webapp/login/html/menu.html @@ -14,117 +14,151 @@ limitations under the License. --> -