aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2012-07-14 08:10:28 -0400
committerCash Costello <cash.costello@gmail.com>2012-07-14 08:10:28 -0400
commit4761adf8eee9feadd77599682ef192b56520d11d (patch)
tree022a921d20ddd26fb226351cadedf9a8dfe9e971 /pages
parent4448f072dc6149a62b602e60e766fd00c2b6af89 (diff)
parentc1da32e6a7e2f4a15a3b2d69cd38a1c0c164a99d (diff)
downloadelgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.gz
elgg-4761adf8eee9feadd77599682ef192b56520d11d.tar.bz2
Pulling in several small fixes from Brett's fork
Diffstat (limited to 'pages')
-rw-r--r--pages/photos/album/sort.php14
-rw-r--r--pages/photos/batch/edit.php2
-rw-r--r--pages/photos/image/view.php8
3 files changed, 17 insertions, 7 deletions
diff --git a/pages/photos/album/sort.php b/pages/photos/album/sort.php
index a1d890be1..005205dd5 100644
--- a/pages/photos/album/sort.php
+++ b/pages/photos/album/sort.php
@@ -30,11 +30,21 @@ if (elgg_instanceof($owner, 'group')) {
} else {
elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
}
-elgg_push_breadcrumb($album->title, $album->getURL());
+elgg_push_breadcrumb($album->getTitle(), $album->getURL());
elgg_push_breadcrumb(elgg_echo('album:sort'));
+elgg_register_menu_item('title', array(
+ 'name' => 'upload',
+ 'href' => 'photos/upload/' . $album->getGUID(),
+ 'text' => elgg_echo('images:upload'),
+ 'link_class' => 'elgg-button elgg-button-action',
+));
-$content = elgg_view_form('photos/album/sort', array(), array('album' => $album));
+if ($album->getSize()) {
+ $content = elgg_view_form('photos/album/sort', array(), array('album' => $album));
+} else {
+ $content = elgg_echo('tidypics:sort:no_images');
+}
$body = elgg_view_layout('content', array(
'filter' => false,
diff --git a/pages/photos/batch/edit.php b/pages/photos/batch/edit.php
index b96ddf408..ca9a55b18 100644
--- a/pages/photos/batch/edit.php
+++ b/pages/photos/batch/edit.php
@@ -29,7 +29,7 @@ $title = elgg_echo('tidypics:editprops');
elgg_push_breadcrumb(elgg_echo('photos'), "photos/all");
elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
-elgg_push_breadcrumb($album->title, $album->getURL());
+elgg_push_breadcrumb($album->getTitle(), $album->getURL());
elgg_push_breadcrumb($title);
$content = elgg_view_form('photos/batch/edit', array(), array('batch' => $batch));
diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php
index 6db9ff529..6bd0257e0 100644
--- a/pages/photos/image/view.php
+++ b/pages/photos/image/view.php
@@ -36,8 +36,8 @@ if (elgg_instanceof($owner, 'group')) {
} else {
elgg_push_breadcrumb($owner->name, "photos/owner/$owner->username");
}
-elgg_push_breadcrumb($album->title, $album->getURL());
-elgg_push_breadcrumb($photo->title);
+elgg_push_breadcrumb($album->getTitle(), $album->getURL());
+elgg_push_breadcrumb($photo->getTitle());
if (elgg_get_plugin_setting('download_link', 'tidypics')) {
// add download button to title menu
@@ -54,11 +54,11 @@ $content = elgg_view_entity($photo, array('full_view' => true));
$body = elgg_view_layout('content', array(
'filter' => false,
'content' => $content,
- 'title' => $photo->title,
+ 'title' => $photo->getTitle(),
'sidebar' => elgg_view('tidypics/sidebar', array(
'page' => 'view',
'image' => $photo,
)),
));
-echo elgg_view_page($photo->title, $body);
+echo elgg_view_page($photo->getTitle(), $body);