Work in progress

rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala

@@ -144,7 +144,7 @@ class NodeGroupForm(
   val pendingChangeRequestXml =
     <div id="pendingChangeRequestNotification">
       <div>
-        <img src={"/" + StaticResourceRewrite.prefix + "/images/icWarn.png"} alt="Warning!" height="32" width="32" class="warnicon"/>
+        <i class="fa fa-exclamation-triangle warnicon" aria-hidden="true"></i>
         <div style="float:left">
           The following pending change requests affect this Group, you should check that your modification is not already pending:
           <ul id="changeRequestList"/>

rudder-web/src/main/scala/com/normation/rudder/web/components/RuleCompliance.scala

@@ -141,7 +141,7 @@ class RuleCompliance (
         Details of changes for each period are displayed below the graph. Click to change the selected period.
         </div>
         <div class="recentChange_refresh">
-          {SHtml.ajaxButton(<img src={"/" + StaticResourceRewrite.prefix +"/images/icRefresh.png"}/>, () => refresh() , ("class","recentChangeGraph refreshButton btn btn-default") , ("title","Refresh"))}
+          {SHtml.ajaxButton(<i class="fa fa-refresh"></i>, () => refresh() , ("class","btn btn-primary") , ("title","Refresh"))}
         </div>
       </div>
 

rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala

@@ -866,9 +866,7 @@ object DisplayNode extends Loggable {
     <div style="margin:5px;">
      <div>
       <div>
-          <img src={"/" + StaticResourceRewrite.prefix + "/images/icWarn.png"} alt="Warning!" height="25" width="25" class="warnicon"
-            style="vertical-align: middle; padding: 0px 0px 2px 0px;"
-          />
+          <i class="fa fa-exclamation-triangle warnicon" aria-hidden="true"></i>
           <b>Are you sure you want to delete this node?</b>
       </div>
       <div style="margin-top:7px">If you choose to remove this node from Rudder, it won't be managed anymore,

rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala

@@ -363,9 +363,8 @@ class EventListDisplayer(
 
       val dialog =
       <p>
-          <img src={"/" + StaticResourceRewrite.prefix + "/images/icWarn.png"} alt="Warning!" height="25" width="25" class="warnicon"
-            style="vertical-align: middle; padding: 0px 0px 2px 0px;"/>
-          <b>{"Are you sure you want to restore configuration policy %s this change".format(action.name)}</b>
+        <i class="fa fa-exclamation-triangle warnicon" aria-hidden="true"></i>
+        <b>{"Are you sure you want to restore configuration policy %s this change".format(action.name)}</b>
       </p>
       <span class="tw-bs"> {
         SHtml.ajaxButton(

rudder-web/src/main/scala/com/normation/rudder/web/snippet/node/PendingHistoryGrid.scala

@@ -257,8 +257,8 @@ object PendingHistoryGrid extends Loggable {
     // sort those events by date, to take the closer deletion date from the inventory date (head of the list)
     effectiveEvents.sortWith( (ev1,ev2) => ev1.creationDate.isBefore(ev2.creationDate)).headOption match {
       case Some(deleted) =>
-        <div style="padding: 10px 15px 0">
-          <img src={"/" + StaticResourceRewrite.prefix + "/images/icWarn.png"} alt="Warning!" height="32" width="32" class="warnicon" style="float :left; margin-right:9px; margin-top:-9px"/>
+        <div style="padding: 10px 15px 0" class="tw-bs">
+          <i class="fa fa-exclamation-triangle warnicon" aria-hidden="true"></i>
           <h3> {"This node was deleted on %s by %s".format(DateFormaterService.getFormatedDate(deleted.creationDate),deleted.principal.name)}</h3>
         </div>
       case None => NodeSeq.Empty

rudder-web/src/main/webapp/javascript/rudder/rudder-datatable.js

@@ -639,13 +639,10 @@ function createExpectedReportTable(gridId, data, contextPath, refresh) {
       , "sTitle": "Directive"
       , "fnCreatedCell" : function (nTd, sData, oData, iRow, iCol) {
           $(nTd).addClass("listopen tw-bs");
-          var tooltipIcon = $("<img />");
-          tooltipIcon.attr("src",resourcesPath + "/images/ic_question_14px.png");
-          tooltipIcon.addClass("reportIcon");
+          var tooltipIcon = $("<i>");
+          tooltipIcon.addClass("fa fa-question-circle icon-info reportIcon");
           var tooltipId = oData.jsid+"-tooltip";
-          tooltipIcon.attr("tooltipid",tooltipId);
-          tooltipIcon.attr("title","");
-          tooltipIcon.addClass("tooltip tooltipable");
+          tooltipIcon.attr("tooltip",tooltipId);
           var toolTipContainer= $("<div>Directive '<b>"+sData+"</b>' is based on technique '<b>"+oData.techniqueName+"</b>' (version "+oData.techniqueVersion+")</div>");
           toolTipContainer.addClass("tooltipContent");
           toolTipContainer.attr("id",tooltipId);
@@ -1708,7 +1705,7 @@ function createTable(gridId,data,columns, customParams, contextPath, refresh, st
 
   $('#'+gridId+' thead tr').addClass("head");
   if (!( typeof refresh === 'undefined')) {
-    var refreshButton = $("<button><img src='"+resourcesPath + "/images/icRefresh.png'/></button>");
+    var refreshButton = $("<button class='btn btn-primary'><i class='fa fa-refresh'></i></button>");
     refreshButton.button();
     refreshButton.attr("title","Refresh");
     refreshButton.click( function() { refresh(); } );

rudder-web/src/main/webapp/style/rudder/rudder-groups.css

@@ -62,4 +62,7 @@
 #groupDetails .radio-inline .tooltip{
   position:relative;
   opacity:1;
+}
+#pendingChangeRequestNotification + .wbBaseField .wbBaseFieldLabel{
+  margin:0 0 0 5px;
 }

rudder-web/src/main/webapp/style/rudder/rudder-menu.css

@@ -2567,6 +2567,21 @@ span.techversion {
   cursor: help;
   font-weight: bold;
 }
+
+/* ICONS */
+.fa.warnicon{
+  margin-left:8px;
+  font-size:32px;
+  color:#f08004;
+}
+#confirmDeletion .fa.warnicon{
+  font-size: 22px;
+  margin-left: 0;
+}
+.fa.targetRemove{
+  margin:2px;
+  cursor:pointer;
+}
 @keyframes opacity-1 {
   0%   {opacity:0;visibility: visible;}
   100% {opacity:1;visibility: visible;}

rudder-web/src/main/webapp/style/rudder/rudder.css

@@ -1885,17 +1885,10 @@ template, a Directive, etc)
 /************************************
 Descriptions
 ************************************/
-
-
 .warn div {
   /*display:inline-block;*/
   vertical-align: middle;
 }
-.warn div.warn_logo {
-  width:64px;
-  height:64px;
-  background: url(../images/icWarn.png) no-repeat;
-}
 
 div.serverDetail {
   font-weight:bold;
@@ -2105,30 +2098,6 @@ tr.unfoldable {
   margin-top: 5px;
 }
 
-.topQuickSearch {
-  float: right;
-  margin-right: 10px;
-  margin-top: -3px;
-}
-
-.topQuickSearch .ac_input {
-  width:250px;
-  font-size:10px;
-  background: url("../../images/icMagnify.png") no-repeat scroll left center white;
-  padding: 5px 3px 5px 30px;
-}
-
-
-
-
-.topQuickSearchResults ul li {
-  font-size: 10px;
-}
-
-div.topQuickSearchResults.ac_results {
-  width: 200px !important;
-}
-
 /***********************************
  * Trees
 ************************************/

rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html

@@ -197,7 +197,7 @@
         <div id="DirectiveCtrl" ng-controller="DirectiveCtrl">
           <div class="spacing-title targetHeader">
             Apply these Directives:
-            <img src="/images/ic_question.png" data-lift="with-cached-resource" class="targetIcon" tooltip="directiveAddExplanation"/>
+            <i class="fa fa-question-circle targetIcon icon-info" aria-hidden="true" tooltip="directiveAddExplanation"></i>
           </div>
           <div style="background-color:#DDFFDD;" class="targetContainer">
             <ul>
@@ -208,7 +208,7 @@
                 <span class="targetDisplay">
                     <span class="fa fa-file-text"></span>
                     {{ directive.name }}
-                    <img src="/images/ic_delete.png" data-lift="with-cached-resource" class="targetRemove" ng-click="removeInclude(directive.id)"/>
+                    <i class="fa fa-times targetRemove" ng-click="removeInclude(directive.id)"></i>
                 </span>
               </li>
             </ul>
@@ -250,7 +250,7 @@
         <div id="GroupCtrl" ng-controller="GroupCtrl">
           <div class="spacing-title targetHeader">
             Apply to Nodes in any of these Groups:
-            <img src="/images/ic_question.png" data-lift="with-cached-resource" class="targetIcon" tooltip="includeExplanation"/>
+            <i class="fa fa-question-circle targetIcon icon-info" aria-hidden="true" tooltip="includeExplanation"></i>
           </div>
           <div style="background-color:#DDFFDD;" class="targetContainer">
 	        <ul>
@@ -261,15 +261,15 @@
 	            <span class="targetDisplay">
                     <span class="fa fa-sitemap"></span>
                   {{ getTargetName(included) }}
-                  <img src="/images/ic_delete.png" data-lift="with-cached-resource" class="targetRemove" ng-click="removeInclude(included)"/>
+                  <i class="fa fa-times targetRemove" ng-click="removeInclude(included)"></i>
 	            </span>
 	          </li>
 	        </ul>
 	        <hr class="spacer"/>
           </div>
           <div class="spacing-title targetHeader">
             Except to Nodes in any of these Groups:
-            <img src="/images/ic_question.png" data-lift="with-cached-resource" class="targetIcon" tooltip="excludeExplanation"/>
+            <i class="fa fa-question-circle targetIcon icon-info" aria-hidden="true" tooltip="excludeExplanation"></i>
           </div>
           <div style="background-color:#FFDDDD;" class="targetContainer">
             <ul>
@@ -280,7 +280,7 @@
                 <span class="targetDisplay">
                     <span class="fa fa-sitemap"></span>
                   {{ getTargetName(excluded) }}
-                  <img class="targetRemove" data-lift="with-cached-resource" src="/images/ic_delete.png" ng-click="removeExclude(excluded)"/>
+                  <i class="fa fa-times targetRemove" ng-click="removeExclude(excluded)"></i>
                 </span>
               </li>
             </ul>