You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/07/14 23:21:37 UTC
[1/6] fauxton commit: updated refs/heads/import-master to 2d2cc24
Repository: couchdb-fauxton
Updated Branches:
refs/heads/import-master 0ec46e9fe -> 2d2cc2431
remove whitespace
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/919442c6
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/919442c6
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/919442c6
Branch: refs/heads/import-master
Commit: 919442c641781cf383613a2f0a1cf71440d8c452
Parents: 0ec46e9
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Thu May 29 21:08:05 2014 +0200
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jul 14 12:39:00 2014 +0400
----------------------------------------------------------------------
app/addons/fauxton/resizeColumns.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/919442c6/app/addons/fauxton/resizeColumns.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/resizeColumns.js b/app/addons/fauxton/resizeColumns.js
index 1cdaca8..b2c938c 100644
--- a/app/addons/fauxton/resizeColumns.js
+++ b/app/addons/fauxton/resizeColumns.js
@@ -12,7 +12,7 @@
// This file creates a set of helper functions that will be loaded for all html
-// templates. These functions should be self contained and not rely on any
+// templates. These functions should be self contained and not rely on any
// external dependencies as they are loaded prior to the application. We may
// want to change this later, but for now this should be thought of as a
// "purely functional" helper system.
@@ -35,12 +35,12 @@ function(FauxtonAPI) {
},
getPanelWidth: function(){
var sidebarWidth = $('#sidebar-content').length > 0 ? $('#sidebar-content').width(): 0;
- return (this.getPrimaryNavWidth() + sidebarWidth);
+ return (this.getPrimaryNavWidth() + sidebarWidth);
},
initialize: function(){
// $(window).off('resize');
var that = this;
- //add throttler :)
+ //add throttler :)
this.lazyLayout = _.debounce(that.onResizeHandler, 300).bind(this);
FauxtonAPI.utils.addWindowResize(this.lazyLayout,"animation");
FauxtonAPI.utils.initWindowResize();
@@ -64,7 +64,7 @@ function(FauxtonAPI) {
} else {
var combinedWidth = window.innerWidth - this.getPanelWidth(),
smallWidthConstraint = ($('#sidebar-content').length > 0)? 470:800,
- panelWidth;
+ panelWidth;
if( combinedWidth > smallWidthConstraint && combinedWidth < 1400){
panelWidth = window.innerWidth - this.getPanelWidth();
@@ -75,14 +75,14 @@ function(FauxtonAPI) {
}
$(this.options.selectorElements).innerWidth(panelWidth);
-
+
}
//if there is a callback, run that
if(this.options.callback) {
this.options.callback();
}
this.trigger('resize');
- }
+ }
};
_.extend(Resize.prototype, Backbone.Events);
[6/6] fauxton commit: updated refs/heads/import-master to 2d2cc24
Posted by ro...@apache.org.
modify the documentation for the installation
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2d2cc243
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2d2cc243
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2d2cc243
Branch: refs/heads/import-master
Commit: 2d2cc243169cb564a5dd48106fe0c0b1204cab83
Parents: 41d68b8
Author: Stéphane Wirtel <st...@wirtel.be>
Authored: Sun Jul 13 12:20:18 2014 +0200
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Mon Jul 14 23:21:32 2014 +0200
----------------------------------------------------------------------
readme.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2d2cc243/readme.md
----------------------------------------------------------------------
diff --git a/readme.md b/readme.md
index 4db17a0..ce69219 100644
--- a/readme.md
+++ b/readme.md
@@ -14,7 +14,10 @@ A recent of [node.js](http://nodejs.org/) and npm is required.
### Fauxton Setup ###
- cd src/fauxton
+ # Clone the Fauxton repo: https://git-wip-us.apache.org/repos/asf/couchdb-fauxton.git
+ git clone https://git-wip-us.apache.org/repos/asf/couchdb-fauxton.git fauxton
+
+ cd fauxton
# Install all dependencies
npm install
[5/6] fauxton commit: updated refs/heads/import-master to 2d2cc24
Posted by ro...@apache.org.
Add modified .gitignore from couchdb
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/41d68b8e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/41d68b8e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/41d68b8e
Branch: refs/heads/import-master
Commit: 41d68b8ee499b5a54c03bb542757ae2a3172e70d
Parents: b9a5eae
Author: Garren Smith <ga...@gmail.com>
Authored: Mon Jul 14 15:10:38 2014 +0200
Committer: Garren Smith <ga...@gmail.com>
Committed: Mon Jul 14 15:11:15 2014 +0200
----------------------------------------------------------------------
.gitignore | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/41d68b8e/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..1baaaf1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,28 @@
+node_modules
+dist
+build
+app/load_addons.js
+!app/addons/
+app/addons/*
+!app/addons/activetasks
+!app/addons/config
+!app/addons/plugins
+!app/addons/logs
+!app/addons/stats
+!app/addons/replication
+!app/addons/contribute
+!app/addons/auth
+!app/addons/exampleAuth
+!app/addons/permissions
+!app/addons/verifyinstall
+!app/addons/compaction
+!app/addons/fauxton
+!app/addons/pouchdb
+!app/addons/databases
+!app/addons/documents
+!app/addons/styletests
+settings.json*
+!settings.json.default
+!assets/js/plugins/zeroclipboard/ZeroClipboard.swf
+test/test.config.js
+app/initialize.js
[4/6] fauxton commit: updated refs/heads/import-master to 2d2cc24
Posted by ro...@apache.org.
Fauxton: verifyinstall fix for PouchDB Server
Closes COUCHDB-2266
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b9a5eaef
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b9a5eaef
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b9a5eaef
Branch: refs/heads/import-master
Commit: b9a5eaefefe57abd325a779253a75781dc55798f
Parents: 8b80c95
Author: Nolan Lawson <no...@gmail.com>
Authored: Fri Jul 11 17:28:43 2014 -0700
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jul 14 12:39:21 2014 +0400
----------------------------------------------------------------------
app/addons/verifyinstall/resources.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9a5eaef/app/addons/verifyinstall/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/verifyinstall/resources.js b/app/addons/verifyinstall/resources.js
index aa08997..86b8165 100644
--- a/app/addons/verifyinstall/resources.js
+++ b/app/addons/verifyinstall/resources.js
@@ -86,7 +86,8 @@ function (app, FauxtonAPI, Databases, Documents) {
var promise = $.get(viewDoc.url() + '/_view/testview');
promise.then(function (resp) {
- var row = JSON.parse(resp).rows[0];
+ resp = _.isString(resp) ? JSON.parse(resp) : resp;
+ var row = resp.rows[0];
if (row.value === 6) {
return deferred.resolve();
}
[3/6] fauxton commit: updated refs/heads/import-master to 2d2cc24
Posted by ro...@apache.org.
Fauxton: fix scrollbar-issue - COUCHDB-2234
- Try to honor borders in calculating the width
- Adjust magic numbers to new widths of the left area
- Refactor the header/api-url section
- Removing the maximum widths of 1400px and 1500px, which caused
vertical scrollbars to appear at 1400px (which is on top of the
page content, some hundred pixels away from the left side on
large screens) on a system like windows
COUCHDB-2234
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/8b80c956
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/8b80c956
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/8b80c956
Branch: refs/heads/import-master
Commit: 8b80c956ef5d450a126f0b26ef9f1053f9168223
Parents: f4c64b0
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Sat May 31 15:14:32 2014 +0200
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jul 14 12:39:14 2014 +0400
----------------------------------------------------------------------
app/addons/fauxton/resizeColumns.js | 14 ++++++++------
app/addons/fauxton/templates/api_bar.html | 1 +
app/addons/fauxton/templates/breadcrumbs.html | 2 +-
assets/less/fauxton.less | 13 ++++++-------
4 files changed, 16 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8b80c956/app/addons/fauxton/resizeColumns.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/resizeColumns.js b/app/addons/fauxton/resizeColumns.js
index c1c96c5..b3d8841 100644
--- a/app/addons/fauxton/resizeColumns.js
+++ b/app/addons/fauxton/resizeColumns.js
@@ -29,12 +29,16 @@ function(FauxtonAPI) {
Resize.prototype = {
getPrimaryNavWidth: function(){
- var primaryNavWidth = $('body').hasClass('closeMenu')? 64:224;
+ var primaryNavWidth = $('body').hasClass('closeMenu') ? 64 : 220;
return primaryNavWidth;
},
getPanelWidth: function(){
- var sidebarWidth = $('#sidebar-content').length > 0 ? $('#sidebar-content').width(): 0;
- return (this.getPrimaryNavWidth() + sidebarWidth);
+ var sidebarWidth = $('#sidebar-content').length > 0 ? $('#sidebar-content').outerWidth() : 0,
+ borders = parseInt($('#dashboard').css('border-left-width'), 10) +
+ parseInt($('#dashboard-content').css('border-left-width'), 10) +
+ parseInt($('#dashboard-content').css('border-right-width'), 10);
+
+ return (this.getPrimaryNavWidth() + sidebarWidth + borders);
},
initialize: function(){
// $(window).off('resize');
@@ -64,12 +68,10 @@ function(FauxtonAPI) {
smallWidthConstraint = ($('#sidebar-content').length > 0)? 470:800,
panelWidth;
- if( combinedWidth > smallWidthConstraint && combinedWidth < 1400){
+ if (combinedWidth > smallWidthConstraint) {
panelWidth = window.innerWidth - this.getPanelWidth();
} else if (combinedWidth < smallWidthConstraint){
panelWidth = smallWidthConstraint;
- } else if(combinedWidth > 1400){
- panelWidth = 1400;
}
$('.window-resizeable').innerWidth(panelWidth);
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8b80c956/app/addons/fauxton/templates/api_bar.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/api_bar.html b/app/addons/fauxton/templates/api_bar.html
index 886c06e..f556220 100644
--- a/app/addons/fauxton/templates/api_bar.html
+++ b/app/addons/fauxton/templates/api_bar.html
@@ -16,6 +16,7 @@ the License.
API URL
<i class="fonticon-plus icon"></i>
</button>
+<div class="clearfix"></div>
<div class="api-navbar" style="display: none">
<div class="input-prepend input-append">
<span class="add-on">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8b80c956/app/addons/fauxton/templates/breadcrumbs.html
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/templates/breadcrumbs.html b/app/addons/fauxton/templates/breadcrumbs.html
index 18961b7..d305cee 100644
--- a/app/addons/fauxton/templates/breadcrumbs.html
+++ b/app/addons/fauxton/templates/breadcrumbs.html
@@ -12,7 +12,7 @@ License for the specific language governing permissions and limitations under
the License.
-->
-<ul class="breadcrumb">
+<ul class="breadcrumb pull-left">
<% _.each(_.initial(crumbs), function(crumb) { %>
<li>
<a href="#<%- crumb.link %>"><%- crumb.name %></a>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/8b80c956/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index fc92909..c32147d 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -530,7 +530,6 @@ table.databases {
#dashboard {
- max-width: 1500px;
.box-shadow(-6px 0 rgba(0, 0, 0, 0.1));
border-left: 1px solid #999;
position: absolute;
@@ -547,7 +546,7 @@ table.databases {
&.one-pane{
min-width: 800px;
margin-top: 0;
- overflow: auto;
+ overflow-x: hidden;
}
}
@@ -619,8 +618,8 @@ table.databases {
}
#breadcrumbs {
- padding: 15px 20px;
.breadcrumb {
+ margin: 15px 20px;
margin-bottom: 0;
background-color: transparent;
padding: 0;
@@ -872,12 +871,12 @@ div.spinner {
#api-navbar{
position: relative;
+ padding-right: 5px;
}
.api-url-btn {
- position: absolute;
- right: 15px;
- top: -50px;
+ margin-top: 5px;
+ margin-bottom: 5px;
.icon {
font-size: 11px;
}
@@ -885,7 +884,7 @@ div.spinner {
.api-navbar {
border-top: 1px solid @red;
- padding: 20px 20px 15px;
+ padding: 20px;
.input-append.input-prepend {
margin-bottom: 0px;
.add-on {
[2/6] fauxton commit: updated refs/heads/import-master to 2d2cc24
Posted by ro...@apache.org.
remove unused configuration for resizable container
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/f4c64b06
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/f4c64b06
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/f4c64b06
Branch: refs/heads/import-master
Commit: f4c64b0660b4b0ae48233d998963737b8dfc40fa
Parents: 919442c
Author: Robert Kowalski <ro...@kowalski.gd>
Authored: Thu May 29 21:09:45 2014 +0200
Committer: Alexander Shorin <kx...@apache.org>
Committed: Mon Jul 14 12:39:06 2014 +0400
----------------------------------------------------------------------
app/addons/fauxton/resizeColumns.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/f4c64b06/app/addons/fauxton/resizeColumns.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/resizeColumns.js b/app/addons/fauxton/resizeColumns.js
index b2c938c..c1c96c5 100644
--- a/app/addons/fauxton/resizeColumns.js
+++ b/app/addons/fauxton/resizeColumns.js
@@ -25,7 +25,6 @@ function(FauxtonAPI) {
var Resize = function(options){
this.options = options;
- this.options.selectorElements = options.selectorElements || ".window-resizeable";
};
Resize.prototype = {
@@ -49,7 +48,6 @@ function(FauxtonAPI) {
updateOptions:function(options){
this.options = {};
this.options = options;
- this.options.selectorElements = options.selectorElements || ".window-resizeable";
},
turnOff:function(){
FauxtonAPI.utils.removeWindowResize("animation");
@@ -74,7 +72,7 @@ function(FauxtonAPI) {
panelWidth = 1400;
}
- $(this.options.selectorElements).innerWidth(panelWidth);
+ $('.window-resizeable').innerWidth(panelWidth);
}
//if there is a callback, run that