]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
updated some of the core pages based on new CSS and layouts
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 17 Dec 2010 22:05:13 +0000 (22:05 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Fri, 17 Dec 2010 22:05:13 +0000 (22:05 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7667 36083f99-b078-4883-b0ff-0f9b5a30f544

pages/account/forgotten_password.php
pages/account/register.php
pages/entities/list.php [deleted file]
pages/friends/index.php
pages/friends/of.php
pages/settings/statistics.php

index a387717b301f2fecf6464ae0d7d73438f83a22f7..8ec7b6cbd8b0197027a95a3b4f676d64b1b1d747 100644 (file)
@@ -17,6 +17,6 @@ $content = elgg_view_title($title);
 
 $content .= elgg_view_form('user/requestnewpassword');
 
-$body = elgg_view_layout("one_column_with_sidebar", array('content' => $content));
+$body = elgg_view_layout("one_column", array('content' => $content));
 
 echo elgg_view_page($title, $body);
index 9aa835b9c0e4cac0230f45651005cfb3871649c5..b368cfdd4d1831fb7f4d2c6e59743d06eda18328 100644 (file)
@@ -43,6 +43,6 @@ $body_params = array(
 );
 $content .= elgg_view_form('register', $form_params, $body_params);
 
-$body = elgg_view_layout("one_column_with_sidebar", array('content' => $content));
+$body = elgg_view_layout("one_column", array('content' => $content));
 
 echo elgg_view_page($title, $body);
diff --git a/pages/entities/list.php b/pages/entities/list.php
deleted file mode 100644 (file)
index c926de4..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Entity viewer
- *
- * @package Elgg
- * @subpackage Core
- */
-
-elgg_push_context('search');
-$area2 = elgg_list_entities();
-elgg_pop_context();
-
-$body = elgg_view_layout('two_column_left_sidebar', $area1, $area2);
-
-echo elgg_view_page("", $body);
\ No newline at end of file
index 13799e973cf1e7a8ababe304dab0a099d297fb05..a8e5f7e8eb8dc6c44e144689942d38337c8dc1e1 100644 (file)
@@ -8,15 +8,12 @@
 
 $owner = elgg_get_page_owner();
 if (!$owner) {
-       gatekeeper();
-       set_page_owner(get_loggedin_userid());
-       $owner = elgg_get_page_owner();
+       // unknown user so send away (@todo some sort of 404 error)
+       forward();
 }
 
 $title = elgg_echo("friends:owned", array($owner->name));
 
-$content = elgg_view_title($title);
-
 $options = array(
        'relationship' => 'friend',
        'relationship_guid' => $owner->getGUID(),
@@ -24,8 +21,12 @@ $options = array(
        'type' => 'user',
        'full_view' => FALSE
 );
-$content .= elgg_list_entities_from_relationship($options);
+$content = elgg_list_entities_from_relationship($options);
 
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+$params = array(
+       'content' => $content,
+       'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
 
 echo elgg_view_page($title, $body);
index 66cda587dd4d97522b8821870bf88e6a00326707..395334ff5d9beab30176375e469121d3169a4beb 100644 (file)
@@ -8,15 +8,12 @@
 
 $owner = elgg_get_page_owner();
 if (!$owner) {
-       gatekeeper();
-       set_page_owner(get_loggedin_userid());
-       $owner = elgg_get_page_owner();
+       // unknown user so send away (@todo some sort of 404 error)
+       forward();
 }
 
 $title = elgg_echo("friends:of:owned", array($owner->name));
 
-$content = elgg_view_title($title);
-
 $options = array(
        'relationship' => 'friend',
        'relationship_guid' => $owner->getGUID(),
@@ -24,8 +21,12 @@ $options = array(
        'type' => 'user',
        'full_view' => FALSE
 );
-$content .= elgg_list_entities_from_relationship($options);
+$content = elgg_list_entities_from_relationship($options);
 
-$body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));
+$params = array(
+       'content' => $content,
+       'title' => $title,
+);
+$body = elgg_view_layout('one_sidebar', $params);
 
 echo elgg_view_page($title, $body);
index 165c31e8e4acdd4ea45cdb8b9c9ee58d060f6c65..2c9c32190d30e1f226fc157d5593f03c4ec2a2a0 100644 (file)
@@ -22,6 +22,6 @@ $params = array(
        'content' => $content,
        'title' => $title,
 );
-$body = elgg_view_layout('one_sidebar', array('content' => $content));
+$body = elgg_view_layout('one_sidebar', $params);
 
 echo elgg_view_page($title, $body);