Permalink
Browse files

Merge pull request #49 from dolmen/CPANRatings/fix/HTML-markup

HTML markup fixes
  • Loading branch information...
2 parents c09d7ae + 19b87d0 commit b5b9e7bdb5049571b1a4d46c58df7d27e0e15240 @abh abh committed Jul 27, 2012
@@ -3,8 +3,8 @@
<h3>Contact</h3>
<div id="twitter">
-<script src="http://widgets.twimg.com/j/2/widget.js"></script>
-<script>
+<script src="http://widgets.twimg.com/j/2/widget.js" type="text/javascript"></script>
+<script type="text/javascript">
new TWTR.Widget({
version: 2,
type: 'profile',
@@ -38,7 +38,7 @@ <h3>Contact</h3>
<p>
Report issues in
-the <a href="https://github.com/perlorg/perlweb/issues?labels=cpanratings&sort=created&direction=desc&state=open&page=1">issue
+the <a href="https://github.com/perlorg/perlweb/issues?labels=cpanratings&amp;sort=created&amp;direction=desc&amp;state=open&amp;page=1">issue
tracker</a> or <a href="http://www.perl.org/siteinfo.html">email
us</a>.
</p>
@@ -51,6 +51,8 @@ <h3>Release Notes</h3>
<ul>
+<li>July 2012: HTML markup fixes.</li>
+
<li>June 2011: Run on Plack, better formatting, better javascript,
use <a href="http://search.cpan.org/faq.html#Is_there_a_API?">Search
CPAN API</a>, various bugfixes. Code is
@@ -74,5 +76,3 @@ <h3>Release Notes</h3>
<li>August 13, 2003: RSS finished, validating distribution names now, lots of other tweaks.
<li>August 11, 2003: Very much a beta. Comments to <a href="mailto:ask@perl.org">ask@perl.org</a>.
</ul>
-</p>
-
@@ -10,7 +10,7 @@ <h2>Rate a module</h2>
[% PROCESS search/search_form.html %]
[% UNLESS combust.user_info.id %]
-<p>To write a review you'll need a <a href="[% combust.login_url %]">Bitcard account</a>.</p>
+<p>To write a review you'll need a <a href="[% combust.login_url | html %]">Bitcard account</a>.</p>
[% END %]
<h2>Browse reviews</h2>
@@ -78,7 +78,7 @@
[% i %]<input type="radio" name="[% question.field %]" [% checked.${question.field}.$i %] value="[%i%]">&nbsp;
[% END %]
[% IF 1 OR question.field != 'rating_overall' %]
-undef<input type="radio" name="[% question.field %]" [% checked.${question.field}.0 %] selected value="">&nbsp;
+undef<input type="radio" name="[% question.field %]" [% checked.${question.field}.0 %] checked value="">&nbsp;
[% END %]
[% IF errors.${question.field} %](<span class="error">[% errors.${question.field} %]</span>)[% END %]
</td>
@@ -3,8 +3,8 @@
<a href="/">Home</a> |
<a href="/search">Search</a> |
<a href="/about.html">About</a> |
- <a href="[% combust.account_url %]">Bitcard Account</a> |
- <a id="login_link" class="login" href="[% combust.login_url %]">Login</a>
+ <a href="[% combust.account_url | html %]">Bitcard Account</a> |
+ <a id="login_link" class="login" href="[% combust.login_url | html %]">Login</a>
[% END %]
@@ -4,6 +4,6 @@
END;
FOR css = page.css %]
- <link rel="stylesheet" type="text/css" href="[% combust.static_url(css) || css %]"> [%
+ <link rel="stylesheet" type="text/css" href="[% combust.static_url(css) || css %]" /> [%
END;
%]
@@ -4,7 +4,7 @@
title = page.title || template.title;
IF page.bhead;
- page.banner = page.bhead _ '<SPAN CLASS="title">' _ page.banner _ "</span>";
+ page.banner = page.bhead _ '<span class="title">' _ page.banner _ "</span>";
END;
IF !page.site;
@@ -19,7 +19,7 @@
UNLESS page.banner;
# should we make use of page.site here? i.e. "dbi.perl.org: "
- page.banner = page.site _ '<SPAN CLASS="title">' _ title _ "</span>";
+ page.banner = page.site _ '<span class="title">' _ title _ "</span>";
END;
@@ -50,7 +50,7 @@
<link rel="shortcut icon" href="[% combust.static_url(page.favicon || "/favicon.ico") %]">
[% IF page.description;
- '<META name="description" content="' _ page.description _ '">';
+ '<meta name="description" content="' _ page.description _ '">';
END
%]
[% IF page.morehead; page.morehead; END %]
@@ -62,85 +62,85 @@
</head>
<body>
-<TABLE CELLSPACING="0" WIDTH="730">
-<TR>
-<TD WIDTH="100%" COLSPAN="2" class="BANNER">[% page.banner %]</TD>
-</TR>
+<table cellspacing="0" width="730">
+<tr>
+<td width="100%" colspan="2" class="BANNER">[% page.banner %]</TD>
+</tr>
[% IF page.sidebar %]
-<TR>
-<TD WIDTH="100%" COLSPAN="2" ID="NAV" CLASS="topNAV" style="border-bottom: 1px solid #191970;">
+<tr>
+<td width="100%" colspan="2" id="NAV" class="topNAV" style="border-bottom: 1px solid #191970;">
[% page.sidebar %]
-</TD>
-</TR>
+</td>
+</tr>
[% END %]
-</TABLE>
+</table>
[% IF isindex %]
-<DIV ID="MAIN">
+<div id="MAIN">
[% END %]
[% content %]
[% UNLESS !isindex %]
-</DIV>
+</div>
[% END %]
-[% UNLESS nofooter %]
-<P>
-<TABLE border="0" WIDTH="730" CELLSPACING="0" CELLPADDING="0">
-<TR ALIGN="RIGHT">
+[% UNLESS nofooter %]
+<table border="0" width="730" cellspacing="0" cellpadding="0">
+<tr align="right">
-<TD WIDTH="590" VALIGN="MIDDLE">
-<BR>
+<td width="590" valign="middle">
+<br>
-<DIV CLASS="FOOTER">
+<div class="FOOTER">
[% UNLESS shortfooter || page.footer %]
- <A HREF="/">Perl.org</A> sites
- : <!-- <A href="http://books.perl.org/" title="books.perl.org">books</a>
- | --> <A href="http://rt.perl.org/perlbug/">bugs</a>
- | <A href="http://dev.perl.org/">dev</a>
- | <A href="http://history.perl.org/">history</a>
- | <A href="http://jobs.perl.org/">jobs</a>
- | <A href="http://learn.perl.org/">learn</a>
- | <A href="http://lists.perl.org/">lists</a>
- | <A href="http://use.perl.org/">use</a>
- <BR>
+ <a href="/">Perl.org</A> sites
+ : <!-- <a href="http://books.perl.org/" title="books.perl.org">books</a>
+ | --> <a href="http://rt.perl.org/perlbug/">bugs</a>
+ | <a href="http://dev.perl.org/">dev</a>
+ | <a href="http://history.perl.org/">history</a>
+ | <a href="http://jobs.perl.org/">jobs</a>
+ | <a href="http://learn.perl.org/">learn</a>
+ | <a href="http://lists.perl.org/">lists</a>
+ | <a href="http://use.perl.org/">use</a>
+ <br>
<small>
<a href="http://www.perlfoundation.org">
- <IMG STYLE="float:right; position: relative; padding-left: 3px"
- HEIGHT=24 WIDTH=24
- BORDER=0
- SRC="[% combust.static_url("images/onion/onion-24x24.gif") %]"></A>
- &#169; Copyright 2002-[% USE date; year = date.format(date.now, '%Y'); year %] <a href="http://www.perlfoundation.org">The&nbsp;Perl&nbsp;Foundation</a><BR>
- <A HREF="[% page.siteinfo || "http://www.perl.org/siteinfo.html" %]"
- >Site Information and Contacts</A>
+ <img style="float:right; position: relative; padding-left: 3px"
+ height="24" width="24"
+ border="0"
+ alt="The Perl Foundation"
+ src="[% combust.static_url("images/onion/onion-24x24.gif") %]"></a>
+ &#169; Copyright 2002-[% USE date; year = date.format(date.now, '%Y'); year %] <a href="http://www.perlfoundation.org">The&nbsp;Perl&nbsp;Foundation</a><br>
+ <a href="[% page.siteinfo || "http://www.perl.org/siteinfo.html" %]"
+ >Site Information and Contacts</a>
</small>
[% ELSIF page.footer %]
[% page.footer %]
[% ELSE %]
&nbsp;
[% END %]
-</DIV>
-</TD>
-<TD valign="middle" align="center">
+</div>
+</td>
+<td valign="middle" align="center">
[% IF page.logobutton %]
<img border=0
- src="[% page.logobutton.src %]"
+ src="[% page.logobutton.src %]"
alt="[% page.logobutton.alt %]">
[% ELSE %]
<img border=0
- src="[% combust.static_url("/images/lcamel.gif") %]"
+ src="[% combust.static_url("/images/lcamel.gif") %]"
alt="the camel">
[% END %]
-</TD>
-</TR>
-</TABLE>
+</td>
+</tr>
+</table>
[% END %]
-
+
[%
page.js.unshift("/cdn/libs/jquery/1.6/jquery.js");
PROCESS tpl/js_includes.html(js_files = page.js);
@@ -161,6 +161,3 @@
</body>
</html>
-
-
-
@@ -12,10 +12,10 @@
<title>[% page.title %] - [% site.name %]</title>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
- <link rel="shortcut icon" href="[% combust.static_url(page.favicon || "/favicon.ico") %]">
+ <link rel="shortcut icon" href="[% combust.static_url(page.favicon || "/favicon.ico") %]" />
[% IF site.syntaxhighlight %]
- <link rel="stylesheet" title="perl" type="text/css" href="[% combust.static_url("/css/shCore.css") %]" media="all">
- <link rel="stylesheet" title="perl" type="text/css" href="[% combust.static_url("/css/shThemeDefault.css") %]" media="all">
+ <link rel="stylesheet" title="perl" type="text/css" href="[% combust.static_url("/css/shCore.css") %]" media="all" />
+ <link rel="stylesheet" title="perl" type="text/css" href="[% combust.static_url("/css/shThemeDefault.css") %]" media="all" />
<script type="text/javascript" charset="utf-8" src="[% combust.static_url("/js/shCore.js") %]"></script>
<script type="text/javascript" charset="utf-8" src="[% combust.static_url("/js/shBrushPerl.js") %]"></script>
[% END %]
@@ -105,14 +105,14 @@ <h1>
[% IF site.brand == 'com' %]
<p class="copyright">
- <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/us/80x15.png"></a> © 2002-[% USE date; date.format(date.now, '%Y') %] Perl.com | <a href="/siteinfo.html">Site Info</a>
+ <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/us/80x15.png" /></a> © 2002-[% USE date; date.format(date.now, '%Y') %] Perl.com | <a href="/siteinfo.html">Site Info</a>
</p>
[% ELSE %]
<p class="sites">
&nbsp;When you need <em>Perl</em> think <strong>Perl.org</strong>: <a href="http://www.perl.org/">www</a> | <a href="http://blogs.perl.org/">blogs</a> | <a href="http://jobs.perl.org/">jobs</a> | <a href="http://learn.perl.org/">learn</a> <!-- | <a href="http://lists.perl.org/">lists</a> --> | <a href="http://dev.perl.org/">dev</a>
</p>
<p class="copyright">
- <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/us/80x15.png"></a> © 2002-[% USE date; date.format(date.now, '%Y') %] Perl.org | <a href="/siteinfo.html">Site Info</a>
+ <a rel="license" href="http://creativecommons.org/licenses/by-nc-nd/3.0/us/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-nc-nd/3.0/us/80x15.png" /></a> © 2002-[% USE date; date.format(date.now, '%Y') %] Perl.org | <a href="/siteinfo.html">Site Info</a>
</p>
[% END %]
Oops, something went wrong.

0 comments on commit b5b9e7b

Please sign in to comment.