You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:52:18 UTC
[45/50] [abbrv] brooklyn-ui git commit: use slideUp/Down instead of
hide/show for animations where we want it to come from the top, not the
top-left; fix spacing on catalog -> locations
use slideUp/Down instead of hide/show for animations where we want it to come from the top, not the top-left;
fix spacing on catalog -> locations
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/b4ddfb57
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/b4ddfb57
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/b4ddfb57
Branch: refs/heads/0.5.0
Commit: b4ddfb570404b902c75c5c1273c852c772f39b0a
Parents: 40e2aa2
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Mar 5 18:57:55 2013 -0800
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Mon Mar 11 15:32:39 2013 +0000
----------------------------------------------------------------------
usage/jsgui/src/main/webapp/assets/css/prettybrook.css | 4 ++--
usage/jsgui/src/main/webapp/assets/js/view/catalog.js | 12 ++++++------
.../src/main/webapp/assets/js/view/entity-activities.js | 8 ++++----
.../main/webapp/assets/tpl/catalog/details-generic.html | 3 +--
.../webapp/assets/tpl/catalog/details-location.html | 2 +-
5 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b4ddfb57/usage/jsgui/src/main/webapp/assets/css/prettybrook.css
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/css/prettybrook.css b/usage/jsgui/src/main/webapp/assets/css/prettybrook.css
index d1bc19e..433adcf 100644
--- a/usage/jsgui/src/main/webapp/assets/css/prettybrook.css
+++ b/usage/jsgui/src/main/webapp/assets/css/prettybrook.css
@@ -875,7 +875,7 @@ tr.app-add-wizard-config-entry {
.accordion-nav-row.active {
font-weight: bold;
}
-.catalog-details-generic {
+.catalog-details {
padding-left: 16px;
padding-right: 25px;
padding-top: 8px;
@@ -884,7 +884,7 @@ tr.app-add-wizard-config-entry {
.catalog-details h3 {
margin-bottom: 8px;
}
-.catalog-details-generic textarea {
+.catalog-details textarea {
width: 100%;
cursor: auto;
}
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b4ddfb57/usage/jsgui/src/main/webapp/assets/js/view/catalog.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/catalog.js b/usage/jsgui/src/main/webapp/assets/js/view/catalog.js
index e56dbdb..4eeb4ba 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/catalog.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/catalog.js
@@ -48,7 +48,7 @@ define([
},
render:function (eventName) {
this.$el.html(_.template(CatalogPageHtml, {}))
- this.$(".accordion-body", this.$el).hide()
+ this.$(".accordion-body", this.$el).slideUp()
this.renderLocationsAccordion()
this.refresh()
return this
@@ -90,16 +90,16 @@ define([
var hidden = elt.next()[0].style.display!='block'
elt.parent().parent().find('.accordion-head').removeClass('active')
if (animation)
- elt.parent().parent().find('.accordion-body').hide('fast')
+ elt.parent().parent().find('.accordion-body').slideUp('fast')
else
- elt.parent().parent().find('.accordion-body').hide()
+ elt.parent().parent().find('.accordion-body').slideUp()
if (hidden) {
elt.addClass('active')
if (animation)
- elt.next().show('fast')
+ elt.next().slideDown('fast')
else
- elt.next().show()
+ elt.next().slideDown()
this.activeAccordion = elt.parent().attr('id')
} else {
@@ -163,7 +163,7 @@ define([
} else if (that.activeAccordion=='locations') {
that.addLocation(event)
} else {
- that.$('#accordion-empty-to-create-info-message').show('slow').delay(2000).hide('slow')
+ that.$('#accordion-empty-to-create-info-message').slideDown('slow').delay(2000).slideUp('slow')
}
},
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b4ddfb57/usage/jsgui/src/main/webapp/assets/js/view/entity-activities.js
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/js/view/entity-activities.js b/usage/jsgui/src/main/webapp/assets/js/view/entity-activities.js
index 9f6e82d..e7473e6 100644
--- a/usage/jsgui/src/main/webapp/assets/js/view/entity-activities.js
+++ b/usage/jsgui/src/main/webapp/assets/js/view/entity-activities.js
@@ -93,12 +93,12 @@ define([
}
},
showFullActivity:function (id) {
- $("#activity-details-none-selected").hide(100);
+ $("#activity-details-none-selected").slideUp(100);
var task = this.collection.get(id);
if (task==null) {
this.activeTask = null;
- $("#activity-details").hide(100);
- $("#activity-details-none-selected").show(100);
+ $("#activity-details").slideUp(100);
+ $("#activity-details-none-selected").slideDown(100);
return;
}
var $ta = this.$("#activity-details textarea");
@@ -111,7 +111,7 @@ define([
});
$("#activity-details").html(html);
}
- $("#activity-details").show(100);
+ $("#activity-details").slideDown(100);
}
});
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b4ddfb57/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html b/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html
index fc7746e..257cbaa 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-generic.html
@@ -1,5 +1,4 @@
-
-<div class="catalog-details catalog-details-generic">
+<div class="catalog-details-generic">
<% if ((typeof title !== 'undefined') && (title.length > 0)) { %>
<h3><%= title %></h3>
http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/b4ddfb57/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-location.html
----------------------------------------------------------------------
diff --git a/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-location.html b/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-location.html
index f655748..c3a3a0f 100644
--- a/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-location.html
+++ b/usage/jsgui/src/main/webapp/assets/tpl/catalog/details-location.html
@@ -1,4 +1,4 @@
-<div class="catalog-details catalog-details-location">
+<div class="catalog-details-location">
<% if ((typeof title !== 'undefined') && (title.length > 0)) { %>
<div class="float-right"><button id="<%= id %>" class="btn btn-danger delete-location">Delete</button></div>