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/07/29 20:10:37 UTC
[2/3] fauxton commit: updated refs/heads/secondary-indexes to 58a3ae3
move around query options, init style
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b9824689
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b9824689
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b9824689
Branch: refs/heads/secondary-indexes
Commit: b9824689be2c46c344ac75b703b2e74db9122b99
Parents: 03492d6
Author: Jenn Schiffer <je...@pancaketheorem.com>
Authored: Mon Jul 28 12:11:51 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Tue Jul 29 14:09:16 2014 -0400
----------------------------------------------------------------------
.../documents/assets/less/advancedOptions.less | 45 ++++
.../documents/templates/advanced_options.html | 218 ++++++++++---------
2 files changed, 160 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9824689/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 5f278a4..0ff8124 100644
--- a/app/addons/documents/assets/less/advancedOptions.less
+++ b/app/addons/documents/assets/less/advancedOptions.less
@@ -12,3 +12,48 @@
/*ALL DOCS TABLE*/
/*for advanced options css*/
+#query {
+ .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;
+ border-bottom: 1px solid #ccc;
+ }
+ .query-group:last-child {
+ border-bottom: none;
+ }
+ .controls-group {
+ margin: 0;
+ }
+ .controls-group:last-child {
+ margin: 0;
+ }
+ }
+ form {
+ margin-bottom: 0;
+ .dropdown.inline {
+ display: inline-block;
+ }
+ }
+}
+#query:before {
+ content: '';
+ position: absolute;
+ top: -25px;
+ left: 30px;
+ border-color: transparent transparent #333 transparent;
+ border-style: solid;
+ border-width: 15px;
+ width: 0;
+ height: 0;
+}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9824689/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 c986d4e..1fc9546 100644
--- a/app/addons/documents/templates/advanced_options.html
+++ b/app/addons/documents/templates/advanced_options.html
@@ -11,57 +11,119 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
License for the specific language governing permissions and limitations under
the License.
-->
-<div class="errors-container"></div>
<form class="js-view-query-update custom-inputs">
-<!-- tabs for choosing Keys or Start & end -->
+ <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="btn-group toggle-btns row-fluid">
- <label for="showKeys" class="drop-down btn span6">
- By Key(s)
- </label>
- <label for="showStartEnd" class="drop-down btn span6">
- Between Keys
- </label>
- </div>
+ <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>
+
+ <% 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 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>
+ </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 span6">
+ By Key(s)
+ </label>
+ <label for="showStartEnd" class="drop-down btn span6">
+ Between Keys
+ </label>
</div>
- <div class="row-fluid hide" id="js-showStartEnd">
- <div class="controls controls-row">
- <div class="span6">
- <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 class="span6">
- <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>
-<!-- Limit and Skip are conditional -->
-
- <div class="controls-group">
+ <div class="controls-group query-group">
+ <!-- Limit and Skip are conditional -->
+ <span class="add-on">
+ Additional Parameters
+ </span>
<div class="row-fluid">
- <div class="span6">
- <label class="drop-down inline">
+ <% 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="dropdown inline">
+ <label class="drop-down">
Limit:
- <select name="limit" class="input-medium">
+ <select name="limit" class="input-small">
<option selected="selected">None</option>
<option>5</option>
<option>10</option>
@@ -69,89 +131,39 @@ the License.
<option>30</option>
<option>50</option>
<option>100</option>
- <option>500</option>
- </select>
- </label>
- </div>
- <div class="span6">
- <label for="skipRows" class="inline drop-down">
- # of rows to skip
- <input name="skip" class="input-small" type="text" id="skipRows" placeholder="0">
- </label>
- </div>
- </div>
- <div class="row-fluid">
- <div class="span6">
- <label id="select2" class="drop-down inline">
- Order:
- <select id="select2" name="descending" class="input-medium">
- <option value="false">Ascending</option>
- <option value="true">Descending</option>
- </select>
- </label>
- </div>
- <div class="span6">
- <label id="select2" class="drop-down inline">
- Docs:
- <select id="select2" name="include_docs" class="input-medium">
- <option value="false">Exclude</option>
- <option value="true">Include</option>
+ <option>500</option>
</select>
</label>
</div>
- </div>
- <div class="row-fluid">
- <% if (showStale) { %>
- <div class="span6">
- <div class="checkbox inline">
- <input id="check7" name="stale" type="checkbox" value="ok">
- <label for="check7">Stale</label>
- </div>
- </div>
- <% } %>
- <div class="span6 update-seq">
- <div class="checkbox inline">
- <input id="check6" name="update_seq" type="checkbox" value="true">
- <label for="check6">Update Sequence</label>
- </div>
- </div>
</div>
- <% if (hasReduce) { %>
+
<div class="row-fluid">
- <div class="span6">
- <div class="checkbox inline">
- <input id="check2" name="reduce" type="checkbox" value="true">
- <label for="check2">Reduce</label>
- </div>
+ <div class="checkbox inline">
+ <input id="select2" name="descending" type="checkbox" value="true">
+ <label for="descending">Descending</label>
</div>
- <div class="span6">
- <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>
+
+ <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="controls-group">
+ <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">Query</button>
+ <button type="submit" class="btn btn-success">
+ <i class="fonticon-play icon"></i>
+ Query
+ </button>
</div>
</div>
+
</form>
-</div>