aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-10-16 20:41:31 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-10-16 20:41:31 +0000
commit70b08afa64465f4d3457ba6e1c4cc2df1dd2069b (patch)
tree251d2559ea516ae4e23395dab4b083d079b65d24 /views
parentc66831fa5138a277a9729174caf14c7eb323fb07 (diff)
downloadelgg-70b08afa64465f4d3457ba6e1c4cc2df1dd2069b.tar.gz
elgg-70b08afa64465f4d3457ba6e1c4cc2df1dd2069b.tar.bz2
More views cleanup.
git-svn-id: http://code.elgg.org/elgg/trunk@3556 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/page_elements/contentwrapper.php18
-rw-r--r--views/default/page_elements/elgg_topbar.php59
-rw-r--r--views/default/page_elements/footer.php33
-rw-r--r--views/default/page_elements/header.php103
-rw-r--r--views/default/page_elements/header_contents.php21
-rw-r--r--views/default/page_elements/owner_block.php189
-rw-r--r--views/default/page_elements/spotlight.php35
-rw-r--r--views/default/page_elements/title.php83
-rw-r--r--views/default/pageshells/pageshell.php66
-rw-r--r--views/default/river/dashboard.php34
-rw-r--r--views/default/river/item/list.php66
-rw-r--r--views/default/river/item/noaccess.php12
-rw-r--r--views/default/river/item/wrapper.php55
-rw-r--r--views/default/river/relationship/friend/create.php81
-rw-r--r--views/default/river/wrapper.php57
-rw-r--r--views/default/search/entity_list.php118
-rw-r--r--views/default/search/gallery.php71
-rw-r--r--views/default/search/gallery_listing.php53
-rw-r--r--views/default/search/listing.php69
-rw-r--r--views/default/search/startblurb.php17
20 files changed, 618 insertions, 622 deletions
diff --git a/views/default/page_elements/contentwrapper.php b/views/default/page_elements/contentwrapper.php
index 2cb001b05..81b7b5c7c 100644
--- a/views/default/page_elements/contentwrapper.php
+++ b/views/default/page_elements/contentwrapper.php
@@ -1,11 +1,23 @@
+<?php
+/**
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ * @uses $vars['value'] The URL to display
+ *
+ */
+?>
<div class="contentWrapper<?php
- if (isset($vars['subclass'])) echo ' ' . $vars['subclass'];
+ if (isset($vars['subclass'])) {
+ echo ' ' . $vars['subclass'];
+ }
?>">
<?php
-
echo $vars['body'];
-
?>
</div> \ No newline at end of file
diff --git a/views/default/page_elements/elgg_topbar.php b/views/default/page_elements/elgg_topbar.php
index 46314f2ad..b9609910c 100644
--- a/views/default/page_elements/elgg_topbar.php
+++ b/views/default/page_elements/elgg_topbar.php
@@ -1,19 +1,18 @@
<?php
-
- /**
- * Elgg top toolbar
- * The standard elgg top toolbar
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
+/**
+ * Elgg top toolbar
+ * The standard elgg top toolbar
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
?>
<?php
- if (isloggedin()) {
+ if (isloggedin()) {
?>
<div id="elgg_topbar">
@@ -21,41 +20,40 @@
<div id="elgg_topbar_container_left">
<div class="toolbarimages">
<a href="http://www.elgg.org" target="_blank"><img src="<?php echo $vars['url']; ?>_graphics/elgg_toolbar_logo.gif" /></a>
-
+
<a href="<?php echo $_SESSION['user']->getURL(); ?>"><img class="user_mini_avatar" src="<?php echo $_SESSION['user']->getIcon('topbar'); ?>" /></a>
-
+
</div>
<div class="toolbarlinks">
<a href="<?php echo $vars['url']; ?>pg/dashboard/" class="pagelinks"><?php echo elgg_echo('dashboard'); ?></a>
</div>
- <?php
+ <?php
- echo elgg_view("navigation/topbar_tools");
+ echo elgg_view("navigation/topbar_tools");
- ?>
-
-
- <div class="toolbarlinks2">
+ ?>
+
+ <div class="toolbarlinks2">
<?php
//allow people to extend this top menu
echo elgg_view('elgg_topbar/extend', $vars);
?>
-
+
<a href="<?php echo $vars['url']; ?>pg/settings/" class="usersettings"><?php echo elgg_echo('settings'); ?></a>
-
+
<?php
-
+
// The administration link is for admin or site admin users only
- if ($vars['user']->admin || $vars['user']->siteadmin) {
-
+ if ($vars['user']->admin || $vars['user']->siteadmin) {
+
?>
-
+
<a href="<?php echo $vars['url']; ?>pg/admin/" class="usersettings"><?php echo elgg_echo("admin"); ?></a>
-
+
<?php
-
+
}
-
+
?>
</div>
@@ -79,5 +77,4 @@
<div class="clearfloat"></div>
<?php
- }
-?> \ No newline at end of file
+ } \ No newline at end of file
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index 0679a988e..31c62a76e 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -1,18 +1,17 @@
<?php
+/**
+ * Elgg footer
+ * The standard HTML footer that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
- /**
- * Elgg footer
- * The standard HTML footer that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
-
- // get the tools menu
- //$menu = get_register('menu');
+// get the tools menu
+//$menu = get_register('menu');
?>
@@ -24,7 +23,7 @@
<td width="210" height="50">
</td>
-
+
<td width="748" height="50" align="right">
<p class="footer_toolbar_links">
<?php
@@ -33,17 +32,17 @@
</p>
</td>
</tr>
-
+
<tr>
<td width="210" height="28">
<a href="http://www.elgg.org" target="_blank">
<img src="<?php echo $vars['url']; ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" border="0" />
</a>
</td>
-
+
<td width="748" height="28" align="right">
<p class="footer_legal_links"><small>
- Powered by Elgg, the leading open source social networking platform
+ Powered by Elgg, the leading open source social networking platform
</small>
</p>
</td>
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index 5235ed740..48073654c 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -1,54 +1,53 @@
<?php
+/**
+ * Elgg pageshell
+ * The standard HTML header that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ * @uses $vars['config'] The site configuration settings, imported
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
+ */
+
+// Set title
+if (empty($vars['title'])) {
+ $title = $vars['config']->sitename;
+} else if (empty($vars['config']->sitename)) {
+ $title = $vars['title'];
+} else {
+ $title = $vars['config']->sitename . ": " . $vars['title'];
+}
+
+global $autofeed;
+if (isset($autofeed) && $autofeed == true) {
+ $url = $url2 = full_url();
+ if (substr_count($url,'?')) {
+ $url .= "&view=rss";
+ } else {
+ $url .= "?view=rss";
+ }
+ if (substr_count($url2,'?')) {
+ $url2 .= "&view=odd";
+ } else {
+ $url2 .= "?view=opendd";
+ }
+ $feedref = <<<END
- /**
- * Elgg pageshell
- * The standard HTML header that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['config'] The site configuration settings, imported
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
- */
-
- // Set title
- if (empty($vars['title'])) {
- $title = $vars['config']->sitename;
- } else if (empty($vars['config']->sitename)) {
- $title = $vars['title'];
- } else {
- $title = $vars['config']->sitename . ": " . $vars['title'];
- }
-
- global $autofeed;
- if (isset($autofeed) && $autofeed == true) {
- $url = $url2 = full_url();
- if (substr_count($url,'?')) {
- $url .= "&view=rss";
- } else {
- $url .= "?view=rss";
- }
- if (substr_count($url2,'?')) {
- $url2 .= "&view=odd";
- } else {
- $url2 .= "?view=opendd";
- }
- $feedref = <<<END
-
<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
<link rel="alternate" type="application/odd+xml" title="OpenDD" href="{$url2}" />
-
+
END;
- } else {
- $feedref = "";
- }
-
- $version = get_version();
- $release = get_version(true);
+} else {
+ $feedref = "";
+}
+
+$version = get_version();
+$release = get_version(true);
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@@ -58,7 +57,7 @@ END;
<meta name="ElggVersion" content="<?php echo $version; ?>" />
<title><?php echo $title; ?></title>
- <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.3.2.min.js"></script>
+ <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.custom.min.js"></script>
<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script>
<script type="text/javascript" src="<?php echo $vars['url']; ?>_css/js.php?lastcache=<?php echo $vars['config']->lastcache; ?>&js=initialise_elgg&viewtype=<?php echo $vars['view']; ?>"></script>
@@ -74,14 +73,14 @@ END;
?>
<!-- include the default css file -->
<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css?lastcache=<?php echo $vars['config']->lastcache; ?>&viewtype=<?php echo $vars['view']; ?>" type="text/css" />
-
- <?php
+
+ <?php
echo $feedref;
- echo elgg_view('metatags',$vars);
+ echo elgg_view('metatags',$vars);
?>
<script type="text/javascript">
- jQuery(document).ready(function($) {
- });
+ jQuery(document).ready(function($) {
+ });
</script>
</head>
diff --git a/views/default/page_elements/header_contents.php b/views/default/page_elements/header_contents.php
index 2786a720e..ac47d8962 100644
--- a/views/default/page_elements/header_contents.php
+++ b/views/default/page_elements/header_contents.php
@@ -1,17 +1,14 @@
<?php
+/**
+ * Elgg header contents
+ * This file holds the header output that a user will see
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ **/
- /**
- * Elgg header contents
- * This file holds the header output that a user will see
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- **/
-
?>
<div id="page_container">
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 535d1b064..46397c4c2 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -1,100 +1,95 @@
<?php
+/**
+ * Elgg owner block
+ * Displays page ownership information
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
+
+$contents = "";
+
+// Is there a page owner?
+$owner = page_owner_entity();
+// if (!$owner && isloggedin()) $owner = $_SESSION['user'];
+if ($owner instanceof ElggEntity) {
+ $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+ if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
+ //$info = $owner->name;
+ $info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
+ }
+ $display = "<div id=\"owner_block_icon\">" . $icon . "</div>";
+ $display .= "<div id=\"owner_block_content\">" . $info . "</div><div class=\"clearfloat ownerblockline\"></div>";
+
+ if ($owner->briefdescription) {
+ $desc = $owner->briefdescription;
+ $display .= "<div id=\"owner_block_desc\">" . $desc . "</div>";
+ }
+
+ $contents .= $display;
+}
+
+// Are there feeds to display?
+global $autofeed;
+
+if (isset($autofeed) && $autofeed == true) {
+ $url = $url2 = full_url();
+ if (substr_count($url,'?')) {
+ $url .= "&view=rss";
+ } else {
+ $url .= "?view=rss";
+ }
+ //if (substr_count($url2,'?')) {
+ // $url2 .= "&view=odd";
+ //} else {
+ // $url2 .= "?view=opendd";
+ //}
+ $label = elgg_echo('feed:rss');
+ //$label2 = elgg_echo('feed:odd');
+ $contents .= <<<END
+
+<div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div>
- /**
- * Elgg owner block
- * Displays page ownership information
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- *
- */
-
- $contents = "";
-
- // Is there a page owner?
- $owner = page_owner_entity();
- // if (!$owner && isloggedin()) $owner = $_SESSION['user'];
- if ($owner instanceof ElggEntity) {
- $icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
- if ($owner instanceof ElggUser || $owner instanceof ElggGroup) {
- //$info = $owner->name;
- $info = '<a href="' . $owner->getURL() . '">' . $owner->name . '</a>';
- }
- $display = "<div id=\"owner_block_icon\">" . $icon . "</div>";
- $display .= "<div id=\"owner_block_content\">" . $info . "</div><div class=\"clearfloat ownerblockline\"></div>";
-
- if ($owner->briefdescription) {
- $desc = $owner->briefdescription;
- $display .= "<div id=\"owner_block_desc\">" . $desc . "</div>";
- }
-
- $contents .= $display;
- }
-
- // Are there feeds to display?
- global $autofeed;
-
- if (isset($autofeed) && $autofeed == true) {
- $url = $url2 = full_url();
- if (substr_count($url,'?')) {
- $url .= "&view=rss";
- } else {
- $url .= "?view=rss";
- }
- //if (substr_count($url2,'?')) {
- // $url2 .= "&view=odd";
- //} else {
- // $url2 .= "?view=opendd";
- //}
- $label = elgg_echo('feed:rss');
- //$label2 = elgg_echo('feed:odd');
- $contents .= <<<END
-
- <div id="owner_block_rss_feed"><a href="{$url}" rel="nofollow">{$label}</a></div>
-
END;
- }
-
- //the follow are for logged in users only
- if(isloggedin()){
-
- //is the bookmark plugin installed?
- if(is_plugin_enabled('bookmarks')){
-
- $label3 = elgg_echo('bookmarks:this');
- $contents .= "<div id=\"owner_block_bookmark_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/bookmarks/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label3}</a></div>";
-
- }
-
- //report this button
- if (is_plugin_enabled('reportedcontent'))
- {
- $label4 = elgg_echo('reportedcontent:report');
- $contents .= "<div id=\"owner_block_report_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label4}</a></div>";
- }
-
- }
-
-
- $contents .= elgg_view('owner_block/extend');
-
- // Have we been asked to inject any content? If so, display it
- if (isset($vars['content']))
- $contents .= $vars['content'];
-
- // Initialise the submenu
- $submenu = get_submenu(); // elgg_view('canvas_header/submenu');
- if (!empty($submenu))
- $contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options
-
- if (!empty($contents)) {
- echo "<div id=\"owner_block\">";
- echo $contents;
- echo "</div><div id=\"owner_block_bottom\"></div>";
- }
-
-?> \ No newline at end of file
+}
+
+//the follow are for logged in users only
+if(isloggedin()){
+
+ //is the bookmark plugin installed?
+ if(is_plugin_enabled('bookmarks')){
+
+ $label3 = elgg_echo('bookmarks:this');
+ $contents .= "<div id=\"owner_block_bookmark_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/bookmarks/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label3}</a></div>";
+
+ }
+
+ //report this button
+ if (is_plugin_enabled('reportedcontent'))
+ {
+ $label4 = elgg_echo('reportedcontent:report');
+ $contents .= "<div id=\"owner_block_report_this\"><a href=\"javascript:location.href='". $CONFIG->wwwroot . "mod/reportedcontent/add.php?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">{$label4}</a></div>";
+ }
+
+}
+
+
+$contents .= elgg_view('owner_block/extend');
+
+// Have we been asked to inject any content? If so, display it
+if (isset($vars['content']))
+ $contents .= $vars['content'];
+
+// Initialise the submenu
+$submenu = get_submenu(); // elgg_view('canvas_header/submenu');
+if (!empty($submenu))
+ $contents .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options
+
+if (!empty($contents)) {
+ echo "<div id=\"owner_block\">";
+ echo $contents;
+ echo "</div><div id=\"owner_block_bottom\"></div>";
+} \ No newline at end of file
diff --git a/views/default/page_elements/spotlight.php b/views/default/page_elements/spotlight.php
index 5b5a90ac7..670e0e4c5 100644
--- a/views/default/page_elements/spotlight.php
+++ b/views/default/page_elements/spotlight.php
@@ -1,20 +1,19 @@
<?php
-
- /**
- * Elgg spotlight
- * The spotlight area that displays across the site
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- */
+/**
+ * Elgg spotlight
+ * The spotlight area that displays across the site
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
?>
<div id="layout_spotlight">
<div id="wrapper_spotlight">
-
+
<div class="collapsable_box no_space_after">
<div class="collapsable_box_header">
<?php
@@ -22,15 +21,15 @@
$closed = false;
if ($_SESSION['user'] instanceof ElggUser) {
if ($_SESSION['user']->spotlightclosed) {
-
+
$closed = true;
-
+
}
}
if ($closed) {
?>
<a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo $vars['url']; ?>action/user/spotlight?closed=false')">+</a>
-<?php
+<?php
} else {
?>
<a href="javascript:void(0);" class="toggle_box_contents" onClick="$.post('<?php echo $vars['url']; ?>action/user/spotlight?closed=true')">-</a>
@@ -50,13 +49,9 @@
} else {
echo elgg_view("spotlight/default");
}
-
-
-
-
?>
</div><!-- /.collapsable_box_content -->
</div><!-- /.collapsable_box -->
-
+
</div><!-- /#wrapper_spotlight -->
</div><!-- /#layout_spotlight --> \ No newline at end of file
diff --git a/views/default/page_elements/title.php b/views/default/page_elements/title.php
index 173672cb3..5123c14a7 100644
--- a/views/default/page_elements/title.php
+++ b/views/default/page_elements/title.php
@@ -1,46 +1,47 @@
<?php
-
- /**
- * Elgg title element
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['title'] The page title
- */
-
- $page_owner = page_owner();
- $page_owner_user = get_entity($page_owner);
-
- $submenu = get_submenu(); // elgg_view('canvas_header/submenu');
- if (!empty($submenu)) $submenu = "<ul>" . $submenu . "</ul>";
-
- if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID())) {
- $info = "<h2>" . $vars['title'] . "</h2>";
- if($page_owner_user instanceOf ElggGroup) {
- $display = "<div id=\"content_area_group_title\">" . $info . "</div>";
- } else {
- $display = "<div id=\"content_area_user_title\">" . $info . "</div>";
- }
- if (!empty($submenu) && $vars['submenu'] == true)
- $display .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options
+/**
+ * Elgg title element
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ * @uses $vars['title'] The page title
+ */
+
+$page_owner = page_owner();
+$page_owner_user = get_entity($page_owner);
+
+$submenu = get_submenu(); // elgg_view('canvas_header/submenu');
+if (!empty($submenu)) {
+ $submenu = "<ul>" . $submenu . "</ul>";
+}
+
+if (($_SESSION['guid']) && ($page_owner && $page_owner_user->guid != $_SESSION['user']->getGUID())) {
+ $info = "<h2>" . $vars['title'] . "</h2>";
+ if($page_owner_user instanceOf ElggGroup) {
+ $display = "<div id=\"content_area_group_title\">" . $info . "</div>";
} else {
- $info = "<h2>" . $vars['title'] . "</h2>";
- if($page_owner_user instanceOf ElggGroup) {
- $display = "<div id=\"content_area_group_title\">" . $info . "</div>";
- } else {
- $display = "<div id=\"content_area_user_title\">" . $info . "</div>";
- }
- if (!empty($submenu) && $vars['submenu'] == true)
- $display .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>"; // plugins can extend this to add menu options
+ $display = "<div id=\"content_area_user_title\">" . $info . "</div>";
}
+ if (!empty($submenu) && $vars['submenu'] == true) {
+ // plugins can extend this to add menu options
+ $display .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>";
+ }
+} else {
+ $info = "<h2>" . $vars['title'] . "</h2>";
+ if($page_owner_user instanceOf ElggGroup) {
+ $display = "<div id=\"content_area_group_title\">" . $info . "</div>";
+ } else {
+ $display = "<div id=\"content_area_user_title\">" . $info . "</div>";
+ }
+ if (!empty($submenu) && $vars['submenu'] == true) {
+ // plugins can extend this to add menu options
+ $display .= "<div id=\"owner_block_submenu\">" . $submenu . "</div>";
+ }
+}
- //print to screen
- echo $display;
-
-
-
-?> \ No newline at end of file
+//print to screen
+echo $display; \ No newline at end of file
diff --git a/views/default/pageshells/pageshell.php b/views/default/pageshells/pageshell.php
index 8e7f29667..61396dfbc 100644
--- a/views/default/pageshells/pageshell.php
+++ b/views/default/pageshells/pageshell.php
@@ -1,32 +1,30 @@
<?php
-
- /**
- * Elgg pageshell
- * The standard HTML page shell that everything else fits into
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- *
- * @uses $vars['config'] The site configuration settings, imported
- * @uses $vars['title'] The page title
- * @uses $vars['body'] The main content of the page
- * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
- */
-
- // Set the content type
- header("Content-type: text/html; charset=UTF-8");
-
- // Set title
- if (empty($vars['title'])) {
- $title = $vars['config']->sitename;
- } else if (empty($vars['config']->sitename)) {
- $title = $vars['title'];
- } else {
- $title = $vars['config']->sitename . ": " . $vars['title'];
- }
-
+/**
+ * Elgg pageshell
+ * The standard HTML page shell that everything else fits into
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ * @uses $vars['config'] The site configuration settings, imported
+ * @uses $vars['title'] The page title
+ * @uses $vars['body'] The main content of the page
+ * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
+ */
+
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
+// Set title
+if (empty($vars['title'])) {
+ $title = $vars['config']->sitename;
+} else if (empty($vars['config']->sitename)) {
+ $title = $vars['title'];
+} else {
+ $title = $vars['config']->sitename . ": " . $vars['title'];
+}
?>
<?php echo elgg_view('page_elements/header', $vars); ?>
@@ -34,7 +32,7 @@
<?php echo elgg_view('page_elements/header_contents', $vars); ?>
<!-- main contents -->
-
+
<!-- display any system messages -->
<?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>
@@ -48,13 +46,13 @@
</div><!-- /#layout_canvas -->
<?php
- if(isloggedin()){
+if(isloggedin()){
?>
- <!-- spotlight -->
- <?php echo elgg_view('page_elements/spotlight', $vars); ?>
+ <!-- spotlight -->
+ <?php echo elgg_view('page_elements/spotlight', $vars); ?>
<?php
- }
+}
?>
<!-- footer -->
-<?php echo elgg_view('page_elements/footer', $vars); ?>
+<?php echo elgg_view('page_elements/footer', $vars); ?> \ No newline at end of file
diff --git a/views/default/river/dashboard.php b/views/default/river/dashboard.php
index aa9b65615..b049348f1 100644
--- a/views/default/river/dashboard.php
+++ b/views/default/river/dashboard.php
@@ -1,23 +1,23 @@
<?php
- /**
- * Elgg river for dashboard.
- *
- * @package Elgg
- * @author Curverider Ltd
- * @link http://elgg.com/
- */
+/**
+ * Elgg river for dashboard.
+ *
+ * @package Elgg
+ * @author Curverider Ltd
+ * @link http://elgg.com/
+ */
- /// Extract the river
- $river = $vars['river'];
+/// Extract the river
+$river = $vars['river'];
?>
<div id="river">
- <?php
- if (($river) && (count($river)>0))
- {
- foreach ($river as $r) echo $r;
- //echo "<div>$r</div>";
+<?php
+if (($river) && (count($river)>0)) {
+ foreach ($river as $r) {
+ echo $r;
}
- else
- echo elgg_echo('river:widget:noactivity');
- ?>
+} else {
+ echo elgg_echo('river:widget:noactivity');
+}
+?>
</div> \ No newline at end of file
diff --git a/views/default/river/item/list.php b/views/default/river/item/list.php
index 7bbac0044..9508a0da6 100644
--- a/views/default/river/item/list.php
+++ b/views/default/river/item/list.php
@@ -1,51 +1,65 @@
-
+<?php
+/**
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
+?>
<div class="river_item_list">
<?php
-
if (isset($vars['items']) && is_array($vars['items'])) {
-
+
$i = 0;
- if (!empty($vars['items']))
- foreach($vars['items'] as $item) {
-
- echo elgg_view_river_item($item);
- $i++;
- if ($i >= $vars['limit']) break;
-
+ if (!empty($vars['items'])) {
+ foreach($vars['items'] as $item) {
+ echo elgg_view_river_item($item);
+ $i++;
+ if ($i >= $vars['limit']) {
+ break;
+ }
+ }
}
-
}
-
+
if ($vars['pagination'] !== false) {
-
$baseurl = $_SERVER['REQUEST_URI'];
- $baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl);
-
+ $baseurl = $baseurl = preg_replace('/[\&\?]offset\=[0-9]*/',"",$baseurl);
+
$nav = '';
-
+
if (sizeof($vars['items']) > $vars['limit']) {
$newoffset = $vars['offset'] + $vars['limit'];
$urladdition = 'offset='.$newoffset;
- if (substr_count($baseurl,'?')) $nexturl=$baseurl . '&' . $urladdition; else $nexturl=$baseurl . '?' . $urladdition;
-
+ if (substr_count($baseurl,'?')) {
+ $nexturl = $baseurl . '&' . $urladdition;
+ } else {
+ $nexturl=$baseurl . '?' . $urladdition;
+ }
+
$nav .= '<a class="back" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
}
-
+
if ($vars['offset'] > 0) {
$newoffset = $vars['offset'] - $vars['limit'];
- if ($newoffset < 0) $newoffset = 0;
+ if ($newoffset < 0) {
+ $newoffset = 0;
+ }
$urladdition = 'offset='.$newoffset;
- if (substr_count($baseurl,'?')) $prevurl=$baseurl . '&' . $urladdition; else $prevurl=$baseurl . '?' . $urladdition;
-
+ if (substr_count($baseurl,'?')) {
+ $prevurl=$baseurl . '&' . $urladdition;
+ } else {
+ $prevurl=$baseurl . '?' . $urladdition;
+ }
+
$nav .= '<a class="forward" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
}
-
-
+
if (!empty($nav)) {
echo '<div class="river_pagination"><p>'.$nav.'</p><div class="clearfloat"></div></div>';
}
-
}
-
?>
</div> \ No newline at end of file
diff --git a/views/default/river/item/noaccess.php b/views/default/river/item/noaccess.php
index 96958170b..a993423a0 100644
--- a/views/default/river/item/noaccess.php
+++ b/views/default/river/item/noaccess.php
@@ -1,5 +1,11 @@
<?php
+/**
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
- echo elgg_echo('river:noaccess');
-
-?> \ No newline at end of file
+echo elgg_echo('river:noaccess'); \ No newline at end of file
diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php
index c8d18e9dd..27de4affd 100644
--- a/views/default/river/item/wrapper.php
+++ b/views/default/river/item/wrapper.php
@@ -1,51 +1,48 @@
<?php
+/**
+ * Elgg river item wrapper.
+ * Wraps all river items.
+ *
+ * @package Elgg
+ * @author Curverider
+ * @link http://elgg.com/
+ */
- /**
- * Elgg river item wrapper.
- * Wraps all river items.
- *
- * @package Elgg
+//get the site admins choice avatars or action icons
+$avatar_icon = get_plugin_setting("avatar_icon","riverdashboard");
+if(!$avatar_icon) {
+ $avatar_icon = "icon";
+}
- * @author Curverider
-
- * @link http://elgg.com/
- */
-
- //get the site admins choice avatars or action icons
- $avatar_icon = get_plugin_setting("avatar_icon","riverdashboard");
- if(!$avatar_icon)
- $avatar_icon = "icon";
-
- if($avatar_icon == "icon"){
-
-?>
+if($avatar_icon == "icon"){
+ ?>
<div class="river_item">
<div class="river_<?php echo $vars['item']->type; ?>">
<div class="river_<?php echo $vars['item']->subtype; ?>">
- <div class="river_<?php echo $vars['item']->action_type; ?>">
+ <div class="river_<?php echo $vars['item']->action_type; ?>">
<div class="river_<?php echo $vars['item']->type; ?>_<?php if($vars['item']->subtype) echo $vars['item']->subtype . "_"; ?><?php echo $vars['item']->action_type; ?>">
<p>
<?php
- echo $vars['body'];
+ echo $vars['body'];
?>
<span class="river_item_time">
(<?php
- echo friendly_time($vars['item']->posted);
+ echo friendly_time($vars['item']->posted);
?>)
</span>
</p>
</div>
- </div>
+ </div>
</div>
</div>
</div>
-
-<?php
- }else{
-?>
+
+ <?php
+} else {
+ ?>
<div class="river_item">
- <span class="river_item_useravatar">
+ <span class="river_item_useravatar">
<?php
echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'tiny'));
?>
@@ -62,6 +59,6 @@
</p>
<div class="clearfloat"></div>
</div>
-<?php
- }
+ <?php
+}
?> \ No newline at end of file
diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php
index 1378d8088..f42bf30c6 100644
--- a/views/default/river/relationship/friend/create.php
+++ b/views/default/river/relationship/friend/create.php
@@ -1,45 +1,40 @@
<?php
- /**
- * Elgg relationship create event.
- * Display something in the river when a relationship is created.
- *
- * @package Elgg
- * @author Curverider Ltd
- * @link http://elgg.com/
- */
-
- $statement = $vars['statement'];
-
- $performed_by = $statement->getSubject();
- $event = $statement->getEvent();
- $object = $statement->getObject();
-
- if (is_array($object))
- {
- switch ($object['relationship'])
- {
- // Friending
- case 'friend' :
- case 'friends' : // 'friends' shouldn't be used, but just incase :)
-
- // Get second object
- $userb = $object['object'];
-
- // Only users can be friends
- if (($performed_by instanceof ElggUser) && ($userb instanceof ElggUser))
- {
- // User A
- echo "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
-
- // Verb
- echo elgg_echo('river:relationship:friend');
-
- // user B
- echo " <a href=\"{$userb->getURL()}\">{$userb->name}</a>";
- }
-
- break;
- }
+/**
+ * Elgg relationship create event.
+ * Display something in the river when a relationship is created.
+ *
+ * @package Elgg
+ * @author Curverider Ltd
+ * @link http://elgg.com/
+ */
+
+$statement = $vars['statement'];
+
+$performed_by = $statement->getSubject();
+$event = $statement->getEvent();
+$object = $statement->getObject();
+
+if (is_array($object)) {
+ switch ($object['relationship']) {
+ // Friending
+ case 'friend' :
+ case 'friends' : // 'friends' shouldn't be used, but just incase :)
+
+ // Get second object
+ $userb = $object['object'];
+
+ // Only users can be friends
+ if (($performed_by instanceof ElggUser) && ($userb instanceof ElggUser)) {
+ // User A
+ echo "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
+
+ // Verb
+ echo elgg_echo('river:relationship:friend');
+
+ // user B
+ echo " <a href=\"{$userb->getURL()}\">{$userb->name}</a>";
+ }
+
+ break;
}
-
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/views/default/river/wrapper.php b/views/default/river/wrapper.php
index cba00ff5a..0b5bfad62 100644
--- a/views/default/river/wrapper.php
+++ b/views/default/river/wrapper.php
@@ -1,31 +1,28 @@
<?php
+/**
+ * Elgg river item wrapper.
+ * Wraps all river items.
+ *
+ * @package Elgg
+ * @author Curverider
+ * @link http://elgg.com/
+ */
- /**
- * Elgg river item wrapper.
- * Wraps all river items.
- *
- * @package Elgg
-
- * @author Curverider
-
- * @link http://elgg.com/
- */
-
- $statement = $vars['statement'];
- $time = $vars['time'];
- $event = $vars['event'];
- $entry = $vars['entry'];
-
- if ($statement->getObject() instanceof ElggEntity) {
-
- $obj = $statement->getObject();
- $subtype = $obj->getSubtype();
- if (empty($subtype)) $subtype = $obj->type;
- if (empty($subtype)) $subtype = "general";
- } else if (is_array($statement->getObject())) {
- $obj = $statement->getObject();
- $subtype = "relationship_" . $obj['relationship'];
- }
+$statement = $vars['statement'];
+$time = $vars['time'];
+$event = $vars['event'];
+$entry = $vars['entry'];
+
+if ($statement->getObject() instanceof ElggEntity) {
+
+ $obj = $statement->getObject();
+ $subtype = $obj->getSubtype();
+ if (empty($subtype)) $subtype = $obj->type;
+ if (empty($subtype)) $subtype = "general";
+} else if (is_array($statement->getObject())) {
+ $obj = $statement->getObject();
+ $subtype = "relationship_" . $obj['relationship'];
+}
?>
<div class="river_item">
@@ -33,15 +30,15 @@
<div class="river_<?php echo $event; ?>">
<p class="river_<?php echo $subtype; ?>_<?php echo $event; ?>">
<?php
-
+
echo $vars['entry'];
-
+
?>
<span class="river_item_time">
(<?php
-
+
echo friendly_time($time);
-
+
?>)
</span>
</p>
diff --git a/views/default/search/entity_list.php b/views/default/search/entity_list.php
index f0438fa11..07e76e955 100644
--- a/views/default/search/entity_list.php
+++ b/views/default/search/entity_list.php
@@ -1,62 +1,64 @@
<?php
+/**
+ * @package Elgg
+ * @author Curverider
+ * @link http://elgg.com/
+ */
- $context = $vars['context'];
- $offset = $vars['offset'];
- $entities = $vars['entities'];
- $limit = $vars['limit'];
- $count = $vars['count'];
- $baseurl = $vars['baseurl'];
- $context = $vars['context'];
- $viewtype = $vars['viewtype'];
- $pagination = $vars['pagination'];
- $fullview = $vars['fullview'];
-
- $html = "";
- $nav = "";
-
- if (isset($vars['viewtypetoggle'])) {
- $viewtypetoggle = $vars['viewtypetoggle'];
- } else {
- $viewtypetoggle = true;
+$context = $vars['context'];
+$offset = $vars['offset'];
+$entities = $vars['entities'];
+$limit = $vars['limit'];
+$count = $vars['count'];
+$baseurl = $vars['baseurl'];
+$context = $vars['context'];
+$viewtype = $vars['viewtype'];
+$pagination = $vars['pagination'];
+$fullview = $vars['fullview'];
+
+$html = "";
+$nav = "";
+
+if (isset($vars['viewtypetoggle'])) {
+ $viewtypetoggle = $vars['viewtypetoggle'];
+} else {
+ $viewtypetoggle = true;
+}
+
+if ($context == "search" && $count > 0 && $viewtypetoggle) {
+ $nav .= elgg_view("navigation/viewtype",array(
+ 'baseurl' => $baseurl,
+ 'offset' => $offset,
+ 'count' => $count,
+ 'viewtype' => $viewtype,
+ ));
+}
+
+if ($pagination) {
+ $nav .= elgg_view('navigation/pagination',array(
+ 'baseurl' => $baseurl,
+ 'offset' => $offset,
+ 'count' => $count,
+ 'limit' => $limit,
+ ));
+}
+
+$html .= $nav;
+
+if ($viewtype == "list") {
+ if (is_array($entities) && sizeof($entities) > 0) {
+ foreach($entities as $entity) {
+ $html .= elgg_view_entity($entity, $fullview);
}
+ }
+} else {
+ if (is_array($entities) && sizeof($entities) > 0) {
+ $html .= elgg_view("search/gallery",array('entities' => $entities));
+ }
+}
+
+if ($count) {
+ $html .= $nav;
+}
- if ($context == "search" && $count > 0 && $viewtypetoggle) {
- $nav .= elgg_view("navigation/viewtype",array(
-
- 'baseurl' => $baseurl,
- 'offset' => $offset,
- 'count' => $count,
- 'viewtype' => $viewtype,
-
- ));
- }
-
- if ($pagination)
- $nav .= elgg_view('navigation/pagination',array(
-
- 'baseurl' => $baseurl,
- 'offset' => $offset,
- 'count' => $count,
- 'limit' => $limit,
-
- ));
-
- $html .= $nav;
-
- if ($viewtype == "list") {
- if (is_array($entities) && sizeof($entities) > 0) {
- foreach($entities as $entity) {
- $html .= elgg_view_entity($entity, $fullview);
- }
- }
- } else {
- if (is_array($entities) && sizeof($entities) > 0)
- $html .= elgg_view("search/gallery",array('entities' => $entities));
- }
-
- if ($count)
- $html .= $nav;
-
- echo $html;
-
-?>
+echo $html; \ No newline at end of file
diff --git a/views/default/search/gallery.php b/views/default/search/gallery.php
index 366cd713b..52c4d0b92 100644
--- a/views/default/search/gallery.php
+++ b/views/default/search/gallery.php
@@ -1,49 +1,44 @@
<?php
+/**
+ * Elgg gallery view
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+$entities = $vars['entities'];
+if (is_array($entities) && sizeof($entities) > 0) {
- /**
- * Elgg gallery view
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- */
-
- $entities = $vars['entities'];
- if (is_array($entities) && sizeof($entities) > 0) {
-
?>
- <table class="search_gallery">
+<table class="search_gallery">
<?php
-
+
+ $col = 0;
+ foreach($entities as $entity) {
+ if ($col == 0) {
+
+ echo "<tr>";
+
+ }
+ echo "<td class=\"search_gallery_item\">";
+ echo elgg_view_entity($entity);
+ echo "</td>";
+ $col++;
+ if ($col > 3) {
+ echo "</tr>";
$col = 0;
- foreach($entities as $entity) {
- if ($col == 0) {
-
- echo "<tr>";
-
- }
- echo "<td class=\"search_gallery_item\">";
- echo elgg_view_entity($entity);
- echo "</td>";
- $col++;
- if ($col > 3) {
- echo "</tr>";
- $col = 0;
- }
- }
- if ($col > 0) echo "</tr>";
-
+ }
+ }
+ if ($col > 0) echo "</tr>";
+
?>
- </table>
+</table>
<?php
-
- }
-
-?> \ No newline at end of file
+
+} \ No newline at end of file
diff --git a/views/default/search/gallery_listing.php b/views/default/search/gallery_listing.php
index 4c0f40643..900b22832 100644
--- a/views/default/search/gallery_listing.php
+++ b/views/default/search/gallery_listing.php
@@ -1,35 +1,32 @@
<?php
-
- /**
- * Elgg search listing: gallery view
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- */
+/**
+ * Elgg search listing: gallery view
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
?>
- <div class="search_listing">
-
- <div class="search_listing_header">
-
- <?php
-
- echo $vars['icon'];
-
- ?>
-
- </div>
- <div class="search_listing_info">
+<div class="search_listing">
+
+ <div class="search_listing_header">
+
<?php
- echo $vars['info'];
-
+ echo $vars['icon'];
+
?>
- </div>
-
- </div> \ No newline at end of file
+
+ </div>
+ <div class="search_listing_info">
+ <?php
+
+ echo $vars['info'];
+
+ ?>
+ </div>
+
+</div> \ No newline at end of file
diff --git a/views/default/search/listing.php b/views/default/search/listing.php
index 0a9d01fee..fa1719069 100644
--- a/views/default/search/listing.php
+++ b/views/default/search/listing.php
@@ -1,45 +1,38 @@
<?php
-
- /**
- * Elgg search listing
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- */
-
- if (isset($vars['search_viewtype']) && $vars['search_viewtype'] == "gallery") {
-
- echo elgg_view("search/gallery_listing",$vars);
-
- } else {
+/**
+ * Elgg search listing
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+if (isset($vars['search_viewtype']) && $vars['search_viewtype'] == "gallery") {
+ echo elgg_view("search/gallery_listing",$vars);
+} else {
?>
- <div class="search_listing">
-
- <div class="search_listing_icon">
- <?php
-
- echo $vars['icon'];
-
- ?>
- </div>
- <div class="search_listing_info">
- <?php
-
- echo $vars['info'];
-
- ?>
- </div>
-
+<div class="search_listing">
+
+ <div class="search_listing_icon">
+ <?php
+
+ echo $vars['icon'];
+
+ ?>
</div>
-
-<?php
+ <div class="search_listing_info">
+ <?php
- }
+ echo $vars['info'];
+
+ ?>
+ </div>
+
+</div>
+
+<?php
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/views/default/search/startblurb.php b/views/default/search/startblurb.php
index 82b4aef8c..7c78cbf16 100644
--- a/views/default/search/startblurb.php
+++ b/views/default/search/startblurb.php
@@ -1,8 +1,15 @@
-
+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+?>
<div class="contentWrapper">
- <?php
-
- echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']);
-
+ <?php
+
+ echo sprintf(elgg_echo("tag:search:startblurb"),$vars['tag']);
+
?>
</div> \ No newline at end of file