template cleanups

Changes

@@ -2,6 +2,7 @@ Changes for the CPAN Testers Blog website
 =========================================
 
         - removed unused files.
+        - template cleanups.
 
 1.06    2013-03-24
         - optimised static images.

vhost/cgi-bin/templates/articles/arts-failure.html

@@ -1,3 +1,2 @@
 <div class="box"><div class="section">Article Edit</div></div>
-<div class="box">
-<p>Sorry, failed to update that article. Please use the menu options to continue.</div>
+<div class="box"><p>Sorry, failed to update that article. Please use the menu options to continue.</p></div>

vhost/cgi-bin/templates/diary/diary-item.html

@@ -17,22 +17,22 @@
 [% FOREACH item = article.body %]
 [% IF item.type == 1 %]
     [% IF item.link %]
-    [% IF item.align  %][% class  = item.align  %][% ELSE %][% class  = "inline" %][% END %]
+    [% IF item.align  %][% class = item.align %][% ELSE %][% class = "inline" %][% END %]
     [% IF item.href %]
         <div class="thumb[% item.align %]" >
         <a href='[% item.href %]' title="[% item.tag %]"><img src="[% webpath %]/[% item.link %]" alt="[% item.tag %]"
         [% IF item.width  %]width="[% item.width %]"[% END %]
         [% IF item.height %]height="[% item.height %]"[% END %]
         /></a>
-        [% IF item.tag %]<p>[% item.tag %][% END %]
+        [% IF item.tag %]<p>[% item.tag | html %]</p>[% END -%]
         </div>
     [% ELSE %]
         <div class="thumb[% item.align %]" >
         <img src="[% webpath %]/[% item.link %]" alt="[% item.tag %]"
         [% IF item.width  %]width="[% item.width %]"[% END %]
         [% IF item.height %]height="[% item.height %]"[% END %]
         />
-        [% IF item.tag %]<p>[% item.tag %][% END %]
+        [% IF item.tag %]<p>[% item.tag | html %]</p>[% END -%]
         </div>
     [% END %]
     [% END %]
@@ -41,7 +41,7 @@
         [% item.body %]
 [% END %]
 [% IF item.type == 3 %]
-        <a href='[% item.href %]' title="[% item.tag %]">[% item.body %]</a>
+        <a href='[% item.href %]' title="[% item.tag | html %]">[% item.body %]</a>
 [% END %]
 [% END %]
 </div>
@@ -70,7 +70,7 @@
     </div>
 
 [% IF article.data.latest %]
-<p id="comments">Comments Disabled.
+<p id="comments">Comments Disabled.</p>
 [% ELSE %]
 <h3 id="comments">Comments</h3>
 
@@ -121,7 +121,7 @@ <h3>Add A Comment</h3>
 </tr>
 <tr><th><label for="body">Comment</label> *</th>
     <td class="alert">[% comment.body_err %]</td>
-    <td><textarea id="body" name="body" rows="20" cols="45" />[% data.body %]</textarea></td>
+    <td><textarea id="body" name="body" rows="20" cols="45">[% data.body %]</textarea></td>
 </tr>
 <tr><th><label for="href">Link</label></th>
     <td class="alert">[% data.href_err %]</td>

vhost/cgi-bin/templates/diary/diary-list.html

@@ -17,30 +17,30 @@
 
     [% FOREACH item = article.body %]
     [% IF item.type == 1 %]
-    [% IF item.align  %][% class  = item.align  %][% ELSE %][% class  = "inline" %][% END %]
+    [% IF item.align  %][% class = item.align %][% ELSE %][% class = "inline" %][% END %]
     [% IF item.href %]
         <div class="thumb[% item.align %]" >
         <a href='[% item.href %]' title="[% item.tag %]"><img src="[% webpath %]/[% item.link %]" alt="[% item.tag %]"
         [% IF item.width  %]width="[% item.width %]"[% END %]
         [% IF item.height %]height="[% item.height %]"[% END %]
         /></a>
-        [% IF item.tag %]<p>[% item.tag %]</p>[% END -%]
+        [% IF item.tag %]<p>[% item.tag | html %]</p>[% END -%]
         </div>
     [% ELSE %]
         <div class="thumb[% item.align %]" >
         <img src="[% webpath %]/[% item.link %]" alt="[% item.tag %]"
         [% IF item.width  %]width="[% item.width %]"[% END %]
         [% IF item.height %]height="[% item.height %]"[% END %]
         />
-        [% IF item.tag %]<p>[% item.tag %]</p>[% END -%]
+        [% IF item.tag %]<p>[% item.tag | html %]</p>[% END -%]
         </div>
     [% END %]
     [% END %]
     [% IF item.type == 2 %]
         <div class="justified">[% item.body %]</div>
     [% END %]
     [% IF item.type == 3 %]
-        <div class="justified"><a href='[% item.href %]' title="[% item.tag %]">[% item.body %]</a></div>
+        <div class="justified"><a href='[% item.href %]' title="[% item.tag | html %]">[% item.body %]</a></div>
     [% END %]
     [% END %]
 </div>

vhost/cgi-bin/templates/events/event-failure.html

@@ -1,6 +1,5 @@
 <h2>Event Edit</h2>
-
-<p>             Sorry, I failed to update that event.
-                Please click back, or use the menu options to continue.
-                If the symptom persists, please contact your local administrator with
-                details of what request you attempted. Thank You.
+<p>Sorry, I failed to update that event.
+Please click back, or use the menu options to continue.
+If the symptom persists, please contact your local administrator with
+details of what request you attempted. Thank You.</p>

vhost/cgi-bin/templates/events/event-list.html

@@ -19,10 +19,10 @@
 similar regarding CPAN Testers, Perl QA or Perl Testing. If you know of any event not 
 listed here, please send <a href="mailto:barbie@cpan.org">Barbie</a> an email, with a 
 link to the event, or with any further details if you are an organiser of an event,
-and we will add it to our listings, if appropriate.
+and we will add it to our listings, if appropriate.</p>
 
 <!--
-You can now download the latest ICalendar for my appearances.
+<p>You can now download the latest ICalendar for my appearances.
 <a class="more" href="[% cgipath %]/pages.cgi?act=event-ical">Click here</a> for a copy.</p>
 -->
 

vhost/cgi-bin/templates/public/footer.html

@@ -4,7 +4,7 @@
 	  The CPAN Testers server is supported and funded by <a href="http://birmingham.pm.org" title="Birmingham Perl Mongers">Birmingham Perl Mongers</a>.<br />
 		[% iname %] v[% version %] is powered by <a href="http://labyrinth.missbarbell.co.uk" title="Labyrinth Website Management Framework">Labyrinth</a> v[% labversion %]<br />
 		[% copyright %] Comments and design patches to barbie@cpan.org.
-    <p>
+    </p>
 
 		<p>
     The CPAN Testers Family: <br />

vhost/cgi-bin/templates/public/layout.html

@@ -58,7 +58,7 @@
         <div class="sitename">
           <h1><a href="/" title="Home">[% iname %]</a></h1>
           <h3>blog.cpantesters.org</h3>
-          <h2>[% title %]</h2>
+          <h2>[% title | html %]</h2>
         </div>
 
       </div>
@@ -105,7 +105,7 @@ <h2>[% title %]</h2>
         </div>
 
         <!-- Pagetitle -->
-        <h1 class="pagetitle">[% title %]</h1>
+        <h1 class="pagetitle">[% title | html %]</h1>
         <div class="column1-unit">
 
           [% body %]
@@ -124,6 +124,6 @@ <h1 class="pagetitle">[% title %]</h1>
   <p class="footnote"><a href="/article/terms" title="Terms &amp; Conditions">Terms &amp; Conditions</a></p>
 
   <script type="text/javascript" src="/js/iheart.js"></script>
-  
+
 </body>
 </html>

vhost/cgi-bin/templates/public/sidebar.html

@@ -9,7 +9,7 @@ <h1>Menu</h1>
 [% END -%]
 </ul>
 <ul>
-<li><a href='http://stats.cpantesters.org/cpanmail.html' title="Find A Tester">Find A Tester</a></li>
+<li><a href="http://stats.cpantesters.org/cpanmail.html" title="Find A Tester">Find A Tester</a></li>
 </ul>
 
 <h1>Profile</h1>
@@ -20,7 +20,7 @@ <h1>Profile</h1>
 <h1>Search</h1>
 <form name="search" id="search" method="post" action="[% cgipath %]/pages.cgi">
 <input type="hidden" name="act" value="diary-search" />
-<input type="text" id="data" name="data" size="12" value="Search For..." onFocus="if (this.value=='Search For...') this.value='';" />
+<input type="text" id="data" name="data" size="12" value="Search For..." onfocus="if (this.value=='Search For...') this.value='';" />
 <label for="data" class="accessibility">Enter search term</label>
 <input class="button" type="submit" name="Submit" value="GO" />
 </form>
@@ -34,7 +34,7 @@ <h1>Menu</h1>
 [% END -%]
 </ul>
 <ul>
-<li><a href='http://stats.cpantesters.org/cpanmail.html' title="Find A Tester">Find A Tester</a></li>
+<li><a href="http://stats.cpantesters.org/cpanmail.html" title="Find A Tester">Find A Tester</a></li>
 </ul>
 
 [% IF latest.comments.0 %]
@@ -46,7 +46,7 @@ <h1>Recent Comments</h1>
 </p>
 [% END %]
 
-[% IF events.shortlist %]
+[% IF events.shortlist.0 %]
 <h1>Events</h1>
 <ul>
 [% FOREACH item = events.shortlist %]<li><a href="/event/[% item.eventid %]" title="[% item.title %]">[% item.title %]</a> ([% item.eventdate %])</li>[% END %]
@@ -83,8 +83,8 @@ <h1>Our Sponsors</h1>
 
 <div class="adverts">
 <h1>Perl Promotions</h1>
-<script type="text/javascript" src="http://adserver.szabgab.com/ads/direct_link_selflink.js?cnt=5&noself=1"></script>
-<p align="center">Ads provide by<br /> <a href="http://adserver.szabgab.com" title="The Perl Community AdServer">The Perl Community AdServer</a>
+<script type="text/javascript" src="http://adserver.szabgab.com/ads/direct_link_selflink.js?cnt=5&amp;noself=1"></script>
+<p align="center">Ads provide by<br /> <a href="http://adserver.szabgab.com" title="The Perl Community AdServer">The Perl Community AdServer</a></p>
 </div>
 
 [% END %]

vhost/cgi-bin/templates/users/user-login.html

@@ -5,7 +5,7 @@
 %]
 
 [% IF errmess %]
-<p>I'm sorry but that login was not recognised. Please try again, ensuring you enter the correct email address and password. Thank you.
+<p>I'm sorry but that login was not recognised. Please try again, ensuring you enter the correct email address and password. Thank you.</p>
 [% END %]
 
 <form method="post" action="[% cgipath %]/pages.cgi">
@@ -17,7 +17,7 @@
     <td><input type="text" id="cause" name="cause" /></td>
     <td rowspan="2">
       <p>Forgot your password? Not to worry, just enter your email and click the
-      'forgot my password' button below. We will then send you a new password.
+      'forgot my password' button below. We will then send you a new password.</p>
     </td>
 </tr>
 <tr><th><label for="effect">Password</label></th>