rave-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlu...@apache.org
Subject svn commit: r1291474 [2/2] - in /incubator/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/ rave-components/rave-core/src/main/java/org/apache/r...
Date Mon, 20 Feb 2012 21:55:07 GMT
Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql?rev=1291474&r1=1291473&r2=1291474&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/db/initial_data.sql
Mon Feb 20 21:55:06 2012
@@ -104,6 +104,11 @@ insert into page_layout (entity_id, code
 values (@fourwn_col_id, 'columns_3nwn_1_bottom', 4, 7);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_layout_seq;
 
+set @person_profile_layout_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name
= @page_layout_seq);
+insert into page_layout (entity_id, code,  number_of_regions, render_sequence)
+values (@person_profile_layout_id, 'person_profile', 2, 8);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_layout_seq;
+
 --- end page layout data ----
 
 -- page types
@@ -117,6 +122,11 @@ insert into page_type (entity_id, code, 
 values (@person_profile_page_type_id, 'PERSON_PROFILE', 'Person Profile pages which are accessible
by anyone and contain Person Profile information');
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_type_seq;
 
+set @sub_page_type_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_type_seq);
+insert into page_type (entity_id, code, description)
+values (@sub_page_type_id, 'SUB_PAGE', 'Sub pages are contained within another page');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_type_seq;
+
 -- end page types
 
 
@@ -319,8 +329,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_1 ---
 set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_1_id, 'Main', @user_id_1, 1, @newuser_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_1_id, 'Main', @user_id_1, null, 1, @newuser_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 
@@ -362,8 +372,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 
 set @page_2_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_2_id, 'Social', @user_id_1, 2, @two_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_2_id, 'Social', @user_id_1, null, 2, @two_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_2_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -396,12 +406,73 @@ INSERT INTO region_widget(entity_id, wid
 values (@next_region_widget, @tabnews_widget_id, @page_2_region_2, 1, FALSE);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
 
+-- person profile page for user 1
+set @person_profile_page_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name
= @page_seq);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@person_profile_page_id , 'Person Profile', @user_id_1, null, 1, @person_profile_layout_id,
@person_profile_page_type_id);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
+
+set @person_profile_page_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name
= @region_seq);
+INSERT INTO region(entity_id, page_id, render_order)
+values (@person_profile_page_region_1, @person_profile_page_id, 1);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
+
+set @person_profile_page_region_2 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name
= @region_seq);
+INSERT INTO region(entity_id, page_id, render_order)
+values (@person_profile_page_region_2, @person_profile_page_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, @wikipedia_widget_id, @person_profile_page_region_1, 0, 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)
+values (@next_region_widget, @translate_widget_id, @person_profile_page_region_1, 1, 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)
+values (@next_region_widget, @nyt_widget_id, @person_profile_page_region_2, 0, FALSE);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_widget_seq;
+
+-- sub pages for profile page for user 1
+set @sub_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, render_sequence, page_layout_id,
page_type_id)
+values (@sub_page_1_id , 'Person Profile Sub Page 1', @user_id_1, @person_profile_page_id,
1, @two_col_id, @sub_page_type_id);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
+
+set @sub_page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name =
@region_seq);
+INSERT INTO region(entity_id, page_id, render_order)
+values (@sub_page_1_region_1, @sub_page_1_id, 1);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
+
+set @sub_page_1_region_2 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name =
@region_seq);
+INSERT INTO region(entity_id, page_id, render_order)
+values (@sub_page_1_region_2, @sub_page_1_id, 2);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
+
+set @sub_page_2_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@sub_page_2_id , 'Person Profile Sub Page 2', @user_id_1, @person_profile_page_id,
2, @two_col_id, @sub_page_type_id);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
+
+set @sub_page_2_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name =
@region_seq);
+INSERT INTO region(entity_id, page_id, render_order)
+values (@sub_page_2_region_1, @sub_page_2_id, 1);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
+
+set @sub_page_2_region_2 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name =
@region_seq);
+INSERT INTO region(entity_id, page_id, render_order)
+values (@sub_page_2_region_2, @sub_page_2_id, 2);
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @region_seq;
 --- End canonical user_id_1 layout ---
 
 --- Layout for user_id_2 ---
 set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_1_id, 'Main', @user_id_2, 1, @newuser_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_1_id, 'Main', @user_id_2, null, 1, @newuser_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -442,8 +513,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_3 ---
 set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_1_id, 'Main', @user_id_3, 1, @newuser_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_1_id, 'Main', @user_id_3, null, 1, @newuser_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -484,15 +555,15 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_4 ---
 set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_1_id, 'Main', @user_id_4, 1, @two_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_1_id, 'Main', @user_id_4, null, 1, @two_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 --- End user_id_4 layout ---
 
 --- 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, render_sequence, page_layout_id, page_type_id)
-values (@page_1_id, 'Main', @user_id_5, 1, @two_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_1_id, 'Main', @user_id_5, null, 1, @two_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 --- End user_id_5 layout ---
 
@@ -500,8 +571,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_6 ---
 set @page_1_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_1_id, 'Main', @user_id_6, 1, @two_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_1_id, 'Main', @user_id_6, null, 1, @two_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_1_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -537,8 +608,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_7 ---
 set @page_7_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_7_id, 'Main', @user_id_7, 1, @one_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_7_id, 'Main', @user_id_7, null, 1, @one_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_7_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -560,8 +631,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_8 ---
 set @page_8_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_8_id, 'Main', @user_id_8, 1, @twown_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_8_id, 'Main', @user_id_8, null, 1, @twown_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_8_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -597,8 +668,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_9 ---
 set @page_9_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_9_id, 'Main', @user_id_9, 1, @three_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_9_id, 'Main', @user_id_9, null, 1, @three_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_9_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -639,8 +710,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_10 ---
 set @page_10_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_10_id, 'Main', @user_id_10, 1, @threewn_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_10_id, 'Main', @user_id_10, null, 1, @threewn_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_10_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -681,8 +752,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_11 ---
 set @page_11_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_11_id, 'Main', @user_id_11, 1, @four_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_11_id, 'Main', @user_id_11, null, 1, @four_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_11_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -729,8 +800,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_12 ---
 set @page_12_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_12_id, 'Main', @user_id_12, 1, @fourwn_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_12_id, 'Main', @user_id_12, null, 1, @fourwn_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_12_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
@@ -776,8 +847,8 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- Layout for user_id_13 ---
 set @page_13_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_seq);
-INSERT INTO page (entity_id, name, owner_id, render_sequence, page_layout_id, page_type_id)
-values (@page_13_id, 'Main', @user_id_13, 1, @fourwn_col_id, @user_page_type_id);
+INSERT INTO page (entity_id, name, owner_id, parent_page_id, render_sequence, page_layout_id,
page_type_id)
+values (@page_13_id, 'Main', @user_id_13, null, 1, @fourwn_col_id, @user_page_type_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
 set @page_13_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);

Added: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp?rev=1291474&view=auto
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp
(added)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/layouts/person_profile.jsp
Mon Feb 20 21:55:06 2012
@@ -0,0 +1,25 @@
+<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
+<%--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+  --%>
+
+<div class="widgetRow bottomRow">
+    <c:forEach var="region" items="${page.regions}" varStatus="status">
+        <rave:region region="${region}" regionIdx="${status.count}" />
+    </c:forEach>
+</div>

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp?rev=1291474&r1=1291473&r2=1291474&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
(original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/personProfile.jsp
Mon Feb 20 21:55:06 2012
@@ -71,7 +71,7 @@
    	</nav>
 	<h1>${pageTitle}</h1>
 </header>
-<div id="content">
+<div id="personProfileContent">
 	<!-- Display personal information of user-->
 	<h2><fmt:message key="page.personProfile.personal.info" /></h2>
 	<p>
@@ -105,3 +105,39 @@
 		<c:out value=" ${userProfile.email}"/>    		
 	</p>
 </div>
+<%--render the main page content (regions/widgets) --%>
+<div id="pageContent">
+    <div class="regions">
+        <%-- insert the region layout template --%>
+        <tiles:insertTemplate template="${layout}"/>
+    </div>
+    <div class="clear-float">&nbsp;</div>
+</div>
+<script>
+    //Define the global widgets map.  This map will be populated by RegionWidgetRender providers.
+    var widgetsByRegionIdMap = {};
+</script>
+<portal:render-script location="${'BEFORE_LIB'}" />
+<script src="//cdnjs.cloudflare.com/ajax/libs/json2/20110223/json2.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jQuery/jquery-1.6.4.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jquery.ui/1.8.16/jquery-ui.min.js"></script>
+<script src="//ajax.aspnetcdn.com/ajax/jquery.validate/1.8.1/jquery.validate.min.js"></script>
+<!--[if lt IE 9]><script src=//css3-mediaqueries-js.googlecode.com/svn/trunk/css3-mediaqueries.js></script><![endif]-->
+<portal:render-script location="${'AFTER_LIB'}" />
+<portal:render-script location="${'BEFORE_RAVE'}" />
+<script src="<spring:url value="/script/rave.js"/>"></script>
+<script src="<spring:url value="/script/rave_api.js"/>"></script>
+<script src="<spring:url value="/script/rave_opensocial.js"/>"></script>
+<script src="<spring:url value="/script/rave_wookie.js"/>"></script>
+<script src="<spring:url value="/script/rave_layout.js"/>"></script>
+<script src="<spring:url value="/app/messagebundle/rave_client_messages.js"/>"></script>
+<portal:render-script location="${'AFTER_RAVE'}" />
+<script>
+    $(function () {
+        rave.setContext("<spring:url value="/app/" />");
+        rave.initProviders();
+        rave.initWidgets(widgetsByRegionIdMap);
+        rave.initUI();
+        rave.layout.init();
+    });
+</script>

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tiles-defs.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tiles-defs.xml?rev=1291474&r1=1291473&r2=1291474&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tiles-defs.xml (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tiles-defs.xml Mon
Feb 20 21:55:06 2012
@@ -35,6 +35,11 @@
         <put-attribute name="layout" value="/WEB-INF/jsp/layouts/{1}.jsp"/>
     </definition>
 
+    <definition name="templates.user.personProfile.*" extends="templates.base">
+        <put-attribute name="body" value="/WEB-INF/jsp/views/personProfile.jsp"/>
+        <put-attribute name="layout" value="/WEB-INF/jsp/layouts/{1}.jsp"/>
+    </definition>
+
     <definition name="templates.user.*" extends="templates.base">
         <put-attribute name="pageTitleKey" value="page.{1}.title"/>
         <put-attribute name="body" value="/WEB-INF/jsp/views/{1}.jsp"/>
@@ -46,4 +51,4 @@
         <put-attribute name="body" value="/WEB-INF/jsp/views/admin/{1}.jsp"/>
     </definition>
 
-</tiles-definitions>
\ No newline at end of file
+</tiles-definitions>

Modified: incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css?rev=1291474&r1=1291473&r2=1291474&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css (original)
+++ incubator/rave/trunk/rave-portal-resources/src/main/webapp/css/default.css Mon Feb 20
21:55:06 2012
@@ -186,6 +186,13 @@ header h1 {
     margin: 1em 0;
 }
 
+#personProfileContent {
+    background-color: transparent;
+    padding: 0 20px;
+    width: 90%;
+    margin: 1em auto 0;
+}
+
 /* Widgets */
 .widget {
     padding: 5px;
@@ -355,7 +362,7 @@ header h1 {
     width: 90%;
 }
 
-.columns_2_1, .columns_2_2 {
+.columns_2_1, .columns_2_2, .person_profile_1, .person_profile_2 {
     width: 45%;
 }
 
@@ -396,7 +403,7 @@ header h1 {
     clear: both;
 }
 
-.columns_2_2, .columns_3_3, .columns_3nwn_3, .columns_4_4, .columns_3nwn_1_bottom_3, .columns_3nwn_1_bottom_4
{
+.columns_2_2, .columns_3_3, .columns_3nwn_3, .columns_4_4, .columns_3nwn_1_bottom_3, .columns_3nwn_1_bottom_4,
.person_profile_2 {
     margin-right: 0;
 }
 

Modified: incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql?rev=1291474&r1=1291473&r2=1291474&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql (original)
+++ incubator/rave/trunk/rave-portal/src/test/resources/test-data.sql Mon Feb 20 21:55:06
2012
@@ -91,6 +91,11 @@ insert into page_type (entity_id, code, 
 values (@person_profile_page_type_id, 'PERSON_PROFILE', 'Person Profile pages which are only
accessible by anyone and contain Person Profile information');
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_type_seq;
 
+set @sub_page_type_id = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_type_seq);
+insert into page_type (entity_id, code, description)
+values (@sub_page_type_id, 'SUB_PAGE', 'Sub pages are contained within another page');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_type_seq;
+
 -- end page types
 
   -- ***********************************************************************************



Mime
View raw message