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 2014/08/25 15:39:59 UTC
[19/48] fauxton commit: updated refs/heads/secondary-indexes to
8688d16
refactor query options button to header
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/80e4524c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/80e4524c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/80e4524c
Branch: refs/heads/secondary-indexes
Commit: 80e4524c772fee0dde2f9c16fc09b89816b1ba00
Parents: 5b674dd
Author: Jenn Schiffer <je...@pancaketheorem.com>
Authored: Sun Aug 24 16:33:43 2014 +0200
Committer: deathbearbrown <de...@gmail.com>
Committed: Mon Aug 25 09:35:09 2014 -0400
----------------------------------------------------------------------
.../documents/assets/less/advancedOptions.less | 12 +-
app/addons/documents/assets/less/documents.less | 2 +-
app/addons/documents/routes.js | 7 -
.../documents/templates/advanced_options.html | 265 ++++++++++---------
.../documents/templates/header_alldocs.html | 4 -
app/addons/documents/views-advancedopts.js | 2 +-
6 files changed, 143 insertions(+), 149 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/80e4524c/app/addons/documents/assets/less/advancedOptions.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/advancedOptions.less b/app/addons/documents/assets/less/advancedOptions.less
index a932559..ce8b546 100644
--- a/app/addons/documents/assets/less/advancedOptions.less
+++ b/app/addons/documents/assets/less/advancedOptions.less
@@ -12,18 +12,16 @@
/*ALL DOCS TABLE*/
/*for advanced options css*/
-#query-options {
+#query-options-tray {
.border-radius(5px);
width: 490px;
position: absolute;
z-index: 11;
background-color: #333;
padding: 0;
- .well {
- background: none;
- border: none;
+
color: #fff;
- padding: 0;
+
margin: 0;
.query-group {
padding: 20px;
@@ -38,7 +36,7 @@
.controls-group:last-child {
margin: 0;
}
- }
+
form {
margin-bottom: 0;
.dropdown.inline {
@@ -78,7 +76,7 @@
}
}
}
-#query-options:before {
+#query-options-tray:before {
content: '';
position: absolute;
top: -25px;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/80e4524c/app/addons/documents/assets/less/documents.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/documents.less b/app/addons/documents/assets/less/documents.less
index 647e847..271c9da 100644
--- a/app/addons/documents/assets/less/documents.less
+++ b/app/addons/documents/assets/less/documents.less
@@ -42,7 +42,7 @@ button.beautify {
}
-#query-options div.controls-group.well{
+#query-options-tray div.controls-group.well{
height: 180px;
margin-right: 17px;
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/80e4524c/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index 8a43528..bd52fb8 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -247,13 +247,6 @@ function(app, FauxtonAPI, Components, Documents, Changes, DocEditor, Databases,
this.data.database.allDocs.paging.pageSize = this.getDocPerPageLimit(urlParams, parseInt(docParams.limit, 10));
- this.viewEditor = this.setView("#dashboard-upper-content", new Documents.Views.AllDocsHeader({
- database: this.data.database,
- collection: this.data.database.allDocs,
- params: urlParams,
- docParams: docParams
- }));
-
this.documentsView = this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
database: this.data.database,
collection: this.data.database.allDocs,
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/80e4524c/app/addons/documents/templates/advanced_options.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/advanced_options.html b/app/addons/documents/templates/advanced_options.html
index c6268fb..8e8bb36 100644
--- a/app/addons/documents/templates/advanced_options.html
+++ b/app/addons/documents/templates/advanced_options.html
@@ -10,160 +10,167 @@ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.
--->
-<form class="js-view-query-update custom-inputs">
-
- <div class="query-group">
- <span class="add-on">
- API Options
- <a class="help-link" href="<%-getDocUrl(documentation)%>" target="_blank">
- <i class="icon-question-sign"></i>
- </a>
- </span>
-
- <div class="errors-container"></div>
-
- <div class="controls-group">
- <div class="row-fluid">
-
- <div class="checkbox inline">
- <input id="select2" name="include_docs" type="checkbox" value="true">
- <label for="include_docs">Include Docs</label>
- </div>
+-->
+<a id="toggle-query" href="#query-options-tray" data-bypass="true" data-toggle="tab">
+ <i class="fonticon fonticon-plus"></i>
+ Query Options
+</a>
+
+<div id="query-options-tray">
+ <form class="js-view-query-update custom-inputs">
+
+ <div class="query-group">
+ <span class="add-on">
+ API Options
+ <a class="help-link" href="<%-getDocUrl(documentation)%>" target="_blank">
+ <i class="icon-question-sign"></i>
+ </a>
+ </span>
+
+ <div class="errors-container"></div>
+
+ <div class="controls-group">
+ <div class="row-fluid">
- <% if (hasReduce) { %>
<div class="checkbox inline">
- <input id="check2" name="reduce" type="checkbox" value="true">
- <label for="check2">Reduce</label>
+ <input id="select2" name="include_docs" type="checkbox" value="true">
+ <label for="include_docs">Include Docs</label>
</div>
-
- <label id="select1" class="drop-down inline">
- Group Level
- <select id="select1" 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>
- <% } %>
+ <% if (hasReduce) { %>
+ <div class="checkbox inline">
+ <input id="check2" name="reduce" type="checkbox" value="true">
+ <label for="check2">Reduce</label>
+ </div>
+
+ <label id="select1" class="drop-down inline">
+ Group Level
+ <select id="select1" 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>
- </div>
- </div>
-
- <div class="query-group">
- <span class="add-on">
- Keys
- </span>
- <!-- tabs for choosing Keys or Start & end -->
- <div class="btn-group toggle-btns row-fluid">
- <label for="showKeys" class="drop-down btn">
- By Key(s)
- </label>
- <label for="showStartEnd" class="drop-down btn">
- Between Keys
- </label>
</div>
- <div class="controls-group well hide js-query-keys-wrapper">
- <div class="row-fluid" id="js-showKeys">
- <div class="controls controls-row">
- <label for="keys-input" class="drop-down">A key, or an array of keys.</label>
- <textarea id="keys-input" name="keys" class="input-xxlarge" rows="5" type="text" placeholder='Enter valid JSON; e.g., ["1234"] or ["1234","2345"]'></textarea>
- <div id="keys-error" class="inline-block js-keys-error"></div>
- </div>
+ <div class="query-group">
+ <span class="add-on">
+ Keys
+ </span>
+ <!-- tabs for choosing Keys or Start & end -->
+ <div class="btn-group toggle-btns row-fluid">
+ <label for="showKeys" class="drop-down btn">
+ By Key(s)
+ </label>
+ <label for="showStartEnd" class="drop-down btn">
+ Between Keys
+ </label>
</div>
- <div class="row-fluid hide" id="js-showStartEnd">
- <div class="controls controls-row">
- <div>
- <label for="startkey" class="drop-down">Start key</label>
- <input name="startkey" id="startkey" type="text" placeholder='e.g., "1234"' disabled>
+
+ <div class="controls-group well hide js-query-keys-wrapper">
+ <div class="row-fluid" id="js-showKeys">
+ <div class="controls controls-row">
+ <label for="keys-input" class="drop-down">A key, or an array of keys.</label>
+ <textarea id="keys-input" name="keys" class="input-xxlarge" rows="5" type="text" placeholder='Enter valid JSON; e.g., ["1234"] or ["1234","2345"]'></textarea>
+ <div id="keys-error" class="inline-block js-keys-error"></div>
</div>
- <div>
- <label for="endkey" class="drop-down">End key</label>
- <input id="endkey" name="endkey" type="text" placeholder='e.g., "1234"'>
- <div class="controls controls-row checkbox inline">
- <input id="check5" name="inclusive_end" type="checkbox" value="true" checked disabled>
- <label for="check5">Include End Key in results</label>
+ </div>
+ <div class="row-fluid hide" id="js-showStartEnd">
+ <div class="controls controls-row">
+ <div>
+ <label for="startkey" class="drop-down">Start key</label>
+ <input name="startkey" id="startkey" type="text" placeholder='e.g., "1234"' disabled>
+ </div>
+ <div>
+ <label for="endkey" class="drop-down">End key</label>
+ <input id="endkey" name="endkey" type="text" placeholder='e.g., "1234"'>
+ <div class="controls controls-row checkbox inline">
+ <input id="check5" name="inclusive_end" type="checkbox" value="true" checked disabled>
+ <label for="check5">Include End Key in results</label>
+ </div>
</div>
+
</div>
</div>
-
</div>
</div>
- </div>
- <div class="controls-group query-group">
- <!-- Limit and Skip are conditional -->
- <span class="add-on">
- Additional Parameters
- </span>
+ <div class="controls-group query-group">
+ <!-- Limit and Skip are conditional -->
+ <span class="add-on">
+ Additional Parameters
+ </span>
+
+ <div class="row-fluid">
+ <% if (showStale) { %>
+ <div class="checkbox inline">
+ <input id="check7" name="stale" type="checkbox" value="ok">
+ <label for="check7">Stale</label>
+ </div>
+ <% } %>
+ <div class="checkbox inline">
+ <input id="check6" name="update_seq" type="checkbox" value="true">
+ <label for="check6">Update Sequence</label>
+ </div>
- <div class="row-fluid">
- <% if (showStale) { %>
- <div class="checkbox inline">
- <input id="check7" name="stale" type="checkbox" value="ok">
- <label for="check7">Stale</label>
- </div>
- <% } %>
- <div class="checkbox inline">
- <input id="check6" name="update_seq" type="checkbox" value="true">
- <label for="check6">Update Sequence</label>
+ <div class="dropdown inline">
+ <label class="drop-down">
+ Limit:
+ <select name="limit" class="input-small">
+ <option selected="selected">None</option>
+ <option>5</option>
+ <option>10</option>
+ <option>20</option>
+ <option>30</option>
+ <option>50</option>
+ <option>100</option>
+ <option>500</option>
+ </select>
+ </label>
</div>
- <div class="dropdown inline">
- <label class="drop-down">
- Limit:
- <select name="limit" class="input-small">
- <option selected="selected">None</option>
- <option>5</option>
- <option>10</option>
- <option>20</option>
- <option>30</option>
- <option>50</option>
- <option>100</option>
- <option>500</option>
- </select>
- </label>
</div>
- </div>
+ <div class="row-fluid">
+ <div class="checkbox inline">
+ <input id="select2" name="descending" type="checkbox" value="true">
+ <label for="descending">Descending</label>
+ </div>
- <div class="row-fluid">
- <div class="checkbox inline">
- <input id="select2" name="descending" type="checkbox" value="true">
- <label for="descending">Descending</label>
+ <div class="dropdown inline">
+ <label for="skipRows" class="drop-down">
+ Skip
+ <input name="skip" class="input-small" type="text" id="skipRows" placeholder="# of rows">
+ </label>
+ </div>
</div>
+ </div>
- <div class="dropdown inline">
- <label for="skipRows" class="drop-down">
- Skip
- <input name="skip" class="input-small" type="text" id="skipRows" placeholder="# of rows">
- </label>
+ <div class="controls-group query-group">
+ <span class="add-on">
+ Query the DB
+ </span>
+ <div id="button-options" class="controls controls-row">
+ <button type="submit" class="btn btn-success">
+ <i class="fonticon-play icon"></i>
+ Query
+ </button>
</div>
</div>
- </div>
-
- <div class="controls-group query-group">
- <span class="add-on">
- Query the DB
- </span>
- <div id="button-options" class="controls controls-row">
- <button type="submit" class="btn btn-success">
- <i class="fonticon-play icon"></i>
- Query
- </button>
- </div>
- </div>
-</form>
+ </form>
+</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/80e4524c/app/addons/documents/templates/header_alldocs.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/header_alldocs.html b/app/addons/documents/templates/header_alldocs.html
index 6312a47..dfdfc03 100644
--- a/app/addons/documents/templates/header_alldocs.html
+++ b/app/addons/documents/templates/header_alldocs.html
@@ -30,10 +30,6 @@ the License.
<!-- Query Options-->
<div class="header-query-options">
- <a id="toggle-query" href="#query-options" data-bypass="true" data-toggle="tab">
- <i class="fonticon fonticon-plus"></i>
- Query Options
- </a>
<!-- Insert the query options here :) -->
<div id="query-options">
</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/80e4524c/app/addons/documents/views-advancedopts.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-advancedopts.js b/app/addons/documents/views-advancedopts.js
index 6cb515e..f8a1be6 100644
--- a/app/addons/documents/views-advancedopts.js
+++ b/app/addons/documents/views-advancedopts.js
@@ -65,7 +65,7 @@ function(app, FauxtonAPI, resizeColumns ) {
toggleQuery: function (event) {
console.log('togglequery');
$('#dashboard-content').scrollTop(0);
- this.$('#query-options').toggle();
+ this.$('#query-options-tray').toggle();
},
showKeys: function(){