couchdb-commits mailing list archives

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


Round one, the basic layout.


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

Branch: refs/heads/1829-User-Experience-Redesign
Commit: 85d24d6e383f01eebf4f376cc462a4b30951cb40
Parents: e6d95ae
Author: suelockwood <deathbearbrown@gmail.com>
Authored: Mon Jun 17 11:22:43 2013 -0400
Committer: suelockwood <deathbearbrown@gmail.com>
Committed: Mon Jun 17 11:33:50 2013 -0400

----------------------------------------------------------------------
 src/fauxton/app/modules/fauxton/base.js         |   2 +-
 src/fauxton/app/modules/fauxton/layout.js       |   2 +-
 src/fauxton/app/templates/fauxton/nav_bar.html  |  34 +--
 src/fauxton/app/templates/layouts/one_pane.html |  13 +-
 src/fauxton/app/templates/layouts/two_pane.html |  12 +-
 .../templates/layouts/with_right_sidebar.html   |   9 +-
 .../app/templates/layouts/with_sidebar.html     |   8 +-
 .../app/templates/layouts/with_tabs.html        |  13 +-
 .../templates/layouts/with_tabs_sidebar.html    |  13 +-
 src/fauxton/assets/img/minilogo.png             | Bin 0 -> 7497 bytes
 src/fauxton/assets/index.underscore             |  19 +-
 src/fauxton/assets/less/fauxton.less            | 240 +++++++++++++++----
 12 files changed, 250 insertions(+), 115 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/app/modules/fauxton/base.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/fauxton/base.js b/src/fauxton/app/modules/fauxton/base.js
index 46bde66..3861ba9 100644
--- a/src/fauxton/app/modules/fauxton/base.js
+++ b/src/fauxton/app/modules/fauxton/base.js
@@ -45,12 +45,12 @@ function(app, Backbone) {
   });
 
   Fauxton.NavBar = Backbone.View.extend({
+    className:"navbar",
     template: "templates/fauxton/nav_bar",
     // TODO: can we generate this list from the router?
     navLinks: [
       {href:"#/_all_dbs", title:"Databases"}
     ],
-
     initialize: function() {
       this.on("link:add", this.render, this);
     },

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/app/modules/fauxton/layout.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/fauxton/layout.js b/src/fauxton/app/modules/fauxton/layout.js
index d964b7b..3ef089a 100644
--- a/src/fauxton/app/modules/fauxton/layout.js
+++ b/src/fauxton/app/modules/fauxton/layout.js
@@ -25,6 +25,7 @@ function(Backbone) {
     this.apiBar = apiBar;
 
     this.layout = new Backbone.Layout({
+      className: 'row-fluid',
       template: "templates/layouts/with_sidebar",
 
       views: {
@@ -41,7 +42,6 @@ function(Backbone) {
 
   // creatings the dashboard object same way backbone does
   _.extend(Layout.prototype, {
-
     render: function () {
       return this.layout.render();
     },

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/app/templates/fauxton/nav_bar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/fauxton/nav_bar.html b/src/fauxton/app/templates/fauxton/nav_bar.html
index ebe57d0..bf2b883 100644
--- a/src/fauxton/app/templates/fauxton/nav_bar.html
+++ b/src/fauxton/app/templates/fauxton/nav_bar.html
@@ -12,24 +12,16 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<div class="navbar navbar-inverse navbar-fixed-top">
-  <div class="navbar-inner">
-    <div class="container">
-      <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
-      <a class="brand" href="#">Project Fauxton</a>
-      <div class="nav-collapse">
-        <ul id="nav-links" class="nav pull-right">
-          <% _.each(navLinks, function(link) { %>
-            <% if (!link.view) { %>
-              <li><a href="<%= link.href %>"><%= link.title %></a></li>
-            <% } %>
-          <% }); %>
-        </ul>
-      </div><!--/.nav-collapse -->
-    </div>
-  </div>
-</div>
+<a class="brand" href="#">Project Fauxton</a>
+<nav id="main_navigation">
+  <ul id="nav-links" class="nav pull-right">
+    <% _.each(navLinks, function(link) { %>
+      <% if (!link.view) { %>
+        <li><a href="<%= link.href %>"><%= link.title %></a></li>
+      <% } %>
+    <% }); %>
+  </ul>
+</nav>
+
+
+

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/app/templates/layouts/one_pane.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/one_pane.html b/src/fauxton/app/templates/layouts/one_pane.html
index 71c38fb..c99cc13 100644
--- a/src/fauxton/app/templates/layouts/one_pane.html
+++ b/src/fauxton/app/templates/layouts/one_pane.html
@@ -12,17 +12,16 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<div id="primary-navbar"></div>
-
-<div id="dashboard" class="container">
-  <div class="row">
+<div id="primary-navbar" class="span3"></div>
+<div id="dashboard" class="container-fluid span9">
+  <div class="row-fluid fixed-header">
     <div id="breadcrumbs" class="span12"></div>
   </div>
-  <div id="tabs" class="row"></div>
 
-  <div class="row">
+
+  <div class="row-fluid content-area">
+  	<div id="tabs" class="row"></div>
     <div id="dashboard-content" class="list span12"></div>
   </div>
 </div>
-
 <div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/app/templates/layouts/two_pane.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/two_pane.html b/src/fauxton/app/templates/layouts/two_pane.html
index e8b8411..54a43b0 100644
--- a/src/fauxton/app/templates/layouts/two_pane.html
+++ b/src/fauxton/app/templates/layouts/two_pane.html
@@ -12,18 +12,18 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<div id="primary-navbar"></div>
 
-<div id="dashboard" class="container">
-  <div class="row">
+<div id="primary-navbar" class="span3"></div>
+<div id="dashboard" class="container-fluid span9">
+  <div class="row-fluid fixed-header">
     <div id="breadcrumbs" class="span12"></div>
   </div>
-  <div id="tabs" class="row"></div>
 
-  <div class="row">
+
+  <div class="row-fluid content-area">
+  	<div id="tabs" class="row"></div>
     <div id="left-content" class="span6"></div>
     <div id="right-content" class="span6"></div>
   </div>
 </div>
-
 <div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/app/templates/layouts/with_right_sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/with_right_sidebar.html b/src/fauxton/app/templates/layouts/with_right_sidebar.html
index 06623c4..ca9d010 100644
--- a/src/fauxton/app/templates/layouts/with_right_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_right_sidebar.html
@@ -12,13 +12,12 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<div id="primary-navbar"></div>
-
-<div id="dashboard" class="container">
-  <div class="row">
+<div id="primary-navbar" class="span3"></div>
+<div id="dashboard" class="container-fluid span9">
+  <div class="row-fluid fixed-header">
     <div id="breadcrumbs" class="span12"></div>
   </div>
-  <div class="row">
+  <div class="row-fluid content-area">
     <div id="dashboard-content" class="list span8"></div>
     <div id="sidebar-content" class="sidebar span4 pull-right"></div>
   </div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/app/templates/layouts/with_sidebar.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/with_sidebar.html b/src/fauxton/app/templates/layouts/with_sidebar.html
index 5deb4d1..ad87ce1 100644
--- a/src/fauxton/app/templates/layouts/with_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_sidebar.html
@@ -12,13 +12,13 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<div id="primary-navbar"></div>
 
-<div id="dashboard" class="container-fluid">
-  <div class="row-fluid">
+<div id="primary-navbar" class="span3"></div>
+<div id="dashboard" class="container-fluid span9">
+  <div class="row-fluid fixed-header">
     <div id="breadcrumbs" class="span12"></div>
   </div>
-  <div class="row-fluid">
+  <div class="row-fluid content-area">
     <div id="sidebar-content" class="sidebar span3"></div>
     <div id="dashboard-content" class="list span9"></div>
   </div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/app/templates/layouts/with_tabs.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/layouts/with_tabs.html b/src/fauxton/app/templates/layouts/with_tabs.html
index 36b39c8..2a5288b 100644
--- a/src/fauxton/app/templates/layouts/with_tabs.html
+++ b/src/fauxton/app/templates/layouts/with_tabs.html
@@ -12,16 +12,17 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<div id="primary-navbar"></div>
-<div id="dashboard" class="container-fluid">
+<div id="primary-navbar" class="span3"></div>
+<div id="dashboard" class="container-fluid span9">
 
-<div class="row-fluid">
+<div class="row-fluid fixed-header">
   <div id="breadcrumbs" class="row-fluid"></div>
-  <div id="tabs" class="row-fluid"></div>
+</div>
+
+  <div class="row-fluid content-area">
 
-  <div class="row-fluid">
+  	<div id="tabs" class="row-fluid"></div>
     <div id="dashboard-content" class="list span12"></div>
   </div>
-</div>
 
 <div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/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 0b5f2c7..9147407 100644
--- a/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
+++ b/src/fauxton/app/templates/layouts/with_tabs_sidebar.html
@@ -12,20 +12,21 @@ License for the specific language governing permissions and limitations
under
 the License.
 -->
 
-<div id="primary-navbar"></div>
-<div id="dashboard" class="container-fluid">
+<div id="primary-navbar" class="span3"></div>
+<div id="dashboard" class="container-fluid span9">
 
-<div class="row-fluid">
+<div class="row-fluid fixed-header">
   <div id="breadcrumbs" class="row-fluid"></div>
-  <div id="tabs" class="row-fluid"></div>
+</div>
+
 
-  <div class="row-fluid">
+  <div class="row-fluid content-area">
+    <div id="tabs" class="row-fluid"></div>
     <div id="sidebar-content" class="sidebar span4"></div>
     <div id="dashboard-content" class="list span8 pull-right">
       <div id="dashboard-upper-content"></div>
       <div id="dashboard-lower-content"></div>
     </div>
   </div>
-</div>
 
 <div id="api-navbar"></div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/assets/img/minilogo.png
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/img/minilogo.png b/src/fauxton/assets/img/minilogo.png
new file mode 100644
index 0000000..6d48d23
Binary files /dev/null and b/src/fauxton/assets/img/minilogo.png differ

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/assets/index.underscore
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/index.underscore b/src/fauxton/assets/index.underscore
index e29b4c4..e85d2ea 100644
--- a/src/fauxton/assets/index.underscore
+++ b/src/fauxton/assets/index.underscore
@@ -25,25 +25,18 @@
 
   <!-- Application styles. -->
   <link rel="stylesheet" href="<%= assets_root %>css/index.css">
-  <style type="text/css">
-    body {
-    padding-top: 60px;
-    padding-bottom: 40px;
-    }
-  </style>
-  <% if (base) { %>
-  <base href="<%= base %>"></base>
-  <% } %>
+    <% if (base) { %>
+    <base href="<%= base %>"></base>
+    <% } %>
 </head>
 
 <body id="home">
   <!-- Main container. -->
   <div role="main" id="main">
+    <!-- these are notifications that will appear as a fixed bar up top-->
     <div id="global-notifications" class="container errors-container"></div>
-    <div id="app-container"></div>
-    <hr>
-
-    <footer>
+    <div id="app-container" class="container-fluid"></div>
+    <footer id="mainFooter">
       <div id="footer-content" class="container"></div>
     </footer>
   </div>

http://git-wip-us.apache.org/repos/asf/couchdb/blob/85d24d6e/src/fauxton/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less
index 445b815..7b5ef09 100644
--- a/src/fauxton/assets/less/fauxton.less
+++ b/src/fauxton/assets/less/fauxton.less
@@ -34,67 +34,217 @@
 //
 // Breadcrumbs
 
-.breadcrumb {
-  background-color: transparent;
-  padding-left: 0px;
-  li {
-    color: @grayLight;
-    background-color: transparent;
-    a {
-      color: @grayLight;
-    }
-  }
-  .divider {
-    padding: 0 5px;
-    color: @grayLight; //ccc
-  }
-  .active {
-    color: @black;
-    font-weight: bold;
-  }
-}
+// .breadcrumb {
+//   background-color: transparent;
+//   padding-left: 0px;
+//   li {
+//     color: @grayLight;
+//     background-color: transparent;
+//     a {
+//       color: @grayLight;
+//     }
+//   }
+//   .divider {
+//     padding: 0 5px;
+//     color: @grayLight; //ccc
+//   }
+//   .active {
+//     color: @black;
+//     font-weight: bold;
+//   }
+// }
+
+
+// // Navs
+// // ------
+
+// .nav-tabs > li > a {
+//   background-color: @grayLighter;
+// }
+
+// .dropdown-menu li > a {
+//   font-size: 12px;
+// }
+
+// .nav-list .divider {
+//   color: @grayLight;
+//   // This function is defined in mixins
+//   .nav-divider(transparent, @white);
+// }
+
+
+// // Misc
+// // ------
+
+// pre.view-code-error {
+//     color: red !important; // yuck
+// }
+
+// .CodeMirror-scroll {
+//     height: auto;
+//     overflow-y: visible;
+// }
+
+// #define-view form textarea.js-editor {
+//   width: 95%;
+// }
+
+// #define-view .CodeMirror-scroll {
+//   height: auto;
+//   min-height: 50px;
+// }
+
+/*define variable for color here, remove to seperate file later*/
+
+/*nav*/
+@primaryNav : #3A2C2B;
+@navBG: #AF2D24;
+@navBGHighlight: #E93F33;
+@navIconColor: #3A2C2B;
+@navIconHighlight: #FFFFFF;
+
+/*top header*/
+@breadcrumbBG: #F1F1F1;
+@breadcrumbText: #E93F33;
+@breadcrumbArrow: #999999;
+@breadcrumbBorder: #E93F33;
+
+/*background colors*/
+@background: #F2F2F2;
+@leftPanel: #E6E6E6;
+@rightPanel: #CBCBCB;
+@defaultText: #4D4D4D;
+@defaultHTag: #333333;
+
+@saveButton: #80A221;
+
+
+
+.buttonStyle{
 
+}
 
-// Navs
-// ------
 
-.nav-tabs > li > a {
-  background-color: @grayLighter;
+/* ajax loader */
+.loader {
+  background: url('../img/loader.gif') center center no-repeat;
+  min-height:  100px;
+}
+#app-container.loader{
+  min-height: 400px;
+  > *{
+    display: none;
+  }
 }
 
-.dropdown-menu li > a {
-  font-size: 12px;
+#global-notifications{
+  position: fixed;
+  top: 0;
+  display: block;
 }
 
-.nav-list .divider {
-  color: @grayLight;
-  // This function is defined in mixins
-  .nav-divider(transparent, @white);
+#app-container{
+  padding: 0;
+  height: 100%;
+  width: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  > .row-fluid {
+    height: 100%;
+  }
 }
 
 
-// Misc
-// ------
+/* Fixed side navigation */
+#primary-navbar {
+  height: 100%;
+  background-color: @primaryNav;
+  .closeMenu & {
+    width: 105px;
+    .nav{
+      li{
+        a{
+          // .hide-text; 
+        }
+      }
+    }
+  }
 
-pre.view-code-error {
-    color: red !important; // yuck
+  .navbar {
+    a.brand {
+      background: url(../img/minilogo.png) no-repeat 0 0;
+      display: block;
+      .hide-text;
+      margin: 15px;
+      height: 30px;
+      width: 30px;
+    }
+    nav {
+      .nav{
+        li{
+          padding: 15px 0px 15px 80px;
+          font-size: 19px;
+          width: 100%;
+          font-weight: normal;
+          font-family: helvetica;
+          box-sizing: border-box;
+          -moz-box-sizing: border-box;
+          background-color: @navBG;
+          border-bottom:  1px solid @primaryNav;
+          a{
+            padding: 0;
+            color: #fff;
+            text-shadow: none;
+          }
+        }
+      }
+    }
+  }
 }
 
-.CodeMirror-scroll {
-    height: auto;
-    overflow-y: visible;
+#dashboard {
+  .closeMenu & {
+    margin-left: 105px;
+  }
+  height: 100%;
+  z-index: 100;
+  padding: 0;
+  margin: 0;
+  box-shadow: -5px 0 15px -3px #333333;
+  position: relative;
+  #dashboard-content{
+    padding: 15px;
+  }
 }
 
-#define-view form textarea.js-editor {
-  width: 95%;
+.fixed-header{
+  position: fixed;
+  top: 0;
+  border-bottom: 5px solid @breadcrumbBorder;
+  box-shadow: 0 4px 6px -6px #808080;
 }
-
-#define-view .CodeMirror-scroll {
-  height: auto;
-  min-height: 50px;
+.content-area{
+  margin-top: 100px;
+}
+#breadcrumbs {
+   background-color: @breadcrumbBG;
+   padding: 15px 20px;
+   .breadcrumb {
+    margin-bottom: 0;
+    background-color: transparent;
+    padding: 0;
+    li {    
+      color: @breadcrumbText;
+      font-size: 30px;
+      text-shadow: none;
+    }
+   }
 }
 
-.loader {
-  background: url('../img/loader.gif') center center no-repeat;
-  min-height:  100px;
+footer#mainFooter{
+  position: fixed;
+  bottom: 0;
 }
+
+


Mime
View raw message