websetup: Only display Setup button on admins' preferences page.

Renamed it from "Wiki Setup" to just "Setup" for good measure.

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index cb6a7e412b601a1dfefc8b0403d7b3f658da1da5..4d2e611ebe17af3bbbaaed3b54002df89aaf811d 100644 (file)
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -503,9 +503,10 @@ sub formbuilder_setup (@) {
        my %params=@_;
 
        my $form=$params{form};
-       if ($form->title eq "preferences") {
-               push @{$params{buttons}}, "Wiki Setup";
-               if ($form->submitted && $form->submitted eq "Wiki Setup") {
+       if ($form->title eq "preferences" &&
+           IkiWiki::is_admin($params{session}->param("name"))) {
+               push @{$params{buttons}}, "Setup";
+               if ($form->submitted && $form->submitted eq "Setup") {
                        showform($params{cgi}, $params{session});
                        exit;
                }

diff --git a/debian/changelog b/debian/changelog
index e03375bd3edec7d08577788efc5ecea9f4957bf3..9fb9607a34d3640a2e6c9035cffb544d9c972f4d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ ikiwiki (3.20100502) UNRELEASED; urgency=low
     links to the action bar without modifying the template further.
     (COMMENTSLINK and DISCUSSIONLINK could be folded into this, but
     are kept separate for now to avoid breaking modified templates.)
+  * websetup: Only display Setup button on admins' preferences page. 
 
  -- Joey Hess <joeyh@debian.org>  Sun, 02 May 2010 13:22:50 -0400
 

diff --git a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
index 7599e71e5c10ce60a6e3bd8032cb2c69bb95882d..17c60c4239b798f9d6f88483617588446b5e7e34 100644 (file)
--- a/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
+++ b/doc/forum/Can_OpenID_users_be_adminusers__63__.mdwn
@@ -62,7 +62,7 @@ index 0bf100a..77b467a 100644
 
 >>>> So you can see if the two usernames/openids match. If the end is "0",
 >>>> they don't match. If nothing is logged, you have not enabled the websetup plugin.
->>>> If the end if "1" you should see the "Wiki Setup" button, if not the
+>>>> If the end if "1" you should see the "Setup" button, if not the
 >>>> problem is not in determining if you're an admin, but elsewhere..
 >>>> --[[Joey]]
 

diff --git a/doc/plugins/websetup.mdwn b/doc/plugins/websetup.mdwn
index b4d23ba9cfbf85d08dce8a3556ffc45730a29263..a20a3248945780b22b3673c7653a3aa99e58f83b 100644 (file)
--- a/doc/plugins/websetup.mdwn
+++ b/doc/plugins/websetup.mdwn
@@ -2,7 +2,7 @@
 [[!tag type/web]]
 
 This plugin allows wiki admins to configure the wiki using a web interface,
-rather than editing the setup file directly. A "Wiki Setup" button is added
+rather than editing the setup file directly. A "Setup" button is added
 to the admins' preferences page.
 
 Warning: This plugin rewrites your setup file. Any comments or unusual

diff --git a/doc/setup.mdwn b/doc/setup.mdwn
index 2d4da553615cc52c71c053e81dd23b8deeafa3a7..3ea0022ccfc18ed09331924f7e9b5a25db25df17 100644 (file)
--- a/doc/setup.mdwn
+++ b/doc/setup.mdwn
@@ -89,7 +89,7 @@ These range from changing the wiki's name, to enabling [[plugins]],
 to banning users and locking pages.
 
 If you log in as the admin user you configured earlier, and go to
-your Preferences page, you can click on "Wiki Setup" to customize many
+your Preferences page, you can click on "Setup" to customize many
 wiki settings and plugins.
 
 Some settings cannot be configured on the web, for security reasons or