You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2013/11/18 19:19:19 UTC
[1/3] git commit: updated refs/heads/pr/105 to 31b1ff5
Updated Branches:
refs/heads/pr/105 [created] 31b1ff514
lots of little tweaks
Fixed `Couchdb` spelling.
Move version number to right of product name.
Tweaked Primary Nav icon alignment.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/179710a0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/179710a0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/179710a0
Branch: refs/heads/pr/105
Commit: 179710a0148011718178cfc165fd2cda475aa161
Parents: 4c324fc
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Thu Nov 14 15:31:31 2013 -0800
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Thu Nov 14 15:31:31 2013 -0800
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/179710a0/src/fauxton/app/addons/logs/templates/dashboard.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/logs/templates/dashboard.html b/src/fauxton/app/addons/logs/templates/dashboard.html
index 14969c8..199794c 100644
--- a/src/fauxton/app/addons/logs/templates/dashboard.html
+++ b/src/fauxton/app/addons/logs/templates/dashboard.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under
the License.
-->
- <h2> Couchdb Logs </h2>
+ <h2> CouchDB Logs </h2>
<table class="table table-bordered" >
<thead>
<tr>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/179710a0/src/fauxton/app/addons/logs/templates/sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/logs/templates/sidebar.html b/src/fauxton/app/addons/logs/templates/sidebar.html
index 91822e0..59b10ac 100644
--- a/src/fauxton/app/addons/logs/templates/sidebar.html
+++ b/src/fauxton/app/addons/logs/templates/sidebar.html
@@ -13,9 +13,9 @@ the License.
-->
<div id="log-sidebar">
+ <header>Log Filter</header>
<form class="form-inline" id="log-filter-form">
<fieldset>
- <legend>Log Filter</legend>
<input type="text" name="filter" placeholder="Type a filter to sort the logs by">
<!-- TODO: filter by method -->
<!-- TODO: correct removed filter behaviour -->
http://git-wip-us.apache.org/repos/asf/couchdb/blob/179710a0/src/fauxton/app/addons/stats/templates/pie_table.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/addons/stats/templates/pie_table.html b/src/fauxton/app/addons/stats/templates/pie_table.html
index fba4717..7aa9b43 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 @@ the License.
-->
<div class="row-fluid">
- <div class="span8">
<h2> <%= datatype %> </h2>
- </div>
</div>
<div class="row-fluid">
- <div class="span8" style="margin-top:70px">
+ <div>
<table class="table table-condensed table-striped">
<thead>
<tr>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/179710a0/src/fauxton/app/templates/fauxton/footer.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/footer.html b/src/fauxton/app/templates/fauxton/footer.html
index a070b52..593c11f 100644
--- a/src/fauxton/app/templates/fauxton/footer.html
+++ b/src/fauxton/app/templates/fauxton/footer.html
@@ -12,4 +12,4 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<p>Fauxton <%=version%> on <a href="http://couchdb.apache.org/">Apache CouchDB</a></p>
+<p>Fauxton on <a href="http://couchdb.apache.org/">Apache CouchDB</a> <%=version%></p>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/179710a0/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index c3894fc..252391e 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;
}
[2/3] git commit: updated refs/heads/pr/105 to 31b1ff5
Posted by de...@apache.org.
toggling delete docs button on Select All
Also preventing "delete 0 docs" confirm box.
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/99f09b78
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/99f09b78
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/99f09b78
Branch: refs/heads/pr/105
Commit: 99f09b78868e75cbe90a6cd31bb3034ed87b4d85
Parents: 179710a
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Thu Nov 14 16:08:29 2013 -0800
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Thu Nov 14 16:16:59 2013 -0800
----------------------------------------------------------------------
src/fauxton/app/modules/documents/views.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/99f09b78/src/fauxton/app/modules/documents/views.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/views.js b/src/fauxton/app/modules/documents/views.js
index b76d238..1e426f8 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;
}
[3/3] git commit: updated refs/heads/pr/105 to 31b1ff5
Posted by de...@apache.org.
removed Primary Indices header; implied by Secondary
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/31b1ff51
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/31b1ff51
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/31b1ff51
Branch: refs/heads/pr/105
Commit: 31b1ff514257a43a59d6a53ae407af7122051722
Parents: 99f09b7
Author: BigBlueHat <by...@bigbluehat.com>
Authored: Thu Nov 14 16:09:49 2013 -0800
Committer: BigBlueHat <by...@bigbluehat.com>
Committed: Thu Nov 14 16:17:06 2013 -0800
----------------------------------------------------------------------
src/fauxton/app/templates/documents/sidebar.html | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/31b1ff51/src/fauxton/app/templates/documents/sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html
index 93bddc9..cd6dedc 100644
--- a/src/fauxton/app/templates/documents/sidebar.html
+++ b/src/fauxton/app/templates/documents/sidebar.html
@@ -58,7 +58,6 @@ the License.
<nav>
<ul class="nav nav-list">
- <li class="nav-header">Primary Indices</li>
<li class="active"><a id="all-docs" href="#<%= database.url('index') %>?limit=100" class="toggle-view"><i class="icon-list"></i> All documents</a></li>
<li><a id="design-docs" href='#<%= database.url("index") %>?limit=100&startkey="_design"&endkey="_e"' class="toggle-view"><i class="icon-list"></i> All design docs</a></li>
</ul>