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

[<mar...@us...>]

Revision: 22216
          http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=22216&view=rev
Author:   marclaporte
Date:     2009-10-11 17:32:29 +0000 (Sun, 11 Oct 2009)

Log Message:
-----------
[MOD] Moving find/search and replace admin option from wiki to textarea admin panel now that it's available for any edit box

Modified Paths:
--------------
    trunk/lib/prefs/feature.php
    trunk/templates/tiki-admin-include-textarea.tpl
    trunk/templates/tiki-admin-include-wiki.tpl
    trunk/tiki-admin_include_wiki.php

Modified: trunk/lib/prefs/feature.php
===================================================================
--- trunk/lib/prefs/feature.php	2009-10-11 17:06:02 UTC (rev 22215)
+++ trunk/lib/prefs/feature.php	2009-10-11 17:32:29 UTC (rev 22216)
@@ -759,5 +759,11 @@
 			'help' => 'Perspectives',
 			'type' => 'flag',
 		),
+		'feature_wiki_replace' => array(
+			'name' => tra('Search and replace'),
+			'description' => tra('Permits find and replace of content in the edit box'),
+			'help' => 'Regex+search+and+replace',
+			'type' => 'flag',
+		),
 	);
 }

Modified: trunk/templates/tiki-admin-include-textarea.tpl
===================================================================
--- trunk/templates/tiki-admin-include-textarea.tpl	2009-10-11 17:06:02 UTC (rev 22215)
+++ trunk/templates/tiki-admin-include-textarea.tpl	2009-10-11 17:32:29 UTC (rev 22216)
@@ -12,6 +12,7 @@
 
 {preference name=feature_filegals_manager}
 {preference name=feature_dynamic_content}
+{preference name=feature_wiki_replace}
 
 </fieldset>
 

Modified: trunk/templates/tiki-admin-include-wiki.tpl
===================================================================
--- trunk/templates/tiki-admin-include-wiki.tpl	2009-10-11 17:06:02 UTC (rev 22215)
+++ trunk/templates/tiki-admin-include-wiki.tpl	2009-10-11 17:32:29 UTC (rev 22216)
@@ -126,11 +126,8 @@
 	</div>
 </div>
 
+
 <div class="adminoptionbox">
-	<div class='adminoption'><input type="checkbox" id="feature_wiki_replace" name="feature_wiki_replace" {if $prefs.feature_wiki_replace eq 'y'}checked="checked"{/if}/></div>
-	<div class="adminoptionlabel"><label for="feature_wiki_replace">{tr}Regex search and replace{/tr}</label>{if $prefs.feature_help eq 'y'} {help url="regex+search+and+replace"}{/if}</div>
-</div>
-<div class="adminoptionbox">
 	<div class="adminoption"><input type="checkbox" id="feature_actionlog_bytes" name="feature_actionlog_bytes" {if $prefs.feature_actionlog_bytes eq 'y'}checked="checked" {/if}/></div>
 	<div class="adminoptionlabel"><label for="feature_actionlog_bytes">{tr}Log bytes changes (+/-) in action logs{/tr}.</label>
 	<br /><em>{icon _id=information} {tr}May impact performance{/tr}.</em>

Modified: trunk/tiki-admin_include_wiki.php
===================================================================
--- trunk/tiki-admin_include_wiki.php	2009-10-11 17:06:02 UTC (rev 22215)
+++ trunk/tiki-admin_include_wiki.php	2009-10-11 17:32:29 UTC (rev 22216)
@@ -126,7 +126,6 @@
 		'feature_source',
 		'feature_sandbox',
 		'feature_wiki_print',
-		'feature_wiki_replace',
 		'feature_backlinks',
 		'feature_likePages',
 		'wiki_uses_slides',


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