Skip to content

Commit

Permalink
Fixes due to Mojo update
Browse files Browse the repository at this point in the history
  • Loading branch information
vti committed Oct 14, 2009
1 parent 3b89dcd commit 2bb1209
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 28 deletions.
66 changes: 39 additions & 27 deletions bootylicious.pl
Expand Up @@ -103,6 +103,7 @@
app->renderer->default_handler(config('template_handler'));

app->renderer->add_helper(stash => sub { my $c = shift; $c->stash(@_); });
app->renderer->add_helper(param => sub { my $c = shift; $c->req->param(@_)});
app->renderer->add_helper(url => \&url);
app->renderer->add_helper(config => sub { shift; config(@_) });
app->renderer->add_helper(strings => sub { shift; config('strings')->{$_[0]} });
Expand Down Expand Up @@ -200,10 +201,17 @@ sub index {

$articles = [
grep {
grep {/^$tag$/} @{$_->{tags}}
grep {m/^\Q$tag\E$/}
@{$_->{tags}}
} @$articles
];

unless (@$articles) {
$c->stash(rendered => 1);
$c->app->static->serve_404($c);
return 1;
}

my $last_modified = Mojo::Date->new;
if (@$articles) {
$last_modified = $articles->[0]->{modified};
Expand Down Expand Up @@ -894,9 +902,9 @@ sub _parse_article_pod {
% foreach my $article (@{$articles}) {
<div class="text">
<h1 class="title">
<%= '&raquo;' if $article->{link} %>
<%== $article->{link} ? '&raquo;' : '' %>
<a href="<%= $article->{link} || url(article => $article) %>">
<%== $article->{title} %>
<%= $article->{title} %>
</a>
</h1>
<div class="created"><%= date($article->{created}) %></div>
Expand All @@ -906,15 +914,15 @@ sub _parse_article_pod {
% }
</div>
% if ($article->{preview}) {
<%= $article->{preview} %>
<%== $article->{preview} %>
<div class="more"> &rarr;
<a href="<%= url(article => $article) %>#cut">
<%= $article->{preview_link} %>
</a>
</div>
% }
% else {
<%= $article->{content} %>
<%== $article->{content} %>
% }
</div>
% }
Expand Down Expand Up @@ -950,7 +958,7 @@ sub _parse_article_pod {
% }
<li>
<a href="<%= url(article => $article) %>">
<%== $article->{title} %>
<%= $article->{title} %>
</a>
<br />
<div class="created"><%= date($article->{created}) %></div>
Expand All @@ -963,23 +971,23 @@ sub _parse_article_pod {
@@ index.rss.ep
<?xml version="1.0" encoding="UTF-8"?>
<rss version="2.0" xml:base="<%= url('root') %>"
<rss version="2.0" xml:base="<%= url('root')->to_abs %>"
xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel>
<title><%== config('title') %></title>
<title><%= config('title') %></title>
<link><%= url('root')->to_abs %></link>
<description><%== config('descr') %></description>
<description><%= config('descr') %></description>
<pubDate><%= date_rss($articles->[0]->{created}) %></pubDate>
<lastBuildDate><%= date_rss($articles->[0]->{created}) %></lastBuildDate>
<generator>Mojolicious::Lite</generator>
% foreach my $article (@$articles) {
% my $link = url(article => $article)->to_abs;
<item>
<title><%== $article->{title} %></title>
<title><%= $article->{title} %></title>
<link><%= $link %></link>
<description><%== $article->{preview} || $article->{content} %></description>
<description><%= $article->{preview} || $article->{content} %></description>
% foreach my $tag (@{$article->{tags}}) {
<category><%== $tag %></category>
<category><%= $tag %></category>
% }
<pubDate><%= date_rss($article->{created}) %></pubDate>
<guid><%= $link %></guid>
Expand All @@ -996,7 +1004,7 @@ sub _parse_article_pod {
<br />
<div class="tags">
% foreach my $tag (keys %$tags) {
<a href="<%= url(tag => $tag) %>"><%== $tag %></a>
<a href="<%= url(tag => $tag) %>"><%= $tag %></a>
<sub>(<%= $tags->{$tag}->{count} %>)</sub>
% }
</div>
Expand Down Expand Up @@ -1025,7 +1033,7 @@ sub _parse_article_pod {
<br />
% foreach my $article (@$articles) {
<a href="<%= url(article => $article) %>">
<%== $article->{title} %>
<%= $article->{title} %>
</a>
<br />
<div class="created"><%= date($article->{created}) %></div>
Expand All @@ -1038,9 +1046,9 @@ sub _parse_article_pod {
<div class="text">
<h1 class="title">
% if ($article->{link}) {
&raquo; <a href="<%= $article->{link} %>"><%== $article->{title} %></a>
&raquo; <a href="<%= $article->{link} %>"><%= $article->{title} %></a>
% } else {
<%== $article->{title} %>
<%= $article->{title} %>
% }
</h1>
<div class="created"><%= date($article->{created}) %>
Expand All @@ -1053,27 +1061,27 @@ sub _parse_article_pod {
<a href="<%= url(tag => $tag) %>"><%= $tag %></a>
% }
</div>
<%= $article->{content} %>
<%== $article->{content} %>
</div>
@@ page.html.ep
% stash(title => $page->{title});
<div class="text">
<h1 class="title">
<%== $page->{title} %>
<%= $page->{title} %>
</h1>
<%= $page->{content} %>
<%== $page->{content} %>
</div>
@@ draft.html.ep
% stash(title => $draft->{title});
<div class="text">
<h1 class="title">
<%== $draft->{title} %>
<%= $draft->{title} %>
</h1>
<%= $draft->{content} %>
<%== $draft->{content} %>
</div>
Expand All @@ -1084,10 +1092,14 @@ sub _parse_article_pod {
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<title><%= $title . ' / ' if $title %><%== config('title') %></title>
<title><%= $title ? "$title / " : '' %><%= config('title') %></title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
% foreach my $meta (@{config('meta')}) {
<meta <%= "$_=\"$meta->{$_}\" " for keys %$meta %>/>
<meta
% for my $key (keys %$meta) {
<%= "$key=\"$meta->{$key}\" " %>
% }
/>
% }
% foreach my $file (@{config('css')}) {
<link rel="stylesheet" href="/<%= $file %>" type="text/css" />
Expand Down Expand Up @@ -1123,12 +1135,12 @@ sub _parse_article_pod {
.push {height:6em}
</style>
% }
<link rel="alternate" type="application/rss+xml" title="<%== config('title') %>" href="<%= url('index', format => 'rss')->to_abs %>" />
<link rel="alternate" type="application/rss+xml" title="<%= config('title') %>" href="<%= url('index', format => 'rss')->to_abs %>" />
</head>
<body>
<div id="body">
<div id="header">
<h1 id="title"><a href="<%= url('root') %>"><%== config('title') %></a>
<h1 id="title"><a href="<%= url('root') %>"><%= config('title') %></a>
<sup><a href="<%= url('index', format => 'rss') %>"><img src="data:image/png;base64,
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
bWFnZVJlYWR5ccllPAAAAlJJREFUeNqkU0toU0EUPfPJtOZDm9gSPzWVKloXgiCCInXTRTZVQcSN
Expand All @@ -1153,11 +1165,11 @@ sub _parse_article_pod {
</div>
</div>
<div id="content">
<%= $inner_template %>
<%== $inner_template %>
</div>
<div class="push"></div>
</div>
<div id="footer"><%= config('footer') %></div>
<div id="footer"><%== config('footer') %></div>
% foreach my $file (@{config('js')}) {
<script type="text/javascript" href="/<%= $file %>" />
% }
Expand Down
2 changes: 1 addition & 1 deletion mojo
Submodule mojo updated from 00f9b5 to d103de

0 comments on commit 2bb1209

Please sign in to comment.