You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ca...@apache.org on 2012/01/06 00:50:35 UTC
svn commit: r1227898 - in
/incubator/rave/trunk/rave-portal-resources/src/main: resources/
webapp/WEB-INF/jsp/views/ webapp/WEB-INF/tags/ webapp/css/
Author: carlucci
Date: Thu Jan 5 23:50:34 2012
New Revision: 1227898
URL: http://svn.apache.org/viewvc?rev=1227898&view=rev
Log:
RAVE-407: Improve visibility of disabled Widget state
Modified:
incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties
incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties?rev=1227898&r1=1227897&r2=1227898&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/resources/messages.properties Thu Jan 5 23:50:34 2012
@@ -186,15 +186,15 @@ widget.author=Author
widget.authorEmail=Author's email address
widget.description=Description
widget.description.required=Description is required
-widget.disableRendering=Disable Gadget
-widget.disableRenderingMessage=Disable Gadget Message
+widget.disableRendering=Disable Widget
+widget.disableRenderingMessage=Disable Widget Message
widget.screenshotUrl=Screenshot
widget.screenshotUrl.malformed=URL is malformed
widget.thumbnailUrl=Thumbnail
widget.thumbnailUrl.malformed=URL is malformed
widget.title=Title
widget.title.required=Title is required
-widget.titleUrl=URL the gadget title links to
+widget.titleUrl=URL the widget title links to
widget.titleUrl.malformed=URL is malformed
widget.type=Type
widget.type.OpenSocial=OpenSocial
@@ -209,6 +209,7 @@ widget.widgetStatus.PREVIEW=This widget
widget.widgetStatus.PUBLISHED=
widget.chrome.toggle=Collapse/Restore Widget
+widget.chrome.disabled=This widget is currently disabled
widget.menu.about=About this Widget
widget.menu.delete=Delete Widget
Modified: incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1227898&r1=1227897&r2=1227898&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties Thu Jan 5 23:50:34 2012
@@ -218,6 +218,7 @@ widget.widgetStatus.PREVIEW=Deze widget
widget.widgetStatus.PUBLISHED=
widget.chrome.toggle=In-/uitklappen widget
+widget.chrome.disabled=Deze widget is momenteel uitgeschakeld
widget.menu.about=Over deze widget
widget.menu.delete=Verwijder widget
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp?rev=1227898&r1=1227897&r2=1227898&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/store.jsp Thu Jan 5 23:50:34 2012
@@ -172,7 +172,12 @@
href="<spring:url value="/app/store/widget/${widget.entityId}" />?referringPageId=${referringPageId}">
<c:out value="${widget.title}"/>
</a>
-
+ <c:if test="${widget.disableRendering}">
+ <div class="storeWidgetDisabled">
+ <span class="widget-disabled-icon-store ui-icon ui-icon-alert" title="<fmt:message key="widget.chrome.disabled"/>"></span>
+ <c:out value="${widget.disableRenderingMessage}" escapeXml="true" />
+ </div>
+ </c:if>
<c:if test="${not empty widget.author}">
<div class="storeWidgetAuthor"><fmt:message key="widget.author"/>: <c:out
value="${widget.author}"/></div>
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp?rev=1227898&r1=1227897&r2=1227898&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.jsp Thu Jan 5 23:50:34 2012
@@ -103,7 +103,12 @@
</div>
</c:when>
</c:choose>
-
+ <c:if test="${widget.disableRendering}">
+ <div class="storeWidgetDisabled">
+ <span class="widget-disabled-icon-store ui-icon ui-icon-alert" title="<fmt:message key="widget.chrome.disabled"/>"></span>
+ <c:out value="${widget.disableRenderingMessage}" escapeXml="true" />
+ </div>
+ </c:if>
<c:if test="${not empty widget.author}">
<p class="storeWidgetAuthor">
<fmt:message key="widget.author"/>
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag?rev=1227898&r1=1227897&r2=1227898&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag Thu Jan 5 23:50:34 2012
@@ -72,6 +72,10 @@ Template for rendering a RegionWidget in
<button id="widget-${regionWidget.entityId}-min"
class="widget-toolbar-btn widget-toolbar-btn-min"></button>
</div>
+ <%-- if widget is disabled then display notification in titlebar --%>
+ <c:if test="${regionWidget.widget.disableRendering}">
+ <span id="widget-${regionWidget.entityId}-disabled" class="widget-disabled-icon ui-icon ui-icon-alert" title="<fmt:message key="widget.chrome.disabled"/>"></span>
+ </c:if>
</div>
<div class="widget-prefs" id="widget-${regionWidget.entityId}-prefs-content"></div>
<div class="widget" id="widget-${regionWidget.entityId}-body">
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css?rev=1227898&r1=1227897&r2=1227898&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css Thu Jan 5 23:50:34 2012
@@ -265,6 +265,17 @@ header h1 {
text-decoration: underline;
}
+.widget-disabled-icon {
+ float: right;
+ cursor: default;
+}
+
+.widget-disabled-icon-store {
+ cursor: default;
+ display: inline-block;
+ vertical-align: middle;
+}
+
/*** various widget preference related classes ***/
.widget-prefs {
border: 1px solid #D3D3D3;
@@ -529,6 +540,13 @@ ul.storeItems li{
margin: 1em 0;
}
+.storeWidgetDisabled {
+ background-color: #FCE8D7;
+ border: 1px solid #B3C4CF;
+ margin: 3px;
+ padding: 3px;
+}
+
.widgetRating {
margin: 1em 0;
}