From: <jon...@us...> - 2010-11-27 17:56:31
|
Revision: 30903 http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=30903&view=rev Author: jonnybradley Date: 2010-11-27 17:56:24 +0000 (Sat, 27 Nov 2010) Log Message: ----------- [ENH] fgals: Make search optional for file galleries Modified Paths: -------------- branches/6.x/lib/prefs/fgal.php branches/6.x/lib/setup/prefs.php branches/6.x/templates/tiki-admin_include_fgal.tpl branches/6.x/templates/tiki-list_file_gallery.tpl Modified: branches/6.x/lib/prefs/fgal.php =================================================================== --- branches/6.x/lib/prefs/fgal.php 2010-11-27 17:43:06 UTC (rev 30902) +++ branches/6.x/lib/prefs/fgal.php 2010-11-27 17:56:24 UTC (rev 30903) @@ -105,6 +105,10 @@ 'name' => tra('Include the search box on the current gallery files just after the find div'), 'type' => 'flag', ), + 'fgal_search' => array( + 'name' => tra('Include a search box on file galleries'), + 'type' => 'flag', + ), 'fgal_delete_after' => array( 'name' => tra('Automatic deletion of old files'), 'description' => tra('The user will have an option when uploading a file to specify the time after which the file is deleted'), Modified: branches/6.x/lib/setup/prefs.php =================================================================== --- branches/6.x/lib/setup/prefs.php 2010-11-27 17:43:06 UTC (rev 30902) +++ branches/6.x/lib/setup/prefs.php 2010-11-27 17:56:24 UTC (rev 30903) @@ -588,6 +588,7 @@ 'fgal_quota_show' => 'y', 'fgal_list_backlinks' => 'n', 'fgal_search_in_content' => 'n', + 'fgal_search' => 'y', 'fgal_delete_after' => '', 'fgal_delete_after_email' => '', 'fgal_list_id_admin' => 'y', Modified: branches/6.x/templates/tiki-admin_include_fgal.tpl =================================================================== --- branches/6.x/templates/tiki-admin_include_fgal.tpl 2010-11-27 17:43:06 UTC (rev 30902) +++ branches/6.x/templates/tiki-admin_include_fgal.tpl 2010-11-27 17:56:24 UTC (rev 30903) @@ -128,6 +128,7 @@ </div> </div> {preference name='fgal_quota_show'} + {preference name='fgal_search'} {preference name='fgal_search_in_content'} <fieldset> Modified: branches/6.x/templates/tiki-list_file_gallery.tpl =================================================================== --- branches/6.x/templates/tiki-list_file_gallery.tpl 2010-11-27 17:43:06 UTC (rev 30902) +++ branches/6.x/templates/tiki-list_file_gallery.tpl 2010-11-27 17:56:24 UTC (rev 30903) @@ -171,8 +171,9 @@ {elseif $dup_mode eq 'y'} {include file='duplicate_file_gallery.tpl'} {else} - {include file='find.tpl' find_show_num_rows = 'y' find_show_categories_multi='y' find_durations=$find_durations find_show_sub='y'} - + {if $prefs.fgal_search eq 'y'} + {include file='find.tpl' find_show_num_rows = 'y' find_show_categories_multi='y' find_durations=$find_durations find_show_sub='y'} + {/if} {if $prefs.fgal_search_in_content eq 'y' and $galleryId > 0} <div class="findtable"> <form id="search-form" class="forms" method="get" action="tiki-search{if $prefs.feature_forum_local_tiki_search eq 'y'}index{else}results{/if}.php"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |