[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[23371] trunk

[<sy...@us...>]

Revision: 23371
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=23371&view=rev
Author:   sylvieg
Date:     2009-11-19 13:26:20 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
[FIX]COLORBOX: new params: thumb + sort_mode + display description

Modified Paths:
--------------
    trunk/lib/wiki-plugins/wikiplugin_colorbox.php
    trunk/templates/wiki-plugins/wikiplugin_colobox.tpl

Modified: trunk/lib/wiki-plugins/wikiplugin_colorbox.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_colorbox.php	2009-11-18 22:28:03 UTC (rev 23370)
+++ trunk/lib/wiki-plugins/wikiplugin_colorbox.php	2009-11-19 13:26:20 UTC (rev 23371)
@@ -20,6 +20,18 @@
 				'description' => tra('Image gallery ID'),
 				'filter' => 'digits'
 			),
+			'thumb' => array(
+				'required' => false,
+				'name' => tra('Thumb'),
+				'description' => tra('The image in the page is displayed or not in mode thumb:'). 'y|n',
+				'filter' => 'alpha'
+			),
+			'sort_mode' => array(
+				'required' => false,
+				'name' => tra('Sort Mode'),
+				'description' => tra('Sort Mode'),
+				'filter' => 'word'
+			),
 		),
 	);
 }
@@ -37,7 +49,9 @@
 		$files = $tikilib->get_files(0, -1, $params['sort_mode'], '', $params['fgalId'], false, false, false, true, false, false, false);
 		$smarty->assign('colorboxUrl', 'tiki-download_file.php?fileId=');
 		$smarty->assign('colorboxColumn', 'id');
-		$smarty->assign('colorboxThumb', 'thumbnail');
+		if ($params['thumb'] != 'n') {
+			$smarty->assign('colorboxThumb', 'thumbnail');
+		}
 	} elseif (!empty($params['galId'])) {
 		if ($prefs['feature_galleries'] != 'y') {
 			return tra('This feature is disabled') . ': feature_galleries';
@@ -50,7 +64,9 @@
 		$files = $imagegallib->get_images(0, -1, $params['sort_mode'], '', $params['galId']);
 		$smarty->assign('colorboxUrl', 'show_image.php?id=');
 		$smarty->assign('colorboxColumn', 'imageId');
-		$smarty->assign('colorboxThumb', 'thumb');
+		if ($params['thumb'] != 'n') {
+			$smarty->assign('colorboxThumb', 'thumb');
+		}
 	} else {
 		return tra('Incorrect param');
 	}

Modified: trunk/templates/wiki-plugins/wikiplugin_colobox.tpl
===================================================================
--- trunk/templates/wiki-plugins/wikiplugin_colobox.tpl	2009-11-18 22:28:03 UTC (rev 23370)
+++ trunk/templates/wiki-plugins/wikiplugin_colobox.tpl	2009-11-19 13:26:20 UTC (rev 23371)
@@ -1,8 +1,10 @@
+{strip}
 {foreach from=$colorboxFiles.data item=file name=files}
 	{capture name=url}{$colorboxUrl}{$file.$colorboxColumn}{/capture}
-	<a href="{$smarty.capture.url}" rel="shadowbox[colorbox{$iColorbox}];type=img">
+	<a href="{$smarty.capture.url}" rel="shadowbox[colorbox{$iColorbox}];type=img" title="{$file.description}">
 	{if $smarty.foreach.files.first}
-		<img border="0" src="{$smarty.capture.url}&{$colorboxThumb}" />
+		<img border="0" src="{$smarty.capture.url}{if !empty($colorboxThumb)}&{$colorboxThumb}{/if}" />
 	{/if}
 	</a>
-{/foreach}
\ No newline at end of file
+{/foreach}
+{/strip}
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.