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/05/17 17:50:25 UTC
svn commit: r1339662 - in /rave/trunk:
rave-components/rave-core/src/main/java/org/apache/rave/portal/model/
rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/
rave-components/rave-core/src/main/java/org/apache/rave/portal/...
Author: carlucci
Date: Thu May 17 15:50:23 2012
New Revision: 1339662
URL: http://svn.apache.org/viewvc?rev=1339662&view=rev
Log:
RAVE-612: add ability to hide/display the widget title and widget border
- refactored renderTitle field to hideChrome in RegionWidget and PageTemplateWidget
- hideChrome now also hides the border around the widget in addition to hiding the titlebar
- updated Person Profile Page template to demo this feature using the groups and experiences widgets
Added:
rave/trunk/rave-demo-gadgets/src/main/webapp/my_experience.xml
- copied, changed from r1339608, rave/trunk/rave-demo-gadgets/src/main/webapp/work_experience.xml
Removed:
rave/trunk/rave-demo-gadgets/src/main/webapp/work_experience.xml
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-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
rave/trunk/rave-demo-gadgets/src/main/webapp/my_groups.xml
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-portal-resources/src/main/webapp/css/default.css
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=1339662&r1=1339661&r2=1339662&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 Thu May 17 15:50:23 2012
@@ -58,8 +58,8 @@ public class PageTemplateWidget implemen
private boolean locked;
@Basic(optional = false)
- @Column(name = "render_title")
- private boolean renderTitle;
+ @Column(name = "hide_chrome")
+ private boolean hideChrome;
@Override
public Long getEntityId() {
@@ -103,11 +103,11 @@ public class PageTemplateWidget implemen
this.locked = locked;
}
- public boolean isRenderTitle() {
- return renderTitle;
+ public boolean isHideChrome() {
+ return hideChrome;
}
- public void setRenderTitle(boolean renderTitle) {
- this.renderTitle = renderTitle;
+ public void setHideChrome(boolean hideChrome) {
+ this.hideChrome = hideChrome;
}
}
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=1339662&r1=1339661&r2=1339662&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 Thu May 17 15:50:23 2012
@@ -80,8 +80,8 @@ public class RegionWidget implements Bas
private boolean locked;
@Basic(optional = false)
- @Column(name = "render_title")
- private boolean renderTitle;
+ @Column(name = "hide_chrome")
+ private boolean hideChrome;
public RegionWidget() {
}
@@ -209,12 +209,12 @@ public class RegionWidget implements Bas
this.locked = locked;
}
- public boolean isRenderTitle() {
- return renderTitle;
+ public boolean isHideChrome() {
+ return hideChrome;
}
- public void setRenderTitle(boolean renderTitle) {
- this.renderTitle = renderTitle;
+ public void setHideChrome(boolean hideChrome) {
+ this.hideChrome = hideChrome;
}
@Override
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java?rev=1339662&r1=1339661&r2=1339662&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/repository/impl/JpaPageRepository.java Thu May 17 15:50:23 2012
@@ -140,7 +140,7 @@ public class JpaPageRepository extends A
regionWidget.setRegion(region);
regionWidget.setCollapsed(false);
regionWidget.setLocked(ptw.isLocked());
- regionWidget.setRenderTitle(ptw.isRenderTitle());
+ regionWidget.setHideChrome(ptw.isHideChrome());
regionWidget.setRenderOrder((int) ptw.getRenderSeq());
regionWidget.setWidget(ptw.getWidget());
widgets.add(regionWidget);
@@ -166,7 +166,7 @@ public class JpaPageRepository extends A
lPage.setPageLayout(pt.getPageLayout());
lPage.setParentPage(page);
lPage.setRegions(convertRegions(pt.getPageTemplateRegions(), lPage));
-
+
// create new pageUser tuple
PageUser pageUser = new PageUser(lPage.getOwner(), lPage, pt.getRenderSequence());
pageUser.setPageStatus(PageInvitationStatus.OWNER);
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java?rev=1339662&r1=1339661&r2=1339662&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultPageService.java Thu May 17 15:50:23 2012
@@ -58,7 +58,7 @@ public class DefaultPageService implemen
private final UserService userService;
private final PageTemplateRepository pageTemplateRepository;
private final String defaultPageName;
-
+
private final long MOVE_PAGE_DEFAULT_POSITION_INDEX = -1L;
@Autowired
@@ -84,7 +84,7 @@ public class DefaultPageService implemen
public Page getPage(long pageId) {
return pageRepository.get(pageId);
}
-
+
@Override
public List<Page> getAllUserPages(long userId) {
return pageRepository.getAllPages(userId, PageType.USER);
@@ -115,13 +115,13 @@ public class DefaultPageService implemen
// the first sequenced ordered page is considered the user's default page
return (pages == null || pages.isEmpty()) ? null : pages.get(0);
}
-
+
@Override
@Transactional
public Page addNewUserPage(String pageName, String pageLayoutCode) {
return addNewUserPage(userService.getAuthenticatedUser(), pageName, pageLayoutCode);
}
-
+
@Override
@Transactional
public Page addNewDefaultUserPage(long userId) {
@@ -156,7 +156,7 @@ public class DefaultPageService implemen
page.setRegions(regions);
// set this as a "sub-page" page type
page.setPageType(PageType.SUB_PAGE);
-
+
PageUser pageUser = new PageUser(page.getOwner(), page, renderSequence);
pageUser.setPageStatus(PageInvitationStatus.OWNER);
List<PageUser> members = new ArrayList<PageUser>();
@@ -182,9 +182,9 @@ public class DefaultPageService implemen
@Override
@Transactional
- public void deletePage(long pageId) {
+ public void deletePage(long pageId) {
User user = userService.getAuthenticatedUser();
- // first delete the page
+ // first delete the page
pageRepository.delete(pageRepository.get(pageId));
// now re-sequence the page sequence numbers
@@ -199,7 +199,7 @@ public class DefaultPageService implemen
public int deletePages(long userId, PageType pageType) {
return pageRepository.deletePages(userId, pageType);
}
-
+
@Override
@Transactional
public RegionWidget moveRegionWidget(long regionWidgetId, int newPosition, long toRegionId, long fromRegionId) {
@@ -216,7 +216,7 @@ public class DefaultPageService implemen
target = regionRepository.save(target);
return findRegionWidgetById(regionWidgetId, target.getRegionWidgets());
}
-
+
@Override
@Transactional
public RegionWidget moveRegionWidgetToPage(long regionWidgetId, long toPageId) {
@@ -224,14 +224,14 @@ public class DefaultPageService implemen
Page toPage = getFromRepository(toPageId, pageRepository);
// Get the region widget
RegionWidget regionWidget = getFromRepository(regionWidgetId, regionWidgetRepository);
-
+
// Move it to first position of the first region
Region moveToRegion = toPage.getRegions().get(0);
// verify the region widget, source, and target regions not locked
verifyRegionWidgetIsNotLocked(regionWidget);
verifyRegionIsNotLocked(moveToRegion);
-
+
regionWidget.setRenderOrder(0);
regionWidget.setRegion(moveToRegion);
moveToRegion.getRegionWidgets().add(0, regionWidget);
@@ -260,7 +260,7 @@ public class DefaultPageService implemen
verifyRegionIsNotLocked(region);
return createWidgetInstance(widget, region, 0);
}
-
+
@Override
@Transactional
public Page movePage(long pageId, long moveAfterPageId) {
@@ -302,7 +302,7 @@ public class DefaultPageService implemen
return page;
}
-
+
@Transactional
public Boolean addMemberToPage(long pageId, long userId){
Page page = getPage(pageId);
@@ -360,20 +360,20 @@ public class DefaultPageService implemen
/**
* Utility function to determine if a Page layout adjustment is needed
* which comparing the existing and new PageLayout objects
- *
+ *
* @param newLayout the new PageLayout to be applied to the Page
* @param curLayout the existing PageLayout of the Page
* @return true if the Page Regions need to be adjusted up or down
*/
private boolean isLayoutAdjustmentNeeded(PageLayout newLayout, PageLayout curLayout) {
- return newLayout != null &&
- !curLayout.equals(newLayout) &&
+ return newLayout != null &&
+ !curLayout.equals(newLayout) &&
!curLayout.getNumberOfRegions().equals(newLayout.getNumberOfRegions());
}
/***
* Utility function to create additional empty regions for a page.
- *
+ *
* @param page the Page object to add new regions to
* @param numberOfNewRegionsToAdd the number of new Region objects to add to the Page
*/
@@ -395,14 +395,14 @@ public class DefaultPageService implemen
* Utility function to reduce the regions for a page and move any RegionWidgets
* in the Regions getting removed into the region with the largest
* remaining render sequence value
- *
+ *
* @param page the Page to remove Regions from
* @param numberOfRegionsInNewLayout the number of regions in the new layout
*/
private void reduceRegionsForPage(Page page, long numberOfRegionsInNewLayout) {
List<Region> regions = page.getRegions();
Region lastValidRegion = regions.get((int) (numberOfRegionsInNewLayout-1));
-
+
//remove all of the extra regions for this new layout and append the widgets
while (regions.size() > numberOfRegionsInNewLayout) {
Region deletedRegion = regions.remove(regions.size()-1);
@@ -415,28 +415,30 @@ public class DefaultPageService implemen
}
regionRepository.save(lastValidRegion);
}
-
+
/**
* Utility function to move a RegionWidget to a new Region
- *
+ *
* @param regionWidget the RegionWidget to move
* @param moveToRegion the new Region to move it to
*/
private void moveRegionWidgetToNewRegion(RegionWidget regionWidget, Region moveToRegion) {
- List<RegionWidget> regionWidgets = moveToRegion.getRegionWidgets();
+ List<RegionWidget> regionWidgets = moveToRegion.getRegionWidgets();
int renderOrder = regionWidgets.isEmpty() ? 1 : regionWidgets.get(regionWidgets.size()-1).getRenderOrder() + 1;
regionWidget.setRegion(moveToRegion);
regionWidget.setRenderOrder(renderOrder);
- moveToRegion.getRegionWidgets().add(regionWidget);
+ moveToRegion.getRegionWidgets().add(regionWidget);
}
-
+
private RegionWidget createWidgetInstance(Widget widget, Region region, int position) {
RegionWidget regionWidget = new RegionWidget();
regionWidget.setRenderOrder(position);
regionWidget.setWidget(widget);
- // TODO: this should eventually be defined by the PageTemplateWidget.locked field
+ // TODO: setLocked and setHideChrome are hard-coded to false for new widgets manually added by users
+ // which makes sense for most default cases. However should we change them to a customizable property
+ // to allow for more flexibility?
regionWidget.setLocked(false);
- regionWidget.setRenderTitle(true);
+ regionWidget.setHideChrome(false);
region.getRegionWidgets().add(position, regionWidget);
updateRenderSequences(region.getRegionWidgets());
Region persistedRegion = regionRepository.save(region);
@@ -521,7 +523,7 @@ public class DefaultPageService implemen
pageRepository.save(page.getPage());
}
}
- }
+ }
private Page doMovePage(long pageId, long moveAfterPageId) {
// get the logged in user
@@ -539,7 +541,7 @@ public class DefaultPageService implemen
// the pageRepository returns an un-modifiable list
// so we need to create a modifyable arraylist
List<PageUser> thisUsersPages = new ArrayList<PageUser>(pageRepository.getPagesForUser(user.getEntityId(), PageType.USER));
- // first remove it from the list
+ // first remove it from the list
if (!thisUsersPages.remove(movingPageUser)) {
throw new RuntimeException("unable to find pageId " + pageId + " attempted to be moved for user " + user);
}
Copied: rave/trunk/rave-demo-gadgets/src/main/webapp/my_experience.xml (from r1339608, rave/trunk/rave-demo-gadgets/src/main/webapp/work_experience.xml)
URL: http://svn.apache.org/viewvc/rave/trunk/rave-demo-gadgets/src/main/webapp/my_experience.xml?p2=rave/trunk/rave-demo-gadgets/src/main/webapp/my_experience.xml&p1=rave/trunk/rave-demo-gadgets/src/main/webapp/work_experience.xml&r1=1339608&r2=1339662&rev=1339662&view=diff
==============================================================================
--- rave/trunk/rave-demo-gadgets/src/main/webapp/work_experience.xml (original)
+++ rave/trunk/rave-demo-gadgets/src/main/webapp/my_experience.xml Thu May 17 15:50:23 2012
@@ -20,13 +20,13 @@
$Id:$
-->
<Module>
- <ModulePrefs title="Work Experience" author="" author_email="" height="" description="Static widget of work experience for demoing on the Person Profile page">
+ <ModulePrefs title="My Experience" author="" author_email="" height="" description="Static widget of experience for demoing on the Person Profile page">
<Require feature="dynamic-height" />
</ModulePrefs>
<Content type="html" view="home">
<![CDATA[
- <div>Work:</div>
+ <div class="header">Work Experience</div>
<ul>
<li>2011-Present: Apache Rave Developer
<li>2008-2011: Database Administrator
@@ -35,17 +35,26 @@
<li>2001-2002: ASP Developer
<li>1997-2001: JavaScript Developer
</ul>
- <div>School</div>
+ <div class="header">School Experience</div>
<ul>
<li>1993-1997: University of Somewhere
</ul>
- <div>Skills:</div>
+ <div class="header">Skill Experience:</div>
<ul>
<li>Java
<li>JavaScript
<li>HTML
<li>RDBMS
</ul>
+ <style>
+ .header {
+ border-bottom: 1px solid #CCCCCC;
+ color: #228800;
+ }
+ li {
+ font-size: 10pt;
+ }
+ </style>
<script>
gadgets.util.registerOnLoadHandler(gadgets.window.adjustHeight);
</script>
Modified: rave/trunk/rave-demo-gadgets/src/main/webapp/my_groups.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-demo-gadgets/src/main/webapp/my_groups.xml?rev=1339662&r1=1339661&r2=1339662&view=diff
==============================================================================
--- rave/trunk/rave-demo-gadgets/src/main/webapp/my_groups.xml (original)
+++ rave/trunk/rave-demo-gadgets/src/main/webapp/my_groups.xml Thu May 17 15:50:23 2012
@@ -26,11 +26,21 @@
<Content type="html" view="home">
<![CDATA[
+ <div class="header">Groups I Belong To</div>
<ul>
<li>Apache Rave PPMC
<li>Netherlands Football Fanatics
<li>Java User's Group
</ul>
+ <style>
+ .header {
+ border-bottom: 1px solid #CCCCCC;
+ color: #228800;
+ }
+ li {
+ font-size: 10pt;
+ }
+ </style>
<script>
gadgets.util.registerOnLoadHandler(gadgets.window.adjustHeight);
</script>
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=1339662&r1=1339661&r2=1339662&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 Thu May 17 15:50:23 2012
@@ -336,10 +336,10 @@ insert into widget (entity_id, title, ur
values(@my_groups_widget_id, 'My Groups', 'http://localhost:8080/demogadgets/my_groups.xml', 'OpenSocial', 'PUBLISHED', 'Static widget of groups for demoing on the Person Profile page', 'Anthony Carlucci', @user_id_1);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @widget_seq;
--- work experience
-set @work_experience_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @widget_seq);
+-- my experience
+set @my_experience_widget_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @widget_seq);
insert into widget (entity_id, title, url, type, widget_status, description, author, owner_id)
-values(@work_experience_widget_id, 'Work Experience', 'http://localhost:8080/demogadgets/work_experience.xml', 'OpenSocial', 'PUBLISHED', 'Static widget of work experience for demoing on the Person Profile page', 'Anthony Carlucci', @user_id_1);
+values(@my_experience_widget_id, 'My Experience', 'http://localhost:8080/demogadgets/my_experience.xml', 'OpenSocial', 'PUBLISHED', 'Static widget of experience for demoing on the Person Profile page', 'Anthony Carlucci', @user_id_1);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @widget_seq;
-- Activity Streams
@@ -445,28 +445,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, render_title)
-values (@next_region_widget, @ohloh_stats_widget_id, @page_1_region_1, 0, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @ohloh_stats_widget_id, @page_1_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @ohloh_factoids_widget_id, @page_1_region_2, 0, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @ohloh_factoids_widget_id, @page_1_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @nyt_widget_id, @page_1_region_3, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @nyt_widget_id, @page_1_region_3, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @ohloh_cocomo_widget_id, @page_1_region_3, 1, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @ohloh_cocomo_widget_id, @page_1_region_3, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @youtube_widget_id, @page_1_region_3, 1, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @youtube_widget_id, @page_1_region_3, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
@@ -493,18 +493,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, render_title)
-values (@next_region_widget, @my_activity_widget_id, @page_2_region_1, 0, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @my_activity_widget_id, @page_2_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @activity_streams_widget_id, @page_2_region_1, 1, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @activity_streams_widget_id, @page_2_region_1, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @twitter_widget_id, @page_2_region_2, 1, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @twitter_widget_id, @page_2_region_2, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
-- person profile page for user 1
@@ -540,23 +540,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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_1_region_1, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_1_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_1_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_1_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @nyt_widget_id, @page_1_region_3, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @nyt_widget_id, @page_1_region_3, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End john.doe user_id_2 layout ---
@@ -589,23 +589,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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_1_region_1, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_1_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_1_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_1_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_1_region_3, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_1_region_3, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_1_region_3, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End jane.doe user_id_3 layout ---
@@ -622,7 +622,7 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
--end page user data--
--- End user_id_4 layout ---
---- Layout for user_id_5 ---
+--- Layout for user_id_5 ---
---set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
---INSERT INTO page (entity_id, name, owner_id, parent_page_id, page_layout_id, page_type)
---values (@page_1_id, 'Main', @user_id_5, null, @two_col_id, 'USER');
@@ -661,23 +661,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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_1_region_1, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_1_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_1_region_1, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_1_region_1, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_1_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_1_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_1_region_2, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_1_region_2, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End user_id_6 layout ---
@@ -700,13 +700,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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_7_region_1, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_7_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_7_region_1, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_7_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.one user_id_7 layout ---
@@ -733,23 +733,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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_8_region_1, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_8_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_8_region_1, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_8_region_1, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_8_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_8_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_8_region_2, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_8_region_2, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.twown user_id_8 layout ---
@@ -781,23 +781,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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_9_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_9_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_9_region_3, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_9_region_3, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_9_region_1, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_9_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_9_region_1, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_9_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.three user_id_9 layout ---
@@ -829,23 +829,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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_10_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_10_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_10_region_3, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_10_region_3, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_10_region_1, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_10_region_1, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_10_region_1, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_10_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.threewn user_id_10 layout ---
@@ -882,23 +882,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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_11_region_4, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_11_region_4, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_11_region_3, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_11_region_3, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_11_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_11_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_11_region_1, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_11_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.four user_id_11 layout ---
@@ -936,23 +936,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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_12_region_4, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_12_region_4, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_12_region_3, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_12_region_3, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_12_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_12_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_12_region_1, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_12_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End asgoyal.fourwn user_id_12 layout ---
@@ -989,23 +989,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, render_title)
-values (@next_region_widget, @hamster_widget_id, @page_13_region_4, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @hamster_widget_id, @page_13_region_4, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @tabnews_widget_id, @page_13_region_3, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @tabnews_widget_id, @page_13_region_3, 1, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @wikipedia_widget_id, @page_13_region_2, 0, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @wikipedia_widget_id, @page_13_region_2, 0, FALSE, FALSE, FALSE);
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, render_title)
-values (@next_region_widget, @translate_widget_id, @page_13_region_1, 1, FALSE, FALSE, TRUE);
+INSERT INTO region_widget(entity_id, widget_id, region_id, render_order, collapsed, locked, hide_chrome)
+values (@next_region_widget, @translate_widget_id, @page_13_region_1, 1, FALSE, FALSE, FALSE);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
--- End openid user_id_13 layout ---
@@ -1126,13 +1126,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, render_title)
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, hide_chrome)
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, render_title)
-values (@next_person_profile_page_template_widget_id, @person_profile_page_template_region_id, 1, @work_experience_widget_id, true, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, hide_chrome)
+values (@next_person_profile_page_template_widget_id, @person_profile_page_template_region_id, 1, @my_experience_widget_id, true, true);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
------------------------------------------
@@ -1152,13 +1152,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, render_title)
-values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 0, @favorite_websites_widget_id, true, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, hide_chrome)
+values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 0, @favorite_websites_widget_id, true, false);
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, render_title)
-values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 1, @schedule_widget_id, true, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, hide_chrome)
+values (@next_person_profile_subpage1_template_widget_id, @person_profile_subpage1_template_region_id, 1, @schedule_widget_id, true, false);
UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_template_widget_seq;
--------------------------------------------------
@@ -1178,6 +1178,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, render_title)
-values (@next_person_profile_subpage2_template_widget_id, @person_profile_subpage2_template_region_id, 0, @my_activity_widget_id, true, true);
+insert into page_template_widget (entity_id, page_template_region_id, render_sequence, widget_id, locked, hide_chrome)
+values (@next_person_profile_subpage2_template_widget_id, @person_profile_subpage2_template_region_id, 0, @my_activity_widget_id, true, false);
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=1339662&r1=1339661&r2=1339662&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 Thu May 17 15:50:23 2012
@@ -27,12 +27,12 @@ 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}" />
+<c:set var="isHideChrome" value="${regionWidget.hideChrome}" />
<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-wrapper<c:if test="${isLocked}"> widget-wrapper-locked</c:if><c:if test="${isHideChrome}"> widget-wrapper-hidechrome</c:if>" id="widget-${regionWidget.entityId}-wrapper">
- <c:if test="${renderTitle}">
+ <c:if test="${!isHideChrome}">
<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>
Modified: rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css?rev=1339662&r1=1339661&r2=1339662&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/css/default.css (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/css/default.css Thu May 17 15:50:23 2012
@@ -200,6 +200,14 @@ header h1{
-moz-box-shadow: 2px 2px 2px rgba(0,0,0,.25);
}
+.widget-wrapper-hidechrome {
+ border: none !important;
+ border-radius: 0px !important;
+ box-shadow: none !important;
+ -webkit-box-shadow: none !important;
+ -moz-box-shadow: none !important;
+}
+
.widget-wrapper-mobile {
margin-bottom: 3px;
}
@@ -1091,7 +1099,7 @@ span.error, label.error {
.searchdialogcontent {
font-size: 12px !important;
- margin:0 0 !important;
+ margin:0 0 !important;
width: 100% !important;
padding:0 0 !important;
}
\ No newline at end of file
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=1339662&r1=1339661&r2=1339662&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 Thu May 17 15:50:23 2012
@@ -71,7 +71,7 @@ public class OpenSocialWidgetRenderer im
" collapsed: %8$s, " +
" widgetId: %9$s," +
" locked: %10$s," +
- " renderTitle: %11$s});</script>";
+ " hideChrome: %11$s});</script>";
private static final String MARKUP = "<!-- RegionWidget %1$s placeholder -->";
@Override
@@ -124,6 +124,6 @@ public class OpenSocialWidgetRenderer im
item.isCollapsed(),
item.getWidget().getEntityId(),
item.isLocked(),
- item.isRenderTitle());
+ item.isHideChrome());
}
}
\ 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=1339662&r1=1339661&r2=1339662&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 Thu May 17 15:50:23 2012
@@ -54,7 +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 static final boolean VALID_HIDE_CHROME = true;
private RenderContext renderContext;
@Before
@@ -86,6 +86,8 @@ public class OpenSocialWidgetRendererTes
rw.setCollapsed(VALID_COLLAPSED);
rw.setWidget(w);
rw.setRegion(region);
+ rw.setHideChrome(VALID_HIDE_CHROME);
+ rw.setLocked(VALID_LOCKED);
rw.setPreferences(Arrays.asList(new RegionWidgetPreference(1L, 1L, "color", "blue"),
new RegionWidgetPreference(2L, 1L, "speed", "fast"),
new RegionWidgetPreference(3L, 1L, null, null)));
@@ -100,7 +102,7 @@ public class OpenSocialWidgetRendererTes
" collapsed: " + VALID_COLLAPSED + ", " +
" widgetId: 1," +
" locked: " + VALID_LOCKED + "," +
- " renderTitle: " + RENDER_TITLE +
+ " hideChrome: " + VALID_HIDE_CHROME +
"});</script>";
expect(securityTokenService.getEncryptedSecurityToken(rw)).andReturn(VALID_SECURITY_TOKEN);
@@ -134,7 +136,7 @@ public class OpenSocialWidgetRendererTes
" userPrefs: {}," +
" collapsed: false, " +
" widgetId: null," +
- " locked: false, renderTitle: false});</script>";
+ " locked: false, hideChrome: 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=1339662&r1=1339661&r2=1339662&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 Thu May 17 15:50:23 2012
@@ -73,7 +73,7 @@ public class W3cWidgetRenderer implement
" collapsed: %7$s, " +
" widgetId: %8$s, " +
" locked: %9$s, " +
- " renderTitle: %10$s});</script>";
+ " hideChrome: %10$s});</script>";
private static final String MARKUP = "<!-- RegionWidget %1$s placeholder -->";
@@ -159,6 +159,6 @@ public class W3cWidgetRenderer implement
item.isCollapsed(),
item.getWidget().getEntityId(),
item.isLocked(),
- item.isRenderTitle());
+ item.isHideChrome());
}
}