diff options
| -rw-r--r-- | IkiWiki/CGI.pm | 6 | ||||
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | doc/style.css | 16 | ||||
| -rw-r--r-- | doc/wikitemplates.mdwn | 15 |
4 files changed, 29 insertions, 17 deletions
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm index b1caff96d..1471ae926 100644 --- a/IkiWiki/CGI.pm +++ b/IkiWiki/CGI.pm @@ -137,6 +137,7 @@ sub cgi_signin ($$) { #{{{ error($@) if $@; my $form = CGI::FormBuilder->new( title => "signin", + name => "signin", header => 1, charset => "utf-8", method => 'POST', @@ -145,7 +146,7 @@ sub cgi_signin ($$) { #{{{ params => $q, action => $config{cgiurl}, header => 0, - template => scalar template_params("signin.tmpl"), + template => {type => 'div'}, stylesheet => baseurl()."style.css", ); my $buttons=["Login"]; @@ -206,6 +207,7 @@ sub cgi_prefs ($$) { #{{{ error($@) if $@; my $form = CGI::FormBuilder->new( title => "preferences", + name => "preferences", header => 0, charset => "utf-8", method => 'POST', @@ -216,7 +218,7 @@ sub cgi_prefs ($$) { #{{{ javascript => 0, params => $q, action => $config{cgiurl}, - template => scalar template_params("prefs.tmpl"), + template => {type => 'div'}, stylesheet => baseurl()."style.css", fieldsets => [ [login => gettext("Login")], diff --git a/debian/changelog b/debian/changelog index ae633075d..7cfc2b12d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ikiwiki (2.1) UNRELEASED; urgency=low + + * Use div layout for the signin and preferences forms, so that they can be + styled using the stylesheet, rather than by creating signin and prefs + templates. + * Make the openid login form nicely styled. + + -- Joey Hess <joeyh@debian.org> Mon, 30 Apr 2007 17:53:10 -0400 + ikiwiki (2.00) unstable; urgency=low [ Josh Triplett ] diff --git a/doc/style.css b/doc/style.css index b399e2643..fa70530cc 100644 --- a/doc/style.css +++ b/doc/style.css @@ -265,6 +265,8 @@ input#openid_url { border: 2px solid; background-color: #dee; color: black; + + /* Nonstandard, but very nice. */ opacity: 0.95; -moz-opacity: 0.95; filter: alpha(opacity=95); @@ -278,3 +280,17 @@ fieldset { legend { padding: 0 1ex; } +.fb_submit { + float: left; + margin: 2px 0; +} +#signin_openid_url_label { + float: left; + margin-right: 1ex; +} +#signin_openid { + padding: 10px 10px; + border: 1px solid #aaa; + background: #eee; + color: black !important; +} diff --git a/doc/wikitemplates.mdwn b/doc/wikitemplates.mdwn index c707e64fc..5e2eb8a37 100644 --- a/doc/wikitemplates.mdwn +++ b/doc/wikitemplates.mdwn @@ -34,20 +34,5 @@ located in /usr/share/ikiwiki/templates by default. * `searchform.tmpl` - Used by the [[plugins/search]] plugin to add a search form to wiki pages. -If you like, you can add these to further customise it: - -* `signin.tmpl` - If it exists, it is used for customising the - layout of the SignIn form and all assciated forms. The misc.tmpl is - wrapped around this, so it should only be a template for the form. -* `prefs.tmpl` - If it exists, it is used for customising the - layout of the Prefs form and all assciated forms. The misc.tmpl is - wrapped around this, so it should only be a template for the form. - -Note that the SignIn and Prefs forms are implemented using -CGI::FormBuilder, which interfaces to HTML::Template, so not all of it can -be customised with templates, although most of it can, by creating these -templates. Without the templates, CGI::FormBuilder creates the page bodies -by itself. - The [[plugins/template]] plugin also uses templates, though those [[templates]] are stored in the wiki. |