couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From benk...@apache.org
Subject fauxton commit: updated refs/heads/master to b28a844
Date Tue, 05 Apr 2016 14:45:20 GMT
Repository: couchdb-fauxton
Updated Branches:
  refs/heads/master f6a1f8201 -> b28a844bd


Minor fixes

Three unrelated small changes:
- typo fix on doc page
- fix for absolute URLs for APIs setup and config pages
- spacing tweak for icons on db page


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

Branch: refs/heads/master
Commit: b28a844bd52da25418b7220ac696c0b72148e23b
Parents: f6a1f82
Author: Ben Keen <ben.keen@gmail.com>
Authored: Thu Mar 31 09:44:23 2016 -0700
Committer: Ben Keen <ben.keen@gmail.com>
Committed: Tue Apr 5 07:46:22 2016 -0700

----------------------------------------------------------------------
 app/addons/cluster/resources.js                 | 8 ++++++--
 app/addons/cluster/routes.js                    | 6 +++---
 app/addons/databases/assets/less/databases.less | 3 +--
 app/addons/documentation/stores.js              | 4 ++--
 app/addons/setup/resources.js                   | 8 ++++++--
 app/addons/setup/route.js                       | 5 ++---
 6 files changed, 20 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b28a844b/app/addons/cluster/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/cluster/resources.js b/app/addons/cluster/resources.js
index bc692b0..ed17d3a 100644
--- a/app/addons/cluster/resources.js
+++ b/app/addons/cluster/resources.js
@@ -19,8 +19,12 @@ function (app, FauxtonAPI) {
   var Cluster = FauxtonAPI.addon();
 
   Cluster.ClusterNodes = Backbone.Model.extend({
-    url: function () {
-      return app.host + '/_membership';
+    url: function (context) {
+      if (context === 'apiurl') {
+        return window.location.origin + '/_membership';
+      } else {
+        return app.host + '/_membership';
+      }
     },
 
     parse: function (res) {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b28a844b/app/addons/cluster/routes.js
----------------------------------------------------------------------
diff --git a/app/addons/cluster/routes.js b/app/addons/cluster/routes.js
index a3555a2..69d632a 100644
--- a/app/addons/cluster/routes.js
+++ b/app/addons/cluster/routes.js
@@ -15,7 +15,7 @@ define([
   '../../core/api',
   './resources',
   './cluster.react',
-  './cluster.actions',
+  './cluster.actions'
 ],
 
 function (app, FauxtonAPI, Cluster, ClusterComponents, ClusterActions) {
@@ -25,7 +25,7 @@ function (app, FauxtonAPI, Cluster, ClusterComponents, ClusterActions) {
     layout: 'one_pane',
 
     routes: {
-      'cluster/disabled': 'showDisabledFeatureScreen',
+      'cluster/disabled': 'showDisabledFeatureScreen'
     },
 
     crumbs: [
@@ -33,7 +33,7 @@ function (app, FauxtonAPI, Cluster, ClusterComponents, ClusterActions) {
     ],
 
     apiUrl: function () {
-      return [this.memberships.url(), this.memberships.documentation];
+      return [this.memberships.url('apiurl'), this.memberships.documentation];
     },
 
     initialize: function () {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b28a844b/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 4ada93c..0d27d75 100644
--- a/app/addons/databases/assets/less/databases.less
+++ b/app/addons/databases/assets/less/databases.less
@@ -27,7 +27,6 @@
     .border-radius(6px);
     text-decoration: none;
     font-size: 19px;
-    margin-left: 10px;
   }
   td {
     vertical-align: middle;
@@ -73,5 +72,5 @@
 }
 
 .database-actions > * {
-  margin-right: 4px;
+  margin-right: 10px;
 }

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b28a844b/app/addons/documentation/stores.js
----------------------------------------------------------------------
diff --git a/app/addons/documentation/stores.js b/app/addons/documentation/stores.js
index a669cd5..1f79c01 100644
--- a/app/addons/documentation/stores.js
+++ b/app/addons/documentation/stores.js
@@ -19,12 +19,12 @@ define([
     getLinks: function () {
       return [
         {
-          title: 'CouchDB Offical Documentation -- Online',
+          title: 'CouchDB Official Documentation -- Online',
           link: 'http://docs.couchdb.org/en/latest/',
           iconClassName: 'couchdb-icon'
         },
         {
-          title: 'CouchDB Offical Documentation -- Offline',
+          title: 'CouchDB Official Documentation -- Offline',
           link: '/_utils/docs/contents.html',
           iconClassName: 'couchdb-icon'
         },

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b28a844b/app/addons/setup/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/setup/resources.js b/app/addons/setup/resources.js
index 13963bc..0073a0a 100644
--- a/app/addons/setup/resources.js
+++ b/app/addons/setup/resources.js
@@ -24,8 +24,12 @@ function (app, FauxtonAPI) {
 
     documentation: app.host + '/_utils/docs',
 
-    url: function () {
-      return '/_cluster_setup';
+    url: function (context) {
+      if (context === "apiurl") {
+        return window.location.origin + "/_cluster_setup";
+      } else {
+        return '/_cluster_setup';
+      }
     },
 
     validate: function (attrs) {

http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b28a844b/app/addons/setup/route.js
----------------------------------------------------------------------
diff --git a/app/addons/setup/route.js b/app/addons/setup/route.js
index 8710fe4..ddff10d 100644
--- a/app/addons/setup/route.js
+++ b/app/addons/setup/route.js
@@ -16,8 +16,7 @@ define([
   './resources',
   './setup.react',
   './setup.actions',
-  '../cluster/cluster.actions',
-
+  '../cluster/cluster.actions'
 ],
 function (app, FauxtonAPI, Setup, SetupComponents, SetupActions, ClusterActions) {
   var RouteObject = FauxtonAPI.RouteObject.extend({
@@ -37,7 +36,7 @@ function (app, FauxtonAPI, Setup, SetupComponents, SetupActions, ClusterActions)
     ],
 
     apiUrl: function () {
-      return [this.setupModel.url(), this.setupModel.documentation];
+      return [this.setupModel.url('apiurl'), this.setupModel.documentation];
     },
 
     initialize: function () {


Mime
View raw message