You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ps...@apache.org on 2012/11/01 15:46:33 UTC
svn commit: r1404617 - in /rave/trunk/rave-portal-resources/src/main:
resources/messages.properties resources/messages_es.properties
resources/messages_nl.properties
webapp/WEB-INF/jsp/views/widget.marketplace.jsp
Author: psharples
Date: Thu Nov 1 14:46:33 2012
New Revision: 1404617
URL: http://svn.apache.org/viewvc?rev=1404617&view=rev
Log:
Small update so that if a widget detail is not available, a notification will appear rather than the rave "meltdown" message. See RAVE-748.
Modified:
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties
rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp
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=1404617&r1=1404616&r2=1404617&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages.properties Thu Nov 1 14:46:33 2012
@@ -168,6 +168,7 @@ page.widget.backToStore=Back to Store
page.widget.marketplace.title=Widget Detail
page.widget.backToMarketplace=Back to Marketplace
page.widget.marketplace.addToStore=Add Widget to Store
+page.widget.marketplace.showdetail.notavailable=Unable to show the detail page for this widget. This may be because the marketplace provider does not provide a detail view.
page.widget.widgetPreview=Widget Preview
page.widget.comments=Comments
page.widget.comment.edit=Edit Comment
Modified: rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties?rev=1404617&r1=1404616&r2=1404617&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages_es.properties Thu Nov 1 14:46:33 2012
@@ -177,6 +177,7 @@ page.widget.backToStore=Volver a la Tien
page.widget.marketplace.title=Detalle de Widget
page.widget.backToMarketplace=Volver a mercado
page.widget.marketplace.addToStore=Anadir Widget a tienda
+page.widget.marketplace.showdetail.notavailable=No se puede mostrar la pagina de detalles para este widget. Esto puede ser debido a que el proveedor de mercado no proporciona una vista de detalle.
page.widget.widgetPreview=Widget previsualizacion
page.widget.rate=Valoracion\:
page.widget.rate.likebtn=Me <span>agrada</span>
Modified: rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties?rev=1404617&r1=1404616&r2=1404617&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages_nl.properties Thu Nov 1 14:46:33 2012
@@ -180,6 +180,7 @@ page.widget.backToStore=Terug naar de wi
page.widget.marketplace.title=Widgetdetail
page.widget.backToMarketplace=Terug naar marktplaats
page.widget.marketplace.addToStore=Toevoegen Widget aan archief
+page.widget.marketplace.showdetail.notavailable=Kan het detail pagina te tonon voor deze widget. Dit kan zijn omdat de markt provider biedt geen detailweergave.
page.widget.widgetPreview=Widget voorvertoning
page.widget.rate=Waardering:
page.widget.rate.likebtn=Leuk
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp?rev=1404617&r1=1404616&r2=1404617&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/widget.marketplace.jsp Thu Nov 1 14:46:33 2012
@@ -19,8 +19,29 @@
<%@ page language="java" trimDirectiveWhitespaces="true" %>
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
+<c:choose>
+ <c:when test="${not empty errorMessage}">
+ <rave:navbar/>
+ <div id="na_content" class="container">
+ <div class="row detail-widget storeItem">
+ <div class="span3">
+ <div class="detail-widget-preview">
+ <div class="span8 detail-widget-main">
+ <div>
+ <h2>
+ <fmt:message key="page.widget.title"/>
+ </h2>
+ <br/>
+ <span id="widget-0-title"><fmt:message key="page.widget.marketplace.showdetail.notavailable"/></span>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </c:when>
+<c:otherwise>
<rave:navbar pageTitle="${widget.title}"/>
-
<div id="na_content" class="container">
<div class="row detail-widget storeItem">
<div class="span3">
@@ -93,3 +114,5 @@
});
</script>
</portal:register-init-script>
+</c:otherwise>
+</c:choose>