From a4743901a3098b8392fb70bca4ce1f165773f3b6 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Fri, 12 Jul 2019 11:43:54 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B02269=20Font=20Awesome=20:=20update=20iTo?= =?UTF-8?q?p=20for=20new=20v5=20icons=20*=20remove=20useless=20css=20in=20?= =?UTF-8?q?light-grey=20(weren't=20used)=20*=20change=20icons=20class=20na?= =?UTF-8?q?mes=20from=20v4=20to=20v5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/cmdbabstract.class.inc.php | 6 ++--- application/displayblock.class.inc.php | 6 +++-- application/itopwebpage.class.inc.php | 8 +++--- core/config.class.inc.php | 8 +++--- core/dbobject.class.php | 4 +-- core/displayablegraph.class.inc.php | 3 ++- css/light-grey.css | 8 +----- css/light-grey.scss | 8 +----- datamodels/2.x/itop-hub-connector/js/hub.js | 11 ++++---- .../portal/src/Brick/AggregatePageBrick.php | 4 +-- .../portal/src/Brick/BrowseBrick.php | 4 +-- .../portal/src/Brick/CreateBrick.php | 4 +-- .../portal/src/Brick/FilterBrick.php | 4 +-- .../portal/src/Brick/ManageBrick.php | 14 +++++----- .../bricks/browse/mode_mosaic.html.twig | 2 +- .../bricks/manage/layout-table.html.twig | 2 +- .../bricks/manage/tile-top-list.html.twig | 2 +- .../bricks/user-profile/layout.html.twig | 8 +++--- .../portal/templates/errors/layout.html.twig | 8 +++--- .../portal/templates/layout.html.twig | 26 ++++++++++++------- .../itop-tickets/datamodel.itop-tickets.xml | 2 +- js/newsroom_menu.js | 2 +- js/search/search_form_criteria.js | 13 ++++++---- js/search/search_form_criteria_enum.js | 6 ++--- .../search_form_criteria_hierarchical_key.js | 2 +- js/search/search_form_handler.js | 10 +++---- pages/schema.php | 8 +++--- .../search/searchform.class.inc.php | 2 +- .../bsselectobjectfieldrenderer.class.inc.php | 2 +- 29 files changed, 96 insertions(+), 91 deletions(-) diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php index e10157f2e..38d992cee 100644 --- a/application/cmdbabstract.class.inc.php +++ b/application/cmdbabstract.class.inc.php @@ -321,7 +321,7 @@ EOF } $sLabel = htmlentities(Dict::S('Tag:Synchronized'), ENT_QUOTES, 'UTF-8'); $sSynchroTagId = 'synchro_icon-'.$this->GetKey(); - $aIcons[] = "
  $sLabel
"; + $aIcons[] = "
  $sLabel
"; $sTip = addslashes($sTip); $oPage->add_ready_script("$('#$sSynchroTagId').qtip( { content: '$sTip', show: 'mouseover', hide: { fixed: true }, style: { name: 'dark', tip: 'topLeft' }, position: { corner: { target: 'bottomMiddle', tooltip: 'topLeft' }} } );"); } @@ -331,13 +331,13 @@ EOF { $sLabel = htmlentities(Dict::S('Tag:Archived'), ENT_QUOTES, 'UTF-8'); $sTitle = htmlentities(Dict::S('Tag:Archived+'), ENT_QUOTES, 'UTF-8'); - $aIcons[] = "
  $sLabel
"; + $aIcons[] = "
  $sLabel
"; } elseif ($this->IsObsolete()) { $sLabel = htmlentities(Dict::S('Tag:Obsolete'), ENT_QUOTES, 'UTF-8'); $sTitle = htmlentities(Dict::S('Tag:Obsolete+'), ENT_QUOTES, 'UTF-8'); - $aIcons[] = "
  $sLabel
"; + $aIcons[] = "
  $sLabel
"; } $sObjectIcon = $this->GetIcon(); diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index b4ae94e56..85f6da898 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -1898,7 +1898,8 @@ class MenuBlock extends DisplayBlock if ($this->m_sStyle == 'details') { $sSearchAction = "window.location=\"{$sRootUrl}pages/UI.php?operation=search_form&do_search=0&class=$sClass{$sContext}\""; - $sHtml .= "
"; + $sHtml .= "
"; } @@ -1909,7 +1910,8 @@ class MenuBlock extends DisplayBlock } if (!$oPage->IsPrintableVersion() && ($sRefreshAction!='')) { - $sHtml .= "
"; + $sHtml .= "
"; } diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php index 85b5308cf..32ef0e452 100644 --- a/application/itopwebpage.class.inc.php +++ b/application/itopwebpage.class.inc.php @@ -1203,7 +1203,7 @@ EOF; $oExitArchive = new JSPopupMenuItem('UI:ArchiveModeOff', Dict::S('UI:ArchiveModeOff'), 'return ArchiveMode(false);'); $aActions[$oExitArchive->GetUID()] = $oExitArchive->GetMenuItem(); - $sIcon = ''; + $sIcon = ''; $this->AddApplicationMessage(Dict::S('UI:ArchiveMode:Banner'), $sIcon, Dict::S('UI:ArchiveMode:Banner+')); } elseif (UserRights::CanBrowseArchive()) @@ -1249,8 +1249,8 @@ EOF; $sIcon = << - - + + EOF; @@ -1568,7 +1568,7 @@ EOF; */ public function SetMessage($sHtmlMessage) { - $sHtmlIcon = ''; + $sHtmlIcon = ''; $this->AddApplicationMessage($sHtmlMessage, $sHtmlIcon); } diff --git a/core/config.class.inc.php b/core/config.class.inc.php index c8eb3b5c6..8e9e246e3 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -813,8 +813,8 @@ class Config ), 'email_decoration_class' => array( 'type' => 'string', - 'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fa fa-envelope" will put a mail icon.', - 'default' => 'fa fa-envelope', + 'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fas fa-envelope" will put a mail icon.', + 'default' => 'fas fa-envelope', 'value' => '', 'source_of_value' => '', 'show_in_conf_sample' => false, @@ -837,8 +837,8 @@ class Config ), 'phone_number_decoration_class' => array( 'type' => 'string', - 'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fa fa-phone" will put a phone icon.', - 'default' => 'fa fa-phone', + 'description' => 'CSS class(es) to use as decoration for the HTML rendering of the attribute. eg. "fas fa-phone" will put a phone icon.', + 'default' => 'fas fa-phone', 'value' => '', 'source_of_value' => '', 'show_in_conf_sample' => false, diff --git a/core/dbobject.class.php b/core/dbobject.class.php index ee28c8158..f6b790d89 100644 --- a/core/dbobject.class.php +++ b/core/dbobject.class.php @@ -1331,11 +1331,11 @@ abstract class DBObject implements iDisplay { if ($bClickable) { - $sIcon = ""; + $sIcon = ""; } else { - $sIcon = ""; + $sIcon = ""; } } diff --git a/core/displayablegraph.class.inc.php b/core/displayablegraph.class.inc.php index 3562b1830..8d249308b 100644 --- a/core/displayablegraph.class.inc.php +++ b/core/displayablegraph.class.inc.php @@ -1446,7 +1446,8 @@ class DisplayableGraph extends SimpleGraph <<
-

$sSftShort$sSftShort

+

$sSftShort$sSftShort

EOF ); diff --git a/css/light-grey.css b/css/light-grey.css index 46a3a2d09..e54cbac0b 100644 --- a/css/light-grey.css +++ b/css/light-grey.css @@ -2782,7 +2782,7 @@ span.search-button, span.refresh-button { cursor: pointer; } #search-model { - width: 90%; + width: 85%; } .mfp-figure:after { background-color: #dff1ff; @@ -2897,10 +2897,6 @@ table.listResults .originColor { .tooltipD3 span { margin: 2px; } -.dataModelSchema .selfattrtxt { - font-family: "Font Awesome 5 Free"; - font-weight: 400; -} .data-model-viewer { background-color: #fff; margin-top: 7px !important; @@ -2908,8 +2904,6 @@ table.listResults .originColor { } #delDataModelSearch { color: #e87c1e; - font-family: "Font Awesome 5 Free"; - font-weight: 400; display: inline-block; font-size: 15px; margin-left: 1%; diff --git a/css/light-grey.scss b/css/light-grey.scss index 505b267e2..ce87018d0 100644 --- a/css/light-grey.scss +++ b/css/light-grey.scss @@ -3194,7 +3194,7 @@ span.search-button, span.refresh-button { } #search-model{ - width:90%; + width:85%; } .mfp-figure:after{ @@ -3320,10 +3320,6 @@ table.listResults .originColor{ .tooltipD3 span{ margin: 2px; } -.dataModelSchema .selfattrtxt { - font-family: "Font Awesome 5 Free"; - font-weight: 400; -} .data-model-viewer{ background-color: #FFF; @@ -3333,8 +3329,6 @@ table.listResults .originColor{ #delDataModelSearch { color: #E87C1E; - font-family: "Font Awesome 5 Free"; - font-weight: 400; display:inline-block; font-size:15px; margin-left:1%; diff --git a/datamodels/2.x/itop-hub-connector/js/hub.js b/datamodels/2.x/itop-hub-connector/js/hub.js index 4a966b8e6..c7e056f4e 100644 --- a/datamodels/2.x/itop-hub-connector/js/hub.js +++ b/datamodels/2.x/itop-hub-connector/js/hub.js @@ -84,7 +84,7 @@ $(function() backup: function() { var me = this; - $('#hub-installation-progress-text').html(' '+this.options.labels.database_backup); + $('#hub-installation-progress-text').html(' '+this.options.labels.database_backup); $.post(this.options.self_url, {operation: 'do_backup'}, function(data) { me._on_backup(data) }, 'json'); }, _on_backup: function(data) @@ -102,7 +102,7 @@ $(function() }, compile: function() { - $('#hub-installation-progress-text').html(' '+this.options.labels.extensions_installation); + $('#hub-installation-progress-text').html(' '+this.options.labels.extensions_installation); var me = this; var aExtensionCodes = []; var aExtensionDirs = []; @@ -124,7 +124,7 @@ $(function() }, move_to_prod: function() { - $('#hub-installation-progress-text').html(' '+this.options.labels.extensions_installation); + $('#hub-installation-progress-text').html(' '+this.options.labels.extensions_installation); var me = this; $.post(this.options.self_url, {operation: 'move_to_production', authent: this.options.authent}, function(data) { me._on_move_to_prod(data) }, 'json'); }, @@ -133,7 +133,7 @@ $(function() if (data.code == 0) { this._reportSuccess(data.message); - $('#hub-installation-progress-text').html(' '+this.options.labels.installation_successful); + $('#hub-installation-progress-text').html(' '+this.options.labels.installation_successful); // Report the installation status to iTop Hub $('#at_the_end').append(''); if (this.options.redirect_after_completion_url != '') @@ -171,7 +171,8 @@ $(function() }, _reportError: function(sMessage) { - $('#hub-installation-progress-text').html(' '+this.options.labels.rollback+'
'+sMessage+''); + $('#hub-installation-progress-text').html(' '+this.options.labels.rollback+'
'+sMessage+''); $('#hub_start_installation').val('Go Back to iTop'); $('#hub_start_installation').prop('disabled', false); $('#hub-installation-progress').hide(); diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/AggregatePageBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/AggregatePageBrick.php index 1aa801cee..2ad7b1feb 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Brick/AggregatePageBrick.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/AggregatePageBrick.php @@ -38,8 +38,8 @@ use DOMFormatException; class AggregatePageBrick extends PortalBrick { // Overloaded constants - const DEFAULT_DECORATION_CLASS_HOME = 'fa fa-dashboard'; - const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fa fa-dashboard fa-2x'; + const DEFAULT_DECORATION_CLASS_HOME = 'fas fa-tachometer-alt'; + const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fas fa-tachometer-alt fa-2x'; const DEFAULT_PAGE_TEMPLATE_PATH = 'itop-portal-base/portal/templates/bricks/aggregate-page/layout.html.twig'; // Overloaded variables diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/BrowseBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/BrowseBrick.php index b28fc77fd..2ad8703ce 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Brick/BrowseBrick.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/BrowseBrick.php @@ -65,8 +65,8 @@ class BrowseBrick extends PortalBrick const ENUM_FACTORY_TYPE_CLASS = 'class'; // Overloaded constants - const DEFAULT_DECORATION_CLASS_HOME = 'fa fa-map'; - const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fa fa-map fa-2x'; + const DEFAULT_DECORATION_CLASS_HOME = 'fas fa-map'; + const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fas fa-map fa-2x'; const DEFAULT_DATA_LOADING = self::ENUM_DATA_LOADING_FULL; /** @var string DEFAULT_LEVEL_NAME_ATT */ diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/CreateBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/CreateBrick.php index 7b86d256b..760a0b91a 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Brick/CreateBrick.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/CreateBrick.php @@ -35,8 +35,8 @@ use Combodo\iTop\DesignElement; class CreateBrick extends PortalBrick { // Overloaded constants - const DEFAULT_DECORATION_CLASS_HOME = 'fa fa-plus'; - const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fa fa-plus fa-2x'; + const DEFAULT_DECORATION_CLASS_HOME = 'fas fa-plus'; + const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fas fa-plus fa-2x'; const DEFAULT_PAGE_TEMPLATE_PATH = 'itop-portal-base/portal/templates/bricks/create/modal.html.twig'; /** @var string DEFAULT_CLASS */ diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/FilterBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/FilterBrick.php index c55fb3d42..ee8151a34 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Brick/FilterBrick.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/FilterBrick.php @@ -37,8 +37,8 @@ class FilterBrick extends PortalBrick // Overloaded constants const DEFAULT_VISIBLE_NAVIGATION_MENU = false; const DEFAULT_TILE_TEMPLATE_PATH = 'itop-portal-base/portal/templates/bricks/filter/tile.html.twig'; - const DEFAULT_DECORATION_CLASS_HOME = 'fa fa-search'; - const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fa fa-search fa-2x'; + const DEFAULT_DECORATION_CLASS_HOME = 'fas fa-search'; + const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fas fa-search fa-2x'; /** @var string DEFAULT_TARGET_BRICK_CLASS */ const DEFAULT_TARGET_BRICK_CLASS = 'Combodo\\iTop\\Portal\\Brick\\BrowseBrick'; diff --git a/datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php b/datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php index 4e72dbc95..e5e20527e 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php +++ b/datamodels/2.x/itop-portal-base/portal/src/Brick/ManageBrick.php @@ -59,8 +59,8 @@ class ManageBrick extends PortalBrick const ENUM_PAGE_TEMPLATE_PATH_CHART = 'itop-portal-base/portal/templates/bricks/manage/layout-chart.html.twig'; // Overloaded constants - const DEFAULT_DECORATION_CLASS_HOME = 'fa fa-pencil-square'; - const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fa fa-pencil-square fa-2x'; + const DEFAULT_DECORATION_CLASS_HOME = 'fas fa-pen-square'; + const DEFAULT_DECORATION_CLASS_NAVIGATION_MENU = 'fas fa-pen-square fa-2x'; const DEFAULT_PAGE_TEMPLATE_PATH = self::ENUM_PAGE_TEMPLATE_PATH_TABLE; const DEFAULT_DATA_LOADING = self::ENUM_DATA_LOADING_LAZY; const DEFAULT_TILE_TEMPLATE_PATH = 'itop-portal-base/portal/templates/bricks/manage/tile-default.html.twig'; @@ -102,35 +102,35 @@ class ManageBrick extends PortalBrick /** @var array $aPresentationData */ public static $aPresentationData = array( self::ENUM_TILE_MODE_BADGE => array( - 'decorationCssClass' => 'fa fa-id-card-o fa-2x', + 'decorationCssClass' => 'fas fa-id-card fa-2x', 'tileTemplate' => 'itop-portal-base/portal/templates/bricks/manage/tile-badge.html.twig', 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_TABLE, 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_LIST, 'need_details' => true, ), self::ENUM_TILE_MODE_TOP => array( - 'decorationCssClass' => 'fa fa-signal fa-rotate-270 fa-2x', + 'decorationCssClass' => 'fas fa-signal fa-rotate-270 fa-2x', 'tileTemplate' => 'itop-portal-base/portal/templates/bricks/manage/tile-top-list.html.twig', 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_TABLE, 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_LIST, 'need_details' => true, ), self::ENUM_TILE_MODE_PIE => array( - 'decorationCssClass' => 'fa fa-pie-chart fa-2x', + 'decorationCssClass' => 'fas fa-chart-pie fa-2x', 'tileTemplate' => 'itop-portal-base/portal/templates/bricks/manage/tile-chart.html.twig', 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_CHART, 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_PIE, 'need_details' => false, ), self::ENUM_TILE_MODE_BAR => array( - 'decorationCssClass' => 'fa fa-bar-chart fa-2x', + 'decorationCssClass' => 'fas fa-chart-bar fa-2x', 'tileTemplate' => 'itop-portal-base/portal/templates/bricks/manage/tile-chart.html.twig', 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_CHART, 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_BAR, 'need_details' => false, ), self::ENUM_TILE_MODE_TEXT => array( - 'decorationCssClass' => 'fa fa-pencil-square fa-2x', + 'decorationCssClass' => 'fas fa-pen-square fa-2x', 'tileTemplate' => self::DEFAULT_TILE_TEMPLATE_PATH, 'layoutTemplate' => self::ENUM_PAGE_TEMPLATE_PATH_TABLE, 'layoutDisplayMode' => self::ENUM_DISPLAY_MODE_LIST, diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig index 774ef8d4f..cca764f54 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/browse/mode_mosaic.html.twig @@ -6,7 +6,7 @@
{% block bBrowseMosaicContent %}
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig index dd2b3f9b6..56b6307b2 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/layout-table.html.twig @@ -32,7 +32,7 @@ - diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/tile-top-list.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/tile-top-list.html.twig index 7a0cef92f..878f4c8d0 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/tile-top-list.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/manage/tile-top-list.html.twig @@ -11,7 +11,7 @@ data-brick-id="{{ oBrick.GetId }}">
- {{ oBrick.GetTitle()|dict_s }} + {{ oBrick.GetTitle()|dict_s }} ({{ iCount }})
diff --git a/datamodels/2.x/itop-portal-base/portal/templates/bricks/user-profile/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/bricks/user-profile/layout.html.twig index f829c3b86..445ed5a3b 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/bricks/user-profile/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/bricks/user-profile/layout.html.twig @@ -15,7 +15,7 @@ {% block pMainContentHolder%} {% if bDemoMode %}
- + User profile edition is not available in demo mode.
{% endif %} @@ -65,14 +65,14 @@ - + {# #} diff --git a/datamodels/2.x/itop-portal-base/portal/templates/errors/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/errors/layout.html.twig index 72546d102..ab92c7cbd 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/errors/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/errors/layout.html.twig @@ -42,9 +42,11 @@

{{ error_message }}

{{ 'Error:HTTP:GetHelp'|dict_format(constant('ITOP_APPLICATION_SHORT')) }}

- {{ 'Page:GoPreviousPage'|dict_s }} - {{ 'Page:ReloadPage'|dict_s }} - {{ 'Page:GoPortalHome'|dict_s }} + {{ + 'Page:GoPreviousPage'|dict_s }} + {{ 'Page:ReloadPage'|dict_s }} + {{ + 'Page:GoPortalHome'|dict_s }}

diff --git a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig index fbaf50316..fd2b86dcc 100644 --- a/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig +++ b/datamodels/2.x/itop-portal-base/portal/templates/layout.html.twig @@ -193,7 +193,7 @@ {% block pNavigationTopBricks %}
  • - + {{ 'Page:Home'|dict_s }}
    • @@ -210,18 +210,21 @@ {% endblock %} {% if bUserConnected %} -
  • {{ 'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil'|dict_s }}
    • +
  • {{ 'Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil'|dict_s }}
    • {% for aPortal in app['combodo.portal.instance.conf'].portals %} {% if aPortal.id != app['combodo.portal.instance.conf'].properties.id %} - {% set sIconClass = (aPortal.id == 'backoffice') ? 'fa-list-alt' : 'fa-external-link' %} -
  • {{ aPortal.label|dict_s }}
    • + {% set sIconClass = (aPortal.id == 'backoffice') ? 'far fa-list-alt' : 'fas fa-external-link-alt' %} +
  • {{ aPortal.label|dict_s }}
    • {% endif %} {% endfor %} {# We display the separator only if the user has more then 1 portal. Meaning default portal + console or several portal at least #} {% if app['combodo.portal.instance.conf'].portals|length > 1 %} {% endif %} -
  • {{ 'Brick:Portal:UserProfile:Navigation:Dropdown:Logout'|dict_s }}
    • +
  • {{ 'Brick:Portal:UserProfile:Navigation:Dropdown:Logout'|dict_s + }}
    • {% endif %} @@ -249,18 +252,21 @@ @@ -270,7 +276,7 @@
    • - + {{ 'Page:Home'|dict_s }}
      • diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml index 77ef30f0d..b1709c8a1 100755 --- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml +++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml @@ -1081,7 +1081,7 @@ Brick:Portal:UserProfile:Navigation:Dropdown:MyProfil - fa fa-user fa-2x + fas fa-user fa-2x diff --git a/js/newsroom_menu.js b/js/newsroom_menu.js index dd1d4bc79..c33759a61 100644 --- a/js/newsroom_menu.js +++ b/js/newsroom_menu.js @@ -158,7 +158,7 @@ $(function() var iTotalCount = aAllMessages.length; var iCount = 0; var sHtml = '
        • '; - sHtml += '
        • '+this.options.labels.mark_all_as_read+'
          • '; + sHtml += '
        • '+this.options.labels.mark_all_as_read+'
          • '; moment.locale(GetUserLanguage()); var aUnreadMessagesByProvider = []; for(var k in this.options.providers) diff --git a/js/search/search_form_criteria.js b/js/search/search_form_criteria.js index b7aa40814..3607c6cbc 100644 --- a/js/search/search_form_criteria.js +++ b/js/search/search_form_criteria.js @@ -379,7 +379,8 @@ $(function() // Prepare base DOM structure this.element - .append('
          ') + .append('
          ') .append('
          '); // Bind events @@ -422,7 +423,7 @@ $(function() // Removable / locked decoration if(this.options.is_removable === true) { - this.element.find('.sfc_header').append(''); + this.element.find('.sfc_header').append(''); this.element.find('.sfc_close').on('click', function(oEvent){ // Prevent anchor oEvent.preventDefault(); @@ -433,7 +434,7 @@ $(function() else { this.element.addClass('locked'); - this.element.find('.sfc_header').append(''); + this.element.find('.sfc_header').append(''); } // Form group @@ -489,8 +490,10 @@ $(function() .append('') .append('') .append('') - .append('') - .append(''); + .append('') + .append(''); // Events this.element.find('.sfc_fg_button').on('click', function(oEvent){ diff --git a/js/search/search_form_criteria_enum.js b/js/search/search_form_criteria_enum.js index 86fc48633..cbcd3b5fc 100644 --- a/js/search/search_form_criteria_enum.js +++ b/js/search/search_form_criteria_enum.js @@ -140,7 +140,7 @@ $(function() var sFilterPlaceholder = (this._hasAutocompleteAllowedValues()) ? Dict.S('UI:Search:Value:Search:Placeholder') : Dict.S('UI:Search:Value:Filter:Placeholder'); var oFilterElem = $('
          ') .addClass('sf_filter') - .append('') + .append('') .appendTo(oOpContentElem); // - Values wrapper @@ -217,7 +217,7 @@ $(function() // DOM elements // - Filter oFilterElem.find('.sff_input_wrapper') - .append(''); + .append(''); // - Allowed values var aSortedValues = this._sortValuesByLabel(this._getPreloadedAllowedValues()); @@ -304,7 +304,7 @@ $(function() // - Add search dialog button oFilterElem - .append('') + .append('') .addClass('sf_with_buttons'); // - Prepare "selected" values area diff --git a/js/search/search_form_criteria_hierarchical_key.js b/js/search/search_form_criteria_hierarchical_key.js index 600ce906f..323c92b9a 100644 --- a/js/search/search_form_criteria_hierarchical_key.js +++ b/js/search/search_form_criteria_hierarchical_key.js @@ -75,7 +75,7 @@ $(function() { var oChildrenHintElem = $('
          ') .addClass('sfc_opc_mc_items_hint') - .append('') + .append('') .append(Dict.S('UI:Search:Criteria:HierarchicalKey:ChildrenIncluded:Hint')) .appendTo(oOpElem.find('.sfc_opc_mc_items_wrapper')); } diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js index 71a219391..dd106f5af 100644 --- a/js/search/search_form_handler.js +++ b/js/search/search_form_handler.js @@ -390,7 +390,7 @@ $(function() // Header part var oHeaderElem = $('
          ') - .append('' + Dict.S('UI:Search:Criterion:MoreMenu:AddCriteria') + '') + .append('' + Dict.S('UI:Search:Criterion:MoreMenu:AddCriteria') + '') .appendTo(this.elements.more_criterion); // Content part @@ -401,7 +401,7 @@ $(function() var oFilterElem = $('
          ') .addClass('sf_filter') .addClass('sfm_filter') - .append('') + .append('') .appendTo(oContentElem); // - Lists container @@ -658,9 +658,9 @@ $(function() .appendTo(this.elements.criterion_area.find('.sf_criterion_row:first')); var sButtonText = (this.options.auto_submit === true) ? Dict.S('UI:Button:Refresh') : Dict.S('UI:Button:Search'); - var sButtonIcon = (this.options.auto_submit === true) ? 'fa-refresh' : 'fa-search'; + var sButtonIcon = (this.options.auto_submit === true) ? 'fas fa-sync' : 'fas fa-search'; var oButtonElem = $('
          ') - .append('') + .append('') .appendTo(this.elements.submit_button); // Bind events @@ -751,7 +751,7 @@ $(function() // Make placeholder if nothing yet if(oResultAreaElem.html() === '') { - oResultAreaElem.html('

          ' + Dict.S('UI:Search:NoAutoSubmit:ExplainText') + '

          '); + oResultAreaElem.html('

          ' + Dict.S('UI:Search:NoAutoSubmit:ExplainText') + '

          '); oResultAreaElem.find('button').on('click', function(){ // TODO: Bug: Open "Search for CI", change child classe in the dropdown, click the search button. It submit the search for the original child classe, not the current one; whereas a click on the upper right pictogram does. This might be due to the form reloading. me._onSubmitClick(); diff --git a/pages/schema.php b/pages/schema.php index 8c69eb18d..20e569b07 100644 --- a/pages/schema.php +++ b/pages/schema.php @@ -233,7 +233,7 @@ function DisplayClassesList($oPage, $sContext) $oPage->add("

          ".Dict::S('UI:Schema:Title')."

          \n"); $oPage->add("
          "); - $oPage->add("
          "); + $oPage->add("
          "); $oPage->add("
            \n"); $oPage->add_ready_script( <<' + d['tooltip_data']['class'] + ' ' + divD3.html( '
            ' + d['tooltip_data']['class'] + '
            ' + ( (d.related_position < 0) ? d['tooltip_data']['to_remote'] : d['tooltip_data']['to_me'] ) + '
            ' - + ( (d.related_position < 0) ? d['tooltip_data']['to_me'] : d['tooltip_data']['to_remote'] ) + '             '); + + ( (d.related_position < 0) ? d['tooltip_data']['to_me'] : d['tooltip_data']['to_remote'] ) + '             '); }) .on('mouseout',function(d){ divD3.transition() diff --git a/sources/application/search/searchform.class.inc.php b/sources/application/search/searchform.class.inc.php index 2afaaa415..dd9ec489d 100644 --- a/sources/application/search/searchform.class.inc.php +++ b/sources/application/search/searchform.class.inc.php @@ -170,7 +170,7 @@ class SearchForm $sStyle .= ($bAutoSubmit === true) ? '' : ' no_auto_submit'; $sHtml .= "\n"; // Don't use $_SERVER['SCRIPT_NAME'] since the form may be called asynchronously (from ajax.php) $sHtml .= "

            " . Dict::Format('UI:SearchFor_Class_Objects', $sClassesCombo) . "" . Dict::S('UI:SearchToggle') . ""; - $sHtml .= ""; + $sHtml .= ""; $sHtml .= "" . Dict::S('UI:Search:AutoSubmit:DisabledHint') . ""; $sHtml .= "

            \n"; $sHtml .= "
            \n"; diff --git a/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php b/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php index 787be7655..cc7fcf408 100644 --- a/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php +++ b/sources/renderer/bootstrap/fieldrenderer/bsselectobjectfieldrenderer.class.inc.php @@ -371,7 +371,7 @@ EOF $sHierarchicalButtonId = 's_hi_' . $this->oField->GetGlobalId(); $sEndpoint = str_replace('-sMode-', 'hierarchy', $this->oField->GetSearchEndpoint()); - $oOutput->AddHtml('
            '); + $oOutput->AddHtml('
            '); $oOutput->AddJs( <<