couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chewbra...@apache.org
Subject [44/46] git commit: updated refs/heads/1829-User-Experience-Redesign to b7ee0e5
Date Tue, 25 Jun 2013 21:07:51 GMT
docs stuff


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

Branch: refs/heads/1829-User-Experience-Redesign
Commit: ee06572fac47cb4c37d30c5bf1e421e57932a965
Parents: 4beb5e1
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Wed Jun 19 13:26:52 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Wed Jun 19 13:26:52 2013 -0400

----------------------------------------------------------------------
 src/fauxton/app/modules/documents/routes.js     | 10 ++++
 .../app/templates/documents/jumpdoc.html        | 20 ++++++++
 .../app/templates/documents/sidebar.html        |  5 +-
 .../templates/layouts/with_tabs_sidebar.html    |  2 +
 src/fauxton/assets/less/fauxton.less            | 54 ++++++++++++++++++--
 5 files changed, 83 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee06572f/src/fauxton/app/modules/documents/routes.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/routes.js b/src/fauxton/app/modules/documents/routes.js
index 4bc34d6..b5f8f27 100644
--- a/src/fauxton/app/modules/documents/routes.js
+++ b/src/fauxton/app/modules/documents/routes.js
@@ -152,6 +152,9 @@ function(app, FauxtonAPI, Documents, Databases) {
 
       if (this.viewEditor) { this.viewEditor.remove(); }
 
+
+      this.toolsView = this.setView("#dashboard-upper-menu", new Documents.Views.JumpToDoc());
+
       this.documentsView = this.setView("#dashboard-lower-content", new Documents.Views.AllDocsList({
         collection: this.data.database.allDocs
       }));
@@ -224,6 +227,13 @@ function(app, FauxtonAPI, Documents, Databases) {
       }));
 
       this.sidebar.setSelectedTab('new-view');
+      this.crumbs = function () {
+        return [
+          {"name": "Databases", "link": "/_all_dbs"},
+          {"name": this.data.database.id, "link": Databases.databaseUrl(this.data.database)},
+          {"name": "new"}
+        ];
+      };
     },
 
     updateAllDocsFromView: function (event) {

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee06572f/src/fauxton/app/templates/documents/jumpdoc.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/jumpdoc.html b/src/fauxton/app/templates/documents/jumpdoc.html
new file mode 100644
index 0000000..d95e6aa
--- /dev/null
+++ b/src/fauxton/app/templates/documents/jumpdoc.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.
+-->
+
+
+<form id="jump-to-doc" class="form-inline">
+	<label class="fonticon-search">
+    <input type="text" id="jump-to-doc-id" class="input-large" placeholder="Document ID"></input>
+  </label>
+</form>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee06572f/src/fauxton/app/templates/documents/sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html
index 2ef5a6b..2148ab3 100644
--- a/src/fauxton/app/templates/documents/sidebar.html
+++ b/src/fauxton/app/templates/documents/sidebar.html
@@ -30,10 +30,9 @@ the License.
 
     <div class="span5 offset1">
       <div class="dropdown select">
-        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Docs</a>
+        <a class="dropdown-toggle" data-toggle="dropdown" href="#">Add</a>
         <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
-          <li><a id="doc" href="#<%= database.url('app') %>/new">
-            <i class="icon-file"></i> New doc</a>
+          <li><a id="doc" href="#<%= database.url('app') %>/new">New doc</a>
           </li>
           <li>
             <a href="#<%= database.url('app') %>/new_view">New view</a>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee06572f/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 e5dc17f..be65c0c 100644
--- a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
@@ -29,7 +29,9 @@ the License.
 
     <section id="dashboard-content" class="list pull-right">
       <div class="inner">
+        <div id="dashboard-upper-menu"></div>
         <div id="dashboard-upper-content"></div>
+
         <div id="dashboard-lower-content"></div>
       </div>
     </section>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ee06572f/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index 9089a81..743575b 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -262,13 +262,14 @@ footer#mainFooter{
   .box-sizing(border-box);
 }
 
-#dashboard-upper-content{
+#dashboard-upper-menu{
   .topmenu-defaults;
   background-color: #CBCBCB;
 }
 
 #dashboard-lower-content{
   padding: 20px;
+  background-color: #F1F1F1;
 }
 #sidenav{
   padding: 0;
@@ -312,14 +313,11 @@ footer#mainFooter{
   width: 100%;
   margin-bottom: 10px;
 }
-
-
 .navbar-form input{
-  .border-radius(0);
-  padding: 7px;
   margin-top: -5px;
 }
 
+
 /*TABLE STYLES*/
 thead {border-bottom: 2px solid @redButton;}
 
@@ -371,3 +369,49 @@ thead {border-bottom: 2px solid @redButton;}
     }
   }
 }
+
+input[type=text],
+.navbar-form input{
+  .border-radius(0);
+  padding: 7px;
+  margin-top: -5px;
+  border: 1px solid #989898;  
+}
+
+
+input[type=checkbox]{
+
+}
+label.fonticon-search {
+  position: relative;
+  &:before {
+    position: absolute;
+    right: -35px;
+    background-color: #E1E1E1;
+    height: 18px;
+    width: 18px;
+    border: 1px solid #989898;
+    padding: 8px;
+    top: -5px;
+  }
+}
+
+/*pretty print*/
+pre.prettyprint { 
+  background: #E5E0DD;
+  border: none;
+}
+
+.prettyprint .str, .prettyprint .lit {
+  color: @red;
+}
+
+.prettyprint .pln, .prettyprint .pun, .prettyprint .typ{
+  color: #333333;
+}
+
+/*ALL DOCS TABLE*/
+tr.all-docs-item{
+  border: none;
+  background: transparent;
+}


Mime
View raw message