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/06 21:31:32 UTC
[25/26] fauxton commit: updated refs/heads/secondary-indexes to
7a446d8
styling header and query options, add cancel button
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/c80a1c60
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/c80a1c60
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/c80a1c60
Branch: refs/heads/secondary-indexes
Commit: c80a1c605c2ec8ec45e817029f2a409ee808929b
Parents: 015099a
Author: Jenn Schiffer <je...@pancaketheorem.com>
Authored: Mon Aug 4 16:21:20 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Wed Aug 6 12:24:47 2014 -0400
----------------------------------------------------------------------
.../documents/assets/less/advancedOptions.less | 59 ++++++++++++++------
app/addons/documents/assets/less/documents.less | 1 +
app/addons/documents/assets/less/headers.less | 10 ++++
.../documents/templates/advanced_options.html | 44 +++++++--------
.../documents/templates/all_docs_layout.html | 13 -----
app/addons/documents/views-advancedopts.js | 1 -
app/helpers.js | 32 ++++++-----
7 files changed, 92 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c80a1c60/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 b8b5c66..6844b8d 100644
--- a/app/addons/documents/assets/less/advancedOptions.less
+++ b/app/addons/documents/assets/less/advancedOptions.less
@@ -28,20 +28,22 @@
color: #fff;
padding: 0;
margin: 0;
- .query-group {
- padding: 20px;
- border-bottom: 1px solid #555;
- }
- .query-group:last-child {
- border-bottom: none;
- }
- .controls-group {
- margin: 0;
- }
- .controls-group:last-child {
- margin: 0;
- }
-
+ .add-on {
+ padding-bottom: 10px;
+ }
+ .query-group {
+ padding: 20px;
+ border-bottom: 1px solid #555;
+ }
+ .query-group:last-child {
+ border-bottom: none;
+ }
+ .controls-group {
+ margin: 0;
+ }
+ .controls-group:last-child {
+ margin: 0;
+ }
form {
margin-bottom: 0;
.dropdown.inline {
@@ -55,9 +57,19 @@
border: none;
color: #eee;
}
+ .checkbox {
+ padding: 0;
+ margin: 0;
+ }
.btn-success {
.border-radius(5px);
}
+ .btn-cancel, .btn-cancel:active {
+ background: none;
+ border: none;
+ box-shadow: none;
+ color: @red;
+ }
}
.toggle-btns {
.btn {
@@ -80,12 +92,28 @@
margin-left: 1px;
}
}
+ label {
+ margin-right: 0;
+ font-size: 13px;
+ }
div.controls-group.well{
height: 180px;
background: none;
border: none;
padding: 10px 0;
}
+ .row-fluid.fieldsets {
+ .inline {
+ width: 32%;
+ }
+ .inline:nth-child(3) {
+ text-align: right;
+ width: 34%;
+ }
+ }
+ #skipRows {
+ margin-left: 5px;
+ }
}
#query-options-tray:before {
content: '';
@@ -97,7 +125,4 @@
border-width: 15px;
width: 0;
height: 0;
-}
-#button-options {
- margin-top: 20px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c80a1c60/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 5a39fab..26e3ffa 100644
--- a/app/addons/documents/assets/less/documents.less
+++ b/app/addons/documents/assets/less/documents.less
@@ -17,6 +17,7 @@
@import "advancedOptions.less";
@import "changes.less";
@import "sidenav.less";
+@import "headers.less";
tr.all-docs-item {
border: none;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c80a1c60/app/addons/documents/assets/less/headers.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/headers.less b/app/addons/documents/assets/less/headers.less
new file mode 100644
index 0000000..738c28f
--- /dev/null
+++ b/app/addons/documents/assets/less/headers.less
@@ -0,0 +1,10 @@
+.header-left {
+ width: 300px;
+ float: left;
+}
+.header-right {
+ .searchbox-container {
+ position: relative;
+ right: inherit;
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c80a1c60/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 150e372..a2feb0a 100644
--- a/app/addons/documents/templates/advanced_options.html
+++ b/app/addons/documents/templates/advanced_options.html
@@ -20,24 +20,23 @@ the License.
<form class="js-view-query-update custom-inputs">
<div class="query-group">
- <span class="add-on">
+ <div class="add-on">
API Options
<a class="help-link" href="<%-getDocUrl(documentation)%>" target="_blank">
<i class="icon-question-sign"></i>
</a>
- </span>
+ </div>
<div class="errors-container"></div>
<div class="controls-group">
- <div class="row-fluid">
+ <div class="row-fluid fieldsets">
<div class="checkbox inline">
<input id="check1" name="include_docs" type="checkbox" value="true">
<label for="check1">Include Docs</label>
</div>
- <% if (hasReduce) { %>
<div class="checkbox inline">
<input id="check2" name="reduce" type="checkbox" value="true">
<label for="check2">Reduce</label>
@@ -59,16 +58,15 @@ the License.
<option value="999" selected="selected">Exact</option>
</select>
</label>
- <% } %>
</div>
</div>
</div>
<div class="query-group">
- <span class="add-on">
+ <div class="add-on">
Keys
- </span>
+ </div>
<!-- tabs for choosing Keys or Start & end -->
<div class="btn-group toggle-btns row-fluid">
<label for="showKeys" class="drop-down btn">
@@ -110,21 +108,19 @@ the License.
<div class="controls-group query-group">
<!-- Limit and Skip are conditional -->
- <span class="add-on">
+ <div class="add-on">
Additional Parameters
- </span>
+ </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>
+ <div class="row-fluid fieldsets">
+ <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">
@@ -160,14 +156,18 @@ the License.
</div>
<div class="controls-group query-group">
- <span class="add-on">
+ <div class="add-on">
Query the DB
- </span>
+ </div>
<div id="button-options" class="controls controls-row">
<button type="submit" class="btn btn-success">
<i class="fonticon-play icon"></i>
Query
</button>
+
+ <a class="btn btn-cancel">
+ Cancel
+ </a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c80a1c60/app/addons/documents/templates/all_docs_layout.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/all_docs_layout.html b/app/addons/documents/templates/all_docs_layout.html
deleted file mode 100644
index 90de57c..0000000
--- a/app/addons/documents/templates/all_docs_layout.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!--
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-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.
--->
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c80a1c60/app/addons/documents/views-advancedopts.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-advancedopts.js b/app/addons/documents/views-advancedopts.js
index f8a1be6..aaba97d 100644
--- a/app/addons/documents/views-advancedopts.js
+++ b/app/addons/documents/views-advancedopts.js
@@ -63,7 +63,6 @@ function(app, FauxtonAPI, resizeColumns ) {
},
toggleQuery: function (event) {
- console.log('togglequery');
$('#dashboard-content').scrollTop(0);
this.$('#query-options-tray').toggle();
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/c80a1c60/app/helpers.js
----------------------------------------------------------------------
diff --git a/app/helpers.js b/app/helpers.js
index 6fa8481..cbb9391 100644
--- a/app/helpers.js
+++ b/app/helpers.js
@@ -36,24 +36,26 @@ function(utils, d3) {
return path;
};
+
// Get the URL for documentation, wiki, wherever we store it.
// update the URLs in documentation_urls.js
Helpers.docs = {
- "docs": "/_utils/docs/intro/api.html#documents",
- "all_dbs": "/_utils/docs/api/server/common.html?highlight=all_dbs#get--_all_dbs",
- "replication_doc": "/_utils/docs/replication/replicator.html#basics",
- "design_doc": "/_utils/docs/couchapp/ddocs.html#design-docs",
- "view_functions": "/_utils/docs/couchapp/ddocs.html#view-functions",
- "map_functions": "/_utils/docs/couchapp/ddocs.html#map-functions",
- "reduce_functions": "/_utils/docs/couchapp/ddocs.html#reduce-and-rereduce-functions",
- "api_reference": "/_utils/docs/http-api.html",
- "database_permission": "/_utils/docs/api/database/security.html#db-security",
- "stats": "/_utils/docs/api/server/common.html?highlight=stats#get--_stats",
- "_active_tasks": "/_utils/docs/api/server/common.html?highlight=stats#active-tasks",
- "log": "/_utils/docs/api/server/common.html?highlight=stats#log",
- "config": "/_utils/docs/config/index.html",
- "views": "/_utils/docs/intro/overview.html#views",
- "changes": "/_utils/docs/api/database/changes.html?highlight=changes#post--db-_changes"
+ "docs": "http://docs.couchdb.org/en/latest/intro/api.html#documents",
+ "all_dbs": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=all_dbs#get--_all_dbs",
+ "replication_doc": "http://docs.couchdb.org/en/latest/replication/replicator.html#basics",
+ "query_api_basics": "http://docs.cloudant.com/api/basics.html",
+ "design_doc": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#design-docs",
+ "view_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#view-functions",
+ "map_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#map-functions",
+ "reduce_functions": "http://docs.couchdb.org/en/latest/couchapp/ddocs.html#reduce-and-rereduce-functions",
+ "api_reference": "http://docs.couchdb.org/en/latest/http-api.html",
+ "database_permission": "http://docs.couchdb.org/en/latest/api/database/security.html#db-security",
+ "stats": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#get--_stats",
+ "_active_tasks": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#active-tasks",
+ "log": "http://docs.couchdb.org/en/latest/api/server/common.html?highlight=stats#log",
+ "config": "http://docs.couchdb.org/en/latest/config/index.html",
+ "views": "http://docs.couchdb.org/en/latest/intro/overview.html#views",
+ "changes": "http://docs.couchdb.org/en/latest/api/database/changes.html?highlight=changes#post--db-_changes"
};
Helpers.getDocUrl = function(docKey){