[TWiki-Dev] [SVN] PeterThoeny r21457 - twiki/trunk/PreferencesPlugin/lib/TWiki/Plugins

[<de...@de...>]

Author: PeterThoeny
Date: 2011-06-10 03:57:06 -0500 (Fri, 10 Jun 2011)
New Revision: 21457
Trac url: http://develop.twiki.org/trac/changeset/21457

Modified:
   twiki/trunk/PreferencesPlugin/lib/TWiki/Plugins/PreferencesPlugin.pm
Log:
Item6748: Usability: Use PreferencesPlugin to edit TWiki group settings - add new editbutton parameter to EDITPREFERENCES so that a custom "Edit Group Settings" can be shown in TWiki groups

Modified: twiki/trunk/PreferencesPlugin/lib/TWiki/Plugins/PreferencesPlugin.pm
===================================================================
--- twiki/trunk/PreferencesPlugin/lib/TWiki/Plugins/PreferencesPlugin.pm	2011-06-10 08:44:27 UTC (rev 21456)
+++ twiki/trunk/PreferencesPlugin/lib/TWiki/Plugins/PreferencesPlugin.pm	2011-06-10 08:57:06 UTC (rev 21457)
@@ -31,7 +31,7 @@
 use vars qw( $VERSION $RELEASE @shelter );
 
 $VERSION = '$Rev$';
-$RELEASE = '2010-05-15';
+$RELEASE = '2010-06-10';
 
 my $MARKER = "\007";
 
@@ -69,6 +69,7 @@
         $formDef =
           new TWiki::Form( $TWiki::Plugins::SESSION, $formWeb, $form );
     }
+    my $editButton = $attrs->{editbutton} || 'Edit Preferences';
 
     my $query = TWiki::Func::getCgiQuery();
 
@@ -129,7 +130,7 @@
         return;
     }
     # implicit action="view", or drop through from "save" or "cancel"
-    $_[0] =~ s/%EDITPREFERENCES({.*?})?%/_generateEditButton($web, $topic)/ge;
+    $_[0] =~ s/%EDITPREFERENCES({.*?})?%/_generateEditButton($web, $topic, $editButton)/ge;
 }
 
 # Use the post-rendering handler to plug our formatted editor units
@@ -198,7 +199,7 @@
 
 # Generate the button that replaces the EDITPREFERENCES tag in view mode
 sub _generateEditButton {
-    my( $web, $topic ) = @_;
+    my( $web, $topic, $buttonLabel ) = @_;
 
     my $viewUrl = TWiki::Func::getScriptUrl(
         $web, $topic, 'viewauth' );
@@ -211,8 +212,8 @@
         name => 'prefsaction',
         value => 'edit'});
     $text .= CGI::submit(-name => 'edit',
-                         -value=>'Edit Preferences',
-                         -class=>'twikiButton');
+                         -value=> $buttonLabel,
+                         -class=> 'twikiButton');
     $text .= CGI::end_form();
     $text =~ s/\n//sg;
     return $text;