removed social bar, added sponsors

barbie · Apr 22, 2012 · 0c0a3ec · 0c0a3ec
1 parent 0552c9b
commit 0c0a3ec
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 46 deletions.
diff --git a/Changes b/Changes
@@ -1,24 +1,27 @@
 Changes for the CPAN Testers Blog website
 
-1.03	current
+1.03    current
-	- fixed publish status when saving edited comments.
+        - fixed publish status when saving edited comments.
+        - upgrade to Labyrinth 5.12.
+        - removed social media bar due to dubious practices.
+        - added CPAN Testers Sponsors.
 
-1.02	18/08/2011
+1.02    18/08/2011
         - upgrade to Labyrinth 5.09.
         - upgrade to Labyrinth-Plugin-Core 5.09.
-	- added titlemaps and pathmaps to settings.ini.
+        - added titlemaps and pathmaps to settings.ini.
-	- WAI WCAG v2.0 compliance updates.
+        - WAI WCAG v2.0 compliance updates.
-	- update layout to include an update notification.
+        - update layout to include an update notification.
-	- added a new social media bar
+        - added a new social media bar
-	- fixed images and css incorrectly pasted from wiki distro
+        - fixed images and css incorrectly pasted from wiki distro
-	- revised banner logo image by Jon 'JJ' Allen.
+        - revised banner logo image by Jon 'JJ' Allen.
-
+
-1.01	20/06/2011
+1.01    20/06/2011
-	- updates to improve presentation.
+        - updates to improve presentation.
-	- included a Terms & Conidtions page to meet EU Cookie Directive.
+        - included a Terms & Conidtions page to meet EU Cookie Directive.
-	- updates to diary and user templates for images.
+        - updates to diary and user templates for images.
-	- updates to templates for usability compliance.
+        - updates to templates for usability compliance.
-	- fixes for Posted lookups.
+        - fixes for Posted lookups.
         - upgrade to Labyrinth 5.08.
         - upgrade to Labyrinth-Plugin-Core 5.08.
 
@@ -29,28 +32,28 @@ Changes for the CPAN Testers Blog website
         - upgrade to Labyrinth-Plugin-Event 1.00.
         - packaged for CPAN release.
 
-0.06	20/11/2010
+0.06    20/11/2010
-	- user lists now hide special users (Guest), restrict access to users
+        - user lists now hide special users (Guest), restrict access to users
-	  of the same or higher access, and prevent priveledged users from
+          of the same or higher access, and prevent priveledged users from
-	  being deleted.
+          being deleted.
-	- user acls fixed to correctly list folders and access.
+        - user acls fixed to correctly list folders and access.
-	- folder list driven by database, added FolderName function.
+        - folder list driven by database, added FolderName function.
-	- update to admin templates to make them consistent across sites.
+        - update to admin templates to make them consistent across sites.
 
 0.05    29/09/2010
-	- repositioned site boxes to avoid text and logo clashing.
+        - repositioned site boxes to avoid text and logo clashing.
 
-0.04	16/09/2010
+0.04    16/09/2010
-	- added links to Metabase and Labyrinth.
+        - added links to Metabase and Labyrinth.
-	- upgraded to Labyrinth v5.00.
+        - upgraded to Labyrinth v5.00.
 
-0.03	14/01/2010
+0.03    14/01/2010
-	- added quote.html
+        - added quote.html
-	- added Analysis to site family lists.
+        - added Analysis to site family lists.
 
-0.02	04/07/2009
+0.02    04/07/2009
-	- added TinyMCE support to comments for public users.
+        - added TinyMCE support to comments for public users.
-	- fixed bug in saving comments for admin users.
+        - fixed bug in saving comments for admin users.
 
-0.01	17/05/2009
+0.01    17/05/2009
-	- First released version, based on Labyrinth v4.16
+        - First released version, based on Labyrinth v4.16
diff --git a/META.json b/META.json
@@ -1,6 +1,6 @@
 {
     "name": "CPAN-Testers-WWW-Blog",
-    "version": "1.02",
+    "version": "1.03",
     "abstract": "The CPAN Testers Blog website",
     "author": [
         "Barbie (BARBIE) <barbie@cpan.org>"
@@ -23,7 +23,7 @@
     "prereqs" : {
         "runtime" : {
             "requires" : {
-                "Labyrinth": "5.09",
+                "Labyrinth": "5.12",
                 "Labyrinth::Plugin::Core": "5.09",
                 "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.02"
+            "version": "1.03"
         }
     },
     "no_index": {

diff --git a/META.yml b/META.yml
@@ -1,6 +1,6 @@
 --- #YAML:1.0
 name:                CPAN::Testers::WWW::Blog
-version:             1.02
+version:             1.03
 abstract:            The CPAN Testers Blog website
 author:
   - Barbie <barbie@cpan.org>
@@ -10,7 +10,7 @@ distribution_type:   module
 installdirs:         site
 
 requires:
-  Labyrinth:                          5.09
+  Labyrinth:                          5.12
   Labyrinth::Plugin::Core:            5.09
   Labyrinth::Plugin::Articles::Diary: 1.00
   Labyrinth::Plugin::Event:           1.00
@@ -26,7 +26,7 @@ build_requires:
 provides:
   CPAN::Testers::WWW::Blog:
     file:     lib/CPAN/Testers/WWW/Blog.pm
-    version:  1.02
+    version:  1.03
 
 no_index:
   directory:

diff --git a/Makefile.PL b/Makefile.PL
@@ -3,7 +3,7 @@ WriteMakefile(
     NAME                => 'CPAN::Testers::WWW::Blog',
     'VERSION_FROM'      => 'lib/CPAN/Testers/WWW/Blog.pm',
     PREREQ_PM           => {
-        'Labyrinth'                             => '5.09',
+        'Labyrinth'                             => '5.12',
         'Labyrinth::Plugin::Core'               => '5.09',
         'Labyrinth::Plugin::Articles::Diary'    => '1.00',
         'Labyrinth::Plugin::Event'              => '1.01',

diff --git a/lib/CPAN/Testers/WWW/Blog.pm b/lib/CPAN/Testers/WWW/Blog.pm
@@ -3,7 +3,7 @@ package CPAN::Testers::WWW::Blog;
 use warnings;
 use strict;
 
-our $VERSION = '1.02';
+our $VERSION = '1.03';
 
 1;
 

diff --git a/vhost/cgi-bin/pages.cgi b/vhost/cgi-bin/pages.cgi
@@ -2,7 +2,7 @@
 use strict;
 
 use vars qw($VERSION);
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 #----------------------------------------------------------
 # Additional Modules

diff --git a/vhost/cgi-bin/templates/public/layout.html b/vhost/cgi-bin/templates/public/layout.html
@@ -77,8 +77,6 @@ <h2>[% title %]</h2>
         </ul>
         </div>
 
-        [% INCLUDE "public/social-bar.html" %]
-
       </div>
     </div>
 

diff --git a/vhost/cgi-bin/templates/public/sidebar.html b/vhost/cgi-bin/templates/public/sidebar.html
@@ -76,6 +76,11 @@ <h1>Syndication</h1>
 <a href="http://technorati.com/faves?sub=addfavbtn&amp;add=http://blog.cpantesters.org" title="Add to Technorati"><img src="http://static.technorati.com/pix/fave/tech-fav-1.png" alt="Add to Technorati Favorites" width="145" height="25" /></a>
 </p>
 
+<div class="adverts">
+<h1>Our Sponsors</h1>
+<script type="text/javascript" src="http://iheart.cpantesters.org/home/ajax?images=1"></script>
+</div>
+
 <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>