You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by de...@apache.org on 2014/08/25 15:40:23 UTC
[43/48] fauxton commit: updated refs/heads/secondary-indexes to
8688d16
All DBs header update
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/885f234a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/885f234a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/885f234a
Branch: refs/heads/secondary-indexes
Commit: 885f234aee237a0e8deafe85782d3c26582159e1
Parents: 40e1788
Author: deathbearbrown <de...@gmail.com>
Authored: Sun Aug 24 16:33:43 2014 +0200
Committer: deathbearbrown <de...@gmail.com>
Committed: Mon Aug 25 09:37:37 2014 -0400
----------------------------------------------------------------------
app/addons/databases/assets/less/databases.less | 3 +++
app/addons/databases/routes.js | 14 +++++++-------
app/addons/databases/templates/header_alldbs.html | 2 +-
app/addons/databases/templates/newdatabase.html | 2 +-
app/addons/databases/views.js | 5 ++++-
assets/less/headers.less | 4 +---
assets/less/templates.less | 4 ++++
7 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/885f234a/app/addons/databases/assets/less/databases.less
----------------------------------------------------------------------
diff --git a/app/addons/databases/assets/less/databases.less b/app/addons/databases/assets/less/databases.less
index b401e7d..963179e 100644
--- a/app/addons/databases/assets/less/databases.less
+++ b/app/addons/databases/assets/less/databases.less
@@ -32,3 +32,6 @@
font-size: 19px;
}
}
+#new a {
+ text-decoration: none;
+}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/885f234a/app/addons/databases/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/routes.js b/app/addons/databases/routes.js
index 1e4396c..a896d1e 100644
--- a/app/addons/databases/routes.js
+++ b/app/addons/databases/routes.js
@@ -36,18 +36,12 @@ function(app, FauxtonAPI, Databases, Views) {
"_all_dbs(:params)": "allDatabases"
},
- apiUrl: function() {
- return [this.databases.url("apiurl"), this.databases.documentation()];
- },
-
selectedHeader: "Databases",
initialize: function() {
this.databases = new Databases.List();
this.deferred = FauxtonAPI.Deferred();
- this.rightHeader = this.setView("#api-navbar", new Views.RightAllDBsHeader({
- collection: this.databases
- }));
+
},
allDatabases: function() {
@@ -58,6 +52,12 @@ function(app, FauxtonAPI, Databases, Views) {
collection: this.databases
}));
+ this.rightHeader = this.setView("#api-navbar", new Views.RightAllDBsHeader({
+ collection: this.databases,
+ endpoint: this.databases.url("apiurl"),
+ documentation: this.databases.documentation()
+ }));
+
this.databasesView.setPage(dbPage);
},
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/885f234a/app/addons/databases/templates/header_alldbs.html
----------------------------------------------------------------------
diff --git a/app/addons/databases/templates/header_alldbs.html b/app/addons/databases/templates/header_alldbs.html
index a993225..492b5bf 100644
--- a/app/addons/databases/templates/header_alldbs.html
+++ b/app/addons/databases/templates/header_alldbs.html
@@ -17,7 +17,7 @@ the License.
<div id="header-api-bar" class="button"></div>
<!-- add database-->
- <div class="button add-db">
+ <div class="button" id="add-db-button">
</div>
<!-- search (jump to doc)-->
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/885f234a/app/addons/databases/templates/newdatabase.html
----------------------------------------------------------------------
diff --git a/app/addons/databases/templates/newdatabase.html b/app/addons/databases/templates/newdatabase.html
index 1376ad5..2b25aac 100644
--- a/app/addons/databases/templates/newdatabase.html
+++ b/app/addons/databases/templates/newdatabase.html
@@ -12,5 +12,5 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<a class="btn btn-primary new" id="new"><i class="icon fonticon-new-database"></i> Add New Database</a>
+<a id="new"><i class="icon fonticon-new-database"></i> Add New Database</a>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/885f234a/app/addons/databases/views.js
----------------------------------------------------------------------
diff --git a/app/addons/databases/views.js b/app/addons/databases/views.js
index 99a5ea2..e2f0d52 100644
--- a/app/addons/databases/views.js
+++ b/app/addons/databases/views.js
@@ -28,6 +28,7 @@ function(app, Components, FauxtonAPI, Databases) {
initialize: function(options){
//adding the database to the object
_.bindAll(this);
+ this.endpoint = options.endpoint;
},
updateApiUrl: function(api){
@@ -47,7 +48,9 @@ function(app, Components, FauxtonAPI, Databases) {
//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({}));
+ this.apiBar = this.insertView("#header-api-bar", new Components.ApiBar({
+ endpoint: this.endpoint
+ }));
}
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/885f234a/assets/less/headers.less
----------------------------------------------------------------------
diff --git a/assets/less/headers.less b/assets/less/headers.less
index ba21a7f..1ef0743 100644
--- a/assets/less/headers.less
+++ b/assets/less/headers.less
@@ -49,9 +49,7 @@
}
}
.one-pane & {
- position: relative;
- border: none;
- .box-shadow(none);
+ .bottom-shadow-border;
left: auto;
}
/* these styles are for the new header*/
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/885f234a/assets/less/templates.less
----------------------------------------------------------------------
diff --git a/assets/less/templates.less b/assets/less/templates.less
index b2dc28b..cf66117 100644
--- a/assets/less/templates.less
+++ b/assets/less/templates.less
@@ -352,6 +352,10 @@
/*remove gutter without rewriting variable*/
margin-left: 0px;
}
+ .one-pane &{
+ margin-top:60px;
+ padding-bottom:60px;
+ }
.with-sidebar &{
.left-shadow-border;
border-right: 1px solid #999;