Merge branch 'priyaganti-tooltip_Corrections'

src/rockstor/storageadmin/static/storageadmin/css/style.css

@@ -17,6 +17,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 */
 
+/**** Update page css ****/
+
+#supportBox h4{
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: medium;
+}
+#updateInfo {
+  text-align:center;
+}
+#updateInfo h3 {
+  color:#3c763d;
+}
+#changeSection{
+  min-height: 15px;
+  padding: 8px;
+  margin-bottom: 10px;
+  border: 1px solid #e3e3e3;
+  border-radius: 4px;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.05);
+}
+#changeSection p{
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: medium;
+}
+/**** Update page css ****/
+
 html {
     height: 100%;
     overflow: hidden;
@@ -71,9 +98,9 @@ select, textarea, input[type="text"], input[type="password"], input[type="dateti
 */
 
 /* Navbar */
-.navbar-fixed-top .navbar-inner { 
-  padding-left: 20px; 
-  padding-right: 20px; 
+.navbar-fixed-top .navbar-inner {
+  padding-left: 20px;
+  padding-right: 20px;
   background: #6C7A89;
   border: none;
 }
@@ -1538,7 +1565,7 @@ input[type="radio"].selectedRoot {
 }
 
 /* cpu graph */
-.cpugraph path { 
+.cpugraph path {
   stroke: steelblue;
   stroke-width: 1;
   fill: none;
@@ -1557,7 +1584,7 @@ input[type="radio"].selectedRoot {
 }
 .cpugraph.grid path {
   stroke-width: 0;
-}    
+}
 .cpugraph line {
 
 }
@@ -1567,7 +1594,7 @@ input[type="radio"].selectedRoot {
 }
 
 #cpuusage-individual div.cpu {
-  float: left; 
+  float: left;
   margin-right: 2px;
 }
 
@@ -1653,11 +1680,11 @@ input[type="radio"].selectedRoot {
   100% { background-color: none; }
 }
 
-#version-msg i { 
+#version-msg i {
   animation: versionflash 2s;
   animation-iteration-count: infinite;
   -webkit-animation: versionflash 2s;
-  border-radius: 7px; 
+  border-radius: 7px;
 }
 
 /* font-awesome styling */

src/rockstor/storageadmin/static/storageadmin/js/templates/common/navbar.jst

@@ -22,7 +22,6 @@
       </ul>
     </ul>
   </li>
-  <li><a id="analytics_nav" href="#analytics">Analytics</a></li>
   <li class="dropdown">
     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">System <span class="caret"></span></a>
     <ul class="dropdown-menu">

src/rockstor/storageadmin/static/storageadmin/js/templates/nfs/edit_nfs_export.jst

@@ -55,7 +55,7 @@
         <div class="form-group">
           <label class="col-xs-2 control-label" for="host_str">NFS Clients<span class="required"> *</span></label>
           <div class="col-sm-6">
-            <input class="form-control shorten-input" type="text" name="host_str" id="host_str"
+            <input class="form-control shorten-input" type="text" name="host_str" id="host_str" data-html = "true"
 	    title="Hosts permitted to NFS mount. There are five broad categories of this input.<br><strong>anonymous:</strong> Just type a single * character and any host will be allowed.<br><strong>single host:</strong> Hostname or a IP address.<br><strong>IP networks:</strong> All hosts of a subnet given by <strong>address/netmask</strong>.<br><strong>wildcards:</strong> Names with wildcard(*, ?) characters for compact notation. for example, *.cs.foo.edu matches all hosts in the domain cs.food.edu.<br><strong>Netgroups:</strong> NIS netgroups given as @group.<br><br>For more details read the manpage for exports." value="<%= nfsExportGroup.get('host_str') %>">
           </div>
         </div>

src/rockstor/storageadmin/static/storageadmin/js/templates/pool/add_pool_template.jst

@@ -57,7 +57,7 @@
 	<div class="form-group">
           <label class="col-sm-2 control-label" for="mnt_options">Mount options</label>
           <div class="col-sm-3">
-            <input class="form-control" type="text" name="mnt_options" id="mnt_options" title="This is for <strong>Advanced users</strong> to provide specific BTRFS mount options.<br>Type them as a commma separated string of options without any spaces.<br> Allowed options are <strong>alloc_start, autodefrag, clear_cache, commit, compress-force, discard, fatal_errors, inode_cache, max_inline, metadata_ratio, noacl, noatime, nodatacow, nodatasum, nospace_cache, space_cache, ssd, ssd_spread, thread_pool</strong>">
+            <input class="form-control" type="text" name="mnt_options" id="mnt_options" data-html="true" title="This is for <strong>Advanced users</strong> to provide specific BTRFS mount options.<br>Type them as a commma separated string of options without any spaces.<br> Allowed options are <strong>alloc_start, autodefrag, clear_cache, commit, compress-force, discard, fatal_errors, inode_cache, max_inline, metadata_ratio, noacl, noatime, nodatacow, nodatasum, nospace_cache, space_cache, ssd, ssd_spread, thread_pool</strong>">
           </div>
         </div>
           <div id="SelectedDisksTable"> </div>
@@ -98,5 +98,3 @@
 	</div>
       </form>
     </div> <!-- form-box -->
-
-

src/rockstor/storageadmin/static/storageadmin/js/templates/pool/compression_info_edit.jst

@@ -17,7 +17,7 @@
   <div class="form-group">
     <label class="col-sm-4 control-label" for="mnt_options">Extra mount options</label>
     <div class="col-sm-6">
-      <input class="form-control"type="text" name="mnt_options" id="mnt_options" value="<%= pool.get('mnt_options') %>" title="This is for <strong>Advanced users</strong> to provide specific BTRFS mount options.<br>Type them as a commma separated string of options without any spaces.<br> Allowed options are <strong>alloc_start, autodefrag, clear_cache, commit, compress-force, discard, fatal_errors, inode_cache, max_inline, metadata_ratio, noacl, noatime, nodatacow, nodatasum, nospace_cache, space_cache, ssd, ssd_spread, thread_pool</strong>">
+      <input class="form-control"type="text" name="mnt_options" id="mnt_options" data-html="true" value="<%= pool.get('mnt_options') %>" title="This is for <strong>Advanced users</strong> to provide specific BTRFS mount options.<br>Type them as a commma separated string of options without any spaces.<br> Allowed options are <strong>alloc_start, autodefrag, clear_cache, commit, compress-force, discard, fatal_errors, inode_cache, max_inline, metadata_ratio, noacl, noatime, nodatacow, nodatasum, nospace_cache, space_cache, ssd, ssd_spread, thread_pool</strong>">
     </div>
   </div>
 

src/rockstor/storageadmin/static/storageadmin/js/templates/share/share_details_layout.jst

@@ -44,7 +44,7 @@
   <li class="active"><a href="#usage" data-toggle="tab">Usage</a></li>
   <li><a href="#access-control" data-toggle="tab">Access control</a></li>
   <li><a href="#snapshots" data-toggle="tab">Snapshots</a></li>
-  <li><a href="#nfs" data-toggle="tab">NFS</a></li>
+  <!--li><a href="#nfs" data-toggle="tab">NFS</a></li-->
 </ul>
 
 <div class="css-panes">
@@ -70,7 +70,7 @@
   <div id="snapshots">
     <div id="ph-snapshots"></div>
   </div>
-  <div id="nfs">
+  <!--div id="nfs">
     <div id="ph-nfs-exports"></div>
-  </div>
+  </div-->
 </div>

src/rockstor/storageadmin/static/storageadmin/js/templates/update/version_info.jst

@@ -1,49 +1,56 @@
-<h3>You are currently running RockStor <%= currentVersion %></h3>
 <% if (currentVersion != mostRecentVersion) { %>
   <br>
-  <h3>A new update is available!</h3>
-  <span class="h3">RockStor <%= mostRecentVersion %></span>&nbsp;&nbsp;&nbsp;&nbsp;
-  <!-- <a id="update" class="btn btn-primary" title="Update">Update</a> -->
+<div class="col-sm-offset-3 col-sm-6 col-sm-offset-3">
+<div id="updateInfo">
+<h3><strong>Rockstor <%= mostRecentVersion %></strong> update is available! </h3>
+</div>
+</div>&nbsp;&nbsp;&nbsp;&nbsp;
   <br>
   <br>
-  <h4>Here are the changes with this update</h4>
+<div class="col-sm-offset-2 col-sm-8 col-sm-offset-2">
+<div id="changeSection">
+  <p>Here are the changes with this update</p>
   <ul>
     <% _.each(changeList, function(item) { %>
     <% if (item == '') { %>
     <br>
     <% } else { %>
-    <li><h4><%= item %></h4></li>
+    <li><p><%= item %></p></li>
     <% } %>
     <% }); %>
   </ul>
-  <div class="row">
-    <div class="col-md-6">
+</p>
+</div>
+</div>
+
+<div class="col-md-offset-2 col-md-8 col-md-offset-2" id="supportBox">
       <div class="alert alert-success" id="contrib-alert">
-      <h4>We are happy to make this update available to you.<br>Support us by making a purchase at the official RockStor shop.</h4>
-        <a id="donateYes" class="btn btn-primary" title="Update" href="http://shop.rockstor.com" target="_blank">Start the update and take me to the shop</a>
-      </div>
-    </div>
-  </div>
-  <a id="donateNo" class="btn btn-default" title="Update">No, just update </a>
-  </p>
+      <h4>We are happy to make this update available to you. Please support us by
+      <a id="donateYes" href="#version"> Donating</a> or making a <a href="http://shop.rockstor.com" target="_blank"> Purchase</a></h4>
+        <a id="update" class="btn btn-primary" title="start update">Start Update</a>
+</div>
+
 <% } else { %>
-  <p>Rockstor is up-to-date. If you've updated recently, reload the browser<b>(Ctrl+Shift+R)</b> for latest UI changes.</p><br>
+<div class="col-md-offset-3 col-md-6 col-md-offset-3">
+<div id="updateInfo">
+  <h3>System is up-to-date.</h3>
+<p>If you've updated recently, reload the browser<b>(Ctrl+Shift+R)</b> for latest UI changes.</p><br>
 
   <% if (autoUpdateEnabled) { %>
-  <p>Rockstor is configured to check for package updates and automatically upgrade on a daily basis. This will keep your system up to date. While it's not recommended, you can disable this feature and only update when you want to.</p>
-  <a id="disableAuto" class="btn btn-primary" title="Disable Auto Update">Disable auto update</a>
+  <a id="disableAuto" class="btn btn-primary" title="Rockstor is configured to check for updates once a day and automatically update itself. If you so choose, you can disable auto update.">Disable auto update</a>
   <% } else { %>
-  <p>Rockstor can be configured to check for package updates and automatically upgrade on a daily basis. We recommend you enable this feature to keep your system up to date without delay.</p>
-  <a id="enableAuto" class="btn btn-primary" title="Enable Auto Update">Enable auto update</a>
+  <a id="enableAuto" class="btn btn-primary" title="Rockstor can be configured to check for updates once a day and automatically update itself. We recommend you enable auto update.">Enable auto update</a>
   <% } %>
+<p></p>
+</div>
+</div>
 <% } %>
 
-<div id="update-modal" class="modal fade">
+<div id="update-modal" class="modal fade" role="dialog" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-	<h4>RockStor is being updated to the latest version. Please wait... &nbsp;&nbsp; </h4>
+	<h4>Rockstor is being updated to the latest version. Please wait... &nbsp;&nbsp; </h4>
       </div>
       <div class="modal-body">
 	<div style="text-align: center">

src/rockstor/storageadmin/static/storageadmin/js/views/version.js

@@ -28,9 +28,8 @@ VersionView = RockstorLayoutView.extend({
     events: {
 	'click #update': 'update',
 	'click #donateYes': 'donateYes',
-	'click #donateNo': 'donateNo',
 	'click #enableAuto': 'enableAutoUpdate',
-	'click #disableAuto': 'disableAutoUpdate',
+	'click #disableAuto': 'disableAutoUpdate'
     },
 
     initialize: function() {
@@ -52,7 +51,6 @@ VersionView = RockstorLayoutView.extend({
 		_this.currentVersion = data[0];
 		_this.mostRecentVersion = data[1];
 		_this.changeList = data[2];
-		//_this.renderVersionInfo();
 		_this.checkAutoUpdateStatus();
 	    },
 	    error: function(xhr, status, error) {
@@ -104,20 +102,9 @@ VersionView = RockstorLayoutView.extend({
     },
 
     donateYes: function() {
-	contrib = this.$('input[type="radio"][name="contrib"]:checked').val();
-	if (contrib=='custom') {
-	    contrib = $('#custom-amount').val();
-	}
-	if (_.isNull(contrib) || _.isEmpty(contrib) || isNaN(contrib)) {
-	    contrib = 0; // set contrib to 0, let user input the number on paypal
-	}
+	var contrib = 0;
 	this.$('input[name="amount"]').val(contrib);
-	this.$('#contrib-form').submit()
-	this.update();
-    },
-
-    donateNo: function() {
-	this.update();
+	this.$('#contrib-form').submit();
     },
 
     update: function() {