From de2500effa7de7bbfb833cf8f6a2c70c9c907bab Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Tue, 15 Jun 2010 21:37:13 +0000
Subject: 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
---
 mod/pages/actions/pages/delete.php                         | 2 +-
 mod/pages/actions/pages/editwelcome.php                    | 2 +-
 mod/pages/edit.php                                         | 4 ++--
 mod/pages/history.php                                      | 4 ++--
 mod/pages/index.php                                        | 4 ++--
 mod/pages/languages/en.php                                 | 2 +-
 mod/pages/new.php                                          | 4 ++--
 mod/pages/pagesTree.php                                    | 2 +-
 mod/pages/start.php                                        | 2 +-
 mod/pages/view.php                                         | 2 +-
 mod/pages/views/default/annotation/icon.php                | 2 +-
 mod/pages/views/default/annotation/page.php                | 2 +-
 mod/pages/views/default/icon/object/page/medium.php        | 2 +-
 mod/pages/views/default/icon/object/page/small.php         | 2 +-
 mod/pages/views/default/icon/object/page_top/medium.php    | 2 +-
 mod/pages/views/default/icon/object/page_top/small.php     | 2 +-
 mod/pages/views/default/object/page.php                    | 2 +-
 mod/pages/views/default/object/page_top.php                | 2 +-
 mod/pages/views/default/pages/breadcrumbs.php              | 2 +-
 mod/pages/views/default/pages/groupprofile_pages.php       | 2 +-
 mod/pages/views/default/pages/pagegallery.php              | 2 +-
 mod/pages/views/default/pages/pagelisting.php              | 2 +-
 mod/pages/views/default/pages/pageprofile.php              | 2 +-
 mod/pages/views/default/pages/sidebar/sidebarthis.php      | 2 +-
 mod/pages/views/default/pages/sidebar/starter.php          | 2 +-
 mod/pages/views/default/pages/sidebar/tree.php             | 2 +-
 mod/pages/views/default/pages/sidebar/wrapper.php          | 2 +-
 mod/pages/views/default/pages/welcome.php                  | 2 +-
 mod/pages/views/default/river/object/page/annotate.php     | 2 +-
 mod/pages/views/default/river/object/page/create.php       | 2 +-
 mod/pages/views/default/river/object/page/update.php       | 2 +-
 mod/pages/views/default/river/object/page_top/annotate.php | 2 +-
 mod/pages/views/default/river/object/page_top/create.php   | 2 +-
 mod/pages/views/default/river/object/page_top/update.php   | 2 +-
 mod/pages/views/default/widgets/pages/edit.php             | 2 +-
 mod/pages/views/default/widgets/pages/view.php             | 2 +-
 mod/pages/welcome.php                                      | 4 ++--
 mod/pages/world.php                                        | 4 ++--
 38 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/mod/pages/actions/pages/delete.php b/mod/pages/actions/pages/delete.php
index 740f1f6eb..8bda9e794 100644
--- 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 85d6e6138..5d29a5fd9 100644
--- 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 085bb8ee7..6f42fadbd 100644
--- 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 c3bd67154..fec7702ba 100644
--- 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 ad8aaaad2..6c1487c81 100644
--- 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 75d1bba9b..b31c59572 100644
--- 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 75ed61732..b47d91164 100644
--- 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 b44640d7a..19a8977cb 100644
--- 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 b029dbfd7..9caa3c4f2 100644
--- 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 24552b8c3..0000ed48a 100644
--- 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 5f943f8ce..3e0195e5f 100644
--- 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 27135b30d..ecfd0a302 100644
--- 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 3822ae7a2..1e5c1538e 100644
--- 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 81d83523f..3ccc859f3 100644
--- 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 3822ae7a2..1e5c1538e 100644
--- 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 81d83523f..3ccc859f3 100644
--- 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 09c1852e1..843209609 100644
--- 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 09c1852e1..843209609 100644
--- 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 c7e1bfb83..c70f96e12 100644
--- 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 a1da4bd6b..006a05877 100644
--- 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 84d95b53b..1ff32016d 100644
--- 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 806f60c9b..4da9fd4a2 100644
--- 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 b879ca7a2..b1081d9f7 100644
--- 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 47a262501..1c8b77848 100644
--- 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 4734ca929..edc66e499 100644
--- 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 c83e3f682..07de1beb5 100644
--- 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 ed21b4dd6..2109188cf 100644
--- 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 e4a465fdd..a390a9d65 100644
--- 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 e26671623..4bee26d81 100644
--- 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 e34145d79..00885d154 100644
--- 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 ff16e0af8..2b20a9ed8 100644
--- 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 fea3e570b..f3a47e5d9 100644
--- 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 5ff28dfaf..9427d5caa 100644
--- 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 cf4dfbe7d..febe2965d 100644
--- 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 9504d5fdb..6459a0373 100644
--- 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 425e4f501..d975dcdc0 100644
--- 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 dfc998f39..3ff0c3aae 100644
--- 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 72433e8ec..65f054dfb 100644
--- 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
+?>
-- 
cgit v1.2.3