You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2014/10/15 10:47:19 UTC
fauxton commit: updated refs/heads/master to aea1a33
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 5715fdb9a -> aea1a338a
Remove api bar from RightAllDBsHeader
This expands upon Christian's work and removes the api bar component
from the RightAllDBsHeader. It mimics Christians work for the documents
module.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/aea1a338
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/aea1a338
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/aea1a338
Branch: refs/heads/master
Commit: aea1a338adb8e05f1df55e53c673c095bd64c7ea
Parents: 5715fdb
Author: Garren Smith <ga...@gmail.com>
Authored: Tue Oct 14 09:49:59 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Wed Oct 15 10:46:03 2014 +0200
----------------------------------------------------------------------
app/addons/databases/routes.js | 6 +-
app/addons/databases/views.js | 18 ---
app/templates/layouts/one_pane_db.html | 4 +-
assets/less/fauxton.less | 224 +++++++++++++++-------------
4 files changed, 126 insertions(+), 126 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/aea1a338/app/addons/databases/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/routes.js b/app/addons/databases/routes.js
index 5197b57..ebfcdfe 100644
--- a/app/addons/databases/routes.js
+++ b/app/addons/databases/routes.js
@@ -52,13 +52,15 @@ function(app, FauxtonAPI, Databases, Views) {
this.rightHeader = this.setView("#right-header", new Views.RightAllDBsHeader({
collection: this.databases,
- endpoint: this.databases.url("apiurl"),
- documentation: this.databases.documentation()
}));
this.databasesView.setPage(dbPage);
},
+ apiUrl: function () {
+ return [this.databases.url("apiurl"), this.databases.documentation()];
+ },
+
establish: function() {
return [this.databases.fetchOnce()];
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/aea1a338/app/addons/databases/views.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/views.js b/app/addons/databases/views.js
index ff1f32a..3def8eb 100644
--- a/app/addons/databases/views.js
+++ b/app/addons/databases/views.js
@@ -24,17 +24,6 @@ function(app, Components, FauxtonAPI, Databases) {
Views.RightAllDBsHeader = FauxtonAPI.View.extend({
className: "header-right",
template: "addons/databases/templates/header_alldbs",
- initialize: function(options){
- //adding the database to the object
- _.bindAll(this);
- this.endpoint = options.endpoint;
- },
-
- updateApiUrl: function(api){
- //this will update the api bar when the route changes
- //you can find the method that updates it in components.js Components.ApiBar()
- this.apiBar && this.apiBar.update(api);
- },
beforeRender:function(){
this.headerSearch = this.insertView("#header-search", new Views.JumpToDB({
@@ -44,12 +33,6 @@ function(app, Components, FauxtonAPI, Databases) {
this.newbutton = this.insertView("#add-db-button", new Views.NewDatabaseButton({
collection: this.collection
}));
-
-
- //Moved the apibar view into the components file so you can include it in your views
- this.apiBar = this.insertView("#header-api-bar", new Components.ApiBar({
- endpoint: this.endpoint
- }));
}
});
@@ -68,7 +51,6 @@ function(app, Components, FauxtonAPI, Databases) {
}
});
-
Views.JumpToDB = FauxtonAPI.View.extend({
template: "addons/databases/templates/jump_to_db",
events: {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/aea1a338/app/templates/layouts/one_pane_db.html
----------------------------------------------------------------------
diff --git a/app/templates/layouts/one_pane_db.html b/app/templates/layouts/one_pane_db.html
index f0e6989..d30c3e2 100644
--- a/app/templates/layouts/one_pane_db.html
+++ b/app/templates/layouts/one_pane_db.html
@@ -15,11 +15,11 @@ the License.
<div id="primary-navbar"></div>
<div id="dashboard" class="container-fluid one-pane">
<div id="global-notifications" class="container errors-container window-resizeable"></div>
- <div class="fixed-header">
+ <header class="fixed-header">
<div id="breadcrumbs"></div>
<div id="api-navbar"></div>
<div id="right-header" class="window-resizeable"></div>
- </div>
+ </header>
<div class="row-fluid content-area">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/aea1a338/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index b14e0d2..a60dca9 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -136,7 +136,7 @@ select {
border-bottom: 1px solid #e5e5e5;
padding: 8px 4px;
strong {
- font-size: 16px;
+ font-size: 16px;
}
}
}
@@ -335,15 +335,15 @@ table.databases {
}
@media screen and ( max-height: 600px ){
- #primary-navbar{
- overflow-y: scroll;
- }
+ #primary-navbar{
+ overflow-y: scroll;
+ }
}
@media screen and ( min-height: 600px ){
- #primary-navbar{
- overflow-y: hidden;
- }
+ #primary-navbar{
+ overflow-y: hidden;
+ }
}
/* Fixed side navigation */
@@ -368,73 +368,73 @@ table.databases {
font-size: 12px
}
.navbar {
- .burger{
+ .burger{
+ .transition(all @transitionSpeed @transitionEaseType);
+ padding: 22px 0 0 18px;
+ position: fixed;
+ z-index: 100;
+ width: 64px;
+ top: 0;
+ background-color: @primaryNav;
+ width: @navWidth;
+ div{
.transition(all @transitionSpeed @transitionEaseType);
- padding: 22px 0 0 18px;
- position: fixed;
- z-index: 100;
- width: 64px;
- top: 0;
- background-color: @primaryNav;
- width: @navWidth;
- div{
- .transition(all @transitionSpeed @transitionEaseType);
- height: 4px;
- width: 24px;
- .border-radius(2);
- background-color: @navBG;
- margin: 2px 0px;
+ height: 4px;
+ width: 24px;
+ .border-radius(2);
+ background-color: @navBG;
+ margin: 2px 0px;
+ }
+ &:hover div{
+ background-color: @navBGHover;
+ }
+ }
+ .bottom-container {
+ position: fixed;
+ bottom: 0;
+ width: 220px;
+ background: #3a2c2b;
+ .brand {
+ .box-sizing(content-box);
+ .hide-text;
+ .customTransition(left, 1s, 0.805, 0.005, 0.165, 0.985);
+ margin: 10px 0 0 0;
+ width: 200px;
+ height: 40px;
+ padding: 10px;
+ float: none;
+ background: #3a2c2b;
+ .icon {
+ .box-sizing(content-box);
+ background: url(../img/couchdb-site.png) no-repeat 0 0;
+ display: block;
+ height: 100%;
+ width: 100%;
}
- &:hover div{
- background-color: @navBGHover;
+ .closeMenu & {
+ .icon {
+ background: url(../img/minilogo.png) no-repeat 0 0;
+ }
+ width: 45px;
}
}
- .bottom-container {
- position: fixed;
- bottom: 0;
- width: 220px;
- background: #3a2c2b;
- .brand {
- .box-sizing(content-box);
- .hide-text;
- .customTransition(left, 1s, 0.805, 0.005, 0.165, 0.985);
- margin: 10px 0 0 0;
- width: 200px;
- height: 40px;
- padding: 10px;
- float: none;
- background: #3a2c2b;
- .icon {
- .box-sizing(content-box);
- background: url(../img/couchdb-site.png) no-repeat 0 0;
- display: block;
- height: 100%;
- width: 100%;
- }
- .closeMenu & {
- .icon {
- background: url(../img/minilogo.png) no-repeat 0 0;
+ #footer-nav-links {
+ width: 100%;
+ margin: 0;
+ li {
+ a {
+ font-size: 12px;
+ color: @linkColor;
+ padding: 0 0 10px 10px;
+ text-shadow: none;
+ }
+ &.active, &:hover{
+ a {
+ text-decoration: underline;
}
- width: 45px;
}
- }
- #footer-nav-links {
- width: 100%;
- margin: 0;
- li {
- a {
- font-size: 12px;
- color: @linkColor;
- padding: 0 0 10px 10px;
- text-shadow: none;
- }
- &.active, &:hover{
- a {
- text-decoration: underline;
- }
- }
- }
- }
+ }
+ }
}
nav {
margin-top: 64px;
@@ -543,14 +543,14 @@ table.databases {
/*
- FIXED HEADER, DASHBOARD & BREADCRUMBS:
+FIXED HEADER, DASHBOARD & BREADCRUMBS:
- one_pane.html
- two_pane.html
- with_sidebar.html
- with_tabs.html
- with_tabs_sidebar.html
-*/
+one_pane.html
+two_pane.html
+with_sidebar.html
+with_tabs.html
+with_tabs_sidebar.html
+ */
#dashboard {
.left-shadow-border;
position: absolute;
@@ -825,7 +825,7 @@ table.databases {
label.drop-down{
&:before{
- display: none;
+ display: none;
}
}
}
@@ -947,17 +947,17 @@ div.add-dropdown {
min-width: 0;
top: 38px;
.box-shadow(@boxShadow);
- &.arrow:before{
- right: 4px;
- }
- a {
- background-color: #202326;
- color: rgba(255, 255, 255, 0.8);
- &:hover{
- background-color: @navBG;
- color: white;
- }
+ &.arrow:before{
+ right: 4px;
+ }
+ a {
+ background-color: #202326;
+ color: rgba(255, 255, 255, 0.8);
+ &:hover{
+ background-color: @navBG;
+ color: white;
}
+ }
li a {
padding: 10px 15px 10px 12px;
}
@@ -978,9 +978,9 @@ div.add-dropdown {
/*
---------------------------------------------------
- REUSEABLE SHADOW BORDER
+REUSEABLE SHADOW BORDER
---------------------------------------------------
-*/
+ */
.left-shadow-border{
border-left: 1px solid #999;
@@ -1097,16 +1097,32 @@ div.add-dropdown {
height: 60px;
}
}
- #header-api-bar {
- width: 87px;
- }
#breadcrumbs{
.bottom-shadow-border;
}
}
+
+ .one-pane &,
+ .two-pane &,
+ .with-sidebar & {
+ #header-api-bar {
+ width: 87px;
+ }
+ }
+
.one-pane & {
.bottom-shadow-border;
left: auto;
+
+ #api-navbar{
+ position: relative;
+ float: right;
+ left: 0px;
+ z-index: 200;
+ > div {
+ height: 60px;
+ }
+ }
}
/* these styles are for the new header*/
> div {
@@ -1165,7 +1181,7 @@ div.add-dropdown {
float: left;
}
a {
- float: left;
+ float: left;
}
}
color: @breadcrumbText;
@@ -1190,17 +1206,17 @@ div.add-dropdown {
}
}
.fonticon-right-open {
- position: absolute;
-
- &.divider {
- padding: 23px 0;
- }
- +li {
- text-overflow: inherit;
- overflow: auto;
- width: auto;
- margin-left: 14px;
- }
+ position: absolute;
+
+ &.divider {
+ padding: 23px 0;
+ }
+ +li {
+ text-overflow: inherit;
+ overflow: auto;
+ width: auto;
+ margin-left: 14px;
+ }
}
}
}
@@ -1239,7 +1255,7 @@ div.add-dropdown {
background-color: #333;
color: #fff;
margin: 0;
- .add-on {
+ .add-on {
font-size: 16px;
background: none;
padding: 0px;