You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ps...@apache.org on 2012/05/08 20:50:12 UTC

svn commit: r1335687 [3/3] - 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/ rave-components/rave-core/src/main/java/org/apache/rave/portal...

Modified: rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js?rev=1335687&r1=1335686&r2=1335687&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/script/rave_layout.js Tue May  8 18:50:10 2012
@@ -33,6 +33,8 @@ rave.layout = rave.layout || (function()
         var $menuItemEdit = $("#pageMenuEdit");
         var $menuItemDelete = $("#pageMenuDelete");
         var $menuItemMove = $("#pageMenuMove");
+        var $menuItemShare = $("#pageMenuShare");
+        var $menuItemRevokeShare = $("#pageMenuRevokeShare");
 
         /**
          * Initializes the private pageMenu closure
@@ -102,6 +104,26 @@ rave.layout = rave.layout || (function()
                     $movePageDialog.modal('show');
                 });
             }
+
+            // setup the share page menu item
+            if (!$menuItemShare.hasClass("menu-item-disabled")) {  
+                $menuItemShare.bind('click', function(event) {
+                    rave.api.rpc.getUsers({offset: 0,
+                        successCallback: function(result) {
+                            rave.layout.searchHandler.dealWithUserResults(result);
+                            $("#sharePageDialog").modal('show');
+                        }
+                    });
+                });
+            }
+
+            // setup the revoke share page menu item
+            if (!$menuItemRevokeShare.hasClass("menu-item-disabled")) {  
+                $menuItemRevokeShare.bind('click', function(event) {
+                    rave.layout.searchHandler.removeMemberFromPage(rave.layout.searchHandler.userId, 
+                        rave.layout.searchHandler.username);
+                });
+            }
         }
 
         return {
@@ -109,6 +131,287 @@ rave.layout = rave.layout || (function()
         }
     })();
 
+    // functions associated with the user search for sharing pages
+    var searchHandler = (function() {
+        var username;
+        var userId;
+        var pageId;
+        var existingSharers = new Array();
+
+        function setDefaults(username, userId, pageId, pageStatus){
+            this.username = username;
+            this.userId = userId;
+            this.pageId = pageId;
+            if(pageStatus == "PENDING"){
+                confirmPageShare();
+            };
+        }
+
+        function addExistingMember(member){
+            existingSharers.push(member);
+        }
+
+        function removeExistingMember(member){
+            existingSharers.splice( $.inArray(member, existingSharers), 1 );
+        }
+
+        function isUserAlreadyAdded(username){
+            if($.inArray(username, existingSharers) == -1){
+                return false;
+            }
+            else{
+                return true;
+            }
+        }
+
+        function removeMemberFromPage(userId, username){
+            var answer;
+            if(userId == rave.layout.searchHandler.userId){
+                answer = confirm(rave.getClientMessage("revoke.share.current.user.confirm"));
+            }else{
+                answer = confirm(rave.getClientMessage("revoke.share.confirm") + " ("+username+")");
+            }
+            if(answer){
+                $('#shareButtonHolder'+userId).hide();
+                rave.api.rpc.removeMemberFromPage({pageId: this.pageId, userId: userId,
+                    successCallback: function(result) {
+                        rave.layout.searchHandler.removeExistingMember(username);
+                        $('#shareButtonHolder'+userId).empty();
+                        $('#shareButtonHolder'+userId)
+                            .append(
+                                $("<a/>")
+                                    .attr("href", "#")
+                                    .attr("id", userId)
+                                    .attr("onclick", "rave.layout.searchHandler.addMemberToPage("+userId+", '"+username+"');")
+                                    .text(rave.getClientMessage("common.add"))
+                            )
+                            $('#shareButtonHolder'+userId).show();
+                            if(userId == rave.layout.searchHandler.userId){
+                                alert(rave.getClientMessage("revoke.share.current.user"));
+                                // reload as page has been removed
+                                document.location.href='/';
+                            }else{
+                            	alert("(" + username + ") " + rave.getClientMessage("revoke.share"));
+                            }
+                    }
+                });
+            }
+        }
+
+        function addMemberToPage(userId, username){
+            var answer = confirm(rave.getClientMessage("create.share.confirm") + " ("+username+")");
+            if(answer){
+                $('#shareButtonHolder'+userId).hide();
+                rave.api.rpc.addMemberToPage({pageId: this.pageId, userId: userId,
+                    successCallback: function(result) {
+                        rave.layout.searchHandler.addExistingMember(username);
+                        $('#shareButtonHolder'+userId).empty();
+                        $('#shareButtonHolder'+userId)
+                            .append(
+                                    $("<a/>")
+                                    .attr("href", "#")
+                                    .attr("id", userId)
+                                    .attr("onclick", "rave.layout.searchHandler.removeMemberFromPage(" + 
+                                        userId+", '" + username+"');")
+                                    .text(rave.getClientMessage("common.remove"))
+                            )
+                            $('#shareButtonHolder'+userId).show();
+                        alert("(" + username + ") " + rave.getClientMessage("create.share"));
+                    }
+                });
+            }
+        }
+        
+        function acceptShare(){
+        	$('#confirmSharePageDialog').modal('hide');
+            rave.api.rpc.updateSharedPageStatus({pageId: rave.layout.searchHandler.pageId, shareStatus: 'accepted',
+                successCallback: function(result) {
+                    //notification here?
+                }
+            });
+        }
+
+        function declineShare(){
+        	$('#confirmSharePageDialog').modal('hide');
+            rave.api.rpc.updateSharedPageStatus({pageId: rave.layout.searchHandler.pageId, shareStatus: 'refused',
+                successCallback: function(result) {
+                    document.location.href='/';
+                }
+            });
+        }
+
+        function confirmPageShare(){
+        	$("#confirmSharePageDialog").modal('show');
+        }
+
+        function init() {
+            // user clicks "search" in the find users dialog
+            $("#shareSearchButton").click(function() {
+                $('#shareSearchResults').empty();
+                rave.api.rpc.searchUsers({searchTerm: $('#searchTerm').get(0).value, offset: 0,
+                    successCallback: function(result) {
+                        rave.layout.searchHandler.dealWithUserResults(result);
+                    }
+                });
+            }); 
+            
+            // user clicks "clear search" in the find users dialog
+            $("#clearSearchButton").click(function() {
+                $('#searchTerm').get(0).value = "";
+                $('#shareSearchResults').empty();
+                rave.api.rpc.getUsers({offset: 0,
+                    successCallback: function(result) {
+                        rave.layout.searchHandler.dealWithUserResults(result);
+                    }
+                });
+            }); 
+        }//end of init()
+        
+        function updateParamsInString(i18nStr, itemsToReplace){
+            for(var i=0;i<itemsToReplace.length;i++){
+                var token = '{'+i+'}';
+                i18nStr = i18nStr.replace(token, itemsToReplace[i]);
+            }
+            return i18nStr;
+        }
+
+        function paginate(userResults){
+            var $pagingDiv = $('#shareSearchListPaging');
+            $pagingDiv.empty();
+            if(userResults.result.pageSize < userResults.result.totalResults){
+                $pagingDiv.append('<ul id="pagingul" class="paging" style="margin-left: 0;">');
+                if(userResults.result.currentPage > 1){
+                    offset = (userResults.result.currentPage - 2) * userResults.result.pageSize;
+                    $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' + 
+                        offset+', successCallback: function(result)' + 
+                            ' {rave.layout.searchHandler.dealWithUserResults(result);}});">&lt;</a></li>');
+                }
+                for(var i=1;i<=userResults.result.numberOfPages;i++){
+                    if(i == userResults.result.currentPage){
+                        $('#pagingul').append('<li><span class="currentPage">'+i+'</span></li>');
+                    }else{
+                        offset = (i - 1) * userResults.result.pageSize;
+                        $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' + 
+                            offset + ', successCallback: function(result)' + 
+                                ' {rave.layout.searchHandler.dealWithUserResults(result);}});">' + i + '</a></li>');
+                    }
+                }
+                if (userResults.result.currentPage < userResults.result.numberOfPages){
+                    offset = (userResults.result.currentPage) * userResults.result.pageSize;
+                    $('#pagingul').append('<li><a href="#" onclick="rave.api.rpc.getUsers({offset: ' + 
+                        offset + ', successCallback: function(result)' + 
+                            ' {rave.layout.searchHandler.dealWithUserResults(result);}});">&gt;</a></li>');
+                }
+            }
+        }
+
+        function dealWithUserResults(userResults){
+            var searchTerm = $('#searchTerm').get(0).value;
+            if(searchTerm == undefined || searchTerm == ""){
+                $('#clearSearchButton').hide();
+            }else{
+                $('#clearSearchButton').show();
+            }
+            var legend;
+            if(userResults.result.resultSet.length < 1){
+                legend = rave.getClientMessage("no.results.found");
+            }else{
+                legend = updateParamsInString(rave.getClientMessage("search.list.result.x.to.y"), 
+                    new Array(userResults.result.offset + 1, userResults.result.resultSet.length 
+                        + userResults.result.offset, userResults.result.totalResults));
+            }
+            // show the listheader
+            $('#shareSearchListHeader').text(legend);
+            var $targetDiv = $('#shareSearchResults');
+            $targetDiv.empty();
+            // show the paginator
+            paginate(userResults);
+            //now build the content
+            $targetDiv
+                .append(
+                    $("<table/>")
+                        .addClass("searchdialogcontent")
+                            .append(
+                                $("<tr/>")
+                                    .append(
+                                        $("<td/>")
+                                        .addClass("textcell")
+                                        .append(
+                                            $("<b/>")
+                                            .text(rave.getClientMessage("common.username"))
+                                        )
+                                    )
+                                    .append(
+                                        $("<td/>")
+                                        .addClass("booleancell")
+                                        .append(
+                                            $("<b/>")
+                                            .text(rave.getClientMessage("common.sharing"))
+                                        )
+                                    )
+                                )
+                        .append(
+                            $("<tbody/>")
+                            .attr("id", "searchResultsBody")
+                        )
+                )
+
+                jQuery.each(userResults.result.resultSet, function() {
+                    $('#searchResultsBody')
+                    .append(
+                        $("<tr/>")
+                        .attr("id", "searchResultRecord")
+                        .append(
+                            $("<td/>")
+                            .text(this.username)
+                        )
+                        .append(
+                            $("<td/>")
+                            .attr("id", "shareButtonHolder" + this.entityId)
+                        )
+                    )
+
+                    if(this.username != rave.layout.searchHandler.username){
+                        // check if already added 
+                        if(rave.layout.searchHandler.isUserAlreadyAdded(this.username)){
+                            $('#shareButtonHolder'+this.entityId)
+                            .append(
+                                $("<a/>")
+                                .attr("href", "#")
+                                .attr("id", this.entityId)
+                                .attr("onclick", "rave.layout.searchHandler.removeMemberFromPage("+this.entityId+", '"+this.username+"');")
+                                .text(rave.getClientMessage("common.remove"))
+                            )
+                        }else{
+                            $('#shareButtonHolder'+this.entityId)
+                            .append(
+                                $("<a/>")
+                                .attr("href", "#")
+                                .attr("id", this.entityId)
+                                .attr("onclick", "rave.layout.searchHandler.addMemberToPage("+this.entityId+", '"+this.username+"');")
+                                .text(rave.getClientMessage("common.add"))
+                                )
+                        } 
+                    }
+                 
+        	})//end jqueryeach 
+        }//end dealwithresults
+
+        return {
+            init: init,
+            dealWithUserResults : dealWithUserResults,
+            setDefaults : setDefaults,
+            addExistingMember : addExistingMember,
+            removeExistingMember : removeExistingMember,
+            isUserAlreadyAdded : isUserAlreadyAdded,
+            addMemberToPage : addMemberToPage,
+            removeMemberFromPage : removeMemberFromPage,
+            confirmPageShare : confirmPageShare,
+            acceptShare : acceptShare,
+            declineShare : declineShare
+        }
+    })();
+
     // widget menu related functions
     var widgetMenu = (function() {
         var $menu;
@@ -351,6 +654,7 @@ rave.layout = rave.layout || (function()
     function init() {
         pageMenu.init();
         widgetMenu.init();
+        searchHandler.init();
         // initialize the bootstrap dropdowns
         $(".dropdown-toggle").dropdown();
     }
@@ -366,6 +670,7 @@ rave.layout = rave.layout || (function()
         updatePage: updatePage,
         movePage: movePage,
         closePageDialog: closePageDialog,
-        moveWidgetToPage: moveWidgetToPage
+        moveWidgetToPage: moveWidgetToPage,
+        searchHandler : searchHandler
     };
 })();

Modified: rave/trunk/rave-portal/src/test/resources/test-data.sql
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources/test-data.sql?rev=1335687&r1=1335686&r2=1335687&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/test/resources/test-data.sql (original)
+++ rave/trunk/rave-portal/src/test/resources/test-data.sql Tue May  8 18:50:10 2012
@@ -25,6 +25,7 @@
  -- ***********************************************************************************
 -- Manually create table indices
 set @page_seq = 'page';
+set @page_user_seq = 'page_user';
 set @page_layout_seq = 'page_layout';
 set @region_seq = 'region';
 set @region_widget_seq = 'region_widget';
@@ -33,6 +34,7 @@ set @widget_seq = 'widget';
 
 CREATE TABLE IF NOT EXISTS RAVE_PORTAL_SEQUENCES (seq_name VARCHAR(255) PRIMARY KEY NOT NULL, seq_count BIGINT(19));
 INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@page_seq, 1);
+INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@page_user_seq, 1);
 INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@page_layout_seq, 1);
 INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@region_seq, 1);
 INSERT INTO RAVE_PORTAL_SEQUENCES(seq_name, seq_count) values (@region_widget_seq, 1);
@@ -228,10 +230,16 @@ 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)
-values (@page_1_id, 'Main', @user_id_1, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_1_id, 'Main', @user_id_1, @two_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_1_id, @user_id_1, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data
 
 set @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)
@@ -267,10 +275,17 @@ 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)
-values (@page_2_id, 'Social', @user_id_1, 2, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_2_id, 'Social', @user_id_1, @two_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_2_id, @user_id_1, true, 2, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data
+
 set @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 (@page_2_region_1, @page_2_id, 1);
@@ -305,10 +320,17 @@ UPDATE RAVE_PORTAL_SEQUENCES SET seq_cou
 
 --- 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)
-values (@page_1_id, 'Main', @user_id_2, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_1_id, 'Main', @user_id_2, @two_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_1_id, @user_id_2, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @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 (@page_1_region_1, @page_1_id, 1);
@@ -342,10 +364,17 @@ 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)
-values (@page_1_id, 'Main', @user_id_3, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_1_id, 'Main', @user_id_3, @two_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_1_id, @user_id_3, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @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 (@page_1_region_1, @page_1_id, 1);
@@ -379,26 +408,49 @@ 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)
-values (@page_1_id, 'Main', @user_id_4, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_1_id, 'Main', @user_id_4, @two_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
+
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_1_id, @user_id_4, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 --- 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)
-values (@page_1_id, 'Main', @user_id_5, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_1_id, 'Main', @user_id_5, @two_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
+
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_1_id, @user_id_5, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 --- End user_id_5 layout ---
 
 
 
 --- 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)
-values (@page_1_id, 'Main', @user_id_6, 1, @two_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_1_id, 'Main', @user_id_6, @two_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_1_id, @user_id_6, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @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 (@page_1_region_1, @page_1_id, 1);
@@ -432,10 +484,17 @@ 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)
-values (@page_7_id, 'Main', @user_id_7, 1, @one_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_7_id, 'Main', @user_id_7, @one_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_7_id, @user_id_7, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @page_7_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
 INSERT INTO region(entity_id, page_id, render_order)
 values (@page_7_region_1, @page_7_id, 1);
@@ -455,10 +514,17 @@ 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)
-values (@page_8_id, 'Main', @user_id_8, 1, @twown_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_8_id, 'Main', @user_id_8, @twown_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_8_id, @user_id_8, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @page_8_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
 INSERT INTO region(entity_id, page_id, render_order)
 values (@page_8_region_1, @page_8_id, 1);
@@ -492,10 +558,17 @@ 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)
-values (@page_9_id, 'Main', @user_id_9, 1, @three_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_9_id, 'Main', @user_id_9, @three_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_9_id, @user_id_9, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @page_9_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
 INSERT INTO region(entity_id, page_id, render_order)
 values (@page_9_region_1, @page_9_id, 1);
@@ -534,10 +607,17 @@ 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)
-values (@page_10_id, 'Main', @user_id_10, 1, @threewn_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_10_id, 'Main', @user_id_10, @threewn_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_10_id, @user_id_10, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @page_10_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
 INSERT INTO region(entity_id, page_id, render_order)
 values (@page_10_region_1, @page_10_id, 1);
@@ -576,10 +656,17 @@ 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)
-values (@page_11_id, 'Main', @user_id_11, 1, @four_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_11_id, 'Main', @user_id_11, @four_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_11_id, @user_id_11, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @page_11_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
 INSERT INTO region(entity_id, page_id, render_order)
 values (@page_11_region_1, @page_11_id, 1);
@@ -624,10 +711,17 @@ 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)
-values (@page_12_id, 'Main', @user_id_12, 1, @fourwn_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_12_id, 'Main', @user_id_12, @fourwn_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_12_id, @user_id_12, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @page_12_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
 INSERT INTO region(entity_id, page_id, render_order)
 values (@page_12_region_1, @page_12_id, 1);
@@ -671,10 +765,17 @@ 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)
-values (@page_13_id, 'Main', @user_id_13, 1, @fourwn_col_id);
+INSERT INTO page (entity_id, name, owner_id, page_layout_id)
+values (@page_13_id, 'Main', @user_id_13, @fourwn_col_id);
 UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_seq;
 
+--Set up page user data--
+set @page_user_id =(SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @page_user_seq);
+insert into page_user (entity_id, page_id, user_id, editor, render_sequence, page_status)
+values (@page_user_id, @page_13_id, @user_id_13, true, 1, 'OWNER');
+UPDATE RAVE_PORTAL_SEQUENCES SET seq_count = (seq_count + 1) WHERE seq_name = @page_user_seq;
+--end page user data--
+
 set @page_13_region_1 = (SELECT seq_count FROM RAVE_PORTAL_SEQUENCES WHERE seq_name = @region_seq);
 INSERT INTO region(entity_id, page_id, render_order)
 values (@page_13_region_1, @page_13_id, 1);