Merge "modified holmes link file"

3 files changed, 39 insertions, 31 deletions

diff --git a/login/src/main/webapp/login/css/menu_mainStyle.css b/login/src/main/webapp/login/css/menu_mainStyle.css
index 848609a3..ca1af9ed 100644
--- a/login/src/main/webapp/login/css/menu_mainStyle.css
+++ b/login/src/main/webapp/login/css/menu_mainStyle.css
@@ -36,9 +36,8 @@
     width: 240px;
     position: relative;
     z-index: 90;
-    background: #e4e9f0;
-    border: #c1cad5 solid 1px;
-    border-width: 0 1px 0 0;
+    border: #c1cad5 solid 0.5px;
+    border-width: 0px 0px 0px 1px;
 }
 
 .fixed-sidebar #page-sidebar {
@@ -61,7 +60,7 @@
 
 #header-logo {
     width: 240px;
-    background: #2b394a;
+    background: #FFF;
     text-transform: uppercase;
     font-weight: normal;
     height: 52px;
@@ -71,7 +70,7 @@
 
 #sidebar-menu {
     width: 240px;
-    background: #e4e9f0;
+    background: #FFF;
     overflow: hidden;
     height: auto !important;
     position: absolute;
@@ -91,7 +90,7 @@ a {
 
 .accordion {
     width: 240px;
-    background: #FFF;
+    background: #37485d;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
@@ -103,7 +102,7 @@ a {
     cursor: pointer;
     display: block;
     padding: 15px 15px 15px 42px;
-    color: #4D4D4D;
+    color: rgba(255,255,255,0.5);
     font-size: 14px;
     font-weight: 700;
     border-bottom: 1px solid #CCC;
@@ -122,7 +121,7 @@ a {
     top: 16px;
     left: 12px;
     font-size: 18px;
-    color: #595959;
+    color: rgba(255,255,255,0.5);
     -webkit-transition: all 0.4s ease;
     -o-transition: all 0.4s ease;
     transition: all 0.4s ease;
@@ -151,7 +150,7 @@ a {
 
 .submenu {
     display: none;
-    background: #444359;
+    background: #6b6262;
     font-size: 14px;
     -webkit-padding-start: 0px;
 }
@@ -172,7 +171,7 @@ a {
 }
 
 .submenu a:hover {
-    background: #b63b4d;
+    background: #527571;
     color: #FFF;
 }
 
@@ -276,7 +275,7 @@ a {
 
 .submenu_active {
     font-style: italic;
-    color: #191970 !important;
-    background:#d9d9d9;
+    background: #6b1a1a !important;
+    color: #FFF;
     border-left: 3px solid #4ac9ff;
 }
diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html
index 89bad951..89ad1b20 100644
--- a/login/src/main/webapp/login/html/menu.html
+++ b/login/src/main/webapp/login/html/menu.html
@@ -44,7 +44,7 @@
         <div id="page-wrapper" class="main-menu fixed-sidebar fixed-header">
             <div id="page-sidebar">
                 <div id="header-logo">
-                    <img src="/openoui/login/image/openo_logo_white.png" width="75%" style="display:block; margin:0 auto;"/>
+                    <img src="/openoui/login/image/openo_logo_pantone.png" width="75%" style="display:block; margin:0 auto;"/>
                 </div>
                 <div id="sidebar-menu">
                     <ul id="accordion" class="accordion">
@@ -53,7 +53,7 @@
                                 <i class="fa fa-cloud"></i>Service<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/openoui/lifecyclemgr/index.html" target="mainFrame" ui-sref-active="submenu_active">Service Management</a></li>
+                                <li><a href="/openoui/lifecyclemgr/index.html" target="mainFrame">Service Management</a></li>
                             </ul>
                         </li>
                         <li>
@@ -61,7 +61,7 @@
                                 <i class="fa fa-search-minus"></i>Resource<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/openoui/resmgr/index.html" target="mainFrame" ui-sref-active="submenu_active">Resource Management</a></li>
+                                <li><a href="/openoui/resmgr/index.html" target="mainFrame">Resource Management</a></li>
                             </ul>
                         </li>
                         <li>
@@ -69,7 +69,7 @@
                                 <i class="fa fa-map-marker"></i>Province<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/openoui/provincemgr/index.html" target="mainFrame" ui-sref-active="submenu_active">Province Management</a></li>
+                                <li><a href="/openoui/provincemgr/index.html" target="mainFrame">Province Management</a></li>
                             </ul>
                         </li>
                         <li>
@@ -77,9 +77,9 @@
                                 <i class="fa fa-edit"></i>Orchestrator<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/winery/servicetemplates.html" target="mainFrame" ui-sref-active="submenu_active">Model Design</a></li>
-                                <li><a href="/openoui/catalog/csarPackage.html" target="mainFrame" ui-sref-active="submenu_active">Package</a></li>
-                                <li><a href="/openoui/catalog/template.html" target="mainFrame" ui-sref-active="submenu_active">Service Template</a></li>
+                                <li><a href="/winery/servicetemplates.html" target="mainFrame">Model Design</a></li>
+                                <li><a href="/openoui/catalog/csarPackage.html" target="mainFrame">Package</a></li>
+                                <li><a href="/openoui/catalog/template.html" target="mainFrame">Service Template</a></li>
                             </ul>
                         </li>
                         <li>
@@ -87,9 +87,9 @@
                                 <i class="fa fa-cogs"></i>Manage View<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/openoui/extsys/vim/vimView.html" target="mainFrame" ui-sref-active="submenu_active">VIM Manage</a></li>
-                                <li><a href="/openoui/extsys/vnfm/vnfmView.html" target="mainFrame" ui-sref-active="submenu_active">VNFM</a></li>
-                                <li><a href="/openoui/login/html/temp/sdbController.html" target="mainFrame" ui-sref-active="submenu_active">SDN Controller</a></li>
+                                <li><a href="/openoui/extsys/vim/vimView.html" target="mainFrame">VIM Manage</a></li>
+                                <li><a href="/openoui/extsys/vnfm/vnfmView.html" target="mainFrame">VNFM</a></li>
+                                <li><a href="/openoui/extsys/sdncontroller/controller.html" target="mainFrame">SDN Controller</a></li>
                             </ul>
                         </li>
                         <li>
@@ -97,8 +97,8 @@
                                 <i class="fa fa-line-chart"></i>Performance<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/openoui/login/html/temp/performanceQuery.html" target="mainFrame" ui-sref-active="submenu_active">Performance Query</a></li>
-                                <li><a href="/openoui/login/html/temp/alarmQuery.html" target="mainFrame" ui-sref-active="submenu_active">Alarm Query</a></li>
+                                <li><a href="/openoui/login/html/temp/performanceQuery.html" target="mainFrame">Performance Query</a></li>
+                                <li><a href="/openoui/login/html/temp/alarmQuery.html" target="mainFrame">Alarm Query</a></li>
                             </ul>
                         </li>
                         <li>
@@ -106,7 +106,7 @@
                                 <i class="fa fa-eye"></i>Monitor<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/openoui/login/html/temp/parameterSetting.html" target="mainFrame" ui-sref-active="submenu_active">Parameter Setting</a></li>
+                                <li><a href="/openoui/login/html/temp/parameterSetting.html" target="mainFrame">Parameter Setting</a></li>
                             </ul>
                         </li>
                         <li>
@@ -114,7 +114,7 @@
                                 <i class="fa fa-puzzle-piece"></i>Market<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/openoui/vnfmarket/index.html" target="mainFrame" ui-sref-active="submenu_active">VNF Market Place</a></li>
+                                <li><a href="/openoui/vnfmarket/index.html" target="mainFrame">VNF Market Place</a></li>
                             </ul>
                         </li>
                         <li>
@@ -122,14 +122,14 @@
                                 <i class="fa fa-database"></i>Holmes<i class="fa fa-chevron-down"></i>
                             </div>
                             <ul class="submenu">
-                                <li><a href="/openoui/holmes/index.html" target="mainFrame" ui-sref-active="submenu_active">Alarm Analysis</a></li>
+                                <li><a href="/openoui/holmes/index.html" target="mainFrame">Alarm Analysis</a></li>
                             </ul>
                         </li>
                     </ul>
                 </div>
             </div>
-    <div id="page-main-wrapper" style="height:100%;">
-        <div id="page-header" >
+            <div id="page-main-wrapper">
+                <div id="page-header">
                     <div id="page-header-wrapper" class="clearfix">
                         <div class="top-icon-bar dropdown">
                             <a href="javascript:;" title="" class="user-ico clearfix" data-toggle="dropdown">
@@ -155,8 +155,8 @@
                         </div>
                     </div>
                 </div>
-                <div id="rightContainer" style="width:100%;height:100%" class="col-sm-8 col-md-9 col-lg-9">
-                    <iframe id="mainFrame" name="mainFrame" frameBorder=0 scrolling="auto" style="width:100%;height:100%"></iframe>
+                <div id="rightContainer" style="width:100%; margin-left=240px;">
+                    <iframe id="mainFrame" name="mainFrame" frameBorder=0 scrolling=no width="100%" onLoad="iFrameHeight()"></iframe>
                 </div>
             </div>
         </div>
diff --git a/login/src/main/webapp/login/js/menuApp.js b/login/src/main/webapp/login/js/menuApp.js
index 148c9f03..3dad3d76 100644
--- a/login/src/main/webapp/login/js/menuApp.js
+++ b/login/src/main/webapp/login/js/menuApp.js
@@ -14,6 +14,15 @@
     limitations under the License.
 */
 
+$(document).ready(function() {
+    $("li a").each(function(index) {
+        $(this).click(function() {
+            $("li a").removeClass("submenu_active");
+            $("li a").eq(index).addClass("submenu_active");
+        });
+    });
+});
+
 function init_menu() {
     var windowH = $(window).height();
     var headerH = $('#header-logo').height();