From 0de43d46123231b55cf3148f186bf86bc4daf9bf Mon Sep 17 00:00:00 2001 From: Priyanka Ganti Date: Tue, 18 Aug 2015 12:41:08 -0700 Subject: [PATCH 1/6] fixed tooltip displaying html tags --- .../static/storageadmin/js/templates/nfs/edit_nfs_export.jst | 2 +- .../storageadmin/js/templates/pool/compression_info_edit.jst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/nfs/edit_nfs_export.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/nfs/edit_nfs_export.jst index 89d9d2656..623adb92d 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/templates/nfs/edit_nfs_export.jst +++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/nfs/edit_nfs_export.jst @@ -55,7 +55,7 @@
-
diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/compression_info_edit.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/compression_info_edit.jst index 96b16a93e..01c5cac7d 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/compression_info_edit.jst +++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/compression_info_edit.jst @@ -17,7 +17,7 @@
- +
From 2c00a1488858d2eaa54ce811330a3bb6d5598443 Mon Sep 17 00:00:00 2001 From: Priyanka Ganti Date: Tue, 18 Aug 2015 14:10:52 -0700 Subject: [PATCH 2/6] modify tooltip not to show html tags --- .../storageadmin/js/templates/pool/add_pool_template.jst | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/add_pool_template.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/add_pool_template.jst index de0b442c1..b28cb6cc4 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/add_pool_template.jst +++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/pool/add_pool_template.jst @@ -57,7 +57,7 @@
- +
@@ -98,5 +98,3 @@ - - From f5793fd94912b07d03f793df54408e2ed4ffee44 Mon Sep 17 00:00:00 2001 From: Priyanka Ganti Date: Sun, 23 Aug 2015 20:16:44 -0700 Subject: [PATCH 3/6] remodel update page --- .../static/storageadmin/css/style.css | 43 +++++++++++++--- .../js/templates/update/version_info.jst | 50 +++++++++++-------- 2 files changed, 64 insertions(+), 29 deletions(-) diff --git a/src/rockstor/storageadmin/static/storageadmin/css/style.css b/src/rockstor/storageadmin/static/storageadmin/css/style.css index 837498a98..e088196ca 100644 --- a/src/rockstor/storageadmin/static/storageadmin/css/style.css +++ b/src/rockstor/storageadmin/static/storageadmin/css/style.css @@ -17,6 +17,33 @@ along with this program. If not, see . */ +/**** 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 */ diff --git a/src/rockstor/storageadmin/static/storageadmin/js/templates/update/version_info.jst b/src/rockstor/storageadmin/static/storageadmin/js/templates/update/version_info.jst index b84e79cb8..2ece72a9e 100644 --- a/src/rockstor/storageadmin/static/storageadmin/js/templates/update/version_info.jst +++ b/src/rockstor/storageadmin/static/storageadmin/js/templates/update/version_info.jst @@ -1,37 +1,45 @@ -

You are currently running RockStor <%= currentVersion %>

<% if (currentVersion != mostRecentVersion) { %>
-

A new update is available!

- RockStor <%= mostRecentVersion %>     - +
+
+

Rockstor <%= mostRecentVersion %> update is available!

+
+
    

-

Here are the changes with this update

+
+
+

Here are the changes with this update

    <% _.each(changeList, function(item) { %> -

  • <%= item %>

    • +

  • <%= item %>

    • <% }); %>
-
-
+

+
+
+ +
-

We are happy to make this update available to you.
Support us by making a purchase at the official RockStor shop.

- Start the update and take me to the shop -
-
-
- No, just update -

+

We are happy to make this update available to you. Please support us by + or making a Purchase

+ Start Update +
+ <% } else { %> -

Rockstor is up-to-date. If you've updated recently, reload the browser(Ctrl+Shift+R) for latest UI changes.


+
+
+

Everything is up-to-date.

+

If you've updated recently, reload the browser(Ctrl+Shift+R) for latest UI changes.


<% if (autoUpdateEnabled) { %> -

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 + Disable auto update <% } else { %> -

Rockstor can be configured to check for updates once a day and automatically update itself. We recommend you enable auto update.

- Enable auto update + Enable auto update <% } %> +

+
+
<% } %>