Начало Каталог Помощ
Регистрация Вход
SKZH
/
ITSSTOOLS
3
0
Разклонения 0
Файлове Задачи 0 Заявки за сливане 0 Уики
Преглед на файлове

Portal: Added an environment banner in the portal like in the console. It warns the user when he is browsing in an other mode than "production".

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4531 a333f486-631f-4898-b8df-5754b55c2be0
glajarige преди 8 години
родител
a6b801aed1
ревизия
aaae1dfe0c
променени са 8 файла, в които са добавени 44 реда и са изтрити 1 реда
Разделен изглед Покажи статистика за разликите
  1. 3 1
      datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php
  2. 2 0
      datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php
  3. 2 0
      datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php
  4. 2 0
      datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php
  5. 11 0
      datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig
  6. 11 0
      datamodels/2.x/itop-portal-base/portal/web/css/portal.css
  7. 12 0
      datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
  8. 1 0
      datamodels/2.x/itop-portal-base/portal/web/index.php

+ 3 - 1
datamodels/2.x/itop-portal-base/cs.dict.itop-portal-base.php
Целия файл 

@@ -40,7 +40,9 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
 
     'Portal:Button:Add' => 'Přidat',
 
     'Portal:Button:Remove' => 'Odebrat',
 
     'Portal:Button:Delete' => 'Smazat',
 
-    'Error:HTTP:404' => 'Stránka nenalezena',
 
+	'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
 
+	'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
 
+	'Error:HTTP:404' => 'Stránka nenalezena',
 
     'Error:HTTP:500' => 'Jejda! Nastal problém',
 
     'Error:HTTP:GetHelp' => 'Kontaktujte prosím administrátora, pokud problém přetrvá.',
 
     'Error:XHR:Fail' => 'Data se nepodařilo načíst, kontaktujte prosím administrátora.',

+ 2 - 0
datamodels/2.x/itop-portal-base/en.dict.itop-portal-base.php
Целия файл 

@@ -36,6 +36,8 @@ Dict::Add('EN US', 'English', 'English', array(
 
 	'Portal:Button:Add' => 'Add',
 
 	'Portal:Button:Remove' => 'Remove',
 
 	'Portal:Button:Delete' => 'Delete',
 
+	'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode',
 
+	'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode',
 
 	'Error:HTTP:404' => 'Page not found',
 
 	'Error:HTTP:500' => 'Oops! An error has occured.',
 
 	'Error:HTTP:GetHelp' => 'Please contact your iTop administrator if the problem keeps happening.',

+ 2 - 0
datamodels/2.x/itop-portal-base/es_cr.dict.itop-portal-base.php
Целия файл 

@@ -36,6 +36,8 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 
 	'Portal:Button:Add' => 'Añadir',
 
 	'Portal:Button:Remove' => 'Eliminar',
 
 	'Portal:Button:Delete' => 'Borrar',
 
+	'Portal:EnvironmentBanner:Title' => 'You are currently in <strong>%1$s</strong> mode~~',
 
+	'Portal:EnvironmentBanner:GoToProduction' => 'Go back to PRODUCTION mode~~',
 
 	'Error:HTTP:404' => 'Página no encontrada',
 
 	'Error:HTTP:500' => '¡Vaya! Ha ocurrido un error.',
 
 	'Error:HTTP:GetHelp' => 'Póngase en contacto con el administrador de iTop si el problema persiste.',

+ 2 - 0
datamodels/2.x/itop-portal-base/fr.dict.itop-portal-base.php
Целия файл 

@@ -36,6 +36,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
 
 	'Portal:Button:Add' => 'Ajouter',
 
 	'Portal:Button:Remove' => 'Enlever',
 
 	'Portal:Button:Delete' => 'Supprimer',
 
+	'Portal:EnvironmentBanner:Title' => 'Vous êtes dans le mode <strong>%1$s</strong>',
 
+	'Portal:EnvironmentBanner:GoToProduction' => 'Retourner au mode PRODUCTION',
 
 	'Error:HTTP:404' => 'Page non trouvée',
 
 	'Error:HTTP:500' => 'Oups ! Une erreur est survenue.',
 
 	'Error:HTTP:GetHelp' => 'Si le problème persiste, veuillez contacter votre administrateur iTop.',

+ 11 - 0
datamodels/2.x/itop-portal-base/portal/src/views/layout.html.twig
Целия файл 

@@ -104,6 +104,17 @@
 
 </head>
 
 <body class="{% block pPageBodyClass %}{% endblock %}">
 
 	{% block pPageBodyWrapper %}
 
+		{% block pEnvBannerWrapper %}
 
+			{% if app['combodo.current_environment'] != 'production' %}
 
+				<div id="envbanner" class="alert alert-danger" role="alert">
 
+					{{ 'Portal:EnvironmentBanner:Title'|dict_format( app['combodo.current_environment']|upper )|raw }}
 
+					<button type="button" onclick="window;location.href='{{ app['url_generator'].generate('p_home', {'switch_env': 'production'}) }}'">
 
+						{{ 'Portal:EnvironmentBanner:GoToProduction'|dict_s|raw }}
 
+					</button>
 
+				</div>
 
+			{% endif %}
 
+		{% endblock %}
 
+		
 		{% block pNavigationWrapper %}
 
 		{# Topbar navigation menu for mobile screens #}
 
 		<nav class="navbar navbar-fixed-top navbar-default visible-xs" id="topbar" role="navigation">

+ 11 - 0
datamodels/2.x/itop-portal-base/portal/web/css/portal.css
Целия файл 

@@ -15,6 +15,17 @@
 
 footer {
 
   margin: 5em 1em;
 
 }
 
+/* Environment banner */
 
+#envbanner {
 
+  position: relative;
 
+  z-index: 10;
 
+  padding: 5px 15px;
 
+  text-align: center;
 
+}
 
+#envbanner > button {
 
+  margin-left: 5px;
 
+  color: #000;
 
+}
 
 /* Navigation menu */
 
 .navbar-nav .dropdown-menu a .glyphicon, .user_infos .dropdown-menu a .glyphicon {
 
   margin-right: 15px;

+ 12 - 0
datamodels/2.x/itop-portal-base/portal/web/css/portal.scss
Целия файл 

@@ -19,6 +19,18 @@ footer{
 
 	margin: 5em 1em;
 
 }
 
 
+/* Environment banner */
 
+#envbanner{
 
+	position: relative;
 
+	z-index: 10;
 
+	padding: 5px 15px;
 
+	text-align: center;
 
+}
 
+#envbanner > button{
 
+	margin-left: 5px;
 
+	color: #000;
 
+}
 
+
 
 /* Navigation menu */
 
 .navbar-nav .dropdown-menu a .glyphicon,
 
 .user_infos .dropdown-menu a .glyphicon{

+ 1 - 0
datamodels/2.x/itop-portal-base/portal/web/index.php
Целия файл 

@@ -82,6 +82,7 @@ $oApp->register(new Silex\Provider\HttpFragmentServiceProvider());
 
 
 // Configuring Silex application
 
 $oApp['debug'] = $bDebug;
 
+$oApp['combodo.current_environment'] = utils::GetCurrentEnvironment();
 
 $oApp['combodo.absolute_url'] = utils::GetAbsoluteUrlAppRoot();
 
 $oApp['combodo.portal.base.absolute_url'] = utils::GetAbsoluteUrlAppRoot() . 'env-' . utils::GetCurrentEnvironment() . '/itop-portal-base/portal/web/';
 
 $oApp['combodo.portal.base.absolute_path'] = MODULESROOT . '/itop-portal-base/portal/web/';