aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-04 11:22:39 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-03-04 11:22:39 +0000
commit51f65f6debcb86ed5b329aa79bf571d60f587468 (patch)
tree08d05fa080385a5421602af9b49d879ff3b2bbd3
parent7d846c7536b7bf4091de37372e7ea1928c94bbc8 (diff)
downloadelgg-51f65f6debcb86ed5b329aa79bf571d60f587468.tar.gz
elgg-51f65f6debcb86ed5b329aa79bf571d60f587468.tar.bz2
Added contentWrapper view
git-svn-id: https://code.elgg.org/elgg/trunk@3063 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/elgglib.php13
-rw-r--r--mod/groups/all.php5
-rw-r--r--mod/groups/edit.php2
-rw-r--r--mod/groups/groupprofile.php2
-rw-r--r--mod/groups/views/default/groups/contentwrapper.php5
-rw-r--r--mod/groups/views/rss/groups/contentwrapper.php5
-rw-r--r--views/default/page_elements/contentwrapper.php11
-rw-r--r--views/rss/page_elements/contentwrapper.php5
8 files changed, 38 insertions, 10 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 3b7735f9f..4aa0983db 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -620,18 +620,21 @@
$subtype = $entity->getSubtype();
if (empty($subtype)) { $subtype = $entity_type; }
-
+
+ $contents = '';
if (elgg_view_exists("{$entity_type}/{$subtype}")) {
- return elgg_view("{$entity_type}/{$subtype}",array(
+ $contents = elgg_view("{$entity_type}/{$subtype}",array(
'entity' => $entity,
'full' => $full
), $bypass, $debug);
- } else {
- return elgg_view("{$entity_type}/default",array(
+ }
+ if (empty($contents)) {
+ $contents = elgg_view("{$entity_type}/default",array(
'entity' => $entity,
'full' => $full
), $bypass, $debug);
- }
+ }
+ return $contents;
}
/**
diff --git a/mod/groups/all.php b/mod/groups/all.php
index 8036abc94..7a6be0596 100644
--- a/mod/groups/all.php
+++ b/mod/groups/all.php
@@ -59,9 +59,8 @@
set_context($context);
$title = sprintf(elgg_echo("groups:all"),page_owner_entity()->name);
- $area2 = elgg_view_title($title);
- $area2 .= "<div class='contentWrapper groups'>" . elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter));
- $area2 .= $objects . "</div>";
+ $area2 = elgg_view_title($title);
+ $area2 .= elgg_view('groups/contentwrapper', array('body' => elgg_view("groups/group_sort_menu", array("count" => $group_count, "filter" => $filter)) . $objects));
$body = elgg_view_layout('sidebar_boxes',$area1, $area2);
// Finally draw the page
diff --git a/mod/groups/edit.php b/mod/groups/edit.php
index 848906dc8..da6477b9f 100644
--- a/mod/groups/edit.php
+++ b/mod/groups/edit.php
@@ -24,7 +24,7 @@
$body .= elgg_view("forms/groups/edit", array('entity' => $group));
} else {
- $body .= "<div class=\"contentWrapper\">" . elgg_echo('groups:noaccess') . "</div>";
+ $body .= elgg_view('groups/contentwrapper',array('body' => elgg_echo('groups:noaccess')));
}
$body = elgg_view_layout('two_column_left_sidebar', '', $body);
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index 7d84f5d25..aed1f2a9b 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -50,7 +50,7 @@
$title = elgg_echo('groups:notfound');
$area2 = elgg_view_title($title);
- $area2 .= "<div class='contentWrapper'>" . elgg_echo('groups:notfound:details') . "</div>";
+ $area2 .= elgg_view('groups/contentwrapper',array('body' => elgg_echo('groups:notfound:details')));
$body = elgg_view_layout('two_column_left_sidebar', "", $area2,"");
}
diff --git a/mod/groups/views/default/groups/contentwrapper.php b/mod/groups/views/default/groups/contentwrapper.php
new file mode 100644
index 000000000..384f08980
--- /dev/null
+++ b/mod/groups/views/default/groups/contentwrapper.php
@@ -0,0 +1,5 @@
+"<div class='contentWrapper groups'>"<?php
+
+ echo $vars['body'];
+
+?></div> \ No newline at end of file
diff --git a/mod/groups/views/rss/groups/contentwrapper.php b/mod/groups/views/rss/groups/contentwrapper.php
new file mode 100644
index 000000000..640dd8104
--- /dev/null
+++ b/mod/groups/views/rss/groups/contentwrapper.php
@@ -0,0 +1,5 @@
+<?php
+
+ echo $vars['body'];
+
+?> \ No newline at end of file
diff --git a/views/default/page_elements/contentwrapper.php b/views/default/page_elements/contentwrapper.php
new file mode 100644
index 000000000..ff54a0b6e
--- /dev/null
+++ b/views/default/page_elements/contentwrapper.php
@@ -0,0 +1,11 @@
+<div class="contentWrapper<?php
+
+ if (isset($vars['subclass'])) echo ' ' . $vars['subclass'];
+
+?>">
+<?php
+
+ echo $vars['body'];
+
+?>
+</div> \ No newline at end of file
diff --git a/views/rss/page_elements/contentwrapper.php b/views/rss/page_elements/contentwrapper.php
new file mode 100644
index 000000000..640dd8104
--- /dev/null
+++ b/views/rss/page_elements/contentwrapper.php
@@ -0,0 +1,5 @@
+<?php
+
+ echo $vars['body'];
+
+?> \ No newline at end of file