From 600effcfc450689f3a01788da0fc8ded87bb45ae Mon Sep 17 00:00:00 2001
From: Greg Froese <greg.froese@gmail.com>
Date: Sun, 17 May 2009 04:55:17 +0000
Subject: fixed views topping out at 10 and made the download link an option

---
 views/default/object/image.php           |  8 ++++++--
 views/default/settings/tidypics/edit.php | 22 ++++++++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

(limited to 'views/default')

diff --git a/views/default/object/image.php b/views/default/object/image.php
index 13a94fc7d..aceac958b 100644
--- a/views/default/object/image.php
+++ b/views/default/object/image.php
@@ -100,7 +100,7 @@ if ($photo_tags) {
 			}
 			
 			create_annotation($file_guid, "tp_view", "1", "integer", $the_viewer, 2);
-			$views_a = get_annotations($file_guid, "object", "image", "tp_view");
+			$views_a = get_annotations($file_guid, "object", "image", "tp_view", "", 0, 9999);
 			$views = count($views_a);
 		
 			$my_views = 0;
@@ -160,7 +160,11 @@ if ($photo_tags) {
 		<div id="tidypics_controls">
 			<ul>
 				<li><a id="tag_control" href="javascript:void(0)" onclick="startTagging()"><?= elgg_echo('tidypics:tagthisphoto') ?></a></li>
-				<?php echo elgg_view('tidypics/download', array('file_guid' => $file_guid,) ); ?>
+				<?php 
+					if(get_plugin_setting('download_link', 'tidypics') == "yes") {
+						echo elgg_view('tidypics/download', array('file_guid' => $file_guid,) );
+					}
+				?>
 			</ul>
 		</div>
 <?php if ($photo_tags) { ?>
diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
index f800d313f..ecfee33bd 100644
--- a/views/default/settings/tidypics/edit.php
+++ b/views/default/settings/tidypics/edit.php
@@ -43,6 +43,28 @@
 	
 	<?php echo elgg_view('input/text', array('internalname' => 'params[maxfilesize]', 'value' => $maxfilesize)); ?>
 </p>
+<?php
+	$image_lib = $vars['entity']->image_lib;
+	if (!$image_lib) $image_lib = 'GD';
+?>
+<p>
+	<?php 
+		echo elgg_echo('tidypics:settings:download_link'); 
+		$download_link = $vars['entity']->download_link;
+		if (!$download_link) $download_link = 'yes';
+	?>
+	
+	<?php
+		echo elgg_view('input/pulldown', array(
+			'internalname' => 'params[download_link]',
+			'options_values' => array(
+				'yes' => 'yes',
+				'no' => 'no',
+			),
+			'value' => $download_link));
+	?>
+</p>
+
 <?php
 	$watermark_text = $vars['entity']->watermark_text;
 	if(!$watermark_text) $watermark_text = "";
-- 
cgit v1.2.3