aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--start.php2
-rw-r--r--views/default/object/image.php18
-rw-r--r--views/default/tidypics/download.php4
-rw-r--r--views/default/tidypics/hover_menu.php (renamed from views/default/tidypics/menu.php)0
-rw-r--r--views/default/tidypics/image_menu.php22
5 files changed, 30 insertions, 16 deletions
diff --git a/start.php b/start.php
index 94fb0440c..f0c6a22f9 100644
--- a/start.php
+++ b/start.php
@@ -28,7 +28,7 @@
extend_view('css', 'tidypics/css');
// Extend hover-over and profile menu
- extend_view('profile/menu/links','tidypics/menu');
+ extend_view('profile/menu/links','tidypics/hover_menu');
//group view ** psuedo widget view for group pages**
extend_view('groups/right_column','tidypics/groupprofile_albums');
diff --git a/views/default/object/image.php b/views/default/object/image.php
index 0da55f795..f64942b61 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -167,17 +167,13 @@ if ($photo_tags) {
<div class="clearfloat"></div>
</div>
- <div id="tidypics_controls">
- <ul>
- <li><a id="tag_control" href="javascript:void(0)" onclick="startTagging()"><?= elgg_echo('tidypics:tagthisphoto') ?></a></li>
- <?php
- if(get_plugin_setting('download_link', 'tidypics') == "yes") {
- echo elgg_view('tidypics/download', array('file_guid' => $file_guid,) );
- }
- ?>
- </ul>
- </div>
-<?php
+<?php
+ // image menu (start tagging, download, etc.)
+ echo '<div id="tidypics_controls"><ul>';
+ echo elgg_view('tidypics/image_menu', array('file_guid' => $file_guid,) );
+ echo '</ul></div>';
+
+ // tagging code
echo elgg_view('tidypics/tagging', array( 'photo_tags' => $photo_tags,
'links' => $photo_tag_links,
'photo_tags_json' => $photo_tags_json,
diff --git a/views/default/tidypics/download.php b/views/default/tidypics/download.php
deleted file mode 100644
index becb4b5fe..000000000
--- a/views/default/tidypics/download.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
- $file_guid = $vars['file_guid'];
-?>
-<li><a href="<?php echo $vars['url']; ?>action/tidypics/download?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("image:download"); ?></a></li> \ No newline at end of file
diff --git a/views/default/tidypics/menu.php b/views/default/tidypics/hover_menu.php
index 4368993dd..4368993dd 100644
--- a/views/default/tidypics/menu.php
+++ b/views/default/tidypics/hover_menu.php
diff --git a/views/default/tidypics/image_menu.php b/views/default/tidypics/image_menu.php
new file mode 100644
index 000000000..269fcce8f
--- /dev/null
+++ b/views/default/tidypics/image_menu.php
@@ -0,0 +1,22 @@
+<?php
+
+ /**************************************************************************
+ *
+ * Tidypics Image Menu
+ *
+ * This is the menu that appears below an image. Admins can override the
+ * menu with a different view to provide a look and feel that matches
+ * their themes. The view can be extended to provide additional controls.
+ *
+ **************************************************************************/
+
+ $file_guid = $vars['file_guid'];
+?>
+<li id="start_tagging"><a id="tag_control" href="javascript:void(0)" onclick="startTagging()"><?= elgg_echo('tidypics:tagthisphoto') ?></a></li>
+<?php
+ if (get_plugin_setting('download_link', 'tidypics') != "no") {
+?>
+<li id="download_image"><a href="<?php echo $vars['url']; ?>action/tidypics/download?file_guid=<?php echo $file_guid; ?>"><?php echo elgg_echo("image:download"); ?></a></li>
+<?php
+ }
+?> \ No newline at end of file