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/13 22:30:18 UTC
[1/4] fauxton commit: updated refs/heads/secondary-indexes to 61c9e3c
Repository: couchdb-fauxton
Updated Branches:
refs/heads/secondary-indexes ba4c20ce0 -> 61c9e3c4a
fix api bar help icon
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/61c9e3c4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/61c9e3c4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/61c9e3c4
Branch: refs/heads/secondary-indexes
Commit: 61c9e3c4a40de24ab3a6c9fa93175f79c440ac7f
Parents: 2a25975
Author: Jenn Schiffer <je...@pancaketheorem.com>
Authored: Wed Aug 13 16:28:28 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Wed Aug 13 16:30:20 2014 -0400
----------------------------------------------------------------------
app/addons/fauxton/templates/api_bar.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/61c9e3c4/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 90dd5e0..9db0d7b 100644
--- a/app/addons/fauxton/templates/api_bar.html
+++ b/app/addons/fauxton/templates/api_bar.html
@@ -22,7 +22,7 @@ the License.
<span class="add-on">
API URL
<a class="help-link" data-bypass="true" href="<%-getDocUrl(documentation)%>" target="_blank">
- <i class="fonticon-link"></i>
+ <i class="icon-question-sign"></i>
</a>
</span>
<input id="api-url-text" type="text" class="input-xxlarge" value="<%- endpoint %>">
[3/4] fauxton commit: updated refs/heads/secondary-indexes to 61c9e3c
Posted by de...@apache.org.
style api bar button on fixed header
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/2a259756
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/2a259756
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/2a259756
Branch: refs/heads/secondary-indexes
Commit: 2a2597562c013f665e8cc7b9c33b6d91b5985ab0
Parents: 84e6f9e
Author: Jenn Schiffer <je...@pancaketheorem.com>
Authored: Wed Aug 13 16:24:25 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Wed Aug 13 16:30:20 2014 -0400
----------------------------------------------------------------------
assets/less/headers.less | 84 ++++++++++++++++++++++++-------------------
1 file changed, 47 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/2a259756/assets/less/headers.less
----------------------------------------------------------------------
diff --git a/assets/less/headers.less b/assets/less/headers.less
index ff790e5..a110714 100644
--- a/assets/less/headers.less
+++ b/assets/less/headers.less
@@ -118,6 +118,10 @@
}
}
+.fixed-header {
+
+}
+
.header-left{
position: relative;
#header-dropdown-menu {
@@ -142,29 +146,17 @@
}
}
-.header-right {
- .tray {
- display: none;
- .border-radius(5px);
- position: absolute;
- right: 5px;
- top: 55px;
- z-index: 11;
- background-color: #333;
- color: #fff;
- margin: 0;
- }
- .tray:before {
- content: '';
- position: absolute;
- top: -25px;
- border-color: transparent transparent #333 transparent;
- border-style: solid;
- border-width: 15px;
- width: 0;
- height: 0;
- }
- .add-on {
+.tray {
+ display: none;
+ .border-radius(5px);
+ position: absolute;
+ right: 5px;
+ top: 55px;
+ z-index: 11;
+ background-color: #333;
+ color: #fff;
+ margin: 0;
+ .add-on {
font-size: 16px;
background: none;
padding: 0px;
@@ -177,6 +169,35 @@
height: auto;
line-height: 1em;
}
+}
+.tray:before {
+ content: '';
+ position: absolute;
+ top: -25px;
+ border-color: transparent transparent #333 transparent;
+ border-style: solid;
+ border-width: 15px;
+ width: 0;
+ height: 0;
+}
+
+.fixed-header,
+.header-right {
+ > .btn {
+ padding: 0;
+ margin: 0;
+ }
+ > .button,
+ > .button a,
+ .api-url-btn > button,
+ .btn-primary {
+ color: #666;
+ font-size: 13px;
+ line-height: 3em;
+ }
+}
+
+.header-right {
.well {
padding: 0;
margin: 0;
@@ -200,20 +221,6 @@
color: #999;
}
}
- > .btn {
- padding: 0;
- margin: 0;
- }
- > .button,
- > .button a,
- .api-url-btn > button {
- color: #666;
- font-size: 13px;
- line-height: 3em;
- }
- .api-navbar:before {
- right: 25px;
- }
> div {
float: right;
height: 60px;
@@ -226,4 +233,7 @@
border-left: none;
}
}
+.api-navbar:before {
+ right: 25px;
+}
[2/4] fauxton commit: updated refs/heads/secondary-indexes to 61c9e3c
Posted by de...@apache.org.
refactor css for header trays
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/84e6f9ee
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/84e6f9ee
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/84e6f9ee
Branch: refs/heads/secondary-indexes
Commit: 84e6f9eec5b31c56f888ca9c3d017b5eff1601a6
Parents: ad4c128
Author: Jenn Schiffer <je...@pancaketheorem.com>
Authored: Wed Aug 13 15:53:11 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Wed Aug 13 16:30:20 2014 -0400
----------------------------------------------------------------------
.../documents/assets/less/advancedOptions.less | 35 ++++------------
.../documents/templates/advanced_options.html | 2 +-
app/addons/fauxton/templates/api_bar.html | 2 +-
assets/less/fauxton.less | 37 ++++-------------
assets/less/headers.less | 42 ++++++++++++++++----
5 files changed, 50 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/app/addons/documents/assets/less/advancedOptions.less
----------------------------------------------------------------------
diff --git a/app/addons/documents/assets/less/advancedOptions.less b/app/addons/documents/assets/less/advancedOptions.less
index 6febf3b..16ddb2b 100644
--- a/app/addons/documents/assets/less/advancedOptions.less
+++ b/app/addons/documents/assets/less/advancedOptions.less
@@ -13,27 +13,17 @@
/*for advanced options css*/
.advanced-options.well {
- display: inline-block;
- background: none;
- border: none;
box-shadow: none;
+ border: none;
+ background: none;
+}
+
+#query-options-tray:before {
+ right: 140px;
}
+
#query-options-tray {
- display: none;
- .border-radius(5px);
width: 490px;
- position: absolute;
- right: 5px;
- z-index: 11;
- background-color: #333;
- color: #fff;
- padding: 0;
- margin: 0;
- .add-on {
- padding: 0;
- margin: 0;
- line-height: 1em;
- }
.query-group {
padding: 20px;
border-bottom: 1px solid #555;
@@ -126,15 +116,4 @@
#skipRows {
margin-left: 5px;
}
-}
-#query-options-tray:before {
- content: '';
- position: absolute;
- top: -25px;
- right: 140px;
- border-color: transparent transparent #333 transparent;
- border-style: solid;
- border-width: 15px;
- width: 0;
- height: 0;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/app/addons/documents/templates/advanced_options.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/advanced_options.html b/app/addons/documents/templates/advanced_options.html
index 5e0e77f..95bbe5c 100644
--- a/app/addons/documents/templates/advanced_options.html
+++ b/app/addons/documents/templates/advanced_options.html
@@ -16,7 +16,7 @@ the License.
Query Options
</a>
-<div id="query-options-tray">
+<div id="query-options-tray" class="tray">
<form class="js-view-query-update custom-inputs">
<div class="query-group">
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/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 255087d..90dd5e0 100644
--- a/app/addons/fauxton/templates/api_bar.html
+++ b/app/addons/fauxton/templates/api_bar.html
@@ -17,7 +17,7 @@ the License.
API URL
</a>
<div class="clearfix"></div>
-<div class="api-navbar" style="display: none">
+<div class="api-navbar tray">
<div class="input-prepend input-append">
<span class="add-on">
API URL
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index e8a9fdb..74c698a 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -249,37 +249,25 @@ div.spinner {
}
.api-url-btn {
- margin-top: 5px;
- margin-bottom: 5px;
.icon {
font-size: 11px;
}
+ background: none;
+ border: none;
+ padding: 0;
+ margin: 0;
+}
+.api-url-btn:hover {
+ background: none;
}
-
.api-navbar {
- .border-radius(5px);
- position: absolute;
- right: 5px;
- background-color: #333;
padding: 5px 20px;
- z-index: 2;
.input-append.input-prepend {
margin-bottom: 0px;
.copying {
background-color: #999;
transition: background-color 5ms linear;
}
- .add-on {
- background: none;
- padding: 0px;
- margin: 10px 0;
- border: none;
- display: block;
- text-align: left;
- color: #fff;
- text-shadow: none;
- height: auto;
- }
.input-xxlarge {
.border-radius(5px 0 0 5px);
border: none;
@@ -315,17 +303,6 @@ div.spinner {
}
}
}
-.api-navbar:before {
- content: '';
- position: absolute;
- top: -25px;
- right: 30px;
- border-color: transparent transparent #333 transparent;
- border-style: solid;
- border-width: 15px;
- width: 0;
- height: 0;
-}
.js-filter-form {
.help-block {
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/84e6f9ee/assets/less/headers.less
----------------------------------------------------------------------
diff --git a/assets/less/headers.less b/assets/less/headers.less
index 149e90b..ff790e5 100644
--- a/assets/less/headers.less
+++ b/assets/less/headers.less
@@ -21,7 +21,6 @@
.box-shadow(0px 6px 0 0 rgba(0, 0, 0, 0.1));
}
-
.fixed-header{
height: 60px;
background-color: @breadcrumbBG;
@@ -143,10 +142,40 @@
}
}
-
.header-right {
+ .tray {
+ display: none;
+ .border-radius(5px);
+ position: absolute;
+ right: 5px;
+ top: 55px;
+ z-index: 11;
+ background-color: #333;
+ color: #fff;
+ margin: 0;
+ }
+ .tray:before {
+ content: '';
+ position: absolute;
+ top: -25px;
+ border-color: transparent transparent #333 transparent;
+ border-style: solid;
+ border-width: 15px;
+ width: 0;
+ height: 0;
+ }
.add-on {
font-size: 16px;
+ background: none;
+ padding: 0px;
+ margin: 10px 0;
+ border: none;
+ display: block;
+ text-align: left;
+ color: #fff;
+ text-shadow: none;
+ height: auto;
+ line-height: 1em;
}
.well {
padding: 0;
@@ -182,6 +211,9 @@
font-size: 13px;
line-height: 3em;
}
+ .api-navbar:before {
+ right: 25px;
+ }
> div {
float: right;
height: 60px;
@@ -193,11 +225,5 @@
> div:last-child {
border-left: none;
}
- .api-url-btn {
- background: none;
- border: none;
- padding: 0;
- margin: 0;
- }
}
[4/4] fauxton commit: updated refs/heads/secondary-indexes to 61c9e3c
Posted by de...@apache.org.
use Events to close trays
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/ad4c128c
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/ad4c128c
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/ad4c128c
Branch: refs/heads/secondary-indexes
Commit: ad4c128c3129b0d7c3011a1a6259d6f30349f509
Parents: ba4c20c
Author: Jenn Schiffer <je...@pancaketheorem.com>
Authored: Wed Aug 13 15:16:45 2014 -0400
Committer: deathbearbrown <de...@gmail.com>
Committed: Wed Aug 13 16:30:20 2014 -0400
----------------------------------------------------------------------
app/addons/documents/views-advancedopts.js | 15 ++++++++++-----
app/addons/fauxton/components.js | 13 ++++++++++---
2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ad4c128c/app/addons/documents/views-advancedopts.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/views-advancedopts.js b/app/addons/documents/views-advancedopts.js
index 0a91914..993750f 100644
--- a/app/addons/documents/views-advancedopts.js
+++ b/app/addons/documents/views-advancedopts.js
@@ -26,6 +26,7 @@ function(app, FauxtonAPI, resizeColumns ) {
className: "advanced-options well",
initialize: function (options) {
+ FauxtonAPI.Events.on('AdvancedOptions:closeTray', this.closeTray);
this.database = options.database;
this.ddocName = options.ddocName;
this.viewName = options.viewName;
@@ -64,18 +65,22 @@ function(app, FauxtonAPI, resizeColumns ) {
toggleQuery: function(event) {
$('#dashboard-content').scrollTop(0);
this.$('#query-options-tray').toggle();
- $('.api-navbar').hide();
+ FauxtonAPI.Events.trigger('APIbar:closeTray');
},
+ closeTray: function(){
+ $('#query-options-tray').hide();
+ },
+
resetForm: function() {
- $('input, textarea').each(function(){
+ this.$('input, textarea').each(function(){
$(this).val('');
});
- $('input:checkbox').attr('checked', false);
- $("select").each(function(){
+ this.$('input:checkbox').attr('checked', false);
+ this.$("select").each(function(){
this.selectedIndex = 0;
});
- $('#query-options-tray').hide();
+ this.$('#query-options-tray').hide();
},
showKeys: function(){
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/ad4c128c/app/addons/fauxton/components.js
----------------------------------------------------------------------
diff --git a/app/addons/fauxton/components.js b/app/addons/fauxton/components.js
index 3784b8d..e8bd559 100644
--- a/app/addons/fauxton/components.js
+++ b/app/addons/fauxton/components.js
@@ -97,6 +97,7 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
},
initialize: function(options){
+ FauxtonAPI.Events.on('APIbar:closeTray', this.closeTray);
var _options = options || {};
this.endpoint = _options.endpoint || '_all_docs';
this.documentation = _options.documentation || 'docs';
@@ -109,8 +110,8 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
}else{
$currentTarget.removeClass("fonticon-minus").addClass("fonticon-plus");
}
- $('#query-options-tray').hide();
- $('.api-navbar').toggle();
+ FauxtonAPI.Events.trigger('AdvancedOptions:closeTray');
+ this.$('.api-navbar').toggle();
},
serialize: function() {
@@ -123,15 +124,22 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
hide: function(){
this.$el.addClass('hide');
},
+
show: function(){
this.$el.removeClass('hide');
},
+
+ closeTray: function(){
+ $('.api-navbar').hide();
+ },
+
update: function(endpoint) {
this.show();
this.endpoint = endpoint[0];
this.documentation = endpoint[1];
this.render();
},
+
afterRender: function(){
ZeroClipboard.config({ moviePath: "/assets/js/plugins/zeroclipboard/ZeroClipboard.swf" });
var client = new ZeroClipboard(this.$(".copy-url"));
@@ -147,7 +155,6 @@ function(app, FauxtonAPI, ace, spin, ZeroClipboard) {
});
});
}
-
});