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/10/21 20:53:10 UTC
fauxton commit: updated refs/heads/master to 0c551d3
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 7ead94935 -> 0c551d37e
Minor style fixes
This fixes a number of small issues described in:
https://issues.apache.org/jira/browse/COUCHDB-2370:
- don't truncate all headers if there is space
- fix font size of active tasks title
- add more space to the button in config/add-section
- fix wording after verfying the installation
- autfocus the add-section-modal in config
Closes COUCHDB-2370
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0c551d37
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0c551d37
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0c551d37
Branch: refs/heads/master
Commit: 0c551d37ed40e1171009695e33ed5ed1c6c1132b
Parents: 7ead949
Author: Benjamin Keen <be...@gmail.com>
Authored: Sat Oct 11 18:13:22 2014 -0700
Committer: Robert Kowalski <ro...@apache.org>
Committed: Tue Oct 21 20:52:44 2014 +0200
----------------------------------------------------------------------
app/addons/config/assets/less/config.less | 21 ++++++++++++++++++++-
app/addons/config/templates/dashboard.html | 3 ++-
app/addons/config/templates/modal.html | 5 ++---
app/addons/config/views.js | 6 +++---
app/addons/verifyinstall/views.js | 2 +-
assets/less/fauxton.less | 6 ++++--
6 files changed, 32 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c551d37/app/addons/config/assets/less/config.less
----------------------------------------------------------------------
diff --git a/app/addons/config/assets/less/config.less b/app/addons/config/assets/less/config.less
index 24bbab8..48708ee 100644
--- a/app/addons/config/assets/less/config.less
+++ b/app/addons/config/assets/less/config.less
@@ -10,6 +10,9 @@
* License for the specific language governing permissions and limitations under
* the License.
*/
+button.addSection {
+ margin-bottom: 12px;
+}
.config-item {
height: 65px;
@@ -24,11 +27,26 @@
.js-hidden {
display: none;
}
- button {width: 7%;}
+
+ button { width: 7%;}
}
#add-section-modal .modal {
width: 400px;
+ margin-left: -200px;
+ left: 50%;
+
+ input {
+ width: 100%;
+ }
+
+ form {
+ margin-bottom: 0px;
+ }
+
+ .modal-footer {
+ padding: 14px 0px 0px;
+ }
}
#config-trash {
@@ -45,3 +63,4 @@ table.config {
}
}
}
+
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c551d37/app/addons/config/templates/dashboard.html
----------------------------------------------------------------------
diff --git a/app/addons/config/templates/dashboard.html b/app/addons/config/templates/dashboard.html
index 37ae634..20aecac 100644
--- a/app/addons/config/templates/dashboard.html
+++ b/app/addons/config/templates/dashboard.html
@@ -13,11 +13,12 @@ the License.
-->
<div class="row">
- <button id="js-add-section" href="#" class="btn btn-primary pull-right">
+ <button id="js-add-section" href="#" class="btn btn-primary pull-right addSection">
<i class="icon icon-plus icon-white"> </i>
Add Section
</button>
</div>
+
<table class="config table table-striped table-bordered">
<thead>
<th id="config-section" width="20%"> Section </th>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c551d37/app/addons/config/templates/modal.html
----------------------------------------------------------------------
diff --git a/app/addons/config/templates/modal.html b/app/addons/config/templates/modal.html
index 00a577b..4aa7b8a 100644
--- a/app/addons/config/templates/modal.html
+++ b/app/addons/config/templates/modal.html
@@ -19,14 +19,13 @@ the License.
<div class="modal-body">
<div class="js-form-error-config"></div>
<form id="js-add-section-form" class="form well">
- <label>Section</label>
- <input type="text" name="section" placeholder="Section" autocomplete="off">
+ <input type="text" name="section" placeholder="Section" autocomplete="off" autofocus>
<input type="text" name="name" placeholder="Name">
<br/>
<input type="text" name="value" placeholder="Value">
<div class="modal-footer">
<button type="button" class="btn" data-dismiss="modal">Cancel</button>
- <button type="submit" class="btn btn-primary"> Save </button>
+ <button type="submit" class="btn btn-primary">Save</button>
</div>
</form>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c551d37/app/addons/config/views.js
----------------------------------------------------------------------
diff --git a/app/addons/config/views.js b/app/addons/config/views.js
index c59425c..3a43225 100644
--- a/app/addons/config/views.js
+++ b/app/addons/config/views.js
@@ -76,6 +76,7 @@ function(app, FauxtonAPI, Config, Components) {
serialize: function () {
return {option: this.model.toJSON()};
},
+
saveAndRender: function (event) {
var options = {},
$input = this.$(event.currentTarget).parents('td').find(".js-value-input"),
@@ -155,8 +156,7 @@ function(app, FauxtonAPI, Config, Components) {
Views.Modal = FauxtonAPI.View.extend({
className: "modal hide fade",
-
- template: "addons/config/templates/modal",
+ template: "addons/config/templates/modal",
events: {
"submit #js-add-section-form": "submitClick"
@@ -248,10 +248,10 @@ function(app, FauxtonAPI, Config, Components) {
show: function(){
this.$el.modal({show:true});
},
+
hide: function(){
this.$el.modal('hide');
}
-
});
return Views;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c551d37/app/addons/verifyinstall/views.js
----------------------------------------------------------------------
diff --git a/app/addons/verifyinstall/views.js b/app/addons/verifyinstall/views.js
index 1e7e6f5..dd0c287 100644
--- a/app/addons/verifyinstall/views.js
+++ b/app/addons/verifyinstall/views.js
@@ -43,7 +43,7 @@ function(app, FauxtonAPI, VerifyInstall) {
complete: function () {
FauxtonAPI.addNotification({
- msg: 'Success! You CouchDB install is working. Time to Relax',
+ msg: 'Success! Your CouchDB installation is working. Time to Relax.',
type: 'success',
selector: '#error'
});
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c551d37/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index fd02ee3..1050ce7 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -533,6 +533,10 @@ REUSEABLE SHADOW BORDER
/* only specify the sidebar width when there’s a sidebar */
.with-sidebar #breadcrumbs {
width: @sidebarWidth;
+
+ .active {
+ width: 259px;
+ }
}
#breadcrumbs {
@@ -561,7 +565,6 @@ REUSEABLE SHADOW BORDER
.with-sidebar &,
.two-pane & {
padding:20px 10px;
- font-size: 19px;
float: left;
}
a {
@@ -575,7 +578,6 @@ REUSEABLE SHADOW BORDER
color: #333;
overflow: hidden;
text-overflow: ellipsis;
- width: 259px;
white-space: nowrap;
}
&.divider {