From 90e0f20bb8bdaa706feeb09ecea776a977f1fb14 Mon Sep 17 00:00:00 2001
From: Guillaume Subiron <maethor@subiron.org>
Date: Wed, 23 Jan 2019 09:16:05 +0100
Subject: [PATCH] Debug display bugs due to font awesome upgrade

---
 module/htdocs/css/shinken-layout.css          | 21 ++++++++++++-------
 .../views/_eltdetail_action-menu.tpl          |  4 ++--
 module/plugins/impacts/views/impacts.tpl      |  2 +-
 .../plugins/problems/htdocs/css/problems.css  | 13 ++++++++++++
 .../views/_problems_actions-navbar.tpl        |  4 ++--
 .../problems/views/_problems_eltdetail.tpl    |  6 +++---
 .../problems/views/_problems_table.tpl        |  4 ++--
 module/plugins/problems/views/problems.tpl    |  8 +++----
 module/plugins/worldmap/views/_worldmap.tpl   |  2 +-
 module/views/header_element.tpl               |  2 +-
 10 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/module/htdocs/css/shinken-layout.css b/module/htdocs/css/shinken-layout.css
index 613624d8..8da60827 100644
--- a/module/htdocs/css/shinken-layout.css
+++ b/module/htdocs/css/shinken-layout.css
@@ -44,6 +44,10 @@ body {
     margin-top:15px;
 }
 
+.page-header .fas {
+    margin-right: 10px;
+}
+
 .breadcrumb {
     margin:0;
 }
@@ -198,13 +202,13 @@ td .ellipsis > .long-output {
   margin: 0;
 }
 
-.fa.fa-striked:after {
+.fas.fa-striked:after {
     position: absolute;
     content: "/";
     font-weight: bold;
-    font-size: 1.7em;
+    font-size: 2em;
     left: 16px;
-    top: 11px;
+    top: 7px;
 }
 
 .navbar-inverse {
@@ -348,8 +352,8 @@ td .ellipsis > .long-output {
 }
 
 
-.navbar-inverse-2 .btn-action .fa,
-.btn-action .fa {
+.navbar-inverse-2 .btn-action .far,
+.btn-action .far {
     font-size: 20px;
     height: 22px;
     width: 22px;
@@ -437,9 +441,10 @@ footer nav {
 #action-menu li a {
     font-size: small;
 }
-#action-menu li .fa {
-    padding: 0 12px;
-    font-size: 12px;
+#action-menu li .fas,
+#action-menu li .far {
+    padding: 1px;
+    margin: 1px;
 }
 @media(max-width:768px) {
     #action-menu {
diff --git a/module/plugins/eltdetail/views/_eltdetail_action-menu.tpl b/module/plugins/eltdetail/views/_eltdetail_action-menu.tpl
index 6fad299d..7f525980 100644
--- a/module/plugins/eltdetail/views/_eltdetail_action-menu.tpl
+++ b/module/plugins/eltdetail/views/_eltdetail_action-menu.tpl
@@ -37,13 +37,13 @@
     <li> <a href="#" class="js-schedule-downtime" title="Schedule a downtime for this {{elt_type}}"
         data-placement="right"
         data-element="{{helper.get_uri_name(elt)}}" >
-        <i class="fas fa-clock"></i> <span class="hidden-xs">Schedule a downtime</span>
+        <i class="far fa-clock"></i> <span class="hidden-xs">Schedule a downtime</span>
     </a> </li>
     %if elt.downtimes:
     <li> <a href="#" class="js-delete-all-downtimes" title="Delete all downtimes for this {{elt_type}}"
         data-placement="right"
         data-element="{{helper.get_uri_name(elt)}}" >
-        <i class="fas fa-clock"></i> <span class="hidden-xs">Delete all downtimes</span>
+        <i class="far fa-clock"></i> <span class="hidden-xs">Delete all downtimes</span>
     </a> </li>
     %end
     %if elt_type=='host' and app.helpdesk_module.is_available():
diff --git a/module/plugins/impacts/views/impacts.tpl b/module/plugins/impacts/views/impacts.tpl
index b7a19dbe..a81253fb 100644
--- a/module/plugins/impacts/views/impacts.tpl
+++ b/module/plugins/impacts/views/impacts.tpl
@@ -160,7 +160,7 @@
                         title="Schedule a downtime for this element"
                         data-element="{{helper.get_uri_name(pb)}}"
                         >
-                   <i class="fas fa-clock"></i><span class="hidden-sm hidden-xs"> Downtime</span>
+                   <i class="far fa-clock"></i><span class="hidden-sm hidden-xs"> Downtime</span>
                   </button>
                </div>
             </li>
diff --git a/module/plugins/problems/htdocs/css/problems.css b/module/plugins/problems/htdocs/css/problems.css
index 072c2bde..3c28302e 100644
--- a/module/plugins/problems/htdocs/css/problems.css
+++ b/module/plugins/problems/htdocs/css/problems.css
@@ -99,6 +99,10 @@ tr.selected {
     border-right: 1px solid red;
 }
 
+.fa-stack {
+    width: 2em;
+}
+
 tr.selected .item-icon,
 .item-state:hover .item-icon {
     display: none;
@@ -113,6 +117,10 @@ tr.selected .item-checkbox,
     display: none;
 }
 
+.js-select-all .onhover-label .fas {
+    line-height: 0.9;
+}
+
 .js-select-all:hover .onhover-label {
     display: inline-block;
     width: 200px;
@@ -131,6 +139,11 @@ tr.selected .item-checkbox,
     text-align: right;
 }
 
+.pb_detail-action-buttons .btn-action {
+    padding: 8px;
+    color: #555;
+}
+
 @media(max-width:768px) {
     text-align: center;
 }
diff --git a/module/plugins/problems/views/_problems_actions-navbar.tpl b/module/plugins/problems/views/_problems_actions-navbar.tpl
index 68ebe996..2492761f 100644
--- a/module/plugins/problems/views/_problems_actions-navbar.tpl
+++ b/module/plugins/problems/views/_problems_actions-navbar.tpl
@@ -18,7 +18,7 @@
    <li>
      <div class="dropdown" style="display: inline; padding: 0; margin: 0;">
        <button class="btn btn-ico btn-action dropdown-toggle" type="button" id="dropdown-downtime" data-toggle="dropdown" title="Schedule a downtime">
-         <i class="fas fa-clock"></i>
+         <i class="far fa-clock"></i>
        </button>
        <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-downtime" style="margin-top: 15px;">
          <li class="dropdown-header">Set a downtime for…</li>
@@ -56,7 +56,7 @@
    %if s and s['nb_downtime']:
    <li>
      <button class="btn btn-ico btn-action js-delete-all-downtimes" title="Remove all downtimes">
-       <i class="fas fa-clock text-danger"></i>
+       <i class="far fa-clock text-danger"></i>
      </button>
    </li>
    %end
diff --git a/module/plugins/problems/views/_problems_eltdetail.tpl b/module/plugins/problems/views/_problems_eltdetail.tpl
index 00dd9fda..7ca4e07e 100644
--- a/module/plugins/problems/views/_problems_eltdetail.tpl
+++ b/module/plugins/problems/views/_problems_eltdetail.tpl
@@ -21,7 +21,7 @@
          <button class="btn btn-lg btn-ico btn-action dropdown-toggle" type="button" id="dropdown-downtime-{{ helper.get_html_id(pb) }}" data-toggle="dropdown"
            title="Schedule a downtime for this element"
            data-element="{{helper.get_uri_name(pb)}}">
-           <i class="fas fa-clock"></i>
+           <i class="far fa-clock"></i>
          </button>
          <ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdown-downtime-{{ helper.get_html_id(pb) }}" style="margin-top: 15px;">
            <li class="dropdown-header">Set a downtime for…</li>
@@ -55,7 +55,7 @@
        <a class="btn btn-lg btn-ico btn-action" href="{{!helper.get_link_dest(pb)}}#graphs" title="Element graphs"><i class="fas fa-chart-line"></i></a>
        %end
        %if app.logs_module.is_available():
-       <a class="btn btn-lg btn-ico btn-action" href="{{!helper.get_link_dest(pb)}}#history title="Element history"><i class="fas fa-th-list"></i></a>
+       <a class="btn btn-lg btn-ico btn-action" href="{{!helper.get_link_dest(pb)}}#history" title="Element history"><i class="fas fa-list"></i></a>
        %end
        %if app.helpdesk_module.is_available():
        <a class="btn btn-lg btn-ico btn-action" href="{{!helper.get_link_dest(pb)}}#helpdesk title="Element helpdesk"><i class="fas fa-ambulance"></i></a>
@@ -131,7 +131,7 @@
         %include("_eltdetail_comment_table.tpl", elt=pb, comments=[ c for c in pb.comments if c.entry_time > since])
 
         %if pb.downtimes:
-        <h4 class="page-header"><i class="fas fa-clock"></i></i> Downtimes</h4>
+        <h4 class="page-header"><i class="far fa-clock"></i></i> Downtimes</h4>
         %include("_eltdetail_downtime_table.tpl", downtimes=pb.downtimes)
         %end
      </div>
diff --git a/module/plugins/problems/views/_problems_table.tpl b/module/plugins/problems/views/_problems_table.tpl
index d74b6b2d..63866fdb 100644
--- a/module/plugins/problems/views/_problems_table.tpl
+++ b/module/plugins/problems/views/_problems_table.tpl
@@ -7,7 +7,7 @@
       {{pb}}
       </td>
     %else:
-      <td width="110px" title="{{pb.get_name()}} - {{pb.state}}<br> Since {{helper.print_date(pb.last_state_change, format="%d %b %Y %H:%M:%S")}}<br> Last check {{helper.print_duration(pb.last_chk)}}<br> Next check {{helper.print_duration(pb.next_chk)}}"
+      <td width="130px" title="{{pb.get_name()}} - {{pb.state}}<br> Since {{helper.print_date(pb.last_state_change, format="%d %b %Y %H:%M:%S")}}<br> Last check {{helper.print_duration(pb.last_chk)}}<br> Next check {{helper.print_duration(pb.next_chk)}}"
         class="font-{{pb.state.lower()}} text-center">
         <div style="display: table-cell; vertical-align: middle; padding-right: 10px;">
           {{!helper.get_fa_icon_state(pb, use_title=False)}}
@@ -29,7 +29,7 @@
         <i class="fas fa-check" title="Acknowledged"></i><br>
         %end
         %if pb.in_scheduled_downtime:
-        <i class="fas fa-clock" title="In scheduled downtime"></i><br>
+        <i class="far fa-clock" title="In scheduled downtime"></i><br>
         %end
       </td>
       <td width="100%">
diff --git a/module/plugins/problems/views/problems.tpl b/module/plugins/problems/views/problems.tpl
index 058121b9..30255a0f 100644
--- a/module/plugins/problems/views/problems.tpl
+++ b/module/plugins/problems/views/problems.tpl
@@ -56,7 +56,7 @@
 
       <table class="table table-condensed table-hover problems-table">
         <colgroup>
-            <col style="width: 120px;"/>
+            <col style="width: 122px;"/>
             <col style="width: 30px;"/>
             <col class="host-column hidden-sm hidden-xs hidden-md"/>
             <col class="service-column hidden-sm hidden-xs"/>
@@ -106,7 +106,7 @@ Next check <strong>{{helper.print_duration(pb.next_chk)}}</strong>
                          %if pb.state_type == 'HARD':
                          {{!helper.print_duration(pb.last_state_change, just_duration=True, x_elts=2)}}
                          %else:
-                         attempt {{pb.attempt}}/{{pb.max_check_attempts}}
+                         <small>attempt {{pb.attempt}}/{{pb.max_check_attempts}}</small>
                          <!--soft state-->
                          %end
                        <!--</span>-->
@@ -118,7 +118,7 @@ Next check <strong>{{helper.print_duration(pb.next_chk)}}</strong>
                  <i class="fas fa-check" title="Acknowledged"></i><br>
                  %end
                  %if pb.in_scheduled_downtime:
-                 <i class="fas fa-clock" title="In scheduled downtime"></i><br>
+                 <i class="far fa-clock" title="In scheduled downtime"></i><br>
                  %end
                </td>
                %aka = ''
@@ -166,7 +166,7 @@ Next check <strong>{{helper.print_duration(pb.next_chk)}}</strong>
                            data-trigger="hover" data-placement="left"
                            data-item="{{pb.get_full_name()}}"
                            href="{{!helper.get_link_dest(pb)}}#graphs">
-                           <i class="fas fa-line-chart"></i>
+                           <i class="fas fa-chart-line"></i>
                         </a>
                      %end
                      %end
diff --git a/module/plugins/worldmap/views/_worldmap.tpl b/module/plugins/worldmap/views/_worldmap.tpl
index 54f52919..346a5365 100644
--- a/module/plugins/worldmap/views/_worldmap.tpl
+++ b/module/plugins/worldmap/views/_worldmap.tpl
@@ -36,7 +36,7 @@
   function hostInfoContent() {
     var text = '<div class="map-infoView" id="iw-' + this.name + '">' + this.iconState + ' <span class="map-hostname"><a href="/host/' + this.name + '">' + this.name + '</a> ' + this.businessImpact + ' is ' + this.state + '.</span>';
     if (this.scheduledDowntime) {
-      text += '<div><i class="fas fa-clock"></i> Currently in scheduled downtime.</div>';
+      text += '<div><i class="far fa-clock"></i> Currently in scheduled downtime.</div>';
     }
     if (this.isProblem) {
       text += '<div><i class="fas fa-check"></i> ';
diff --git a/module/views/header_element.tpl b/module/views/header_element.tpl
index edb5116b..756bc48a 100644
--- a/module/views/header_element.tpl
+++ b/module/views/header_element.tpl
@@ -235,7 +235,7 @@
             <li> <a href="{{ app.get_url('System') }}"> <i class="fas fa-fw fa-heartbeat sidebar-icon"></i>
                &nbsp;Status </a> </li>
             %if app.logs_module.is_available():
-            <li> <a href="{{ app.get_url('History') }}"> <i class="fas fa-fw fa-th-list sidebar-icon"></i>
+            <li> <a href="{{ app.get_url('History') }}"> <i class="fas fa-fw fa-list sidebar-icon"></i>
                &nbsp;Logs </a> </li>
             <li> <a href="{{ app.get_url('GlobalStats') }}"> <i class="fas fa-fw fa-bell sidebar-icon"></i>
                &nbsp;Alerts </a> </li>