You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2013/08/22 12:44:38 UTC
[5/7] git commit: updated refs/heads/master to b65f11f
reordering query buttons
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f4a623ff
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f4a623ff
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f4a623ff
Branch: refs/heads/master
Commit: f4a623ff2370a1972cedc8ca44ab5dc57807942f
Parents: 6bd8e2a
Author: sean barclay <fu...@hotmail.com>
Authored: Tue Aug 20 21:29:00 2013 -0700
Committer: Garren Smith <ga...@gmail.com>
Committed: Thu Aug 22 12:30:11 2013 +0200
----------------------------------------------------------------------
.../app/templates/documents/view_editor.html | 85 +++++++++++---------
src/fauxton/assets/less/fauxton.less | 7 +-
2 files changed, 50 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f4a623ff/src/fauxton/app/templates/documents/view_editor.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index 9a7c8dd..3f0d959 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -109,42 +109,6 @@ the License.
<div class="tab-pane" id="query">
<div class="advanced-options well">
<form class="view-query-update">
- <div class="controls controls-row">
- <label class="span3 inline">
- Limit:
- <select name="limit" class="input-small">
- <option>5</option>
- <option selected="selected">10</option>
- <option>25</option>
- <option>50</option>
- <option>100</option>
- </select>
- </label>
- <label class="span3 checkbox inline">
- <input name="include_docs" type="checkbox" value="true"> Include Docs
- </label>
- <% if (hasReduce) { %>
- <label class="span2 checkbox inline">
- <input name="reduce" type="checkbox" value="true"> Reduce
- </label>
- <label class="span4 inline">
- Group Level:
- <select disabled name="group_level" class="input-small">
- <option value="0">None</option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
- <option value="5">5</option>
- <option value="6">6</option>
- <option value="7">7</option>
- <option value="8">8</option>
- <option value="9">9</option>
- <option value="999" selected="selected">exact</option>
- </select>
- </label>
- <% } %>
- </div>
<div class="row-fluid">
<div class="controls controls-row">
<input name="key" class="span6" type="text" placeholder="Key">
@@ -159,16 +123,57 @@ the License.
</div>
<div class="row-fluid">
<div class="controls controls-row">
- <label class="span2 checkbox inline">
+
+ <label class="checkbox inline">
+ <input name="include_docs" type="checkbox" value="true"> Include Docs
+ </label>
+
+ <% if (hasReduce) { %>
+ <label class="checkbox inline">
+ <input name="reduce" type="checkbox" value="true"> Reduce
+ </label>
+
+ <label class="checkbox inline">
+ Group Level:
+ <select disabled name="group_level" class="input-small">
+ <option value="0">None</option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="999" selected="selected">exact</option>
+ </select>
+ </label>
+ <% } %>
+ </div>
+ <div class="controls controls-row">
+ <label class="checkbox inline">
<input name="stale" type="checkbox" value="ok"> Stale
</label>
- <label class="span2 checkbox inline">
+ <label class="checkbox inline">
<input name="descending" type="checkbox" value="true"> Descending
</label>
- <label class="span4 checkbox inline">
+ <label class="checkbox inline">
+ Limit:
+ <select name="limit" class="input-small">
+ <option>5</option>
+ <option selected="selected">10</option>
+ <option>25</option>
+ <option>50</option>
+ <option>100</option>
+ </select>
+ </label>
+ </div>
+ <div class="controls controls-row">
+ <label class="checkbox inline">
<input name="inclusive_end" type="checkbox" value="false"> Disable Inclusive End
</label>
- <label class="span4 checkbox inline">
+ <label class="checkbox inline">
<input name="update_seq" type="checkbox" value="true"> Include Update Sequence
</label>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb/blob/f4a623ff/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index d19813f..49c973a 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -610,10 +610,11 @@ tbody {padding-top: 10px;}
/*form elements and buttons*/
-
.btn-group {
> .btn + .dropdown-toggle,
- > .btn:first-child
+ > .btn:first-child,
+ > .btn:last-child,
+ > .dropdown-toggle
{
.border-radius(0);
background-image: none;
@@ -680,6 +681,7 @@ input[type=text], input[type=password],
padding: 7px;
margin-top: -5px;
border: 1px solid @inputBorder;
+ .border-radius(0);
}
@@ -743,6 +745,7 @@ tr.all-docs-item{
/*documents and databases */
.view.show{
color: @fontGrey;
+ margin-top: 56px;
}
div.spinner {