From 179710a0148011718178cfc165fd2cda475aa161 Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Thu, 14 Nov 2013 15:31:31 -0800 Subject: [PATCH 1/3] lots of little tweaks Fixed `Couchdb` spelling. Move version number to right of product name. Tweaked Primary Nav icon alignment. --- src/fauxton/app/addons/logs/templates/dashboard.html | 2 +- src/fauxton/app/addons/logs/templates/sidebar.html | 2 +- src/fauxton/app/addons/stats/templates/pie_table.html | 4 +--- src/fauxton/app/templates/fauxton/footer.html | 2 +- src/fauxton/assets/less/fauxton.less | 4 +++- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/fauxton/app/addons/logs/templates/dashboard.html b/src/fauxton/app/addons/logs/templates/dashboard.html index 14969c8c14e..199794c9686 100644 --- a/src/fauxton/app/addons/logs/templates/dashboard.html +++ b/src/fauxton/app/addons/logs/templates/dashboard.html @@ -12,7 +12,7 @@ the License. --> -

Couchdb Logs

+

CouchDB Logs

diff --git a/src/fauxton/app/addons/logs/templates/sidebar.html b/src/fauxton/app/addons/logs/templates/sidebar.html index 91822e0133d..59b10ace4ba 100644 --- a/src/fauxton/app/addons/logs/templates/sidebar.html +++ b/src/fauxton/app/addons/logs/templates/sidebar.html @@ -13,9 +13,9 @@ -->
+
Log Filter
- Log Filter diff --git a/src/fauxton/app/addons/stats/templates/pie_table.html b/src/fauxton/app/addons/stats/templates/pie_table.html index fba4717cf6d..7aa9b43f59c 100644 --- a/src/fauxton/app/addons/stats/templates/pie_table.html +++ b/src/fauxton/app/addons/stats/templates/pie_table.html @@ -13,13 +13,11 @@ -->
-

<%= datatype %>

-
-
+
diff --git a/src/fauxton/app/templates/fauxton/footer.html b/src/fauxton/app/templates/fauxton/footer.html index a070b52efe4..593c11f38cd 100644 --- a/src/fauxton/app/templates/fauxton/footer.html +++ b/src/fauxton/app/templates/fauxton/footer.html @@ -12,4 +12,4 @@ the License. --> -

Fauxton <%=version%> on Apache CouchDB

+

Fauxton on Apache CouchDB <%=version%>

diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index c3894fc6452..252391e1d60 100644 --- a/src/fauxton/assets/less/fauxton.less +++ b/src/fauxton/assets/less/fauxton.less @@ -233,6 +233,7 @@ a:hover{ position: relative; &:before { position: absolute; + top: -5px; left: -44px; font-size: 28px; color: @NavIcon; @@ -414,7 +415,7 @@ footer#mainFooter{ /*SIDEBAR TEMPLATE STYLES*/ .topmenu-defaults { height: 70px; - padding: 20px 10px 0; + padding: 12px 10px 0; border-bottom: 1px solid @darkRed; .box-sizing(border-box); } @@ -627,6 +628,7 @@ tbody {padding-top: 10px;} background-color: @redButton; color: #fff; padding: 10px 15px; + cursor: pointer; &:before{ padding-right: 5px; } From 99f09b78868e75cbe90a6cd31bb3034ed87b4d85 Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Thu, 14 Nov 2013 16:08:29 -0800 Subject: [PATCH 2/3] toggling delete docs button on Select All Also preventing "delete 0 docs" confirm box. --- src/fauxton/app/modules/documents/views.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js index b76d238e893..1e426f82b84 100644 --- a/src/fauxton/app/modules/documents/views.js +++ b/src/fauxton/app/modules/documents/views.js @@ -573,7 +573,7 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, resizeColumns) { }, selectAll: function(evt){ - $("input:checkbox").prop('checked', !$(evt.target).hasClass('active')); + $("input:checkbox").prop('checked', !$(evt.target).hasClass('active')).trigger('change'); }, serialize: function() { @@ -619,7 +619,7 @@ function(app, FauxtonAPI, Components, Documents, pouchdb, resizeColumns) { .map(function(e) { return $(this).attr("data-id"); }) .get(); - if (!window.confirm("Are you sure you want to delete these " + eles.length + " docs?")) { + if (eles.length === 0 || !window.confirm("Are you sure you want to delete these " + eles.length + " docs?")) { return false; } From 31b1ff514257a43a59d6a53ae407af7122051722 Mon Sep 17 00:00:00 2001 From: BigBlueHat Date: Thu, 14 Nov 2013 16:09:49 -0800 Subject: [PATCH 3/3] removed Primary Indices header; implied by Secondary --- src/fauxton/app/templates/documents/sidebar.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html index 93bddc9053c..cd6dedcab3e 100644 --- a/src/fauxton/app/templates/documents/sidebar.html +++ b/src/fauxton/app/templates/documents/sidebar.html @@ -58,7 +58,6 @@