diff options
author | Moritz Lenz <moritz@faui2k3.org> | 2010-03-17 21:23:36 (GMT) |
---|---|---|
committer | Moritz Lenz <moritz@faui2k3.org> | 2010-03-17 21:23:36 (GMT) |
commit | 0b345cf974415560a251fba2e63e8d5b97a18ba2 (patch) | |
tree | f75f0e3528e3dc456d00f88655525f8fc1dc3879 | |
parent | 0454639da379706f39b384995da3e2b09747f6fd (diff) |
simply templates by removing unnecessary NAME=
-rw-r--r-- | cgi/template/channel-index.tmpl | 14 | ||||
-rw-r--r-- | cgi/template/day.tmpl | 32 | ||||
-rw-r--r-- | cgi/template/index.tmpl | 10 | ||||
-rw-r--r-- | cgi/template/line.tmpl | 15 | ||||
-rw-r--r-- | cgi/template/search.tmpl | 55 |
5 files changed, 62 insertions, 64 deletions
diff --git a/cgi/template/channel-index.tmpl b/cgi/template/channel-index.tmpl index f5660c7..a750ea4 100644 --- a/cgi/template/channel-index.tmpl +++ b/cgi/template/channel-index.tmpl @@ -4,20 +4,20 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta name="description" content="IRC logs by ilbot" /> - <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=BASE_URL>style.css" title="Irclog default Stylesheet" /> - <link rel="shortcut icon" href="<TMPL_VAR NAME=BASE_URL>moose1.ico" type="image/x-icon" /> + <link rel="stylesheet" type="text/css" href="<TMPL_VAR BASE_URL>style.css" title="Irclog default Stylesheet" /> + <link rel="shortcut icon" href="<TMPL_VAR BASE_URL>moose1.ico" type="image/x-icon" /> <title>IRC logs</title> </head> <body> <h1>IRC logs - Channel Index</h1> - <TMPL_INCLUDE NAME=linkblock.tmpl> + <TMPL_INCLUDE linkblock.tmpl> - <h2 id="<TMPL_VAR NAME=CHANNEL>">#<TMPL_VAR NAME=CHANNEL></h2> - <p><strong><a href="<TMPL_VAR NAME=BASE_URL><TMPL_VAR NAME=CHANNEL>/today">Today</a></strong></p> + <h2 id="<TMPL_VAR CHANNEL>">#<TMPL_VAR CHANNEL></h2> + <p><strong><a href="<TMPL_VAR BASE_URL><TMPL_VAR CHANNEL>/today">Today</a></strong></p> - <TMPL_VAR NAME=CALENDAR> + <TMPL_VAR CALENDAR> - <TMPL_INCLUDE NAME="footer.tmpl"> + <TMPL_INCLUDE footer.tmpl"> </body> </html> diff --git a/cgi/template/day.tmpl b/cgi/template/day.tmpl index ef4e4a0..631b4f6 100644 --- a/cgi/template/day.tmpl +++ b/cgi/template/day.tmpl @@ -3,11 +3,11 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> - <meta name="description" content="IRC LOG for channel #<TMPL_VAR NAME=CHANNEL>" /> - <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=BASE_URL>style.css" title="Irclog Stylesheet" /> - <link rel="shortcut icon" href="<TMPL_VAR NAME=BASE_URL>moose1.ico" type="image/x-icon" /> - <title>IRC log for #<TMPL_VAR NAME=CHANNEL>, <TMPL_VAR NAME=DATE></title> - <TMPL_IF NAME=ADMIN> + <meta name="description" content="IRC LOG for channel #<TMPL_VAR CHANNEL>" /> + <link rel="stylesheet" type="text/css" href="<TMPL_VAR BASE_URL>style.css" title="Irclog Stylesheet" /> + <link rel="shortcut icon" href="<TMPL_VAR BASE_URL>moose1.ico" type="image/x-icon" /> + <title>IRC log for #<TMPL_VAR CHANNEL>, <TMPL_VAR DATE></title> + <TMPL_IF ADMIN> <script type="text/javascript"> <!-- function reset_checkboxes() { @@ -20,21 +20,21 @@ </script> </TMPL_IF> - <script type="text/javascript" src="<TMPL_VAR NAME=BASE_URL>jquery.min.js"></script> - <script type="text/javascript" src="<TMPL_VAR NAME=BASE_URL>jquery.autocomplete.js"></script> + <script type="text/javascript" src="<TMPL_VAR BASE_URL>jquery.min.js"></script> + <script type="text/javascript" src="<TMPL_VAR BASE_URL>jquery.autocomplete.js"></script> </head> <body> - <p><a href="http://perl6.org/"><img style="float:right; border:none" src="<TMPL_VAR NAME=BASE_URL>camelia.png" width="193" height="180" + <p><a href="http://perl6.org/"><img style="float:right; border:none" src="<TMPL_VAR BASE_URL>camelia.png" width="193" height="180" alt="Camelia, the Perl 6 bug"/></a></p> - <h1>IRC log for #<TMPL_VAR NAME=CHANNEL>, <TMPL_VAR NAME=DATE></h1> + <h1>IRC log for #<TMPL_VAR CHANNEL>, <TMPL_VAR DATE></h1> <TMPL_VAR NAME=CHANNEL_LINKS DEFAULT=""> <TMPL_INCLUDE NAME='linkblock.tmpl'> <p>All times shown according to <abbr title="Coordinated Universal Time">UTC</abbr>.</p> - <TMPL_IF NAME=ADMIN> - <form method="post" action="<TMPL_VAR NAME=BASE_URL>spam.pl?date=<TMPL_VAR NAME=DATE>;channel=<TMPL_VAR NAME=CHANNEL>"> + <TMPL_IF ADMIN> + <form method="post" action="<TMPL_VAR BASE_URL>spam.pl?date=<TMPL_VAR DATE>;channel=<TMPL_VAR CHANNEL>"> <p><input type="submit" value="Mark as spam" /></p> <p><a href="javascript:reset_checkboxes()">Reset all Checkboxes</a></p> <div style="clear:both"></div> @@ -44,7 +44,7 @@ <table id="log" style="clear:both"> <tr class="head"> - <TMPL_IF NAME=ADMIN> + <TMPL_IF ADMIN> <th>Range</th> <th>Single</th> </TMPL_IF> @@ -52,12 +52,12 @@ <th>Nick</th> <th>Message</th> </tr> - <TMPL_LOOP NAME=MESSAGES> + <TMPL_LOOP MESSAGES> <TMPL_INCLUDE NAME='line.tmpl'> </TMPL_LOOP> </table> - <TMPL_IF NAME=ADMIN> + <TMPL_IF ADMIN> <p><input type="submit" value="Mark as spam" /></p> <div style="clear:both"></div> </form> @@ -68,7 +68,7 @@ <TMPL_INCLUDE NAME="footer.tmpl"> - <script type="text/javascript" src="<TMPL_VAR NAME=BASE_URL>nickfilter.js"></script> + <script type="text/javascript" src="<TMPL_VAR BASE_URL>nickfilter.js"></script> </body> </html> -<!-- <TMPL_IF DEBUG> <TMPL_VAR NAME=DEBUG> </TMPL_IF> --> +<!-- <TMPL_IF DEBUG> <TMPL_VAR DEBUG> </TMPL_IF> --> diff --git a/cgi/template/index.tmpl b/cgi/template/index.tmpl index 21c6572..ff88738 100644 --- a/cgi/template/index.tmpl +++ b/cgi/template/index.tmpl @@ -4,19 +4,19 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta name="description" content="IRC logs by ilbot" /> - <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=BASE_URL>style.css" title="Irclog default Stylesheet" /> - <link rel="shortcut icon" href="<TMPL_VAR NAME=BASE_URL>moose1.ico" type="image/x-icon" /> + <link rel="stylesheet" type="text/css" href="<TMPL_VAR BASE_URL>style.css" title="Irclog default Stylesheet" /> + <link rel="shortcut icon" href="<TMPL_VAR BASE_URL>moose1.ico" type="image/x-icon" /> <title>IRC logs - Index</title> </head> <body> <h1>Index of IRC logs</h1> - <p><a href="<TMPL_VAR NAME=BASE_URL>/search.pl">Search the logs</a></p> + <p><a href="<TMPL_VAR BASE_URL>search.pl">Search the logs</a></p> <h2>Channels</h2> - <ul><TMPL_LOOP NAME=CHANNELS> - <li><a href="<TMPL_VAR NAME=BASE_URL><TMPL_VAR NAME=CHANNEL ESCAPE=URL>/">#<TMPL_VAR NAME=CHANNEL></a> - <a href="<TMPL_VAR NAME=BASE_URL><TMPL_VAR NAME=CHANNEL ESCAPE=URL>/today">Today</a></li> + <ul><TMPL_LOOP CHANNELS> + <li><a href="<TMPL_VAR BASE_URL><TMPL_VAR NAME=CHANNEL ESCAPE=URL>/">#<TMPL_VAR CHANNEL></a> - <a href="<TMPL_VAR BASE_URL><TMPL_VAR NAME=CHANNEL ESCAPE=URL>/today">Today</a></li> </TMPL_LOOP> </ul> diff --git a/cgi/template/line.tmpl b/cgi/template/line.tmpl index 9730d94..0c4d81b 100644 --- a/cgi/template/line.tmpl +++ b/cgi/template/line.tmpl @@ -1,10 +1,9 @@ -<tr id="id_l<TMPL_VAR NAME=LINE_NUMBER>" <TMPL_IF NAME=CLASS>class="<TMPL_VAR NAME=CLASS>"</TMPL_IF>> - <TMPL_IF NAME=ADMIN> - <td class="checkbox"><input type="checkbox" name="range" value="<TMPL_VAR NAME=ID>" size="1" style="width:1em"/></td> - <td class="checkbox"><input type="checkbox" name="single" value="<TMPL_VAR NAME=ID>" size="1" style="width:1em"/></td> +<tr id="id_l<TMPL_VAR LINE_NUMBER>" <TMPL_IF CLASS>class="<TMPL_VAR CLASS>"</TMPL_IF>> + <TMPL_IF ADMIN> + <td class="checkbox"><input type="checkbox" name="range" value="<TMPL_VAR ID>" size="1" style="width:1em"/></td> + <td class="checkbox"><input type="checkbox" name="single" value="<TMPL_VAR ID>" size="1" style="width:1em"/></td> </TMPL_IF> - <td class="time" id="i_<TMPL_VAR NAME=ID>"><a href="<TMPL_VAR NAME=BASE_URL><TMPL_VAR NAME=CHANNEL>/<TMPL_VAR NAME=DATE>#i_<TMPL_VAR NAME=ID>"><TMPL_VAR - NAME=TIME></a></td> - <td class="nick<TMPL_IF NAME=NICK_CLASS> <TMPL_VAR NAME=NICK_CLASS></TMPL_IF>"><TMPL_VAR NAME=NICK></td> - <td class="msg<TMPL_IF NAME=MSG_CLASS> <TMPL_VAR NAME=MSG_CLASS></TMPL_IF> <TMPL_VAR NAME=SEARCH_FOUND DEFAULT=''>"><TMPL_VAR NAME=MESSAGE ESCAPE=0></td> + <td class="time" id="i_<TMPL_VAR ID>"><a href="<TMPL_VAR BASE_URL><TMPL_VAR CHANNEL>/<TMPL_VAR DATE>#i_<TMPL_VAR ID>"><TMPL_VAR TIME></a></td> + <td class="nick<TMPL_IF NICK_CLASS> <TMPL_VAR NICK_CLASS></TMPL_IF>"><TMPL_VAR NICK></td> + <td class="msg<TMPL_IF MSG_CLASS> <TMPL_VAR MSG_CLASS></TMPL_IF> <TMPL_VAR NAME=SEARCH_FOUND DEFAULT=''>"><TMPL_VAR NAME=MESSAGE ESCAPE=0></td> </tr> diff --git a/cgi/template/search.tmpl b/cgi/template/search.tmpl index b1ba740..f31bce4 100644 --- a/cgi/template/search.tmpl +++ b/cgi/template/search.tmpl @@ -3,61 +3,61 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> - <meta name="description" content="IRC LOG for channel <TMPL_VAR NAME=CHANNEL>" /> - <link rel="stylesheet" type="text/css" href="<TMPL_VAR NAME=BASE_URL>style.css" title="Purple Haze Stylesheet" /> - <link rel="shortcut icon" href="<TMPL_VAR NAME=BASE_URL>moose1.ico" type="image/x-icon" /> + <meta name="description" content="IRC LOG for channel <TMPL_VAR CHANNEL>" /> + <link rel="stylesheet" type="text/css" href="<TMPL_VAR BASE_URL>style.css" title="Purple Haze Stylesheet" /> + <link rel="shortcut icon" href="<TMPL_VAR BASE_URL>moose1.ico" type="image/x-icon" /> <title>IRC logs - Search</title> </head> <body> <h1>Search in IRC logs</h1> - <p><a href="<TMPL_VAR NAME=BASE_URL>">Index</a></p> + <p><a href="<TMPL_VAR BASE_URL>">Index</a></p> - <form action="<TMPL_VAR NAME=BASE_URL>search.pl" method="get" + <form action="<TMPL_VAR BASE_URL>search.pl" method="get" accept-charset="utf-8"> <label for="channel">Channel</label> - <select id="channel" name="channel" size="<TMPL_VAR NAME=CH_COUNT>"> - <TMPL_LOOP NAME=CHANNELS> - <option <TMPL_IF NAME=SELECTED>selected="selected"</TMPL_IF>><TMPL_VAR - NAME=CHANNEL></option> + <select id="channel" name="channel" size="<TMPL_VAR CH_COUNT>"> + <TMPL_LOOP CHANNELS> + <option <TMPL_IF SELECTED>selected="selected"</TMPL_IF>><TMPL_VAR + CHANNEL></option> </TMPL_LOOP> </select> <br /> <label for="nick">Nick</label> <input type="text" size="10" maxlength="30" name="nick" - value="<TMPL_VAR NAME=NICK>" id="nick"></input> + value="<TMPL_VAR NICK>" id="nick"></input> <br /> <label for="q">Text</label> <input type="text" size="10" maxlength="30" name="q" - value="<TMPL_VAR NAME=Q>" id="text"></input> + value="<TMPL_VAR Q>" id="text"></input> <br /> <input type="submit"></input><br /> </form> - <TMPL_IF NAME=DAYS> + <TMPL_IF DAYS> <h1>Results</h1> - <p>Results from days <TMPL_VAR NAME=DAYS_LOWER> to <TMPL_VAR - NAME=DAYS_UPPER>, from overall <TMPL_VAR NAME=DAYS_COUNT> days</p> + <p>Results from days <TMPL_VAR DAYS_LOWER> to <TMPL_VAR + DAYS_UPPER>, from overall <TMPL_VAR DAYS_COUNT> days</p> <p> Result pages: - <TMPL_LOOP NAME=RESULT_PAGES> - <a href="<TMPL_VAR NAME=BASE_URL>search.pl?nick=<TMPL_VAR - NAME=NICK ESCAPE=URL>;channel=<TMPL_VAR NAME=CURRENT_CHANNEL - ESCAPE=URL>;q=<TMPL_VAR NAME=Q>;offset=<TMPL_VAR NAME=OFFSET>"><TMPL_VAR - NAME=PAGE></a> + <TMPL_LOOP RESULT_PAGES> + <a href="<TMPL_VAR BASE_URL>search.pl?nick=<TMPL_VAR + NICK ESCAPE=URL>;channel=<TMPL_VAR CURRENT_CHANNEL + ESCAPE=URL>;q=<TMPL_VAR Q>;offset=<TMPL_VAR OFFSET>"><TMPL_VAR + PAGE></a> </TMPL_LOOP> </p> - <TMPL_LOOP NAME=DAYS> - <h2><a href="<TMPL_VAR NAME=URL>"><TMPL_VAR NAME=DAY></a></h2> + <TMPL_LOOP DAYS> + <h2><a href="<TMPL_VAR URL>"><TMPL_VAR DAY></a></h2> <table> - <TMPL_LOOP NAME=LINES> - <TMPL_INCLUDE NAME='line.tmpl'> + <TMPL_LOOP LINES> + <TMPL_INCLUDE line.tmpl'> </TMPL_LOOP> </table> </TMPL_LOOP> @@ -65,14 +65,13 @@ <p> Result pages: - <TMPL_LOOP NAME=RESULT_PAGES> - <a href="<TMPL_VAR NAME=BASE_URL>search.pl?nick=<TMPL_VAR + <TMPL_LOOP RESULT_PAGES> + <a href="<TMPL_VAR BASE_URL>search.pl?nick=<TMPL_VAR NAME=NICK ESCAPE=URL>;channel=<TMPL_VAR NAME=CURRENT_CHANNEL - ESCAPE=URL>;q=<TMPL_VAR NAME=Q>;offset=<TMPL_VAR NAME=OFFSET>"><TMPL_VAR - NAME=PAGE></a> + ESCAPE=URL>;q=<TMPL_VAR Q>;offset=<TMPL_VAR OFFSET>"><TMPL_VAR PAGE></a> </TMPL_LOOP> </p> - <TMPL_INCLUDE NAME="footer.tmpl"> + <TMPL_INCLUDE footer.tmpl"> </body> </html> |