[Bast-commits] r9856 - in ironman/IronMan-Web: branches/dev/lib/IronMan/Web/Controller trunk trunk/root/archive trunk/root/inc

[idn at dev.catalyst.perl.org]

Author: idn
Date: 2011-04-10 08:56:33 +0000 (Sun, 10 Apr 2011)
New Revision: 9856

Added:
   ironman/IronMan-Web/trunk/development-cycle.pod
   ironman/IronMan-Web/trunk/root/archive/index.tt
Modified:
   ironman/IronMan-Web/branches/dev/lib/IronMan/Web/Controller/Archive.pm
   ironman/IronMan-Web/trunk/root/archive/day.tt
   ironman/IronMan-Web/trunk/root/archive/month.tt
   ironman/IronMan-Web/trunk/root/archive/year.tt
   ironman/IronMan-Web/trunk/root/inc/wrapper.tt
Log:
Unpicking the shitty mess I made in the svn repo when I tried to sort it out the first time around....

Modified: ironman/IronMan-Web/branches/dev/lib/IronMan/Web/Controller/Archive.pm
===================================================================
--- ironman/IronMan-Web/branches/dev/lib/IronMan/Web/Controller/Archive.pm	2011-04-10 08:35:27 UTC (rev 9855)
+++ ironman/IronMan-Web/branches/dev/lib/IronMan/Web/Controller/Archive.pm	2011-04-10 08:56:33 UTC (rev 9856)
@@ -27,6 +27,8 @@
 sub index :Path :Args(0) {
     my ( $self, $c ) = @_;
 
+    $c->response->body('Matched IronMan::Web::Controller::Archive in Archive.');
+
 }
 
 =head2 year

Added: ironman/IronMan-Web/trunk/development-cycle.pod
===================================================================
--- ironman/IronMan-Web/trunk/development-cycle.pod	                        (rev 0)
+++ ironman/IronMan-Web/trunk/development-cycle.pod	2011-04-10 08:56:33 UTC (rev 9856)
@@ -0,0 +1,49 @@
+=head1 IronMan::Web
+
+This module forms part of the Enlightened Perl Organisation IronMan project.
+
+For more details, see the overview document at:
+
+    http://dev.catalyst.perl.org/repos/bast/ironman/overview.pod
+ 
+The latest version of this document can be found at:
+
+    http://dev.catalyst.perl.org/repos/bast/ironman/IronMan-Web/branches/dev/development-cycle.pod
+
+=head2 Development branch preparation.
+
+The development branch has the following known intentional differences:
+
+=head3 The '-Debug' option
+
+    diff -Naur branches/ironboy/lib/IronMan/Web.pm branches/dev/lib/IronMan/Web.pm
+    --- branches/ironboy/lib/IronMan/Web.pm 2010-07-10 10:37:30.825413356 +0100
+    +++ branches/dev/lib/IronMan/Web.pm     2010-07-10 10:37:31.174421647 +0100
+    @@ -14,7 +14,7 @@
+     # Static::Simple: will serve static files from the application's root 
+     #                 directory
+     
+    -use Catalyst qw/ConfigLoader Static::Simple StackTrace/;
+    +use Catalyst qw/-Debug ConfigLoader Static::Simple StackTrace/;
+     
+     our $VERSION = '0.01';
+
+=head2 Comparing branches
+
+Use the following to compare the two branches:
+
+    diff -Naur branches/ironboy/ branches/dev/ --exclude .svn | more
+
+Carefully review the changes presented to ensure there is nothing unexpected.
+
+=head2 Development to IronBoy
+
+Merge the changes from dev to ironboy, I suggest doing this per file (eg :
+
+
+
+    svn merge 
+
+    
+
+=cut

Modified: ironman/IronMan-Web/trunk/root/archive/day.tt
===================================================================
--- ironman/IronMan-Web/trunk/root/archive/day.tt	2011-04-10 08:35:27 UTC (rev 9855)
+++ ironman/IronMan-Web/trunk/root/archive/day.tt	2011-04-10 08:56:33 UTC (rev 9856)
@@ -1,6 +1,6 @@
+[% SET page_title = 'Archives for ' _ day.strftime('%A, %d %B %Y') %] 
+<h2>Daily archive for [% day.strftime('%A, %d %B %Y') %]</h2>
 
-Daily archive for [% day.strftime('%A, %d %B %Y') %]
-
 [% INCLUDE 'inc/next_prev.tt' %]
 
 [% FOREACH post IN posts %]

Added: ironman/IronMan-Web/trunk/root/archive/index.tt
===================================================================
--- ironman/IronMan-Web/trunk/root/archive/index.tt	                        (rev 0)
+++ ironman/IronMan-Web/trunk/root/archive/index.tt	2011-04-10 08:56:33 UTC (rev 9856)
@@ -0,0 +1,6 @@
+[% SET page_title = 'Archives' %]
+
+<h2>Archives</h2>
+
+<p>This page is going to be a list of months and numbers of posts linking through to
+the deeper archives - bring your ideas to irc://irc.perl.org/#northwestengland.pm</p>

Modified: ironman/IronMan-Web/trunk/root/archive/month.tt
===================================================================
--- ironman/IronMan-Web/trunk/root/archive/month.tt	2011-04-10 08:35:27 UTC (rev 9855)
+++ ironman/IronMan-Web/trunk/root/archive/month.tt	2011-04-10 08:56:33 UTC (rev 9856)
@@ -1,5 +1,6 @@
+[% SET page_title = 'Archives for ' _ month.strftime('%B %Y') %] 
 
-Monthly archive for [% month.strftime('%B %Y') %]
+<h2>Monthly archive for [% month.strftime('%B %Y') %]</h2>
 
 [% INCLUDE 'inc/next_prev.tt' %]
 

Modified: ironman/IronMan-Web/trunk/root/archive/year.tt
===================================================================
--- ironman/IronMan-Web/trunk/root/archive/year.tt	2011-04-10 08:35:27 UTC (rev 9855)
+++ ironman/IronMan-Web/trunk/root/archive/year.tt	2011-04-10 08:56:33 UTC (rev 9856)
@@ -1,5 +1,6 @@
+[% SET page_title = 'Archives for ' _ year %]
 
+<h2>Yearly archive for [% year %]</h2>
 
-Yearly archive for [% year %]
-
-There's nothing here yet.
+<p>This page is going to be an annual archive - suggestions on presentation welcome in
+irc://irc.perl.org/#northwestengland.pm</p>

Modified: ironman/IronMan-Web/trunk/root/inc/wrapper.tt
===================================================================
--- ironman/IronMan-Web/trunk/root/inc/wrapper.tt	2011-04-10 08:35:27 UTC (rev 9855)
+++ ironman/IronMan-Web/trunk/root/inc/wrapper.tt	2011-04-10 08:56:33 UTC (rev 9856)
@@ -17,7 +17,7 @@
     <link rel="stylesheet" type="text/css" href="/static/css/print.css" media="print" />
     <link rel="stylesheet" type="text/css" href="/static/css/handheld.css" media="handheld" />
     <link rel="stylesheet" type="text/css" href="/static/css/screen-members-list.css" />
-    <title>[% branding.page_title %]</title>
+    <title>[% IF page_title %][% page_title %] - [% END %][% branding.page_title %]</title>
   </head>
   <body>
     <div id="wrap">