N°3777 - favicon: change easily favicon

datamodels/2.x/itop-portal-base/portal/src/DependencyInjection/SilexCompatBootstrap/PortalXmlConfiguration/Basic.php

@@ -72,6 +72,7 @@ class Basic extends AbstractConfiguration
 	 */
 	private function GetInitialPortalConf()
 	{
+
 		$aPortalConf = array(
 			'properties' => array(
 				'id'              => $_ENV['PORTAL_ID'],
@@ -81,15 +82,15 @@ class Basic extends AbstractConfiguration
 				'favicon'         => Branding::GetPortalFavIconAbsoluteUrl(),
 				'themes'          => array(
 					'bootstrap' => 'itop-portal-base/portal/public/css/bootstrap-theme-combodo.scss',
-					'portal' => 'itop-portal-base/portal/public/css/portal.scss',
-					'others' => array(),
+					'portal'    => 'itop-portal-base/portal/public/css/portal.scss',
+					'others'    => array(),
 				),
-				'templates' => array(
+				'templates'       => array(
 					'layout' => 'itop-portal-base/portal/templates/layout.html.twig',
-					'home' => 'itop-portal-base/portal/templates/home/layout.html.twig',
+					'home'   => 'itop-portal-base/portal/templates/home/layout.html.twig',
 				),
-				'urlmaker_class' => null,
-				'triggers_query' => null,
+				'urlmaker_class'  => null,
+				'triggers_query'  => null,
 				'attachments' => array(
 					'allow_delete' => true,
 				),

datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig

@@ -25,7 +25,7 @@
 	{% block pPageExtraMetas %}
 	{% endblock %}
 	<title>{% block pPageTitle %}{% if sPageTitle is defined and sPageTitle is not null %}{{ sPageTitle }} - {{ constant('ITOP_APPLICATION_SHORT') }}{% else %}{{ 'Page:DefaultTitle'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}{% endif %}{% endblock %}</title>
-    <link rel="shortcut icon" href="{{ app['combodo.portal.instance.conf'].properties.favicon|add_itop_version }}"/>
+<link rel="shortcut icon" href="{{ app['combodo.portal.instance.conf'].properties.favicon|add_itop_version }}"/>
 
 	{% block pPageStylesheets %}
         {# First bootstrap core, lib themes, then bootstrap theme, portal adjustements #}
@@ -251,7 +251,7 @@
 				</nav>
 			{% endblock %}
 
-			{# Sidebar navigation menu for normal screens #}
+            {# Sidebar navigation menu for normal screens #}
 			{% block pNavigationSideMenuWrapper %}
 				<nav class="navbar-default hidden-xs col-sm-3 col-md-2" id="sidebar" role="navigation">
 					<div class="user_card bg-primary">

datamodels/2.x/itop-structure/datamodel.itop-structure.xml

@@ -2000,7 +2000,7 @@
       <enable_action>UR_ACTION_MODIFY</enable_action>
     </menu>
   </menus>
-  <branding>
+  <brandings>
     <themes>
       <theme id="fullmoon" _delta="define">
         <variables>
@@ -2035,7 +2035,7 @@
       <stylesheets>
       </stylesheets>
     </themes_common>
-  </branding>
+  </brandings>
   <user_rights>
     <groups>
     </groups>