couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gar...@apache.org
Subject git commit: updated refs/heads/move-auth-sidebar to 654672e
Date Tue, 13 Aug 2013 13:16:43 GMT
Updated Branches:
  refs/heads/move-auth-sidebar 0b7da27af -> 654672efb (forced update)


Fauxton: bug fix on view editor


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

Branch: refs/heads/move-auth-sidebar
Commit: 654672efba83c028e94a63f68cec09ad6acb889f
Parents: 924233e
Author: Garren Smith <garren.smith@gmail.com>
Authored: Tue Aug 13 15:13:36 2013 +0200
Committer: Garren Smith <garren.smith@gmail.com>
Committed: Tue Aug 13 15:16:26 2013 +0200

----------------------------------------------------------------------
 src/fauxton/Gruntfile.js                             | 6 +++---
 src/fauxton/app/modules/documents/resources.js       | 4 ++++
 src/fauxton/app/templates/documents/view_editor.html | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/654672ef/src/fauxton/Gruntfile.js
----------------------------------------------------------------------
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js
index e9cb13c..9cb7e2e 100644
--- a/src/fauxton/Gruntfile.js
+++ b/src/fauxton/Gruntfile.js
@@ -214,9 +214,9 @@ module.exports = function(grunt) {
       port: 8000,
       proxy: {
         target: {
-          host: 'garrensmith.cloudant.com',
-          port: 443,
-          https: true
+          host: 'localhost',
+          port: 5984,
+          https: false
         },
         // This sets the Host header in the proxy so that you can use external
         // CouchDB instances and not have the Host set to 'localhost'

http://git-wip-us.apache.org/repos/asf/couchdb/blob/654672ef/src/fauxton/app/modules/documents/resources.js
----------------------------------------------------------------------
diff --git a/src/fauxton/app/modules/documents/resources.js b/src/fauxton/app/modules/documents/resources.js
index 826b44a..0a80ad8 100644
--- a/src/fauxton/app/modules/documents/resources.js
+++ b/src/fauxton/app/modules/documents/resources.js
@@ -22,6 +22,10 @@ function(app, FauxtonAPI) {
   Documents.Doc = Backbone.Model.extend({
     idAttribute: "_id",
 
+    defaults: {
+      views: {}
+    },
+
     url: function(context) {
       if (context === "app") {
         return this.getDatabase().url("app") + "/" + this.safeID();

http://git-wip-us.apache.org/repos/asf/couchdb/blob/654672ef/src/fauxton/app/templates/documents/view_editor.html
----------------------------------------------------------------------
diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html
index ed61903..98b2f6c 100644
--- a/src/fauxton/app/templates/documents/view_editor.html
+++ b/src/fauxton/app/templates/documents/view_editor.html
@@ -48,7 +48,7 @@ the License.
                         </select>
                       </div>
                     </div>
-                    <div id="new-ddoc-section" class="span5" style="display:none">
+                    <div id="new-ddoc-section" class="span5 offset1" style="display:none">
                       <label class="control-label" for="new-ddoc"> _design/ </label>
                       <div class="controls">
                         <input type="text" id="new-ddoc" placeholder="newDesignDoc">


Mime
View raw message