Author: carlucci
Date: Tue Oct 2 19:43:37 2012
New Revision: 1393134
URL: http://svn.apache.org/viewvc?rev=1393134&view=rev
Log:
RAVE-802: Make it easier to set default height of widgets through database
preference. Patch supplied by Dan Gornstein
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
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/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/db/initial_data.sql
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/admin/preferencedetail.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_wookie.js
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java?rev=1393134&r1=1393133&r2=1393134&view=diff
==============================================================================
---
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
(original)
+++
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/web/util/PortalPreferenceKeys.java
Tue Oct 2 19:43:37 2012
@@ -29,4 +29,5 @@ public final class PortalPreferenceKeys
public static final String JAVASCRIPT_DEBUG_MODE = "javaScriptDebugMode";
public static final String INITIAL_WIDGET_STATUS = "initialWidgetStatus";
public static final String EXTERNAL_MARKETPLACE_URL =
"externalMarketplaceUrl";
+ public static final String WIDGET_HEIGHT = "defaultWidgetHeight";
}
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=1393134&r1=1393133&r2=1393134&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
Tue Oct 2 19:43:37 2012
@@ -24,11 +24,7 @@ import org.apache.rave.portal.model.impl
import java.util.Map;
-import static
org.apache.rave.portal.web.util.PortalPreferenceKeys.INITIAL_WIDGET_STATUS;
-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;
+import static org.apache.rave.portal.web.util.PortalPreferenceKeys.*;
/**
* Form object for portal preferences
@@ -38,6 +34,7 @@ public class PortalPreferenceForm {
public static final String DEFAULT_PAGE_SIZE = "10";
public static final String DEFAULT_TITLE_SUFFIX = "";
public static final String DEFAULT_JAVASCRIPT_DEBUG_MODE = "1";
+ public static final String DEFAULT_WIDGET_HEIGHT = "250";
public static final String DEFAULT_INITIAL_WIDGET_STATUS = "PREVIEW";
public static final String DEFAULT_EXTERNAL_MARKETPLACE_URL = "";
@@ -66,6 +63,9 @@ public class PortalPreferenceForm {
if (getExternalMarketplaceUrl() == null){
preferenceMap.put(EXTERNAL_MARKETPLACE_URL, new
PortalPreferenceImpl(EXTERNAL_MARKETPLACE_URL,
DEFAULT_EXTERNAL_MARKETPLACE_URL));
}
+ if(getDefaultWidgetHeight() == null){
+ preferenceMap.put(WIDGET_HEIGHT, new
PortalPreferenceImpl(WIDGET_HEIGHT, DEFAULT_WIDGET_HEIGHT));
+ }
}
public PortalPreference getExternalMarketplaceUrl() {
@@ -88,6 +88,14 @@ public class PortalPreferenceForm {
preferenceMap.put(PAGE_SIZE, pageSize);
}
+ public PortalPreference getDefaultWidgetHeight(){
+ return preferenceMap.get(WIDGET_HEIGHT);
+ }
+
+ public void setDefaultWidgetHeight(PortalPreference widgetHeight){
+ preferenceMap.put(WIDGET_HEIGHT, widgetHeight);
+ }
+
public PortalPreference getTitleSuffix() {
return preferenceMap.get(TITLE_SUFFIX);
}
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=1393134&r1=1393133&r2=1393134&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/messages.properties
(original)
+++ rave/trunk/rave-portal-resources/src/main/resources/messages.properties Tue
Oct 2 19:43:37 2012
@@ -281,6 +281,7 @@ admin.preferencedetail.initialWidgetStat
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.defaultWidgetHeight=Default widget height
admin.preferencedetail.pageSize.malformed=Enter a whole number greater than 0
admin.preferencedetail.javaScriptDebugMode=JavaScript Debug Mode
admin.preferencedetail.javaScriptDebugMode.true=Enabled
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=1393134&r1=1393133&r2=1393134&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
Tue Oct 2 19:43:37 2012
@@ -283,6 +283,7 @@ admin.preferences.shorttitle=Preferencia
admin.preferences.edit=Editar preferencias
admin.preferencedetail.title=Interfaz de administraci\u00F3n Rave -
Preferencias
admin.preferencedetail.titleSuffix=Sufijo del titulo de la pagina
+admin.preferencedetail.defaultWidgetHeight=Altura predeterminada Widget
admin.preferencedetail.pageSize=Numero de items por pagina (lista)
admin.preferencedetail.pageSize.malformed=Entre un numero valido superior a 0
admin.preferencedetail.javaScriptDebugMode=Modo de Debug de JavaScript
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=1393134&r1=1393133&r2=1393134&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
Tue Oct 2 19:43:37 2012
@@ -288,6 +288,7 @@ admin.preferencedetail.title=Rave admin
admin.preferencedetail.titleSuffix=Toevoeging pagina titel
admin.preferencedetail.pageSize=Aantal items per pagina (lijst)
admin.preferencedetail.pageSize.malformed=Voer een geheel getal in groter dan 0
+admin.preferencedetail.defaultWidgetHeight=Standaard widget hoogte
admin.preferencedetail.javaScriptDebugMode=JavaScript Debug Mode
admin.preferencedetail.javaScriptDebugMode.true=Ingeschakeld
admin.preferencedetail.javaScriptDebugMode.false=Uitgeschakeld
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1393134&r1=1393133&r2=1393134&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
Tue Oct 2 19:43:37 2012
@@ -1116,6 +1116,13 @@ values (@next_portal_preference_id, 'jav
INSERT INTO portal_preference_values
values (@next_portal_preference_id, '1');
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@portal_preference_seq;
+
+set @next_portal_preference_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES
WHERE seq_name = @portal_preference_seq);
+INSERT INTO portal_preference (entity_id, preference_key)
+values (@next_portal_preference_id, 'defaultWidgetHeight');
+INSERT INTO portal_preference_values
+values (@next_portal_preference_id, '250');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name =
@portal_preference_seq;
-- end portal preferences
-- category
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=1393134&r1=1393133&r2=1393134&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
Tue Oct 2 19:43:37 2012
@@ -63,6 +63,17 @@
</spring:bind>
<form:errors path="pageSize.value"
cssClass="error"/>
</div>
+ <div class="control-group">
+ <spring:bind path="defaultWidgetHeight.value">
+ <label for="defaultWidgetHeight"
class="control-label">
+ <fmt:message
key="admin.preferencedetail.defaultWidgetHeight"/> *
+ </label>
+ <div class="controls">
+ <input id="defaultWidgetHeight"
name="defaultWidgetHeight.value" type="number" step="1" value="<c:out
value="${status.value}"/>"/>
+ </div>
+ </spring:bind>
+ <form:errors path="defaultWidgetHeight.value"
cssClass="error"/>
+ </div>
<div class="control-group">
<spring:bind path="javaScriptDebugMode.value">
<form:label
path="javaScriptDebugMode.value" class="control-label">
@@ -110,4 +121,4 @@
</article>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag?rev=1393134&r1=1393133&r2=1393134&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/rave_js.tag
Tue Oct 2 19:43:37 2012
@@ -50,6 +50,8 @@
rave.setContext("<spring:url value="/app/" />");
<%-- set the javascript debug mode so js code has access to it --%>
rave.setJavaScriptDebugMode(<c:out value="${jsDebugMode}"/>);
+ <%-- set the default widget height so js code has access to it --%>
+ rave.setDefaultWidgetHeight(<c:out
value="${portalSettings['defaultWidgetHeight'].value}"/>);
<%-- set the current page viewer --%>
<sec:authorize access="isAuthenticated()">
<sec:authentication property="principal.username" scope="request"
var="username"/>
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=1393134&r1=1393133&r2=1393134&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 Tue
Oct 2 19:43:37 2012
@@ -36,6 +36,8 @@ var rave = rave || (function () {
};
// JS debug mode is off by default
var javaScriptDebugMode = 0;
+ //Assigning a default value of 250 if unable to get value from the DB
+ var defaultWidgetHeight = 250;
var onWidgetsInitializedHandlers = [];
var onProvidersInitializedHandlers = [];
var onUIInitializedHandlers = [];
@@ -1108,6 +1110,14 @@ var rave = rave || (function () {
return javaScriptDebugMode;
}
+ function setDefaultWidgetHeight(widgetHeight) {
+ defaultWidgetHeight = widgetHeight;
+ }
+
+ function getDefaultWidgetHeight(){
+ return defaultWidgetHeight;
+ }
+
function setPageViewer(viewer) {
pageViewer = viewer;
}
@@ -1327,6 +1337,12 @@ var rave = rave || (function () {
*/
setJavaScriptDebugMode: setJavaScriptDebugMode,
+ /*Gets the value of the Default Widget Height*/
+ getDefaultWidgetHeight: getDefaultWidgetHeight,
+
+ /*Sets the value of the Default Widget Height*/
+ setDefaultWidgetHeight: setDefaultWidgetHeight,
+
/**
* Sets the authenticated page viewer for the Rave web application
*
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js?rev=1393134&r1=1393133&r2=1393134&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_opensocial.js
Tue Oct 2 19:43:37 2012
@@ -20,7 +20,6 @@ var rave = rave || {};
rave.opensocial = rave.opensocial || (function () {
var WIDGET_TYPE = "OpenSocial";
var OFFSET = 10;
- var MIN_HEIGHT = 250;
var VIEW_NAMES = {
CANVAS:"canvas",
DEFAULT:"default",
@@ -236,7 +235,7 @@ rave.opensocial = rave.opensocial || (fu
var elem = document.getElementById("widget-" + id + "-wrapper");
// determine the height of the gadget's iframe
- var height = MIN_HEIGHT;
+ var height = rave.getDefaultWidgetHeight();
if (view == rave.opensocial.VIEW_NAMES.CANVAS) {
height = elem.clientHeight;
} else if (gadget.metadata.modulePrefs &&
gadget.metadata.modulePrefs.height) {
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_wookie.js
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_wookie.js?rev=1393134&r1=1393133&r2=1393134&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_wookie.js
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/static/script/rave_wookie.js
Tue Oct 2 19:43:37 2012
@@ -20,7 +20,6 @@ var rave = rave || {};
rave.wookie = rave.wookie || (function() {
var WIDGET_TYPE = "W3C";
var OFFSET = 10;
- var MIN_HEIGHT = 250;
// keep this value so we can show the widget in the maximize view even
when its collapsed
var userCollapsed;
var container;
@@ -34,7 +33,7 @@ rave.wookie = rave.wookie || (function()
userCollapsed = widget.collapsed;
var widgetBodyElement = document.getElementById(["widget-",
widget.regionWidgetId, "-body"].join(""));
- var height = MIN_HEIGHT;
+ var height = rave.getDefaultWidgetHeight();
if (widget.height) height = widget.height;
//
@@ -66,7 +65,7 @@ rave.wookie = rave.wookie || (function()
scroll: "no",
frameborder: 0,
height: height,
- "min-height": ""+MIN_HEIGHT+"px"
+ "min-height": ""+rave.getDefaultWidgetHeight()+"px"
},
uri: widget.widgetUrl,
onGadgetLoad: "onWidget"+widget.regionWidgetId+"Load"
