Repository: couchdb Updated Branches: refs/heads/Update-Sidebar-Ui 73c8a066b -> 91e04da4c
Moving the dashboard menu area out into the views Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2ead1915 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2ead1915 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2ead1915 Branch: refs/heads/Update-Sidebar-Ui Commit: 2ead19155f8067fa1e303f290a52fd4cfb539e94 Parents: 73c8a06 Author: suelockwood <[email protected]> Authored: Wed Apr 16 11:19:58 2014 -0400 Committer: suelockwood <[email protected]> Committed: Wed Apr 16 11:19:58 2014 -0400 ---------------------------------------------------------------------- .../app/addons/documents/assets/less/documents.less | 6 +++++- src/fauxton/app/addons/documents/routes.js | 7 +------ .../app/addons/documents/templates/all_docs_layout.html | 12 ++++++++---- .../app/addons/documents/templates/view_editor.html | 2 ++ src/fauxton/app/addons/documents/views.js | 5 +++++ .../app/templates/layouts/with_tabs_sidebar.html | 6 ++++-- src/fauxton/assets/less/fauxton.less | 8 +++++--- 7 files changed, 30 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/2ead1915/src/fauxton/app/addons/documents/assets/less/documents.less ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/assets/less/documents.less b/src/fauxton/app/addons/documents/assets/less/documents.less index 0dc10a0..57f77ec 100644 --- a/src/fauxton/app/addons/documents/assets/less/documents.less +++ b/src/fauxton/app/addons/documents/assets/less/documents.less @@ -83,9 +83,13 @@ button.beautify { .change-box { margin: 0 20px 20px 20px; } +.searchbox-container { + position: fixed; + right: 15px; +} .change-wrapper { - margin-top: 57px; + margin-top: 20px; border-bottom: 1px solid #dddddd; &:last-child { border-bottom: none; http://git-wip-us.apache.org/repos/asf/couchdb/blob/2ead1915/src/fauxton/app/addons/documents/routes.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/routes.js b/src/fauxton/app/addons/documents/routes.js index e69cecb..e159de6 100644 --- a/src/fauxton/app/addons/documents/routes.js +++ b/src/fauxton/app/addons/documents/routes.js @@ -256,11 +256,6 @@ function(app, FauxtonAPI, Documents, Databases, Resources) { if (this.viewEditor) { this.viewEditor.remove(); } - this.toolsView = this.setView("#dashboard-upper-menu", new Documents.Views.JumpToDoc({ - database: this.data.database, - collection: this.data.database.allDocs - })); - this.data.database.allDocs.paging.pageSize = this.getDocPerPageLimit(urlParams, parseInt(docParams.limit, 10)); this.viewEditor = this.setView("#dashboard-upper-content", new Documents.Views.AllDocsLayout({ @@ -549,7 +544,7 @@ function(app, FauxtonAPI, Documents, Databases, Resources) { this.apiUrl = function() { return [this.data.database.url("apiurl"), this.data.database.documentation()]; - } + }; } }); http://git-wip-us.apache.org/repos/asf/couchdb/blob/2ead1915/src/fauxton/app/addons/documents/templates/all_docs_layout.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/all_docs_layout.html b/src/fauxton/app/addons/documents/templates/all_docs_layout.html index 2862e16..e2c2479 100644 --- a/src/fauxton/app/addons/documents/templates/all_docs_layout.html +++ b/src/fauxton/app/addons/documents/templates/all_docs_layout.html @@ -11,10 +11,14 @@ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<ul class="nav nav-tabs window-resizeable" id="db-views-tabs-nav"> - <li><a id="toggle-query" href="#query" data-bypass="true" data-toggle="tab"> - <i class="fonticon fonticon-plus"></i> Query Options</a></li> -</ul> +<div class="dashboard-upper-menu"> + <ul class="nav nav-tabs window-resizeable" id="db-views-tabs-nav"> + <li><a id="toggle-query" href="#query" data-bypass="true" data-toggle="tab"> + <i class="fonticon fonticon-plus"></i> Query Options</a></li> + </ul> + <div class="js-search searchbox-container"></div> +</div> + <div class="tab-content"> <div class="tab-pane" id="query"> </div> http://git-wip-us.apache.org/repos/asf/couchdb/blob/2ead1915/src/fauxton/app/addons/documents/templates/view_editor.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/templates/view_editor.html b/src/fauxton/app/addons/documents/templates/view_editor.html index e08e36e..3a427f0 100644 --- a/src/fauxton/app/addons/documents/templates/view_editor.html +++ b/src/fauxton/app/addons/documents/templates/view_editor.html @@ -11,6 +11,7 @@ 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="dashboard-upper-menu"> <ul class="nav nav-tabs" id="db-views-tabs-nav"> <li class="active"> <a data-bypass="true" id="index-nav" data-toggle="tab" href="#index"> <i class="fonticon-wrench fonticon"></i> @@ -22,6 +23,7 @@ the License. <li><a data-bypass="true" id="meta-nav" href="#metadata" data-toggle="tab">Design Doc Metadata</a></li> <% } %> </ul> +</div> <div class="all-docs-list errors-container"></div> <div class="tab-content"> <div id="query-options-wrapper"></div> http://git-wip-us.apache.org/repos/asf/couchdb/blob/2ead1915/src/fauxton/app/addons/documents/views.js ---------------------------------------------------------------------- diff --git a/src/fauxton/app/addons/documents/views.js b/src/fauxton/app/addons/documents/views.js index 6d61e4f..88c9d1c 100644 --- a/src/fauxton/app/addons/documents/views.js +++ b/src/fauxton/app/addons/documents/views.js @@ -473,6 +473,11 @@ function(app, FauxtonAPI, Components, Documents, Databases, pouchdb, showPreview: false, database: this.database, })); + + this.toolsView = this.setView(".js-search", new Views.JumpToDoc({ + database: this.database, + collection: this.database.allDocs + })); }, afterRender: function () { http://git-wip-us.apache.org/repos/asf/couchdb/blob/2ead1915/src/fauxton/app/templates/layouts/with_tabs_sidebar.html ---------------------------------------------------------------------- diff --git a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html index d4efc8d..80d79d2 100644 --- a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html +++ b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html @@ -29,8 +29,10 @@ the License. <section id="dashboard-content" class="list pull-right window-resizeable"> <div class="inner"> - <div id="dashboard-upper-menu" class="window-resizeable"></div> - <div id="dashboard-upper-content"></div> + <!-- <div id="dashboard-upper-menu" class="window-resizeable"></div> --> + <div id="dashboard-upper-content"> + + </div> <div id="dashboard-lower-content"></div> </div> http://git-wip-us.apache.org/repos/asf/couchdb/blob/2ead1915/src/fauxton/assets/less/fauxton.less ---------------------------------------------------------------------- diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index 7e0683d..92655ed 100644 --- a/src/fauxton/assets/less/fauxton.less +++ b/src/fauxton/assets/less/fauxton.less @@ -612,13 +612,15 @@ table.databases { .topmenu-defaults { height: 70px; padding: 12px 10px 0; - border-bottom: 1px solid @darkRed; .box-sizing(border-box); } -#dashboard-upper-menu{ +.dashboard-upper-menu{ + right: 0; + left: @sidebarWidth+@navWidth; position: fixed; z-index: 11; + display: block; .topmenu-defaults; background-color: #CBCBCB; } @@ -711,7 +713,7 @@ table.databases { #db-views-tabs-nav{ position: fixed; z-index: 12; - margin-top: 31px; + margin-top: 19px; margin-bottom: 0; /*background-color: #f4f4f4;*/ padding: 0 20px;
