change tooltip icon. rockstor#697

schakrava · Jul 5, 2015 · 0cb1cd2 · 0cb1cd2
1 parent 9150b18
commit 0cb1cd2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/cc_form.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/cc_form.jst
@@ -12,7 +12,7 @@
 	      <div class="col-sm-6">
 		<input class="form-control" type="text" id="<%= cci.id %>" name="<%= cci.id %>" value="<%= cci.get('val')%>">
 	      </div>
-	      &nbsp;&nbsp<i class="fa fa-exclamation-circle" title="<%= cci.get('description') %>" rel="tooltip"></i>
+	      &nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="<%= cci.get('description') %>" rel="tooltip"></i>
 	    </div>
 	</div>
 	<% }); %>

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/ports_form.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/ports_form.jst
@@ -10,7 +10,7 @@
 	  <div class="col-sm-5">
 	    <input class="form-control" type="text" id="<%= port.id %>" name="<%= port.id %>" value="<%= port.get('hostp')%>">
 	  </div>
-	  <i class="fa fa-exclamation-circle" title="<%= port.get('description') %>"></i>
+	  <i class="fa fa-info-circle fa-lg" title="<%= port.get('description') %>"></i>
 	</div>
 	<% }); %>
       </form>

diff --git a/...rockstor/storageadmin/static/storageadmin/js/templates/rockons/settings_summary_table.jst b/...rockstor/storageadmin/static/storageadmin/js/templates/rockons/settings_summary_table.jst
@@ -2,9 +2,9 @@
 <table class="table table-condensed table-bordered table-hover table-striped tablesorter">
 <thead>
   <tr>
-     <th>Resource type&nbsp;&nbsp<i class="fa fa-exclamation-circle" title="Type of the system resource on Rockstor. Eg: Share, port numbers etc.. Custom type is for arbitrary variables needed by the Rock-on that may not map to a system resource." rel="tooltip"></i></th>
-    <th>Name&nbsp;&nbsp<i class="fa fa-exclamation-circle" title="Name of the resource according to Rockstor. Eg: Share names, port numbers etc.." rel="tooltip"></i></th>
-    <th>Mapped representation&nbsp;&nbsp<i class="fa fa-exclamation-circle" title="Name/representation of the resource inside the Rock-on. Eg: Shares map to directories, ports map to (possibly different)ports to send traffic to the Rock-on, etc.." rel="tooltip"></i></th>
+     <th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Type of the system resource on Rockstor. Eg: Share, port numbers etc.. Custom type is for arbitrary variables needed by the Rock-on that may not map to a system resource." rel="tooltip"></i></th>
+    <th>Name&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name of the resource according to Rockstor. Eg: Share names, port numbers etc.." rel="tooltip"></i></th>
+    <th>Mapped representation&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name/representation of the resource inside the Rock-on. Eg: Shares map to directories, ports map to (possibly different)ports to send traffic to the Rock-on, etc.." rel="tooltip"></i></th>
   </tr>
 </thead>
 
@@ -35,7 +35,7 @@
   <% cc.each(function(cci, index) { %>
     <tr>
       <td>Custom</td>
-      <td><%= cci.get('val') %>&nbsp;&nbsp<i class="fa fa-exclamation-circle" title="<%= cci.get('description') %>" rel="tooltip"></i></td>
+      <td><%= cci.get('val') %>&nbsp;&nbsp<i class="fa fa-info-circle" title="<%= cci.get('description') %>" rel="tooltip"></i></td>
       <td><%= cci.get('key') %></td>
     </tr>
   <% }); %>

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/summary_table.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/summary_table.jst
@@ -1,9 +1,9 @@
 <table class="table table-condensed table-bordered table-hover table-striped tablesorter">
 <thead>
   <tr>
-    <th>Resource type&nbsp;&nbsp<i class="fa fa-exclamation-circle" title="Type of the system resource on Rockstor. Eg: Share, port numbers etc.. Custom type is for arbitrary variables needed by the Rock-on that may not map to a system resource." rel="tooltip"></i></th>
-    <th>Name&nbsp;&nbsp<i class="fa fa-exclamation-circle" title="Name of the resource according to Rockstor. Eg: Share names, port numbers etc.." rel="tooltip"></i></th>
-    <th>Mapped representation&nbsp;&nbsp<i class="fa fa-exclamation-circle" title="Name/representation of the resource inside the Rock-on. Eg: Shares map to directories, ports map to (possibly different)ports to send traffic to the Rock-on, etc.." rel="tooltip"></i></th>
+    <th>Resource type&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Type of the system resource on Rockstor. Eg: Share, port numbers etc.. Custom type is for arbitrary variables needed by the Rock-on that may not map to a system resource." rel="tooltip"></i></th>
+    <th>Name&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name of the resource according to Rockstor. Eg: Share names, port numbers etc.." rel="tooltip"></i></th>
+    <th>Mapped representation&nbsp;&nbsp<i class="fa fa-info-circle fa-lg" title="Name/representation of the resource inside the Rock-on. Eg: Shares map to directories, ports map to (possibly different)ports to send traffic to the Rock-on, etc.." rel="tooltip"></i></th>
   </tr>
 </thead>
 

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/vol_table.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/rockons/vol_table.jst
@@ -16,8 +16,7 @@
 	      <% }); %>
 	    </select>
 	  </div>
-	  <i class="fa fa-exclamation-circle" title="<%= volume.get('description') %>"></i>
-
+	  <i class="fa fa-info-circle fa-lg" title="<%= volume.get('description') %>"></i>
 	</div>
 	<% }); %>
       </form>

diff --git a/src/rockstor/storageadmin/static/storageadmin/js/views/rockons.js b/src/rockstor/storageadmin/static/storageadmin/js/views/rockons.js
@@ -48,8 +48,8 @@ RockonsView = RockstorLayoutView.extend({
     },
 
     render: function() {
-	this.rockons.fetch();
 	this.service.fetch();
+	this.rockons.fetch();
 	this.updateStatus();
 
 	return this;