You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ve...@apache.org on 2012/05/08 16:56:18 UTC
svn commit: r1335557 - in /rave/trunk:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-portal-resources/src/main/webapp/WEB-INF/db/
rave-portal-resources/src/main/webapp/WEB-INF/tags/
rave-providers/rave-opensocial-provider/r...
Author: venkatm
Date: Tue May 8 14:56:17 2012
New Revision: 1335557
URL: http://svn.apache.org/viewvc?rev=1335557&view=rev
Log:
RAVE-612 - Add ability to hide/display the widget title
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java?rev=1335557&r1=1335556&r2=1335557&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/PageTemplateWidget.java Tue May 8 14:56:17 2012
@@ -57,6 +57,10 @@ public class PageTemplateWidget implemen
@Column(name = "locked")
private boolean locked;
+ @Basic(optional = false)
+ @Column(name = "render_title")
+ private boolean renderTitle;
+
@Override
public Long getEntityId() {
return entityId;
@@ -98,4 +102,12 @@ public class PageTemplateWidget implemen
public void setLocked(boolean locked) {
this.locked = locked;
}
+
+ public boolean isRenderTitle() {
+ return renderTitle;
+ }
+
+ public void setRenderTitle(boolean renderTitle) {
+ this.renderTitle = renderTitle;
+ }
}
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java?rev=1335557&r1=1335556&r2=1335557&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/model/RegionWidget.java Tue May 8 14:56:17 2012
@@ -79,6 +79,10 @@ public class RegionWidget implements Bas
@Column(name = "locked")
private boolean locked;
+ @Basic(optional = false)
+ @Column(name = "render_title")
+ private boolean renderTitle;
+
public RegionWidget() {
}
@@ -205,6 +209,14 @@ public class RegionWidget implements Bas
this.locked = locked;
}
+ public boolean isRenderTitle() {
+ return renderTitle;
+ }
+
+ public void setRenderTitle(boolean renderTitle) {
+ this.renderTitle = renderTitle;
+ }
+
@Override
public boolean equals(Object obj) {
if (obj == null) {
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=1335557&r1=1335556&r2=1335557&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 May 8 14:56:17 2012
@@ -437,28 +437,28 @@ values (@page_1_region_3, @page_1_id, 3,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed)
-values (@next_region_widget, @ohloh_stats_widget_id, @page_1_region_1, 0, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, render_title)
+values (@next_region_widget, @ohloh_stats_widget_id, @page_1_region_1, 0, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed)
-values (@next_region_widget, @ohloh_factoids_widget_id, @page_1_region_2, 0, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, render_title)
+values (@next_region_widget, @ohloh_factoids_widget_id, @page_1_region_2, 0, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @nyt_widget_id, @page_1_region_3, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @nyt_widget_id, @page_1_region_3, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed)
-values (@next_region_widget, @ohloh_cocomo_widget_id, @page_1_region_3, 1, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, render_title)
+values (@next_region_widget, @ohloh_cocomo_widget_id, @page_1_region_3, 1, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed)
-values (@next_region_widget, @youtube_widget_id, @page_1_region_3, 1, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, render_title)
+values (@next_region_widget, @youtube_widget_id, @page_1_region_3, 1, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
@@ -478,18 +478,18 @@ values (@page_2_region_2, @page_2_id, 2,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed)
-values (@next_region_widget, @my_activity_widget_id, @page_2_region_1, 0, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, render_title)
+values (@next_region_widget, @my_activity_widget_id, @page_2_region_1, 0, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed)
-values (@next_region_widget, @activity_streams_widget_id, @page_2_region_1, 1, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, render_title)
+values (@next_region_widget, @activity_streams_widget_id, @page_2_region_1, 1, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed)
-values (@next_region_widget, @twitter_widget_id, @page_2_region_2, 1, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, render_title)
+values (@next_region_widget, @twitter_widget_id, @page_2_region_2, 1, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
-- person profile page for user 1
@@ -518,23 +518,23 @@ values (@page_1_region_3, @page_1_id, 3,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_1_region_1, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_1_region_1, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_1_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_1_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @nyt_widget_id, @page_1_region_3, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @nyt_widget_id, @page_1_region_3, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End john.doe user_id_2 layout ---
@@ -560,23 +560,23 @@ values (@page_1_region_3, @page_1_id, 3,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_1_region_1, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_1_region_1, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_1_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_1_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_1_region_3, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_1_region_3, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End jane.doe user_id_3 layout ---
@@ -613,23 +613,23 @@ values (@page_1_region_2, @page_1_id, 2,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_1_region_1, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_1_region_1, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_1_region_1, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_1_region_1, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_1_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_1_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_1_region_2, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_1_region_2, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End user_id_6 layout ---
@@ -646,13 +646,13 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_7_region_1, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_7_region_1, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_7_region_1, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_7_region_1, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.one user_id_7 layout ---
@@ -673,23 +673,23 @@ values (@page_8_region_2, @page_8_id, 2,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_8_region_1, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_8_region_1, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_8_region_1, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_8_region_1, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_8_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_8_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_8_region_2, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_8_region_2, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.twown user_id_8 layout ---
@@ -715,23 +715,23 @@ values (@page_9_region_3, @page_9_id, 3,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_9_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_9_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_9_region_3, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_9_region_3, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_9_region_1, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_9_region_1, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_9_region_1, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_9_region_1, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.three user_id_9 layout ---
@@ -757,23 +757,23 @@ values (@page_10_region_3, @page_10_id,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_10_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_10_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_10_region_3, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_10_region_3, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_10_region_1, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_10_region_1, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_10_region_1, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_10_region_1, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.threewn user_id_10 layout ---
@@ -804,23 +804,23 @@ values (@page_11_region_4, @page_11_id,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_11_region_4, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_11_region_4, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_11_region_3, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_11_region_3, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_11_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_11_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_11_region_1, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_11_region_1, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.four user_id_11 layout ---
@@ -852,23 +852,23 @@ values (@page_12_region_4, @page_12_id,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_12_region_4, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_12_region_4, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_12_region_3, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_12_region_3, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_12_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_12_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_12_region_1, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_12_region_1, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.fourwn user_id_12 layout ---
@@ -899,23 +899,23 @@ values (@page_13_region_4, @page_13_id,
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @hamster_widget_id, @page_13_region_4, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @hamster_widget_id, @page_13_region_4, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @tabnews_widget_id, @page_13_region_3, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @tabnews_widget_id, @page_13_region_3, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @wikipedia_widget_id, @page_13_region_2, 0, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @wikipedia_widget_id, @page_13_region_2, 0, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
set @next_region_widget = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_widget_seq);
-INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked)
-values (@next_region_widget, @translate_widget_id, @page_13_region_1, 1, FALSE, FALSE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, render_title)
+values (@next_region_widget, @translate_widget_id, @page_13_region_1, 1, FALSE, FALSE, TRUE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End openid user_id_13 layout ---
@@ -1036,13 +1036,13 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- widgets
set @next_person_profile_page_template_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_template_widget_seq);
-insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked)
-values (@next_person_profile_page_template_widget_id, @person_profile_page_template_region_id, 0, @my_groups_widget_id, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, render_title)
+values (@next_person_profile_page_template_widget_id, @person_profile_page_template_region_id, 0, @my_groups_widget_id, true, true);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
set @next_person_profile_page_template_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_template_widget_seq);
-insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked)
-values (@next_person_profile_page_template_widget_id, @person_profile_page_template_region_id, 1, @work_experience_widget_id, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, render_title)
+values (@next_person_profile_page_template_widget_id, @person_profile_page_template_region_id, 1, @work_experience_widget_id, true, true);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
------------------------------------------
@@ -1062,13 +1062,13 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- widgets
set @next_person_profile_subpage1_template_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_template_widget_seq);
-insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked)
-values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 0, @favorite_websites_widget_id, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, render_title)
+values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 0, @favorite_websites_widget_id, true, true);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
set @next_person_profile_subpage1_template_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_template_widget_seq);
-insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked)
-values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 1, @schedule_widget_id, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, render_title)
+values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 1, @schedule_widget_id, true, true);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
--------------------------------------------------
@@ -1088,6 +1088,6 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
-- widgets
set @next_person_profile_subpage2_template_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_template_widget_seq);
-insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked)
-values (@next_person_profile_subpage2_template_widget_id, @person_profile_subpage2_template_region_id, 0, @my_activity_widget_id, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, render_title)
+values (@next_person_profile_subpage2_template_widget_id, @person_profile_subpage2_template_region_id, 0, @my_activity_widget_id, true, true);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag?rev=1335557&r1=1335556&r2=1335557&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag Tue May 8 14:56:17 2012
@@ -27,76 +27,81 @@ Template for rendering a RegionWidget in
<%@ attribute name="regionWidget" type="org.apache.rave.portal.model.RegionWidget" required="true" description="The regionWidget object" %>
<c:set var="isLocked" value="${regionWidget.locked}" />
+<c:set var="renderTitle" value="${regionWidget.renderTitle}" />
<fmt:setBundle basename="messages"/>
<%--@elvariable id="regionWidget" type="org.apache.rave.portal.model.RegionWidget"--%>
<div class="widget-wrapper<c:if test="${isLocked}"> widget-wrapper-locked</c:if>" id="widget-${regionWidget.entityId}-wrapper">
- <div class="widget-title-bar<c:if test="${isLocked}"> widget-title-bar-locked</c:if>">
- <c:if test="${!isLocked}">
- <div id="widget-${regionWidget.entityId}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></div>
- </c:if>
- <div id="widget-${regionWidget.entityId}-title" class="widget-title">
- <c:choose>
- <c:when test="${not empty regionWidget.widget.titleUrl}">
- <a href="<c:out value="${regionWidget.widget.titleUrl}"/>" rel="external"><c:out value="${regionWidget.widget.title}"/></a>
- </c:when>
- <c:otherwise>
- <c:out value="${regionWidget.widget.title}"/>
- </c:otherwise>
- </c:choose>
- </div>
- <%-- These are toolbar buttons --%>
- <div id="widget-${regionWidget.entityId}-toolbar" class="widget-toolbar <c:if test="${isLocked}">hidden</c:if>">
- <div id="widget-${regionWidget.entityId}-widget-menu-wrapper" class="dropdown widget-menu-wrapper">
- <a id="widget-${regionWidget.entityId}-menu-button" class="dropdown-toggle" data-toggle="dropdown">
- <i class="icon-cog"></i>
- </a>
- <ul id="widget-${regionWidget.entityId}-menu" class="dropdown-menu widget-menu">
- <%--
- By default the edit prefs item is disabled.
- Each provider's widget initialization will be responsible for enabling this item
- if the widget has preferences to be edited
- --%>
- <li id="widget-${regionWidget.entityId}-menu-editprefs-item" class="menu-item-disabled">
- <a href="#">
- <fmt:message key="widget.menu.editprefs"/>
- </a>
- </li>
- <li id="widget-${regionWidget.entityId}-menu-maximize-item">
- <a href="#">
- <fmt:message key="widget.menu.maximize"/>
- </a>
- </li>
- <li id="widget-${regionWidget.entityId}-menu-move-item" <c:if test='${hasOnlyOnePage}'>class="menu-item-disabled"</c:if>>
- <a href="#">
- <fmt:message key="widget.menu.movetopage"/>
- </a>
- </li>
- <li id="widget-${regionWidget.entityId}-menu-delete-item">
- <a href="#">
- <fmt:message key="widget.menu.delete"/>
- </a>
- </li>
- <li class="divider"></li>
- <li id="widget-${regionWidget.entityId}-menu-about-item">
- <a href="#">
- <fmt:message key="widget.menu.about"/>
- </a>
- </li>
- </ul>
+ <c:if test="${renderTitle}">
+ <div class="widget-title-bar<c:if test="${isLocked}"> widget-title-bar-locked</c:if>">
+ <c:if test="${!isLocked}">
+ <div id="widget-${regionWidget.entityId}-collapse" class="widget-toolbar-toggle-collapse" title="<fmt:message key="widget.chrome.toggle"/>"></div>
+ </c:if>
+ <div id="widget-${regionWidget.entityId}-title" class="widget-title">
+ <c:choose>
+ <c:when test="${not empty regionWidget.widget.titleUrl}">
+ <a href="<c:out value="${regionWidget.widget.titleUrl}"/>" rel="external"><c:out value="${regionWidget.widget.title}"/></a>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${regionWidget.widget.title}"/>
+ </c:otherwise>
+ </c:choose>
</div>
- <%-- the minimize widget button, which is hidden by default and only displays in maximized view --%>
- <span id="widget-${regionWidget.entityId}-min" class="widget-toolbar-btn widget-toolbar-btn-min">
- <i class="icon-resize-small"></i>
- </span>
+ <%-- These are toolbar buttons --%>
+ <div id="widget-${regionWidget.entityId}-toolbar" class="widget-toolbar <c:if test="${isLocked}">hidden</c:if>">
+ <div id="widget-${regionWidget.entityId}-widget-menu-wrapper" class="dropdown widget-menu-wrapper">
+ <a id="widget-${regionWidget.entityId}-menu-button" class="dropdown-toggle" data-toggle="dropdown">
+ <i class="icon-cog"></i>
+ </a>
+ <ul id="widget-${regionWidget.entityId}-menu" class="dropdown-menu widget-menu">
+ <%--
+ By default the edit prefs item is disabled.
+ Each provider's widget initialization will be responsible for enabling this item
+ if the widget has preferences to be edited
+ --%>
+ <li id="widget-${regionWidget.entityId}-menu-editprefs-item" class="menu-item-disabled">
+ <a href="#">
+ <fmt:message key="widget.menu.editprefs"/>
+ </a>
+ </li>
+ <li id="widget-${regionWidget.entityId}-menu-maximize-item">
+ <a href="#">
+ <fmt:message key="widget.menu.maximize"/>
+ </a>
+ </li>
+ <li id="widget-${regionWidget.entityId}-menu-move-item" <c:if test='${hasOnlyOnePage}'>class="menu-item-disabled"</c:if>>
+ <a href="#">
+ <fmt:message key="widget.menu.movetopage"/>
+ </a>
+ </li>
+ <li id="widget-${regionWidget.entityId}-menu-delete-item">
+ <a href="#">
+ <fmt:message key="widget.menu.delete"/>
+ </a>
+ </li>
+ <li class="divider"></li>
+ <li id="widget-${regionWidget.entityId}-menu-about-item">
+ <a href="#">
+ <fmt:message key="widget.menu.about"/>
+ </a>
+ </li>
+ </ul>
+ </div>
+
+ <%-- the minimize widget button, which is hidden by default and only displays in maximized view --%>
+ <span id="widget-${regionWidget.entityId}-min" class="widget-toolbar-btn widget-toolbar-btn-min">
+ <i class="icon-resize-small"></i>
+ </span>
+ </div>
+
+ <%-- if widget is disabled then display notification in titlebar --%>
+ <c:if test="${regionWidget.widget.disableRendering}">
+ <div id="widget-${regionWidget.entityId}-disabled" class="widget-disabled-icon ui-icon ui-icon-alert" title="<fmt:message key="widget.chrome.disabled"/>"></div>
+ </c:if>
</div>
+ </c:if>
- <%-- if widget is disabled then display notification in titlebar --%>
- <c:if test="${regionWidget.widget.disableRendering}">
- <div id="widget-${regionWidget.entityId}-disabled" class="widget-disabled-icon ui-icon ui-icon-alert" title="<fmt:message key="widget.chrome.disabled"/>"></div>
- </c:if>
- </div>
<div class="widget-prefs" id="widget-${regionWidget.entityId}-prefs-content"></div>
<div class="widget" id="widget-${regionWidget.entityId}-body">
<portal:render-widget regionWidget="${regionWidget}" />
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java?rev=1335557&r1=1335556&r2=1335557&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/main/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRenderer.java Tue May 8 14:56:17 2012
@@ -70,7 +70,8 @@ public class OpenSocialWidgetRenderer im
" userPrefs: %7$s," +
" collapsed: %8$s, " +
" widgetId: %9$s," +
- " locked: %10$s});</script>";
+ " locked: %10$s," +
+ " renderTitle: %11$s});</script>";
private static final String MARKUP = "<!-- RegionWidget %1$s placeholder -->";
@Override
@@ -122,6 +123,7 @@ public class OpenSocialWidgetRenderer im
userPrefs.toString(),
item.isCollapsed(),
item.getWidget().getEntityId(),
- item.isLocked());
+ item.isLocked(),
+ item.isRenderTitle());
}
}
\ No newline at end of file
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java?rev=1335557&r1=1335556&r2=1335557&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-client/src/test/java/org/apache/rave/provider/opensocial/web/renderer/OpenSocialWidgetRendererTest.java Tue May 8 14:56:17 2012
@@ -54,6 +54,7 @@ public class OpenSocialWidgetRendererTes
private static final String VALID_SECURITY_TOKEN = "securityToken";
private static final boolean VALID_COLLAPSED = true;
private static final boolean VALID_LOCKED = false;
+ private static final boolean RENDER_TITLE = false;
private RenderContext renderContext;
@Before
@@ -98,7 +99,8 @@ public class OpenSocialWidgetRendererTes
" userPrefs: {\"speed\":\"fast\",\"color\":\"blue\"}," +
" collapsed: " + VALID_COLLAPSED + ", " +
" widgetId: 1," +
- " locked: " + VALID_LOCKED +
+ " locked: " + VALID_LOCKED + "," +
+ " renderTitle: " + RENDER_TITLE +
"});</script>";
expect(securityTokenService.getEncryptedSecurityToken(rw)).andReturn(VALID_SECURITY_TOKEN);
@@ -132,7 +134,7 @@ public class OpenSocialWidgetRendererTes
" userPrefs: {}," +
" collapsed: false, " +
" widgetId: null," +
- " locked: false});</script>";
+ " locked: false, renderTitle: false});</script>";
scriptManager.registerScriptBlock(markup, ScriptLocation.AFTER_RAVE, RenderScope.CURRENT_REQUEST, null);
expectLastCall();
Modified: rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java?rev=1335557&r1=1335556&r2=1335557&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java (original)
+++ rave/trunk/rave-providers/rave-w3c-provider/src/main/java/org/apache/rave/provider/w3c/web/renderer/W3cWidgetRenderer.java Tue May 8 14:56:17 2012
@@ -71,7 +71,9 @@ public class W3cWidgetRenderer implement
" height: '%5$s', " +
" width: '%6$s', " +
" collapsed: %7$s, " +
- " widgetId: %8$s});</script>";
+ " widgetId: %8$s, " +
+ " locked: %9$s, " +
+ " renderTitle: %10$s});</script>";
private static final String MARKUP = "<!-- RegionWidget %1$s placeholder -->";
@@ -155,6 +157,8 @@ public class W3cWidgetRenderer implement
height,
width,
item.isCollapsed(),
- item.getWidget().getEntityId());
+ item.getWidget().getEntityId(),
+ item.isLocked(),
+ item.isRenderTitle());
}
}