Index: /trunk/BookmarkApp.pm
===================================================================
--- /trunk/BookmarkApp.pm (revision 30)
+++ /trunk/BookmarkApp.pm (revision 31)
@@ -84,4 +84,6 @@
my @all_tags = $bookmarks->get_tags({ selected => $tag });
my @cotags = $bookmarks->get_cotags({ tag => \@tags });
+
+ my $title = 'Bookmarks' . (@tags ? " tagged as " . join(' & ', @tags) : '');
if ($format eq 'json') {
@@ -102,5 +104,5 @@
$xbel->new_document({
- title => 'Bookmarks' . ($tag ? " tagged as $tag" : ''),
+ title => $title,
});
@@ -178,9 +180,10 @@
$link->{href}->query_form($link->{query});
}
-
+
return $self->tt_process(
'list.tt',
{
base_url => $base_url,
+ title => $title,
selected_tag => $tag,
search_tags => \@tags,
@@ -199,4 +202,11 @@
my $tag = $q->param('tag');
+ my @tags = $q->param('tag');
+ # special case: handle the empty tag
+ if (@tags == 1 && $tags[0] eq '') {
+ @tags = ();
+ }
+
+ my $title = 'Bookmarks' . (@tags ? " tagged as " . join(' & ', @tags) : '');
require XML::Atom::Feed;
@@ -205,16 +215,21 @@
my $feed = XML::Atom::Feed->new;
- $feed->title('Bookmarks' . ($tag ? " tagged as $tag" : ''));
+ $feed->title($title);
$feed->id($base_uri->canonical . 'feed');
+ my $html_link = XML::Atom::Link->new;
+ $html_link->type('text/html');
+ $html_link->rel('alternate');
+ $html_link->href($base_uri->canonical);
+ $feed->add_link($html_link);
# construct a feed from the most recent 12 bookmarks
- for my $bookmark ($bookmarks->get_bookmarks({ tag => $tag, limit => 12 })) {
+ for my $bookmark ($bookmarks->get_bookmarks({ tag => \@tags, limit => 12 })) {
my $entry = XML::Atom::Entry->new;
- $entry->id($bookmark->{bookmark_uri});
- $entry->title($bookmark->{title});
+ $entry->id($bookmark->bookmark_uri->canonical);
+ $entry->title($bookmark->title);
my $link = XML::Atom::Link->new;
- $link->href($bookmark->{uri});
+ $link->href($bookmark->uri);
$entry->add_link($link);
- $entry->summary('Tags: ' . join(', ', @{ $bookmark->{tags} }));
+ $entry->summary('Tags: ' . join(', ', @{ $bookmark->tags }));
$feed->add_entry($entry);
}
Index: /trunk/list.tt
===================================================================
--- /trunk/list.tt (revision 30)
+++ /trunk/list.tt (revision 31)
@@ -1,5 +1,5 @@
- Bookmarks
+ [% title %]