Changes header, updating the view headers and adding the link icons
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/a80d189d Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/a80d189d Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/a80d189d Branch: refs/heads/secondary-indexes Commit: a80d189d4fb363877e72ac68a8fbdd7d9d12a671 Parents: cf8cf40 Author: deathbearbrown <[email protected]> Authored: Sun Aug 24 16:33:43 2014 +0200 Committer: deathbearbrown <[email protected]> Committed: Mon Aug 25 09:37:35 2014 -0400 ---------------------------------------------------------------------- .../documents/templates/header_changes.html | 20 ++++++++++++++++++++ app/addons/documents/views-changes.js | 3 ++- app/addons/fauxton/templates/api_bar.html | 2 +- app/addons/indexes/templates/header_right.html | 15 ++++++++++----- app/addons/indexes/views.js | 2 +- 5 files changed, 34 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a80d189d/app/addons/documents/templates/header_changes.html ---------------------------------------------------------------------- diff --git a/app/addons/documents/templates/header_changes.html b/app/addons/documents/templates/header_changes.html new file mode 100644 index 0000000..8521486 --- /dev/null +++ b/app/addons/documents/templates/header_changes.html @@ -0,0 +1,20 @@ +<!-- +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. +--> + + <!-- floats right --> + + <div id="header-api-bar" class="button"></div> + + <!-- search (jump to doc)--> + <div id="header-search" class="js-search searchbox-container"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a80d189d/app/addons/documents/views-changes.js ---------------------------------------------------------------------- diff --git a/app/addons/documents/views-changes.js b/app/addons/documents/views-changes.js index d63a825..f5cb75e 100644 --- a/app/addons/documents/views-changes.js +++ b/app/addons/documents/views-changes.js @@ -27,7 +27,8 @@ function(app, FauxtonAPI, resizeColumns, Components, prettify, ZeroClipboard) { var Views = {}; Views.ChangesHeader = FauxtonAPI.View.extend({ - template: "addons/documents/templates/header_alldocs", + className: "header-right", + template: "addons/documents/templates/header_changes", initialize: function (options) { this.filterView = options.filterView; this.endpoint = options.endpoint; http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a80d189d/app/addons/fauxton/templates/api_bar.html ---------------------------------------------------------------------- diff --git a/app/addons/fauxton/templates/api_bar.html b/app/addons/fauxton/templates/api_bar.html index bab431b..255087d 100644 --- a/app/addons/fauxton/templates/api_bar.html +++ b/app/addons/fauxton/templates/api_bar.html @@ -13,7 +13,7 @@ the License. --> <a class="btn btn-primary pull-right api-url-btn"> - <i class="fonticon-plus icon"></i> + <i class="fonticon-link icon"></i> API URL </a> <div class="clearfix"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a80d189d/app/addons/indexes/templates/header_right.html ---------------------------------------------------------------------- diff --git a/app/addons/indexes/templates/header_right.html b/app/addons/indexes/templates/header_right.html index 38634b5..0370e51 100644 --- a/app/addons/indexes/templates/header_right.html +++ b/app/addons/indexes/templates/header_right.html @@ -12,11 +12,16 @@ License for the specific language governing permissions and limitations under the License. --> <!-- Select toggle--> - <div id="header-select-all"> + <div id="header-api-bar" class="button"></div> + + <!-- Query Options--> + <div class="button header-query-options"> + <!-- Insert the query options here :) --> + <div id="query-options"></div> + </div> + + + <div id="header-select-all" class="button"> <span class="toggle-select-menu icon fonticon-ok-circled">Select</span> </div> - <!-- Query Options--> - <div id="header-query-options"></div> - <!--right margin for api bar--> - <div id="header-api-bar"></div> http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/a80d189d/app/addons/indexes/views.js ---------------------------------------------------------------------- diff --git a/app/addons/indexes/views.js b/app/addons/indexes/views.js index 9d0546e..6340251 100644 --- a/app/addons/indexes/views.js +++ b/app/addons/indexes/views.js @@ -61,7 +61,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, documentation: this.documentation })); - this.advancedOptions = this.insertView('#header-query-options', new QueryOptions.AdvancedOptions({ + this.advancedOptions = this.insertView('#query-options', new QueryOptions.AdvancedOptions({ database: this.database, viewName: this.viewName, ddocName: this.model.id,
