summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2007-12-08 15:59:08 -0500
committerJoey Hess <joey@kitenet.net>2007-12-08 15:59:08 -0500
commit7960031135e74f6d36abc4294dbadb687117222c (patch)
tree482778fb123b930018c62bb72464264c60c51bf2 /IkiWiki
parent7b125b45b025bc92e67ef6e9984f7eb5a1970987 (diff)
MAJOR basewiki reorg
Including redir pages for the moved basewiki pages. These will be removed in a future release.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/CGI.pm6
-rw-r--r--IkiWiki/Plugin/lockedit.pm2
-rw-r--r--IkiWiki/Plugin/openid.pm2
3 files changed, 6 insertions, 4 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 788d0487e..75f096e13 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -249,7 +249,7 @@ sub cgi_prefs ($$) { #{{{
$form->field(name => "email", size => 50, fieldset => "preferences");
$form->field(name => "subscriptions", size => 50,
fieldset => "preferences",
- comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
+ comment => "(".htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).")");
$form->field(name => "banned_users", size => 50,
fieldset => "admin");
@@ -386,7 +386,9 @@ sub cgi_editpage ($$) { #{{{
$form->tmpl_param("can_commit", $config{rcs});
$form->tmpl_param("indexlink", indexlink());
$form->tmpl_param("helponformattinglink",
- htmllink("", "", "HelpOnFormatting", noimageinline => 1));
+ htmllink("", "", "ikiwiki/formatting",
+ noimageinline => 1,
+ linktext => "FormattingHelp"));
$form->tmpl_param("baseurl", baseurl());
if ($form->submitted eq "Cancel") {
diff --git a/IkiWiki/Plugin/lockedit.pm b/IkiWiki/Plugin/lockedit.pm
index 82ce1e7be..a829df1cf 100644
--- a/IkiWiki/Plugin/lockedit.pm
+++ b/IkiWiki/Plugin/lockedit.pm
@@ -42,7 +42,7 @@ sub formbuilder_setup (@) { #{{{
if ($form->title eq "preferences") {
$form->field(name => "locked_pages", size => 50,
fieldset => "admin",
- comment => "(".htmllink("", "", "PageSpec", noimageinline => 1).")");
+ comment => "(".htmllink("", "", "ikiwiki/PageSpec", noimageinline => 1).")");
if (! IkiWiki::is_admin($user_name)) {
$form->field(name => "locked_pages", type => "hidden");
}
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index ab9fc560b..e8dbe964f 100644
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -42,7 +42,7 @@ sub formbuilder_setup (@) { #{{{
$form->field(
name => "openid_url",
- label => gettext("Log in with")." ".htmllink("", "", "OpenID", noimageinline => 1),
+ label => gettext("Log in with")." ".htmllink("", "", "ikiwiki/OpenID", noimageinline => 1),
fieldset => "OpenID",
size => 30,
comment => ($config{openidsignup} ? " | <a href=\"$config{openidsignup}\">".gettext("Get an OpenID")."</a>" : "")