Author: klegacy
Date: Fri Dec 14 16:17:25 2012
New Revision: 1421954
URL: http://svn.apache.org/viewvc?rev=1421954&view=rev
Log:
RAVE-822: Moved alert message to top of page, enlarged and increased display
duration. Added check mark and success class to add widget button
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1421954&r1=1421953&r2=1421954&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages.properties Fri
Dec 14 16:17:25 2012
@@ -164,6 +164,7 @@ page.userprofile.message.success=User pr
page.widget.title=Widget Detail
page.widget.addToPage=Add to Page
+page.widget.addedToPage=Added to Page
page.widget.backToStore=Back to Store
page.widget.marketplace.title=Widget Detail
page.widget.backToMarketplace=Back to Marketplace
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1421954&r1=1421953&r2=1421954&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
Fri Dec 14 16:17:25 2012
@@ -98,7 +98,8 @@
<div id="widgetAdded_${widget.id}"
class="storeButton">
<button class="btn btn-small btn-primary"
id="addWidget_${widget.id}"
-
onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId:
${referringPageId}, buttonId: this.id});">
+
onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId:
${referringPageId}, buttonId: this.id});"
+ data-success="<fmt:message
key="page.widget.addedToPage"/>">
<fmt:message key="page.widget.addToPage"/>
</button>
</div>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp?rev=1421954&r1=1421953&r2=1421954&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
Fri Dec 14 16:17:25 2012
@@ -43,7 +43,8 @@
<div id="widgetAdded_${widget.id}"
class="detailWidgetAdd">
<button class="btn btn-primary btn-large
storeItemButton"
id="addWidget_${widget.id}"
-
onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId:
${referringPageId}, redirectAfterAdd:true});">
+
onclick="rave.api.rpc.addWidgetToPage({widgetId: ${widget.id}, pageId:
${referringPageId}, redirectAfterAdd:true});"
+ data-success="<fmt:message
key="page.widget.addedToPage"/>">
<fmt:message key="page.widget.addToPage"/>
</button>
</div>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js?rev=1421954&r1=1421953&r2=1421954&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js Fri
Dec 14 16:17:25 2012
@@ -874,8 +874,8 @@ var rave = rave || (function () {
$("<div />", {'class':'alert alert-success navbar-spacer',
'text':message})
.hide()
.prependTo("body")
- .css({ position: 'fixed', bottom: '0px', margin:'0 0.5%',
width: '95%', padding:'8px 2%', 'z-index':9999, 'border-radius': '4px 4px 0 0'})
- .fadeIn('fast').delay(5000)
+ .css({ position: 'fixed', top: 0, left: 0, width: 'auto',
'max-width': '60%', 'font-size': '1.25em', padding:'.6em 1em', 'z-index':9999,
'border-radius': '0 0 4px 0'})
+ .fadeIn('fast').delay(8000)
.fadeOut(function () {
$(this).remove();
});
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js?rev=1421954&r1=1421953&r2=1421954&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_api.js
Fri Dec 14 16:17:25 2012
@@ -260,6 +260,12 @@ rave.api = rave.api || (function() {
args.successCallback(result.result.id);
}
rave.showInfoMessage(widgetTitle + ' ' +
rave.getClientMessage("widget.add_suffix"));
+
+ // Update Add Widget button to reflect status
+ var addWidgetButton = "#addWidget_" + args.widgetId;
+ var addedText = '<i class="icon icon-ok
icon-white"></i> ' + $(addWidgetButton).data('success');
+
+
$(addWidgetButton).removeClass("btn-primary").addClass("btn-success").html(addedText);
}
}).error(handleError);
}
