Permalink
Browse files

Merge branch 'devel' of http://github.com/xsawyerx/peg

  • Loading branch information...
szabgab committed Jan 29, 2011
2 parents 31c7293 + 68876b2 commit 19fc486ada0f7b4253445e95b1419199e8dbba80
Showing with 48 additions and 89 deletions.
  1. +3 −2 config.yml
  2. +3 −80 lib/PEG.pm
  3. +3 −0 views/about.tt
  4. +3 −1 views/benefits.tt
  5. +3 −0 views/contact.tt
  6. +3 −0 views/earlier_events.tt
  7. +3 −0 views/events.tt
  8. +3 −0 views/index.tt
  9. +3 −3 views/layouts/main.tt
  10. +3 −1 views/members.tt
  11. +3 −1 views/membership.tt
  12. +3 −0 views/news.tt
  13. +3 −1 views/sponsors.tt
  14. +3 −0 views/what.tt
  15. +3 −0 views/who.tt
  16. +3 −0 views/why.tt
View
@@ -1,5 +1,6 @@
-layout: "main"
appname: "PEG"
template: template_toolkit
charset: "UTF-8"
-
+engines:
+ template_toolkit:
+ WRAPPER: 'layouts/main.tt'
View
@@ -20,86 +20,9 @@ my $news = _read_news();
# this will be refactored out into the templates later
# will use auto pages for this
my %content = (
- index => {
- title => 'Perl Ecosystem Group',
- subtitle => 'Welcome',
- description => 'The Perl Ecosystem Group is bridging the gap between business using Perl and the open source Perl community',
- },
-
- what => {
- title => 'What does the Perl Ecosystem Group do?',
- subtitle => 'What?',
- description => 'Promoting Perl outside the Perl echo-chamber, at non-Perl events, via journals etc.',
- },
-
- why => {
- title => 'Why is it important to be a member of the Perl Ecosystem Group?',
- subtitle => 'Why?',
- description => '',
- },
-
- who => {
- title => 'About us',
- subtitle => 'Who?',
- description => 'The people organizing the Perl related talks and the Perl themed development rooms.',
- },
-
- sponsors => {
- title => 'Sponsors',
- subtitle => 'Sponsors',
- description => 'Sponsors of the Perl Ecosystem Group.',
- },
-
- members => {
- title => 'Members',
- subtitle => 'Members',
- description => 'Members of the Perl Ecosystem Group.',
- },
-
- events => {
- title => 'List of upcoming events',
- subtitle => 'Events',
- description => 'Events where the The Perl Ecosystem Group will organize Perl related talks and will setup a Perl themed booth.',
- events => $upcoming_events,
- },
-
- contact => {
- title => 'Contact Us',
- subtitle => 'Contact',
- description => 'The Perl Ecosystem Group is bridging the gap between business using Perl and the open source Perl community',
- },
-
- membership => {
- title => 'Membership',
- subtitle => 'Membership',
- description => 'Information about the membership levels of the Perl Ecosystem Group',
- },
-
- benefits => {
- title => 'Benefits',
- subtitle => 'Benefits',
- description => 'Information about the benefitst of being a member in the Perl Ecosystem Group',
- },
-
- about => {
- title => 'About',
- subtitle => 'About',
- description => 'About the Perl Ecosystem Group and its technical background',
- },
-
- news => {
- title => 'News',
- subtitle => 'News',
- description => 'News about the Perl Ecosystem Group',
- news => $news,
- },
-
- earlier_events => {
- title => 'Earlier events',
- subtitle => 'Earlier events',
- description => 'A list of events we participated at. Even before the Perl Ecosystem Group was setup',
- events => $earlier_events,
- },
+ earlier_events => { events => $earlier_events },
+ events => { events => $upcoming_events },
+ news => { news => $news },
);
get qr{^ / (?: index \. html )? $}x => sub {
View
@@ -1,3 +1,6 @@
+<% META title = 'About' %>
+<% META subtitle = 'About' %>
+<% META description = 'About the Perl Ecosystem Group and its technical background' %>
<div id="getting-started">
View
@@ -1,4 +1,6 @@
-
+<% META title = 'Benefits' %>
+<% META subtitle = 'Benefits' %>
+<% META description = 'Information about the benefitst of being a member in the Perl Ecosystem Group' %>
<div id="getting-started">
View
@@ -1,3 +1,6 @@
+<% META title = 'Contact Us' %>
+<% META subtitle = 'Contact' %>
+<% META description = 'The Perl Ecosystem Group is bridging the gap between business using Perl and the open source Perl community' %>
<div id="getting-started">
View
@@ -1,3 +1,6 @@
+<% META title = 'Earlier events' %>
+<% META subtitle = 'Earlier events' %>
+<% META description = 'A list of events we participated at. Even before the Perl Ecosystem Group was setup' %>
<div id="getting-started">
View
@@ -1,3 +1,6 @@
+<% META title = 'List of upcoming events' %>
+<% META subtitle = 'Events' %>
+<% META description = 'Events where the The Perl Ecosystem Group will organize Perl related talks and will setup a Perl themed booth.' %>
<div id="getting-started">
View
@@ -1,3 +1,6 @@
+<% META title = 'Perl Ecosystem Group' %>
+<% META subtitle = 'Welcome' %>
+<% META description = 'The Perl Ecosystem Group is bridging the gap between business using Perl and the open source Perl community' %>
<div id="getting-started">
<p>
View
@@ -2,12 +2,12 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
- <title><% title %></title>
+ <title><% template.title %></title>
<link rel="stylesheet" href="/css/style.css" />
<meta http-equiv="Content-Language" content="en" />
<meta http-equiv="Content-type" content="text/html; charset=UTF-8" />
<meta name="keywords" content="Perl, training, consulting, business, community, promotion, advocacy" />
- <meta name="description" content="<% description %>" />
+ <meta name="description" content="<% template.description %>" />
<link href="/rss" rel="alternate" type="application/rss+xml" title ="Perl Ecosystem Group" />
</head>
<body>
@@ -16,7 +16,7 @@
<div id="sidebar">
<ul id="sidebar-items">
<li>
- <h3><% subtitle %></h3>
+ <h3><% template.subtitle %></h3>
<ul class="links">
<li><a href="/what">What</a></li>
<li><a href="/who">Who</a></li>
View
@@ -1,4 +1,6 @@
-
+<% META title = 'Members' %>
+<% META subtitle = 'Members' %>
+<% META description = 'Members of the Perl Ecosystem Group.' %>
<div id="getting-started">
<p>
View
@@ -1,4 +1,6 @@
-
+<% META title = 'Membership' %>
+<% META subtitle = 'Membership' %>
+<% META description = 'Information about the membership levels of the Perl Ecosystem Group' %>
<div id="getting-started">
View
@@ -1,3 +1,6 @@
+<% META title = 'News' %>
+<% META subtitle = 'News' %>
+<% META description = 'News about the Perl Ecosystem Group' %>
<div id="getting-started">
View
@@ -1,4 +1,6 @@
-
+<% META title = 'Sponsors' %>
+<% META subtitle = 'Sponsors' %>
+<% META description = 'Sponsors of the Perl Ecosystem Group.' %>
<div id="getting-started">
View
@@ -1,3 +1,6 @@
+<% META title = 'What does the Perl Ecosystem Group do?' %>
+<% META subtitle = 'What?' %>
+<% META description = 'Promoting Perl outside the Perl echo-chamber, at non-Perl events, via journals etc.' %>
<div id="getting-started">
<ul>
View
@@ -1,3 +1,6 @@
+<% META title = 'About us' %>
+<% META subtitle = 'Who?' %>
+<% META description = 'The people organizing the Perl related talks and the Perl themed development rooms.' %>
<div id="getting-started">
View
@@ -1,3 +1,6 @@
+<% META title = 'Why is it important to be a member of the Perl Ecosystem Group?' %>
+<% META subtitle = 'Why?' %>
+<% META description = '' %>
<div id="getting-started">
<p>

0 comments on commit 19fc486

Please sign in to comment.