Author: scottbw
Date: Wed Aug 8 13:19:56 2012
New Revision: 1370755
URL: http://svn.apache.org/viewvc?rev=1370755&view=rev
Log:
Added external marketplace URL to portal preferences; currently this doesn't
"do" anything, but will eventually allow adding widgets from an external
marketplace from the Add New Widget tabs.
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
rave/trunk/rave-portal-resources/src/main/resources/messages.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
Modified:
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java?rev=1370755&r1=1370754&r2=1370755&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
(original)
+++
rave/trunk/rave-components/rave-web/src/main/java/org/apache/rave/portal/web/model/PortalPreferenceForm.java
Wed Aug 8 13:19:56 2012
@@ -28,6 +28,7 @@ import static org.apache.rave.portal.web
import static
org.apache.rave.portal.web.util.PortalPreferenceKeys.JAVASCRIPT_DEBUG_MODE;
import static org.apache.rave.portal.web.util.PortalPreferenceKeys.PAGE_SIZE;
import static
org.apache.rave.portal.web.util.PortalPreferenceKeys.TITLE_SUFFIX;
+import static
org.apache.rave.portal.web.util.PortalPreferenceKeys.EXTERNAL_MARKETPLACE_URL;
/**
* Form object for portal preferences
@@ -38,6 +39,7 @@ public class PortalPreferenceForm {
public static final String DEFAULT_TITLE_SUFFIX = "";
public static final String DEFAULT_JAVASCRIPT_DEBUG_MODE = "1";
public static final String DEFAULT_INITIAL_WIDGET_STATUS = "PREVIEW";
+ public static final String DEFAULT_EXTERNAL_MARKETPLACE_URL = "";
private Map<String, PortalPreference> preferenceMap;
@@ -61,9 +63,20 @@ public class PortalPreferenceForm {
if (getInitialWidgetStatus() == null){
preferenceMap.put(INITIAL_WIDGET_STATUS, new
PortalPreferenceImpl(INITIAL_WIDGET_STATUS, DEFAULT_INITIAL_WIDGET_STATUS));
}
+ if (getExternalMarketplaceUrl() == null){
+ preferenceMap.put(EXTERNAL_MARKETPLACE_URL, new
PortalPreferenceImpl(EXTERNAL_MARKETPLACE_URL,
DEFAULT_EXTERNAL_MARKETPLACE_URL));
+ }
}
- public PortalPreference getInitialWidgetStatus(){
+ public PortalPreference getExternalMarketplaceUrl() {
+ return preferenceMap.get(EXTERNAL_MARKETPLACE_URL);
+ }
+
+ public void setExternalMarketplaceUrl(PortalPreference
externalMarketplaceUrl){
+ preferenceMap.put(EXTERNAL_MARKETPLACE_URL, externalMarketplaceUrl);
+ }
+
+ public PortalPreference getInitialWidgetStatus(){
return preferenceMap.get(INITIAL_WIDGET_STATUS);
}
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=1370755&r1=1370754&r2=1370755&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages.properties Wed
Aug 8 13:19:56 2012
@@ -273,6 +273,7 @@ admin.preferencedetail.title=Rave admin
admin.preferencedetail.initialWidgetStatus=Initial status to use for new
widgets
admin.preferencedetail.initialWidgetStatus.preview=PREVIEW
admin.preferencedetail.initialWidgetStatus.published=PUBLISHED
+admin.preferencedetail.externalMarketplaceUrl=Location (URL) of external
widget marketplace
admin.preferencedetail.titleSuffix=Page title suffix
admin.preferencedetail.pageSize=Number of items per page (list)
admin.preferencedetail.pageSize.malformed=Enter a whole number greater than 0
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp?rev=1370755&r1=1370754&r2=1370755&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
Wed Aug 8 13:19:56 2012
@@ -88,9 +88,18 @@
<form:option
value="PUBLISHED"><fmt:message
key="admin.preferencedetail.initialWidgetStatus.published"/></form:option>
</form:select>
</div>
- <form:errors
path="javaScriptDebugMode.value" cssClass="error"/>
+ <form:errors
path="initialWidgetStatus.value" cssClass="error"/>
</spring:bind>
- </div>
+ </div>
+ <div class="control-group">
+ <form:label path="externalMarketplaceUrl.value"
class="control-label">
+ <fmt:message
key="admin.preferencedetail.externalMarketplaceUrl"/>
+ </form:label>
+ <div class="controls">
+ <form:input
path="externalMarketplaceUrl.value"/>
+ </div>
+ <form:errors
path="externalMarketplaceUrl.value" cssClass="error"/>
+ </div>
<fieldset>
<fmt:message
key="admin.preferencedetail.updateButton" var="updateButtonText"/>
<button class="btn btn-primary" type="submit"
value="${updateButtonText}">${updateButtonText}</button>
