Permalink
Browse files

image & usability template updates, posted fixes and T&Cs update

  • Loading branch information...
1 parent f264594 commit 9c082c5e04fb009fe4b49f48ee860072a10aa2ed @barbie committed Jun 20, 2011
View
@@ -1,5 +1,14 @@
Changes for the CPAN Testers Blog website
+1.01 20/06/2011
+ - updates to improve presentation.
+ - included a Terms & Conidtions page to meet EU Cookie Directive.
+ - updates to diary and user templates for images.
+ - updates to templates for usability compliance.
+ - fixes for Posted lookups.
+ - upgrade to Labyrinth 5.08.
+ - upgrade to Labyrinth-Plugin-Core 5.08.
+
1.00 20/04/2011
- upgrade to Labyrinth 5.04.
- upgrade to Labyrinth-Plugin-Core 5.06.
View
@@ -1,6 +1,6 @@
{
"name": "CPAN-Testers-WWW-Blog",
- "version": "1.00",
+ "version": "1.01",
"abstract": "The CPAN Testers Blog website",
"author": [
"Barbie (BARBIE) <barbie@cpan.org>"
@@ -23,8 +23,8 @@
"prereqs" : {
"runtime" : {
"requires" : {
- "Labyrinth": "5.04",
- "Labyrinth::Plugin::Core": "5.06",
+ "Labyrinth": "5.08",
+ "Labyrinth::Plugin::Core": "5.08",
"Labyrinth::Plugin::Articles::Diary": "1.00",
"Labyrinth::Plugin::Event": "1.00"
}
@@ -45,7 +45,7 @@
"provides": {
"CPAN::Testers::WWW::Blog": {
"file": "lib/CPAN/Testers/WWW/Blog.pm",
- "version": "1.00"
+ "version": "1.01"
}
},
"no_index": {
View
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: CPAN::Testers::WWW::Blog
-version: 1.00
+version: 1.01
abstract: The CPAN Testers Blog website
author:
- Barbie <barbie@cpan.org>
@@ -10,8 +10,8 @@ distribution_type: module
installdirs: site
requires:
- Labyrinth: 5.04
- Labyrinth::Plugin::Core: 5.06
+ Labyrinth: 5.08
+ Labyrinth::Plugin::Core: 5.08
Labyrinth::Plugin::Articles::Diary: 1.00
Labyrinth::Plugin::Event: 1.00
recommends:
@@ -26,7 +26,7 @@ build_requires:
provides:
CPAN::Testers::WWW::Blog:
file: lib/CPAN/Testers/WWW/Blog.pm
- version: 1.00
+ version: 1.01
no_index:
directory:
View
@@ -3,8 +3,8 @@ WriteMakefile(
NAME => 'CPAN::Testers::WWW::Blog',
'VERSION_FROM' => 'lib/CPAN/Testers/WWW/Blog.pm',
PREREQ_PM => {
- 'Labyrinth' => '5.04',
- 'Labyrinth::Plugin::Core' => '5.06',
+ 'Labyrinth' => '5.08',
+ 'Labyrinth::Plugin::Core' => '5.08',
'Labyrinth::Plugin::Articles::Diary' => '1.00',
'Labyrinth::Plugin::Event' => '1.01',
'Labyrinth::DIUtils::ImageMagick' => '5.04',
@@ -3,7 +3,7 @@ package CPAN::Testers::WWW::Blog;
use warnings;
use strict;
-our $VERSION = '1.00';
+our $VERSION = '1.01';
1;
@@ -284,6 +284,7 @@ GetVolume=SELECT * FROM volumes WHERE volumeid=? AND sectionid=?
InsertVolume=INSERT INTO volumes (volumeid,sectionid,archdate,counter) VALUES (?,?,?,?)
UpdateVolume=UPDATE volumes SET counter=? WHERE volumeid=? AND sectionid=?
+CountPosts=SELECT COUNT(articleid) FROM articles WHERE userid=? AND sectionid=6 AND publish>2;
# Events
AllEvents=SELECT * FROM events AS e \
@@ -5,7 +5,7 @@ actions=Users::UserLists
content=users/user-list.html
[item]
-actions=Users::Item,Diary::Posted
+actions=Users::Item,Articles::Diary::Posted
content=users/user-item.html
[login]
@@ -27,6 +27,11 @@ Social Meeting=Social
Technical Meeting=Tech Meet
HERE
+diutils=ImageMagick
+
+# url mappings
+urlmap-diary-meta=/meta/
+
[HTTP]
webpath=
cgipath=/cgi-bin
@@ -59,3 +64,6 @@ rsslink=http://blog.cpantesters.org
rssweb=http://blog.cpantesters.org
rssname=Barbie
rssmail=barbie@missbarbell.co.uk
+
+[MAIL]
+mailsend=/usr/sbin/sendmail -bm
@@ -448,8 +448,8 @@ CREATE TABLE `menus` (
-- Dumping data for table `menus`
--
-INSERT INTO `menus` VALUES (1,1,1,'Public Navigation','',0);
-INSERT INTO `menus` VALUES (2,1,2,'Admin Navigation','',0);
+INSERT INTO `menus` VALUES (1,1,1,'Public','Public Menu',0);
+INSERT INTO `menus` VALUES (2,1,2,'Admin','Admin Menu',0);
--
-- Table structure for table `mxarticles`
@@ -2,7 +2,7 @@
use strict;
use vars qw($VERSION);
-$VERSION = '1.00';
+$VERSION = '1.01';
#----------------------------------------------------------
# Additional Modules
@@ -5,7 +5,7 @@
<tr><th>[% preview.data.title %]</th></tr>
<tr><td>
[% IF preview.data.link %]<img class="left" src="[% webpath %]/[% preview.data.link %]" [% IF item.resize %]width="100"[% END %] alt="[% preview.data.tag %]" align="right" style="padding:0 0px 0 4px" />[% END %]
-[% preview.data.snippet %] ... <a href='[% cgipath %]/pages.cgi?act=arts-main&amp;name=[% preview.data.quickname %]' title='read more about [% preview.data.title %]'><i>more</i></a>
+[% preview.data.snippet %] ... <a href='[% cgipath %]/pages.cgi?act=arts-main&amp;name=[% preview.data.quickname %]' title='read more about [% preview.data.title %]'><em>more</em></a>
</td></tr>
</table>
[% END %]
@@ -20,17 +20,16 @@
[% END %]
<form method="post" action="[% cgipath %]/pages.cgi" name="EDIT" enctype="multipart/form-data">
-<input type="hidden" name="act" value="diary-save" />
-<input type="hidden" name="recordid" value='' />
-<input type="hidden" name="section" value="[% section %]" />
+<input type="hidden" name="act" value="diary-save" />
+<input type="hidden" name="recordid" value='' />
+<input type="hidden" name="section" value="[% section %]" />
<input type="hidden" name="articleid" value="[% article.data.articleid %]" />
-<input type="hidden" name="folderid" value="[% article.data.folderid %]" />
-<input type="hidden" name="userid" value="[% article.data.userid %]" />
-<input type="hidden" name="imageid" value="[% article.data.imageid %]" />
-<input type="hidden" name='doaction' value='' />
-
-<input type="hidden" name="display" value="display0" />
-<input type="hidden" name="list" value="[% article.blocks %]" />
+<input type="hidden" name="folderid" value="[% article.data.folderid %]" />
+<input type="hidden" name="userid" value="[% article.data.userid %]" />
+<input type="hidden" name="imageid" value="[% article.data.imageid %]" />
+<input type="hidden" name='doaction' value='' />
+<input type="hidden" name="display" value="display0" />
+<input type="hidden" name="list" value="[% article.blocks %]" />
<table class="blocker">
<tr><th width="85">Title *</th>
@@ -75,7 +74,7 @@
[% END %]
<input type="file" name="IMAGEUPLOAD[% item.orderno %]" />
<br />[ <a href="javascript:PhotoGallery('display[% item.orderno %]')">Select from Gallery</a> ]
- <table width="300">
+ <table>
<tr><td>Align:</td><td>[% item.ddalign %]</td></tr>
<tr><td>HyperLink:</td><td><input type="text" name="IMAGELINK[% item.orderno %]" value="[% item.href %]" size="40" /></td></tr>
<tr><td>Tag:</td><td><input type="text" name="IMAGETAG[% item.orderno %]" value="[% item.tag %]" size="40" /></td></tr>
@@ -130,7 +129,11 @@
<p class="small">Posted on [% preview.data.postdate %]</p>
[% FOREACH item = preview.body %]
-[% IF item.type == 2 ; THEN ; item.body ; END %]
+[% IF item.type == 2 %]
+ <div class="justified">
+ [% item.body %]
+ </div>
+[% END %]
[% IF item.type == 1 %]
[% IF item.link %]
@@ -141,21 +144,23 @@
[% 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 %]</p>[% END %]
</div>
[% ELSE %]
<div class="thumb[% item.align %]" >
<img class="[% class %]" src="/[% 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 %]</p>[% END %]
</div>
[% END %]
[% END %]
[% END %]
[% IF item.type == 3 %]
+ <div class="justified">
<a href='[% item.href %]'>[% item.body %]</a>
+ </div>
[% END %]
[% END %]
@@ -165,12 +170,12 @@
[% count = 0 %]
[% FOREACH meta = preview.meta %]
[% IF count > 0 %]/[% END %]
- <a href="[% cgipath %]/pages.cgi?act=diary-meta&amp;data=[% meta %]">[% meta %]</a>
+ <a href="/meta/[% meta %]">[% meta %]</a>
[% count = count + 1 %]
[% END %]
<br />
[% END %]
- <a href="[% cgipath %]/pages.cgi?act=diary-item&amp;articleid=[% article.data.articleid %]#comments">[% IF article.data.comments > 0 ; THEN ; article.data.comments ; ELSE ; '0' ; END %] COMMENTS</a>
+ <a href="/diary/[% article.data.articleid %]#comments">[% IF article.data.comments > 0 ; THEN ; article.data.comments ; ELSE ; '0' ; END %] COMMENTS</a>
[% IF user.access > 3 %]
| Edit | Delete
[% END %]
@@ -181,7 +186,7 @@
[% FOREACH item = comments %]
[% IF item.subject %]<h4>[% item.subject %]</h4>[% END %]
[% item.body %]
- <p class="small">Posted by <em><b>[% item.author %]</b></em> on [% item.postdate %]
+ <p class="small">Posted by <em><strong>[% item.author %]</strong></em> on [% item.postdate %]
| <a href="[% cgipath %]/pages.cgi?act=diary-cedit&amp;commentid=[% item.commentid %]">Edit</a>
| <a href="[% cgipath %]/pages.cgi?act=diary-cdelete2&amp;commentid=[% item.commentid %]&amp;articleid=[% article.data.articleid %]">Delete</a></p>
<hr />
@@ -53,7 +53,7 @@
[% FOREACH item = comments %]
[% IF item.subject %]<h4>[% item.subject %]</h4>[% END %]
[% item.body %]
- <p class="small">Posted by <em><b>[% IF item.href %]<a href="[% item.href %]">[% END ; item.author ; IF item.href %]</a>[% END %]</b></em> on [% item.postdate %]</p>
+ <p class="small">Posted by <em><strong>[% IF item.href %]<a href="[% item.href %]">[% END ; item.author ; IF item.href %]</a>[% END %]</strong></em> on [% item.postdate %]</p>
<hr />
[% END %]
[% ELSE %]
@@ -8,7 +8,7 @@
[% IF mainarts %]
[% FOREACH article = mainarts %]
- <h2><a href="[% webpath %]/diary/[% article.data.articleid %]" rel="bookmark" title="Permanent Link to [% article.data.title %]">[% article.data.title %]</a></h2>
+ <h2><a href="/diary/[% article.data.articleid %]" rel="bookmark" title="Permanent Link to [% article.data.title %]">[% article.data.title %]</a></h2>
<p class="small">Posted by <a href="/user/[% article.data.userid %]">[% article.data.name %]</a> on [% article.data.postdate %]</p>
[% FOREACH item = article.body %]
@@ -20,23 +20,27 @@
[% 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 %]</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 %]</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 %]'>[% item.body %]</a>
+ </div>
[% END %]
[% END %]
@@ -47,12 +51,12 @@
[% count = 0 %]
[% FOREACH meta = article.meta %]
[% IF count > 0 %]/[% END %]
- <a href="[% cgipath %]/pages.cgi?act=diary-meta&amp;data=[% meta %]">[% meta %]</a>
+ <a href="/meta/[% meta %]">[% meta %]</a>
[% count = count + 1 %]
[% END %]
<br />
[% END %]
- <a href="[% cgipath %]/pages.cgi?act=diary-item&amp;articleid=[% article.data.articleid %]#comments">
+ <a href="/diary/[% article.data.articleid %]#comments">
[% IF article.comments == 0 %]NO COMMENTS[% END %]
[% IF article.comments == 1 %]1 COMMENT[% END %]
[% IF article.comments > 1 %][% article.comments %] COMMENTS[% END %]
@@ -65,7 +69,7 @@
<!--
</td><td align="right">
<script type="text/javascript">
-digg_url = 'http://barbie.missbarbell.co.uk/cgi-bin/pages.cgi?act=diary-item&amp;articleid=[% article.data.articleid %]';
+digg_url = 'http://barbie.missbarbell.co.uk/diary/[% article.data.articleid %]';
xdigg_skin = 'compact';
</script>
<script src="http://digg.com/tools/diggthis.js" type="text/javascript"></script>
@@ -79,7 +83,7 @@
[% IF archive.volumes %]
<table class="prevnext">
-<tr><td class="left">[% IF archive.volumes.prev %]<< <a href="[% cgipath %]/pages.cgi?act=diary-list&amp;volume=[% archive.volumes.prev.volumeid %]">[% archive.volumes.prev.archdate %]</a> ([% archive.volumes.prev.counter %])[% END %]</td>
- <td class="right">[% IF archive.volumes.next %]<a href="[% cgipath %]/pages.cgi?act=diary-list&amp;volume=[% archive.volumes.next.volumeid %]">[% archive.volumes.next.archdate %]</a> ([% archive.volumes.next.counter %]) >>[% END %]</td></tr>
+<tr><td class="left">[% IF archive.volumes.prev %]&lt;&lt; <a href="/volume/[% archive.volumes.prev.volumeid %]">[% archive.volumes.prev.archdate %]</a> ([% archive.volumes.prev.counter %])[% END %]</td>
+ <td class="right">[% IF archive.volumes.next %]<a href="/volume/[% archive.volumes.next.volumeid %]">[% archive.volumes.next.archdate %]</a> ([% archive.volumes.next.counter %]) &gt;&gt;[% END %]</td></tr>
</table>
[% END %]
@@ -7,18 +7,21 @@
<title>[% iname | html %]</title>
- <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
- <meta http-equiv="Content-Language" content="en-gb" />
- <meta name="Generator" content="Labyrinth" />
- <meta name="keywords" content="perl,cpan,testing,testers" />
- <meta name="description" content="The latest news and views about CPAN Testers" />
- <meta name="copyright" content="Copyright (C) 2007-2009 CPAN Testers" />
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+ <meta http-equiv="Content-Language" content="en-gb" />
+ <meta http-equiv="Content-Style-Type" content="text/css" />
+ <meta http-equiv="Content-Script-Type" content="text/javascript" />
- <link rel="alternate" type="application/atom+xml" title="Atom" href="http://blog.cpantesters.org/rss/atom-1.0.xml" />
- <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="http://blog.cpantesters.org/rss/rss-2.0.xml" />
+ <meta name="Generator" content="Labyrinth" />
+ <meta name="keywords" content="perl,cpan,testing,testers" />
+ <meta name="description" content="The latest news and views about CPAN Testers" />
+ <meta name="copyright" content="Copyright (C) 2007-2009 CPAN Testers" />
- <link rel="stylesheet" type="text/css" media="screen,projection,print" href="/css/layout2_setup.css" />
- <link rel="stylesheet" type="text/css" media="screen,projection,print" href="/css/layout2_text.css" />
+ <link rel="alternate" type="application/atom+xml" title="Atom" href="http://blog.cpantesters.org/rss/atom-1.0.xml" />
+ <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="http://blog.cpantesters.org/rss/rss-2.0.xml" />
+
+ <link rel="stylesheet" type="text/css" media="screen,projection,print" href="/css/layout2_setup.css" />
+ <link rel="stylesheet" type="text/css" media="screen,projection,print" href="/css/layout2_text.css" />
[% INCLUDE "public/analytics.html" %]
@@ -108,5 +111,7 @@ <h1 class="pagetitle">[% title %]</h1>
</div>
+ <p class="footnote"><a href="/article/terms">Terms &amp; Conditions</a></p>
+
</body>
</html>
Oops, something went wrong. Retry.

0 comments on commit 9c082c5

Please sign in to comment.