aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
Diffstat (limited to 'views')
-rw-r--r--views/default/object/album.php56
1 files changed, 19 insertions, 37 deletions
diff --git a/views/default/object/album.php b/views/default/object/album.php
index 464806ca1..a1b238812 100644
--- a/views/default/object/album.php
+++ b/views/default/object/album.php
@@ -13,7 +13,7 @@
$owner = $vars['entity']->getOwnerEntity();
$friendlytime = friendly_time($vars['entity']->time_created);
$mime = $file->mimetype;
-
+
if (get_context() == "search") {
if (get_input('search_viewtype') == "gallery") {
@@ -59,30 +59,11 @@
} else {
// individual album view
?>
- <div id="pages_breadcrumbs">
-<?php
- if (is_null(page_owner_entity()->username) || empty(page_owner_entity()->username)) { //when no owner available, link to world photos
-?>
- <a href="<?php echo $vars['url'] . 'pg/photos/world'; ?>"><?php echo elgg_echo("albums"); ?></a>&nbsp;&#62;&nbsp;
-<?php
- } else {
-?>
- <a href="<?php echo $vars['url'] . 'pg/photos/owned/' . page_owner_entity()->username; ?>"><?php echo sprintf(elgg_echo("album:user"), page_owner_entity()->name); ?></a>&nbsp;&#62;&nbsp;
-<?php
- }
-?>
- <?php echo $title; ?>
- </div>
-
+<div class="contentWrapper">
<?php
- echo '<div id="tidypics_title">'.$title.'</div>';
- echo '<div id="tidypics_desc">'.autop($desc).'</div>';
+ echo '<div id="tidypics_desc">'.autop($desc).'</div>';
- if ($file->canEdit()) { // add edits
- // specific to my theme only
- //add_submenu_item(elgg_echo('album:addpix'), $vars['url'] . "pg/photos/upload/". $file_guid , '', 'jade');
- //add_submenu_item(elgg_echo('album:edit'), $vars['url'] . "mod/tidypics/edit.php?file_guid=". $file_guid , '', 'jade');
- //add_submenu_item(elgg_echo('album:delete'), $vars['url'] . "action/tidypics/delete?file=". $file_guid , '', 'jade');
+ if ($file->canEdit()) { // add controls
?>
<div id="tidypics_controls">
@@ -97,23 +78,23 @@
?>
</div>
<?php
- }
+ }
- // display the simple image views. Uses: via 'object/image.php'
- $count = get_entities("object","image", $file_guid, '', 999);
+ // display the simple image views. Uses: via 'object/image.php'
+ $count = get_entities("object","image", $file_guid, '', 999);
- //build array for back | next links
- $_SESSION['image_sort'] = array();
+ //build array for back | next links
+ $_SESSION['image_sort'] = array();
- if(count($count) > 0) {
- foreach($count as $image){
- array_push($_SESSION['image_sort'], $image->guid);
- }
+ if(count($count) > 0) {
+ foreach($count as $image){
+ array_push($_SESSION['image_sort'], $image->guid);
+ }
- echo list_entities("object","image", $file_guid, 24, false);
- } else {
- echo elgg_echo('image:none');
- }
+ echo list_entities("object","image", $file_guid, 24, false);
+ } else {
+ echo elgg_echo('image:none');
+ }
?>
<div class="clearfloat"></div>
@@ -128,5 +109,6 @@
echo elgg_view_comments($file);
}
-}
+ echo '</div>';
+ } // end of individual album view
?>