diff options
| -rw-r--r-- | comment.tmpl | 6 | ||||
| -rw-r--r-- | editcomment.tmpl | 4 | ||||
| -rw-r--r-- | emailauth.tmpl | 10 | ||||
| -rw-r--r-- | googleform.tmpl | 2 | ||||
| -rw-r--r-- | login-selector.tmpl | 65 | ||||
| -rw-r--r-- | openid-selector.tmpl | 43 | ||||
| -rw-r--r-- | page.tmpl | 23 | ||||
| -rw-r--r-- | revert.tmpl | 1 | ||||
| -rw-r--r-- | rsspage.tmpl | 4 | ||||
| -rw-r--r-- | searchform.tmpl | 2 | ||||
| -rw-r--r-- | searchquery.tmpl | 4 |
11 files changed, 98 insertions, 66 deletions
diff --git a/comment.tmpl b/comment.tmpl index c16ca7c..e292440 100644 --- a/comment.tmpl +++ b/comment.tmpl @@ -22,12 +22,12 @@ Comment by <TMPL_IF COMMENTOPENID> <span class="author" title="OpenID"> -<a href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a> +<a rel="nofollow" href="<TMPL_VAR COMMENTOPENID>"><TMPL_VAR COMMENTAUTHOR></a> </span> <TMPL_ELSE> <span class="author" title="Signed in"> <TMPL_IF COMMENTAUTHORURL> -<a href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a> +<a rel="nofollow" href="<TMPL_VAR COMMENTAUTHORURL>"><TMPL_VAR COMMENTAUTHOR></a> <TMPL_ELSE> <TMPL_VAR COMMENTAUTHOR> </TMPL_IF> @@ -42,7 +42,7 @@ Comment by <span class="author" title="Unauthenticated, from unknown IP address"> </TMPL_IF> <TMPL_IF AUTHORURL> -<a href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a> +<a rel="nofollow" href="<TMPL_VAR AUTHORURL>"><TMPL_VAR AUTHOR></a> <TMPL_ELSE> <TMPL_VAR AUTHOR> </TMPL_IF> diff --git a/editcomment.tmpl b/editcomment.tmpl index e177db9..703564e 100644 --- a/editcomment.tmpl +++ b/editcomment.tmpl @@ -8,7 +8,7 @@ <TMPL_UNLESS NAME=USERNAME> <TMPL_IF NAME=ALLOWAUTHOR> <label for="author" class="block">Name:</label> -<TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a href="<TMPL_VAR SIGNINURL>">signin</a>) +<TMPL_VAR NAME=FIELD-AUTHOR> (optional, or <a rel="nofollow" href="<TMPL_VAR SIGNINURL>">signin</a>) <br/> <label for="url" class="block">Website:</label> <TMPL_VAR NAME=FIELD-URL> (optional) @@ -17,7 +17,7 @@ <TMPL_VAR NAME=FIELD-EMAIL> <TMPL_VAR FIELD-ANONSUBSCRIBE> <br /> <TMPL_ELSE> -(You might want to <a href="<TMPL_VAR SIGNINURL>">Signin</a> first?) +(You might want to <a rel="nofollow" href="<TMPL_VAR SIGNINURL>">Signin</a> first?) <br /> </TMPL_IF> </TMPL_UNLESS> diff --git a/emailauth.tmpl b/emailauth.tmpl new file mode 100644 index 0000000..5561406 --- /dev/null +++ b/emailauth.tmpl @@ -0,0 +1,10 @@ +To log into <TMPL_VAR WIKINAME>, just open the following link: + +<TMPL_VAR AUTHURL> + +This link can only be used once to log in, and will expire in one day. + +(Please disregard this email if you were not trying to log in.) + +-- +ikiwiki diff --git a/googleform.tmpl b/googleform.tmpl index b1c3078..155a081 100644 --- a/googleform.tmpl +++ b/googleform.tmpl @@ -3,6 +3,6 @@ <div> <input name="sitesearch" value="<TMPL_VAR URL>" type="hidden" /> <input name="q" value="" id="searchbox" size="16" maxlength="255" type="text" - <TMPL_IF HTML5>placeholder="search"</TMPL_IF> /> + placeholder="search" /> </div> </form> diff --git a/login-selector.tmpl b/login-selector.tmpl new file mode 100644 index 0000000..3e7045c --- /dev/null +++ b/login-selector.tmpl @@ -0,0 +1,65 @@ +<script type="text/javascript" src="ikiwiki/jquery.min.js"></script> +<script type="text/javascript" src="ikiwiki/login-selector/login-selector.js"></script> +<script type="text/javascript"> +$(document).ready(function() { + selector.init( + 'openid_identifier', + { + <TMPL_IF LOGIN_SELECTOR_OPENID>'openid': 1,</TMPL_IF> + <TMPL_IF LOGIN_SELECTOR_EMAILAUTH>'email': 1,</TMPL_IF> + }, + '<TMPL_IF OTHERFORM>otherform</TMPL_IF>', + '<TMPL_VAR OTHERFORM_LABEL>' + ); +}); +</script> + +<form action="<TMPL_VAR CGIURL>" method="get" id="login_selector_form"> + <div> + <script> + $('fieldset').append("<legend>Select login method</legend>"); + </script> + + <input type="hidden" name="do" value="signin" /> + <input type="hidden" name="action" value="verify" /> + <div id="login_choice"> + <div id="login_btns"></div> + </div> + + <div id="login_input_area"> + <TMPL_IF LOGIN_SELECTOR_OPENID> + <div> + <h3>OpenId login:</h3> + <label for="openid_identifier" class="block">Enter your OpenID:</label> + <input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR ESCAPE=HTML OPENID_URL>"/> + <input id="openid_submit" type="submit" value="Login"/> + </div> + </TMPL_IF> + <TMPL_IF LOGIN_SELECTOR_EMAILAUTH> + <div> + <h3>Email login:</h3> + <label for="email_address" class="block">Enter your email address:</label> + <input id="email_address" name="Email_entry" type="text" value="<TMPL_VAR ESCAPE=HTML EMAIL_ADDRESS>"/> + <input id="email_submit" type="submit" value="Login"/> + </div> + </TMPL_IF> + </div> + + <TMPL_IF LOGIN_ERROR> + <div class="error"><TMPL_VAR LOGIN_ERROR></div> + </TMPL_IF> + <TMPL_IF LOGIN_INFO> + <TMPL_VAR LOGIN_INFO> + </TMPL_IF> + </div> +</form> + +<div id="otherform"> +<TMPL_IF OTHERFORM> +<br /> +<noscript> +<h3><TMPL_VAR OTHERFORM_LABEL> login:</h3> +</noscript> +</TMPL_IF> +<TMPL_VAR OTHERFORM> +</div> diff --git a/openid-selector.tmpl b/openid-selector.tmpl deleted file mode 100644 index 0fd8330..0000000 --- a/openid-selector.tmpl +++ /dev/null @@ -1,43 +0,0 @@ -<script type="text/javascript" src="ikiwiki/jquery.min.js"></script> -<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script> -<script type="text/javascript"> -$(document).ready(function() { - openid.init('openid_identifier','<TMPL_IF NONOPENIDFORM>nonopenidform</TMPL_IF>'); -}); -</script> - -<noscript> -<h2>OpenID:</h2> -</noscript> - -<form action="<TMPL_VAR CGIURL>" method="get" id="openid_form"> - <fieldset> - <script> - $('fieldset').append("<legend>Select your account provider</legend>"); - </script> - - <input type="hidden" name="do" value="signin" /> - <input type="hidden" name="action" value="verify" /> - <div id="openid_choice"> - <div id="openid_btns"></div> - </div> - <div id="openid_input_area"> - <label for="openid_identifier" class="block">Enter your OpenID:</label> - <input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR ESCAPE=HTML OPENID_URL>"/> - <input id="openid_submit" type="submit" value="Login"/> - </div> - <TMPL_IF OPENID_ERROR> - <div class="error"><TMPL_VAR OPENID_ERROR></div> - </TMPL_IF> - </fieldset> -</form> - -<div id="nonopenidform"> -<TMPL_IF NONOPENIDFORM> -<br /> -<noscript> -<h2>Other:</h2> -</noscript> -</TMPL_IF> -<TMPL_VAR NONOPENIDFORM> -</div> @@ -1,9 +1,5 @@ -<TMPL_IF HTML5><!DOCTYPE html> -<html> -<TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -</TMPL_IF> +<!DOCTYPE html> +<TMPL_IF HTML_LANG_CODE><html lang="<TMPL_VAR HTML_LANG_CODE>" dir="<TMPL_VAR HTML_LANG_DIR>" xmlns="http://www.w3.org/1999/xhtml"><TMPL_ELSE><html xmlns="http://www.w3.org/1999/xhtml"></TMPL_IF> <head> <TMPL_IF DYNAMIC> <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE> @@ -12,6 +8,7 @@ </TMPL_IF> <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF> <title><TMPL_VAR TITLE></title> +<TMPL_IF RESPONSIVE_LAYOUT><meta name="viewport" content="width=device-width, initial-scale=1" /></TMPL_IF> <TMPL_IF FAVICON> <link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" /> </TMPL_IF> @@ -77,13 +74,13 @@ <li><a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a></li> </TMPL_IF> <TMPL_IF HISTORYURL> -<li><a href="<TMPL_VAR HISTORYURL>">History</a></li> +<li><a rel="nofollow" href="<TMPL_VAR HISTORYURL>">History</a></li> </TMPL_IF> <TMPL_IF GETSOURCEURL> -<li><a href="<TMPL_VAR GETSOURCEURL>">Source</a></li> +<li><a rel="nofollow" href="<TMPL_VAR GETSOURCEURL>">Source</a></li> </TMPL_IF> <TMPL_IF PREFSURL> -<li><a href="<TMPL_VAR PREFSURL>">Preferences</a></li> +<li><a rel="nofollow" href="<TMPL_VAR PREFSURL>">Preferences</a></li> </TMPL_IF> <TMPL_IF ACTIONS> <TMPL_LOOP ACTIONS> @@ -134,7 +131,7 @@ <div id="pagebody"> -<TMPL_IF HTML5><section id="content" role="main"><TMPL_ELSE><div id="content"></TMPL_IF> +<TMPL_IF HTML5><section<TMPL_ELSE><div</TMPL_IF> id="content" role="main"> <TMPL_VAR CONTENT> <TMPL_IF HTML5></section><TMPL_ELSE></div></TMPL_IF> @@ -146,11 +143,11 @@ <TMPL_UNLESS DYNAMIC> <TMPL_IF COMMENTS> -<TMPL_IF HTML5><section id="comments" role="complementary"><TMPL_ELSE><div id="comments"></TMPL_IF> +<TMPL_IF HTML5><section<TMPL_ELSE><div</TMPL_IF> id="comments" role="complementary"> <TMPL_VAR COMMENTS> <TMPL_IF ADDCOMMENTURL> <div class="addcomment"> -<a href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a> +<a rel="nofollow" href="<TMPL_VAR ADDCOMMENTURL>">Add a comment</a> </div> <TMPL_ELSE> <div class="addcomment">Comments on this page are closed.</div> @@ -161,7 +158,7 @@ </div> -<TMPL_IF HTML5><footer id="footer" class="pagefooter" role="contentinfo"><TMPL_ELSE><div id="footer" class="pagefooter"></TMPL_IF> +<TMPL_IF HTML5><footer<TMPL_ELSE><div</TMPL_IF> id="footer" class="pagefooter" role="contentinfo"> <TMPL_UNLESS DYNAMIC> <TMPL_IF HTML5><nav id="pageinfo"><TMPL_ELSE><div id="pageinfo"></TMPL_IF> diff --git a/revert.tmpl b/revert.tmpl index 0de3281..b5122b1 100644 --- a/revert.tmpl +++ b/revert.tmpl @@ -19,3 +19,4 @@ <pre> <TMPL_VAR diff> </pre> +</div> diff --git a/rsspage.tmpl b/rsspage.tmpl index 45265f2..d07ecef 100644 --- a/rsspage.tmpl +++ b/rsspage.tmpl @@ -1,10 +1,12 @@ <?xml version="1.0"?> <rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:dcterms="http://purl.org/dc/terms/" > + xmlns:dcterms="http://purl.org/dc/terms/" + xmlns:atom="http://www.w3.org/2005/Atom"> <channel> <title><TMPL_VAR TITLE></title> <link><TMPL_VAR PAGEURL></link> +<atom:link href="<TMPL_VAR FEEDURL>" rel="self" type="application/rss+xml"/> <TMPL_IF COPYRIGHT> <copyright><TMPL_VAR COPYRIGHT ESCAPE=HTML></copyright> </TMPL_IF> diff --git a/searchform.tmpl b/searchform.tmpl index cb65d12..8cdf745 100644 --- a/searchform.tmpl +++ b/searchform.tmpl @@ -1,6 +1,6 @@ <form method="get" action="<TMPL_VAR SEARCHACTION>" id="searchform"> <div> <input type="text" id="searchbox" name="P" value="" size="16" -<TMPL_IF HTML5>placeholder="search"</TMPL_IF> /> + placeholder="search" /> </div> </form> diff --git a/searchquery.tmpl b/searchquery.tmpl index 15bc78e..6277266 100644 --- a/searchquery.tmpl +++ b/searchquery.tmpl @@ -33,8 +33,8 @@ $def{NEXT,$if{$ne{$last,$msize},<INPUT TYPE=submit NAME=">" VALUE="Next">}} <FORM NAME=P METHOD=GET ACTION="$html{$env{CGIURL}}" TARGET="_top"> -<div style="text-align:center"> -<INPUT NAME=P VALUE="$html{$query}" SIZE=65> +<div class="searchquery" style="text-align:center"> +<INPUT class="searchbox" NAME=P VALUE="$html{$query}" SIZE=65> <INPUT TYPE=SUBMIT VALUE="Search"> $env{HELPLINK} <hr> |