From ff5a96f92d56a03bdb5ea383d544599d3b8238cc Mon Sep 17 00:00:00 2001
From: Guillaume Lajarige <guillaume.lajarige@combodo.com>
Date: Thu, 16 Jun 2016 12:03:42 +0000
Subject: [PATCH] Customers portal : Added some IDs in the layout to create new
 hooks

SVN:trunk[4221]
---
 .../portal/src/helpers/applicationhelper.class.inc.php      | 6 ------
 .../2.x/itop-portal-base/portal/src/views/layout.html.twig  | 4 ++--
 .../portal/web/css/bootstrap-theme-combodo.scss             | 4 +---
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
index 3fdb994dc..23877e598 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
+++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php
@@ -313,12 +313,6 @@ class ApplicationHelper
 				'bricks' => array(),
 				'bricks_total_width' => 0
 			);
-			$aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-simplex.min.css';
-			$aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-darkly.min.css';
-			$aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-flatly.min.css';
-			$aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-slate.min.css';
-			$aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-superhero.min.css';
-			$aPortalConf['properties']['themes']['bootstrap'] = 'itop-portal-base/portal/web/css/bootstrap-theme-united.min.css';
 			// - Global portal properties
 			foreach ($oDesign->GetNodes('/module_design/properties/*') as $oPropertyNode)
 			{
diff --git a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig
index 02a9ad24e..a7c8f73c2 100644
--- a/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig
+++ b/datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig
@@ -44,9 +44,9 @@
 		<link href="{{ app['combodo.portal.base.absolute_url'] }}lib/typeahead/css/typeaheadjs.bootstrap.css" rel="stylesheet">
 		<link href="{{ app['combodo.absolute_url'] }}css/magnific-popup.css" rel="stylesheet">
 		{# - Bootstrap theme #}
-		<link href="{{ app['combodo.portal.instance.conf'].properties.themes.bootstrap }}" rel="stylesheet">
+		<link href="{{ app['combodo.portal.instance.conf'].properties.themes.bootstrap }}" rel="stylesheet" id="css_bootstrap_theme">
 		{# - Portal adjustments for BS theme #}
-		<link href="{{ app['combodo.portal.instance.conf'].properties.themes.portal }}" rel="stylesheet">
+		<link href="{{ app['combodo.portal.instance.conf'].properties.themes.portal }}" rel="stylesheet" id="css_portal">
 		{# Custom CSS that is supposed to do adjustments to the portal #}
 		{% if app['combodo.portal.instance.conf'].properties.themes.custom is defined %}
 			<link href="{{ app['combodo.portal.instance.conf'].properties.themes.custom }}" rel="stylesheet">
diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss
index 23f5fead0..46efb6014 100644
--- a/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss
+++ b/datamodels/2.x/itop-portal-base/portal/web/css/bootstrap-theme-combodo.scss
@@ -3457,9 +3457,6 @@ select[multiple].input-group-sm>.input-group-btn>.btn {
 		color: $white;
 		border-bottom: 1px solid #7D7D7D;
 	}
-	.navbar-nav>li.active {
-		box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.8) inset;
-	}
 	.navbar-nav>li.active:after{
 		content: " ";
 		position: absolute;
@@ -3471,6 +3468,7 @@ select[multiple].input-group-sm>.input-group-btn>.btn {
 	}
 	.navbar-nav>li.active>a{
 		margin-top: -1px; /* To mask border from previous li item */
+		box-shadow: 0px 2px 5px rgba(0, 0, 0, 0.8) inset;
 	}
     .navbar-nav>li>a {
         padding-top: 11px;