From c66831fa5138a277a9729174caf14c7eb323fb07 Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Oct 2009 20:26:12 +0000 Subject: Standardizing views.` git-svn-id: http://code.elgg.org/elgg/trunk@3555 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/messages/errors/error.php | 31 ++++++------ views/default/messages/errors/list.php | 53 +++++++++---------- views/default/messages/exceptions/exception.php | 67 ++++++++++++------------- views/default/messages/list.php | 39 ++++++-------- views/default/messages/messages/list.php | 56 +++++++++------------ views/default/messages/messages/message.php | 31 ++++++------ 6 files changed, 122 insertions(+), 155 deletions(-) (limited to 'views/default/messages') diff --git a/views/default/messages/errors/error.php b/views/default/messages/errors/error.php index 468505c89..26a24c807 100644 --- a/views/default/messages/errors/error.php +++ b/views/default/messages/errors/error.php @@ -1,20 +1,17 @@ -

- $vars['object'])); ?> -

\ No newline at end of file +

+ $vars['object'])); ?> +

\ No newline at end of file diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php index e9b9b2ebb..846e22a80 100644 --- a/views/default/messages/errors/list.php +++ b/views/default/messages/errors/list.php @@ -1,57 +1,50 @@
$error)); - } + foreach($vars['object'] as $error) { + echo elgg_view('messages/errors/error',array('object' => $error)); + } ?>
\ No newline at end of file +} \ No newline at end of file diff --git a/views/default/messages/exceptions/exception.php b/views/default/messages/exceptions/exception.php index 0b482d845..c93883cbc 100644 --- a/views/default/messages/exceptions/exception.php +++ b/views/default/messages/exceptions/exception.php @@ -1,44 +1,39 @@ $vars['object']->getMessage())); - * @link http://elgg.org/ - * - * @uses $vars['object'] An exception - */ +$body = <<< END +

+ + $message + +

+END; - global $CONFIG; - - $class = get_class($vars['object']); - $message = elgg_view('output/longtext', array('value' => $vars['object']->getMessage())); - - $body = <<< END -

- - $message - +if ($CONFIG->debug) { + $details = elgg_view('output/longtext', array('value' => htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'))); + $body .= <<< END +


+

+ $details

END; +} - if ($CONFIG->debug) - { - $details = elgg_view('output/longtext', array('value' => htmlentities(print_r($vars['object'], true), ENT_QUOTES, 'UTF-8'))); - $body .= <<< END -
-

- $details -

-END; - } - - $title = $class; - - echo elgg_view_layout("one_column", elgg_view_title($title) . $body); -?> \ No newline at end of file +$title = $class; + +echo elgg_view_layout("one_column", elgg_view_title($title) . $body); \ No newline at end of file diff --git a/views/default/messages/list.php b/views/default/messages/list.php index dd02fdac5..62500882c 100644 --- a/views/default/messages/list.php +++ b/views/default/messages/list.php @@ -1,25 +1,18 @@ 0) { - - foreach($vars['object'] as $register => $list ) { - echo elgg_view("messages/{$register}/list", array('object' => $list)); - } - - } - -?> \ No newline at end of file +if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) { + foreach($vars['object'] as $register => $list ) { + echo elgg_view("messages/{$register}/list", array('object' => $list)); + } +} diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php index 81f3a45a8..67da01657 100644 --- a/views/default/messages/messages/list.php +++ b/views/default/messages/messages/list.php @@ -1,58 +1,50 @@
$message)); - } - + foreach($vars['object'] as $message) { + echo elgg_view('messages/messages/message',array('object' => $message)); + } ?>
- - \ No newline at end of file +} diff --git a/views/default/messages/messages/message.php b/views/default/messages/messages/message.php index bd3514e7a..717fd5e57 100644 --- a/views/default/messages/messages/message.php +++ b/views/default/messages/messages/message.php @@ -1,20 +1,17 @@ -

- $vars['object'])); ?> -

\ No newline at end of file +

+ $vars['object'])); ?> +

\ No newline at end of file -- cgit v1.2.3