aboutsummaryrefslogtreecommitdiff
path: root/pages/photos
diff options
context:
space:
mode:
Diffstat (limited to 'pages/photos')
-rw-r--r--pages/photos/album/view.php11
-rw-r--r--pages/photos/image/view.php5
2 files changed, 11 insertions, 5 deletions
diff --git a/pages/photos/album/view.php b/pages/photos/album/view.php
index 100cc44c6..6e111ab98 100644
--- a/pages/photos/album/view.php
+++ b/pages/photos/album/view.php
@@ -42,6 +42,17 @@ if ($album->getContainerEntity()->canWriteToContainer()) {
));
}
+// only show sort button if there are images
+if ($album->canEdit() && $album->getSize() > 0) {
+ elgg_register_menu_item('title', array(
+ 'name' => 'sort',
+ 'href' => "photos/sort/" . $album->getGUID(),
+ 'text' => elgg_echo('album:sort'),
+ 'link_class' => 'elgg-button elgg-button-action',
+ 'priority' => 200,
+ ));
+}
+
$body = elgg_view_layout('content', array(
'filter' => false,
'content' => $content,
diff --git a/pages/photos/image/view.php b/pages/photos/image/view.php
index fc4a01320..e30bed70a 100644
--- a/pages/photos/image/view.php
+++ b/pages/photos/image/view.php
@@ -19,11 +19,6 @@ if (!$photo) {
$photo->addView();
-if (elgg_get_plugin_setting('tagging', 'tidypics')) {
- elgg_load_js('tidypics:tagging');
- elgg_load_js('jquery.imgareaselect');
-}
-
// set page owner based on owner of photo album
$album = $photo->getContainerEntity();
if ($album) {