Quick and dirty changes to pages to work on 1.8's layout.

git-svn-id: http://code.elgg.org/elgg/trunk@6495 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/pages/actions/pages/delete.php b/mod/pages/actions/pages/delete.php
index 740f1f6ebdd38bfd24b998ed672869cdf33142de..8bda9e794e7a5db1910da615e098a4686fd37d48 100644 (file)
--- a/mod/pages/actions/pages/delete.php
+++ b/mod/pages/actions/pages/delete.php
@@ -32,4 +32,4 @@
        register_error(elgg_echo('pages:delete:failure'));
        forward($_SERVER['HTTP_REFERER']);
 
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/actions/pages/editwelcome.php b/mod/pages/actions/pages/editwelcome.php
index 85d6e61388a65a095af69489ebfde841c885d1cb..5d29a5fd97c6b0987e1c331a0dcc52594f4c6b23 100644 (file)
--- a/mod/pages/actions/pages/editwelcome.php
+++ b/mod/pages/actions/pages/editwelcome.php
@@ -74,4 +74,4 @@
        forward("pg/pages/owned/" . get_user($owner_guid)->username);
        exit;
        
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/edit.php b/mod/pages/edit.php
index 085bb8ee7f81f44fd88146decb4e76f1aa0041d7..6f42fadbd3e4019d423520b0cf46575a31657501 100644 (file)
--- a/mod/pages/edit.php
+++ b/mod/pages/edit.php
@@ -36,7 +36,7 @@
                $body .= elgg_echo("pages:noaccess");
        }
        
-       $body = elgg_view_layout('two_column_left_sidebar', '', $body);
+       $body = elgg_view_layout('one_column_with_sidebar', $body);
        
        page_draw($title, $body);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/history.php b/mod/pages/history.php
index c3bd67154d6ed506b2add9bea4b040e4055fe61e..fec7702ba75fdcc96afaa00c94ff357a42f156df 100644 (file)
--- a/mod/pages/history.php
+++ b/mod/pages/history.php
@@ -46,7 +46,7 @@
        pages_set_navigation_parent($pages);
        $area3 = elgg_view('pages/sidebar/tree');
        
-       $body = elgg_view_layout('two_column_left_sidebar', '', $area2, $area3);
+       $body = elgg_view_layout('one_column_with_sidebar', $area3, $area2);
        
        page_draw($title, $body);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/index.php b/mod/pages/index.php
index ad8aaaad2b571135011a396945916cf793ca0a3d..6c1487c818f9ff0c632c645a6dae30ec4b7f7de0 100644 (file)
--- a/mod/pages/index.php
+++ b/mod/pages/index.php
@@ -52,8 +52,8 @@
        $body = elgg_view_title($title);
        $body .= elgg_view("pages/welcome", array('entity' => $welcome_message));
        $body .= $objects;
-       $body = elgg_view_layout('two_column_left_sidebar', '', $body);
+       $body = elgg_view_layout('one_column_with_sidebar', $body);
        
        // Finally draw the page
        page_draw($title, $body);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/languages/en.php b/mod/pages/languages/en.php
index 75d1bba9b13f4203bd02a496b873f8c97aa7b88b..b31c595724b139593d1b7e69b5ae2d9bbf43d390 100644 (file)
--- a/mod/pages/languages/en.php
+++ b/mod/pages/languages/en.php
@@ -108,4 +108,4 @@
        );
                                        
        add_translation("en",$english);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/new.php b/mod/pages/new.php
index 75ed617329debff0b85d2d72a66596b376ed0f72..b47d91164abe2bc88fd16fa952aafbcc2c638bc4 100644 (file)
--- a/mod/pages/new.php
+++ b/mod/pages/new.php
@@ -38,7 +38,7 @@
        $area2 .= elgg_view_title($title);
        $area2 .= elgg_view("forms/pages/edit");
        
-       $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+       $body = elgg_view_layout('one_column_with_sidebar', $area2, $area1);
        
        page_draw($title, $body);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/pagesTree.php b/mod/pages/pagesTree.php
index b44640d7af5f1af6ab79c072702375b32051da86..19a8977cbbf3b3d29f5b1bd2be06c1e94e3fcdc9 100644 (file)
--- a/mod/pages/pagesTree.php
+++ b/mod/pages/pagesTree.php
@@ -11,4 +11,4 @@
        
        // View tree
                echo pages_get_entity_sidebar($page, $fulltree);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/start.php b/mod/pages/start.php
index b029dbfd72bf3434c37b9cd7c724dfca4b80bcb3..9caa3c4f2f1858b020daeb3f2200b51aeafa317f 100644 (file)
--- a/mod/pages/start.php
+++ b/mod/pages/start.php
@@ -337,4 +337,4 @@
        // Make sure the pages initialisation function is called on initialisation
        register_elgg_event_handler('init','system','pages_init');
        register_elgg_event_handler('pagesetup','system','pages_submenus');
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/view.php b/mod/pages/view.php
index 24552b8c3ba80fbbdf0ab1ca204ec3f431f40ab9..0000ed48a5c81c1e411398d32b81ece37716a220 100644 (file)
--- a/mod/pages/view.php
+++ b/mod/pages/view.php
@@ -54,7 +54,7 @@
        pages_set_navigation_parent($pages);
        $sidebar = elgg_view('pages/sidebar/tree');
 
-       $body = elgg_view_layout('two_column_left_sidebar', '', $body, $sidebar);
+       $body = elgg_view_layout('one_column_with_sidebar', $body, $sidebar);
 
        // Finally draw the page
        page_draw($title, $body);

diff --git a/mod/pages/views/default/annotation/icon.php b/mod/pages/views/default/annotation/icon.php
index 5f943f8ce9c45526d849f94c26339e5820469cba..3e0195e5f308d381cf3fd7fd223439e1a1a5d8e7 100644 (file)
--- a/mod/pages/views/default/annotation/icon.php
+++ b/mod/pages/views/default/annotation/icon.php
@@ -29,4 +29,4 @@
 
 <div class="groupicon">
 <a href="<?php echo $entity->getURL() . "?rev=" . $annotation->id; ?>"><img src="<?php echo $entity->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> <?php echo $vars['js']; ?> /></a>
-</div>
\ No newline at end of file
+</div>

diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php
index 27135b30d2b73ceb7e755d30cfa72af5175f5667..ecfd0a3023d747014fcc381847e1cd21e2f615da 100644 (file)
--- a/mod/pages/views/default/annotation/page.php
+++ b/mod/pages/views/default/annotation/page.php
@@ -37,4 +37,4 @@
 END;
 
        echo elgg_view_listing($icon, $info);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/icon/object/page/medium.php b/mod/pages/views/default/icon/object/page/medium.php
index 3822ae7a215e4dd5094fa179e60d5396ed79abd6..1e5c1538e627f76621562e9336ea00121d306e4e 100644 (file)
--- a/mod/pages/views/default/icon/object/page/medium.php
+++ b/mod/pages/views/default/icon/object/page/medium.php
@@ -1,3 +1,3 @@
 <?php
        echo $vars['url'] . "mod/pages/images/pages_lrg.gif";
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/icon/object/page/small.php b/mod/pages/views/default/icon/object/page/small.php
index 81d83523fcc8cf3b429ad477d644cd805ce413d2..3ccc859f336571a83819c2349214d724ed1e608b 100644 (file)
--- a/mod/pages/views/default/icon/object/page/small.php
+++ b/mod/pages/views/default/icon/object/page/small.php
@@ -1,3 +1,3 @@
 <?php
        echo $vars['url'] . "mod/pages/images/pages.gif";
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/icon/object/page_top/medium.php b/mod/pages/views/default/icon/object/page_top/medium.php
index 3822ae7a215e4dd5094fa179e60d5396ed79abd6..1e5c1538e627f76621562e9336ea00121d306e4e 100644 (file)
--- a/mod/pages/views/default/icon/object/page_top/medium.php
+++ b/mod/pages/views/default/icon/object/page_top/medium.php
@@ -1,3 +1,3 @@
 <?php
        echo $vars['url'] . "mod/pages/images/pages_lrg.gif";
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/icon/object/page_top/small.php b/mod/pages/views/default/icon/object/page_top/small.php
index 81d83523fcc8cf3b429ad477d644cd805ce413d2..3ccc859f336571a83819c2349214d724ed1e608b 100644 (file)
--- a/mod/pages/views/default/icon/object/page_top/small.php
+++ b/mod/pages/views/default/icon/object/page_top/small.php
@@ -1,3 +1,3 @@
 <?php
        echo $vars['url'] . "mod/pages/images/pages.gif";
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/object/page.php b/mod/pages/views/default/object/page.php
index 09c1852e184022c419a90acb998521ee94133acc..843209609612726f2cc180677b6d970cd78e5121 100644 (file)
--- a/mod/pages/views/default/object/page.php
+++ b/mod/pages/views/default/object/page.php
@@ -18,4 +18,4 @@
                        echo elgg_view("pages/pagelisting",$vars);
                }
        }
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php
index 09c1852e184022c419a90acb998521ee94133acc..843209609612726f2cc180677b6d970cd78e5121 100644 (file)
--- a/mod/pages/views/default/object/page_top.php
+++ b/mod/pages/views/default/object/page_top.php
@@ -18,4 +18,4 @@
                        echo elgg_view("pages/pagelisting",$vars);
                }
        }
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/pages/breadcrumbs.php b/mod/pages/views/default/pages/breadcrumbs.php
index c7e1bfb8367df5959f6ba3a721635cb64d150e8a..c70f96e12419a03219e6c172179c2369cb3bf257 100644 (file)
--- a/mod/pages/views/default/pages/breadcrumbs.php
+++ b/mod/pages/views/default/pages/breadcrumbs.php
@@ -25,4 +25,4 @@
             echo " &gt; $parent->title</div>";
         }
 
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/pages/groupprofile_pages.php b/mod/pages/views/default/pages/groupprofile_pages.php
index a1da4bd6babacdeef6ff0292cd50af5fbebf6a1a..006a0587779d8510006582712156aa478bc665d5 100644 (file)
--- a/mod/pages/views/default/pages/groupprofile_pages.php
+++ b/mod/pages/views/default/pages/groupprofile_pages.php
@@ -24,4 +24,4 @@
 
 <?php
     }
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/pages/pagegallery.php b/mod/pages/views/default/pages/pagegallery.php
index 84d95b53bcb20d5b3a2afaf9796ba79e4967871b..1ff32016d513bb2006d41e33320647f80666f687 100644 (file)
--- a/mod/pages/views/default/pages/pagegallery.php
+++ b/mod/pages/views/default/pages/pagegallery.php
@@ -34,4 +34,4 @@
        }
 
        echo elgg_view_listing($icon, $info);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php
index 806f60c9be330b91e01a41db729c82dec2da42a0..4da9fd4a2eab37c4fb81958a774b9a20a327c212 100644 (file)
--- a/mod/pages/views/default/pages/pagelisting.php
+++ b/mod/pages/views/default/pages/pagelisting.php
@@ -35,4 +35,4 @@
        }
        
        echo elgg_view_listing($icon, $info);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php
index b879ca7a22b9d9120dac149ac880f9d66f847266..b1081d9f72f2418111109d974f6523c3b2325b3d 100644 (file)
--- a/mod/pages/views/default/pages/pageprofile.php
+++ b/mod/pages/views/default/pages/pageprofile.php
@@ -80,4 +80,4 @@
        </p>
 </div>
 
-</div>
\ No newline at end of file
+</div>

diff --git a/mod/pages/views/default/pages/sidebar/sidebarthis.php b/mod/pages/views/default/pages/sidebar/sidebarthis.php
index 47a2625015935e333fb7d2e10c93ef5646cdf4b7..1c8b77848165ed3659425f887933dd5ffe161dae 100644 (file)
--- a/mod/pages/views/default/pages/sidebar/sidebarthis.php
+++ b/mod/pages/views/default/pages/sidebar/sidebarthis.php
@@ -89,4 +89,4 @@
                
        if (!$parent) echo "}";
 
-?>]
\ No newline at end of file
+?>]

diff --git a/mod/pages/views/default/pages/sidebar/starter.php b/mod/pages/views/default/pages/sidebar/starter.php
index 4734ca92919eee05812574d82fee12e0d28d230d..edc66e49941158a8d687a33e08144dc38fcd08a8 100644 (file)
--- a/mod/pages/views/default/pages/sidebar/starter.php
+++ b/mod/pages/views/default/pages/sidebar/starter.php
@@ -18,4 +18,4 @@
 
        }
 
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/pages/sidebar/tree.php b/mod/pages/views/default/pages/sidebar/tree.php
index c83e3f68212ea0e5b008dded4ed437bd4c6aaf35..07de1beb5a969f4cd00ed0640e4013513c4939ce 100644 (file)
--- a/mod/pages/views/default/pages/sidebar/tree.php
+++ b/mod/pages/views/default/pages/sidebar/tree.php
@@ -5,4 +5,4 @@
            <h3><?php echo elgg_echo("pages:navigation"); ?></h3>       
                <div id="pagesTree" class="pagesTreeContainer"></div>
 </div>
-<br class="clearfloat" />
\ No newline at end of file
+<br class="clearfloat" />

diff --git a/mod/pages/views/default/pages/sidebar/wrapper.php b/mod/pages/views/default/pages/sidebar/wrapper.php
index ed21b4dd6c0ddf9664afda81d27ac273ca55520d..2109188cf665d3603b3115efa9fac18247cca3e2 100644 (file)
--- a/mod/pages/views/default/pages/sidebar/wrapper.php
+++ b/mod/pages/views/default/pages/sidebar/wrapper.php
@@ -4,4 +4,4 @@
        echo $vars['body'];
        echo "]";
 
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/pages/welcome.php b/mod/pages/views/default/pages/welcome.php
index e4a465fdd3a503e6b9cae139a8352c969d0370f7..a390a9d6533431e603636d2480ee3be02e5dba0d 100644 (file)
--- a/mod/pages/views/default/pages/welcome.php
+++ b/mod/pages/views/default/pages/welcome.php
@@ -26,4 +26,4 @@
     
 <?php
     }
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/views/default/river/object/page/annotate.php b/mod/pages/views/default/river/object/page/annotate.php
index e26671623aff28d3ae9ae16838bfd59e504db4b5..4bee26d814f49c028310ff126fffa95233e5376c 100644 (file)
--- a/mod/pages/views/default/river/object/page/annotate.php
+++ b/mod/pages/views/default/river/object/page/annotate.php
@@ -11,4 +11,4 @@
 
 ?>
 
-<?php echo $string; ?>
\ No newline at end of file
+<?php echo $string; ?>

diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index e34145d798981ccfb8f292abadbb709e215f7b11..00885d154d4a1e02b52a652a0ece963022fa1e97 100644 (file)
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -14,4 +14,4 @@
        $string .= elgg_make_excerpt($contents, 200);
        $string .= "</div>";
 
-       echo $string;
\ No newline at end of file
+       echo $string;

diff --git a/mod/pages/views/default/river/object/page/update.php b/mod/pages/views/default/river/object/page/update.php
index ff16e0af88a51a1b5fb433452f82c904f7f301fd..2b20a9ed8d357b9fc7c883cfa9c54a2eceda0794 100644 (file)
--- a/mod/pages/views/default/river/object/page/update.php
+++ b/mod/pages/views/default/river/object/page/update.php
@@ -11,4 +11,4 @@
     
 ?>
 
-<?php echo $string; ?>
\ No newline at end of file
+<?php echo $string; ?>

diff --git a/mod/pages/views/default/river/object/page_top/annotate.php b/mod/pages/views/default/river/object/page_top/annotate.php
index fea3e570b56a2231e262bd5febd2b2007e85f4dd..f3a47e5d9436284b79fb13eacc704252446fd555 100644 (file)
--- a/mod/pages/views/default/river/object/page_top/annotate.php
+++ b/mod/pages/views/default/river/object/page_top/annotate.php
@@ -11,4 +11,4 @@
 
 ?>
 
-<?php echo $string; ?>
\ No newline at end of file
+<?php echo $string; ?>

diff --git a/mod/pages/views/default/river/object/page_top/create.php b/mod/pages/views/default/river/object/page_top/create.php
index 5ff28dfaf3170ee5a821d30e56824a120158ae5b..9427d5caa50385602f895f4533248f49665239a8 100644 (file)
--- a/mod/pages/views/default/river/object/page_top/create.php
+++ b/mod/pages/views/default/river/object/page_top/create.php
@@ -11,4 +11,4 @@
 
 ?>
 
-<?php echo $string; ?>
\ No newline at end of file
+<?php echo $string; ?>

diff --git a/mod/pages/views/default/river/object/page_top/update.php b/mod/pages/views/default/river/object/page_top/update.php
index cf4dfbe7d5fc7a44086cae508d691aaf0e6fce9d..febe2965df371521c92ee9229b3e3a81172494a4 100644 (file)
--- a/mod/pages/views/default/river/object/page_top/update.php
+++ b/mod/pages/views/default/river/object/page_top/update.php
@@ -11,4 +11,4 @@
     
 ?>
 
-<?php echo $string; ?>
\ No newline at end of file
+<?php echo $string; ?>

diff --git a/mod/pages/views/default/widgets/pages/edit.php b/mod/pages/views/default/widgets/pages/edit.php
index 9504d5fdb3b0f7912b4ec761d2ce963a4c143ebe..6459a037310215bbbb7c50d98e3b05907627f27d 100644 (file)
--- a/mod/pages/views/default/widgets/pages/edit.php
+++ b/mod/pages/views/default/widgets/pages/edit.php
@@ -30,4 +30,4 @@ for ($i=1; $i<=10; $i++) {
 }
 ?>
        </select>
-</p>
\ No newline at end of file
+</p>

diff --git a/mod/pages/views/default/widgets/pages/view.php b/mod/pages/views/default/widgets/pages/view.php
index 425e4f5010332b59f9b3767c42e85c61ef8f4290..d975dcdc063aa299973c75e18a3e25051a64cd36 100644 (file)
--- a/mod/pages/views/default/widgets/pages/view.php
+++ b/mod/pages/views/default/widgets/pages/view.php
@@ -29,4 +29,4 @@
 
      echo "<div id=\"pages_widget\">" . $pages . "</div>";
      
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/welcome.php b/mod/pages/welcome.php
index dfc998f3934cac1ebbdd67a03415a34c16b1a97e..3ff0c3aae6f7255884d2309a59a664fb100b6337 100644 (file)
--- a/mod/pages/welcome.php
+++ b/mod/pages/welcome.php
@@ -33,7 +33,7 @@
        $area2 .= elgg_view_title($title);
        $area2 .= elgg_view("forms/pages/editwelcome", array('entity' => $welcome_message, 'owner' => $page_owner));
        
-       $body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
+       $body = elgg_view_layout('one_column_with_sidebar', $area2, $area1);
        
        page_draw($title, $body);
-?>
\ No newline at end of file
+?>

diff --git a/mod/pages/world.php b/mod/pages/world.php
index 72433e8ec5b5b2f6718177b28fc26eaee867e8ff..65f054dfbee01e65d05de11f8bc17a6693de4b5e 100644 (file)
--- a/mod/pages/world.php
+++ b/mod/pages/world.php
@@ -47,8 +47,8 @@
        
        $body = elgg_view_title($title);
        $body .= $objects;
-       $body = elgg_view_layout('two_column_left_sidebar','',$body);
+       $body = elgg_view_layout('one_column_with_sidebar', $body);
        
        // Finally draw the page
        page_draw($title, $body);
-?>
\ No newline at end of file
+?>