couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deathb...@apache.org
Subject [06/15] fauxton commit: updated refs/heads/secondary-indexes to ddd4a01
Date Tue, 05 Aug 2014 20:59:14 GMT
button and search box moved to header on all docs


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/49406505
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/49406505
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/49406505

Branch: refs/heads/secondary-indexes
Commit: 49406505d64289736b977ed9e1d030475abc6d22
Parents: faa2270
Author: Jenn Schiffer <jenn@pancaketheorem.com>
Authored: Wed Jul 30 15:37:10 2014 -0400
Committer: deathbearbrown <deathbearbrown@gmail.com>
Committed: Tue Aug 5 16:40:13 2014 -0400

----------------------------------------------------------------------
 app/addons/documents/routes.js                      |  5 +++++
 app/addons/documents/templates/all_docs_layout.html | 12 ------------
 app/addons/documents/templates/header_alldocs.html  | 14 +++++++++++---
 app/addons/documents/views.js                       | 12 ++++++++----
 4 files changed, 24 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/49406505/app/addons/documents/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/routes.js b/app/addons/documents/routes.js
index 8a060f6..6361753 100644
--- a/app/addons/documents/routes.js
+++ b/app/addons/documents/routes.js
@@ -172,6 +172,11 @@ function(app, FauxtonAPI, Components, Documents, Changes, DocEditor,
Databases,
         }
       });
 
+      this.header = this.setView("#breadcrumbs", new Documents.Views.AllDocsHeader({
+        database: this.data.database
+      }));
+
+
       this.sidebar = this.setView("#sidebar-content", new Documents.Views.Sidebar({
         collection: this.data.designDocs,
         database: this.data.database

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/49406505/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
index e2c2479..90de57c 100644
--- a/app/addons/documents/templates/all_docs_layout.html
+++ b/app/addons/documents/templates/all_docs_layout.html
@@ -11,15 +11,3 @@ 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 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>
-</div>

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/49406505/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 61eb2d8..72d49ad 100644
--- a/app/addons/documents/templates/header_alldocs.html
+++ b/app/addons/documents/templates/header_alldocs.html
@@ -27,9 +27,17 @@ the License.
   <!-- Select all -->
 
   <!-- search (jump to doc)-->
+  <div id="header-search" class="js-search searchbox-container"></div>
 
   <!-- Query Options-->
-
-
-  <!--right margin for api bar-->
+  <a id="toggle-query" href="#query" data-bypass="true" data-toggle="tab">
+    <i class="fonticon fonticon-plus"></i> 
+    Query Options
+  </a>
+
+  <div class="tab-content">
+    <div class="tab-pane" id="query">
+  </div>
 </div>
+
+  <!--right margin for api bar-->
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/49406505/app/addons/documents/views.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views.js b/app/addons/documents/views.js
index 8f02867..ff1e5b3 100644
--- a/app/addons/documents/views.js
+++ b/app/addons/documents/views.js
@@ -50,12 +50,16 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
     selectAllDocs: function(){
       //trigger event to select all in other view
     },
-    afterRender:function(){
+    beforeRender:function(){
       //insert DB search dropdown
 
       //insert top create level dropdown with gear icon
 
       //search docs
+      this.setView("#header-search", new Views.JumpToDoc({
+        database: this.database,
+        collection: this.database.allDocs
+      }));
 
       //insert queryoptions
 
@@ -293,11 +297,11 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
 
     toggleQuery: function (event) {
       $('#dashboard-content').scrollTop(0);
-      this.$('#query').toggle('slow');
+      this.$('#query').toggle();
     },
 
     beforeRender: function () {
-      this.advancedOptions = this.insertView('#query', new QueryOptions.AdvancedOptions({
+      this.advancedOptions = this.insertView('#toggle-query', new QueryOptions.AdvancedOptions({
         updateViewFn: this.updateAllDocs,
         previewFn: this.previewView,
         hasReduce: false,
@@ -308,7 +312,7 @@ function(app, FauxtonAPI, Components, Documents, Databases, Views, QueryOptions,
       this.toolsView = this.setView(".js-search", new Views.JumpToDoc({
         database: this.database,
         collection: this.database.allDocs
-      }));
+      })); 
     },
 
     afterRender: function () {


Mime
View raw message