[prev in list] [next in list] [prev in thread] [next in thread]
List: bricolage-commits
Subject: [6613] Remove slashes from URIs.
From: theory () bricolage ! cc
Date: 2005-08-29 16:45:32
Message-ID: 20050829164532.13726.qmail () x1 ! develooper ! com
[Download RAW message or body]
Revision: 6613
Author: theory
Date: 2005-08-29 09:45:31 -0700 (Mon, 29 Aug 2005)
ViewCVS: http://viewsvn.bricolage.cc/?rev=6613&view=rev
Log Message:
-----------
Remove slashes from URIs. They will not be needed in 1.9.1 and later.
Modified Paths:
--------------
bricolage.cc/trunk/templates/Archive/archive.mc
bricolage.cc/trunk/templates/Library/util/xml/output_rss_feed.mc
bricolage.cc/trunk/templates/Mason/archive.mc
bricolage.cc/trunk/templates/Mason/nav_link.mc
bricolage.cc/trunk/templates/Mason/nav_menu_item.mc
bricolage.cc/trunk/templates/XHTML/article.mc
bricolage.cc/trunk/templates/XHTML/document_models.mc
bricolage.cc/trunk/templates/XHTML/faq_question.mc
bricolage.cc/trunk/templates/XHTML/link_to_document_item.mc
bricolage.cc/trunk/templates/XHTML/link_to_download.mc
bricolage.cc/trunk/templates/XHTML/link_to_screenshot_image.mc
bricolage.cc/trunk/templates/XHTML/related_document_button.mc
bricolage.cc/trunk/templates/XHTML/related_document_link.mc
["r6613-theory.diff" (r6613-theory.diff)]
Modified: bricolage.cc/trunk/templates/Archive/archive.mc
===================================================================
--- bricolage.cc/trunk/templates/Archive/archive.mc 2005-08-29 16:38:54 UTC (rev \
6612)
+++ bricolage.cc/trunk/templates/Archive/archive.mc 2005-08-29 16:45:31 UTC (rev \
6613) @@ -1,6 +1,6 @@
% for my $art (@articles) {
% my $elem = $art->get_element;
-% my $uri = $burner->best_uri($art)->as_string . '/';
+% my $uri = $burner->best_uri($art)->as_string;
<div class="archiveitem">
<h2><a href="<% $uri %>" title=""><% $art->get_title %></a></h2>
<p class="date"><% $art->get_cover_date('%Y.%m.%d') %></p>
Modified: bricolage.cc/trunk/templates/Library/util/xml/output_rss_feed.mc
===================================================================
--- bricolage.cc/trunk/templates/Library/util/xml/output_rss_feed.mc 2005-08-29 \
16:38:54 UTC (rev 6612)
+++ bricolage.cc/trunk/templates/Library/util/xml/output_rss_feed.mc 2005-08-29 \
16:45:31 UTC (rev 6613) @@ -9,9 +9,9 @@
xmlns:syn="http://purl.org/rss/1.0/modules/syndication/"
xmlns:admin="http://webns.net/mvcb/"
>
- <channel rdf:about="http://www.bricolage.cc<% $story->get_primary_uri %>/">
+ <channel rdf:about="http://www.bricolage.cc<% $story->get_primary_uri %>">
<title><![CDATA[<% $story->get_title %>]]></title>
- <link><% $story->get_uri %>/</link>
+ <link><% $story->get_uri %></link>
<description><![CDATA[<% $story->get_description || $story->get_title \
%>]]></description>
<cc:license rdf:resource="http://creativecommons.org/licenses/by-nc/2.0" />
<dc:language>en-us</dc:language>
@@ -21,13 +21,13 @@
<items>
<rdf:Seq>
% for my $doc (@docs) {
- <rdf:li rdf:resource="http://www.bricolage.cc<% $doc->get_primary_uri %>/" \
/> + <rdf:li rdf:resource="http://www.bricolage.cc<% $doc->get_primary_uri %>" \
/> % }
</rdf:Seq>
</items>
</channel>
% for my $doc (@docs) {
-% my $url = 'http://www.bricolage.cc' . $doc->get_primary_uri . '/';
+% my $url = 'http://www.bricolage.cc' . $doc->get_primary_uri;
% my $elem = $doc->get_element;
% my $title = $doc->get_title;
% # Damn RSS readers don't recognize XHTML in the title. Convert <q> and
Modified: bricolage.cc/trunk/templates/Mason/archive.mc
===================================================================
--- bricolage.cc/trunk/templates/Mason/archive.mc 2005-08-29 16:38:54 UTC (rev 6612)
+++ bricolage.cc/trunk/templates/Mason/archive.mc 2005-08-29 16:45:31 UTC (rev 6613)
@@ -6,7 +6,7 @@
for my $art ($m->comp('/util/archive_list.mc', category => $cat)) {
my $elem = $art->get_element;
$m->comp('/util/xhtml/output_link.mc',
- url => $burner->best_uri($art)->as_string . '/',
+ url => $burner->best_uri($art)->as_string,
text => $art->get_title,
teas => scalar $elem->get_data('teaser')
|| scalar $elem->get_data('paragraph'),
@@ -15,7 +15,7 @@
}
</%perl>
</dl>
- <p class="more"><a href="<% $burner->best_uri($story) %>/" title="<% \
encode_entities $story->get_title %>">Older stories</a></p> + <p \
class="more"><a href="<% $burner->best_uri($story) %>" title="<% encode_entities \
$story->get_title %>">Older stories</a></p> <%doc>
=pod
Modified: bricolage.cc/trunk/templates/Mason/nav_link.mc
===================================================================
--- bricolage.cc/trunk/templates/Mason/nav_link.mc 2005-08-29 16:38:54 UTC (rev 6612)
+++ bricolage.cc/trunk/templates/Mason/nav_link.mc 2005-08-29 16:45:31 UTC (rev 6613)
@@ -10,7 +10,7 @@
my $tip = encode_entities($element->get_data('tooltip'));
my $uri = $burner->best_uri($rel_story)->as_string;
my $text = $element->get_data('link_text') || $rel_story->get_title;
-$m->print(qq{ <li$class><a href="$uri/" title="$tip">$text</a></li>\n});
+$m->print(qq{ <li$class><a href="$uri" title="$tip">$text</a></li>\n});
$burner->notes(first_nav => 1);
return;
</%init>\
Modified: bricolage.cc/trunk/templates/Mason/nav_menu_item.mc
===================================================================
--- bricolage.cc/trunk/templates/Mason/nav_menu_item.mc 2005-08-29 16:38:54 UTC (rev \
6612)
+++ bricolage.cc/trunk/templates/Mason/nav_menu_item.mc 2005-08-29 16:45:31 UTC (rev \
6613) @@ -10,7 +10,7 @@
my $uri = '#';
my $tip = '';
if (my $link = $element->get_related_story) {
- $uri = $burner->best_uri($link)->as_string . '/';
+ $uri = $burner->best_uri($link)->as_string;
$tip = $element->get_data('tooltip') || '';
}
</%init>\
Modified: bricolage.cc/trunk/templates/XHTML/article.mc
===================================================================
--- bricolage.cc/trunk/templates/XHTML/article.mc 2005-08-29 16:38:54 UTC (rev 6612)
+++ bricolage.cc/trunk/templates/XHTML/article.mc 2005-08-29 16:45:31 UTC (rev 6613)
@@ -25,10 +25,11 @@
}
my @archives = Bric::Biz::Asset::Business::Story->list({
- element_key_name => 'archive',
- primary_uri => ANY(@cats),
- unexpired => 1,
- publish_status => 1,
+ element_key_name => 'archive',
+ primary_uri => ANY(@cats),
+ unexpired => 1,
+ publish_status => 1,
+ published_version => 1,
});
$burner->publish_another($_) for @archives;
</%cleanup>\
Modified: bricolage.cc/trunk/templates/XHTML/document_models.mc
===================================================================
--- bricolage.cc/trunk/templates/XHTML/document_models.mc 2005-08-29 16:38:54 UTC \
(rev 6612)
+++ bricolage.cc/trunk/templates/XHTML/document_models.mc 2005-08-29 16:45:31 UTC \
(rev 6613) @@ -1,6 +1,6 @@
% $m->comp('/util/xhtml/output_body.mc', %ARGS);
% for my $model (@models) {
-% my $uri = $burner->best_uri($model)->as_string . '/';
+% my $uri = $burner->best_uri($model)->as_string;
<div class="archiveitem">
<h2><a href="<% $uri %>" title=""><% $model->get_title %></a></h2>
<p><% $model->get_description || \
$model->get_element->get_element->get_description %></p>
Modified: bricolage.cc/trunk/templates/XHTML/faq_question.mc
===================================================================
--- bricolage.cc/trunk/templates/XHTML/faq_question.mc 2005-08-29 16:38:54 UTC (rev \
6612)
+++ bricolage.cc/trunk/templates/XHTML/faq_question.mc 2005-08-29 16:45:31 UTC (rev \
6613) @@ -20,7 +20,7 @@
if (my $rel = $element->get_related_story) {
$m->print(qq{ <p class="more"><a href="},
$burner->best_uri($rel)->as_string,
- qq{/" title="}, encode_entities($rel->get_title),
+ qq{" title="}, encode_entities($rel->get_title),
qq{">Read more</a></p>\n});
}
</%perl>
Modified: bricolage.cc/trunk/templates/XHTML/link_to_document_item.mc
===================================================================
--- bricolage.cc/trunk/templates/XHTML/link_to_document_item.mc 2005-08-29 16:38:54 \
UTC (rev 6612)
+++ bricolage.cc/trunk/templates/XHTML/link_to_document_item.mc 2005-08-29 16:45:31 \
UTC (rev 6613) @@ -9,7 +9,7 @@
my $desc = $element->get_data('description');
$desc = $desc ? ": $desc" : '';
-$m->print(' <li><a href="', $burner->best_uri($doc)->as_string . '/',
+$m->print(' <li><a href="', $burner->best_uri($doc)->as_string,
'" title="', encode_entities($element->get_data('tooltip') || ''),
'">', ($element->get_data('link_text') || $doc->get_title),
"</a>$desc</li>\n"
Modified: bricolage.cc/trunk/templates/XHTML/link_to_download.mc
===================================================================
--- bricolage.cc/trunk/templates/XHTML/link_to_download.mc 2005-08-29 16:38:54 UTC \
(rev 6612)
+++ bricolage.cc/trunk/templates/XHTML/link_to_download.mc 2005-08-29 16:45:31 UTC \
(rev 6613) @@ -38,7 +38,7 @@
my $md5 = Digest::MD5->new->addfile($download->get_file)->hexdigest;
$m->print(qq{ <li><a href="$uri" title="$tip">$text</a> ($date) },
- qq{<span class="small">[ <a href="$log_url/">Changelog</a> ] (MD5: \
$md5)</span></li>\n}); + qq{<span class="small">[ <a \
href="$log_url">Changelog</a> ] (MD5: $md5)</span></li>\n}); return;
</%init>
<%once>
Modified: bricolage.cc/trunk/templates/XHTML/link_to_screenshot_image.mc
===================================================================
--- bricolage.cc/trunk/templates/XHTML/link_to_screenshot_image.mc 2005-08-29 \
16:38:54 UTC (rev 6612)
+++ bricolage.cc/trunk/templates/XHTML/link_to_screenshot_image.mc 2005-08-29 \
16:45:31 UTC (rev 6613) @@ -18,7 +18,7 @@
my $uri = $burner->best_uri($shot)->as_string;
my $event = $type eq 'PDF' || $type eq 'TIFF'
? ''
- : qq{ onclick="return popup(this, $w, $h)"}; #"
+ : qq{ onclick="return popup(this, $w, $h)"};
$m->print(qq{ <li><a href="$uri" title="$tip ($type)"},
"$event>$type</a></li>\n");
return;
Modified: bricolage.cc/trunk/templates/XHTML/related_document_button.mc
===================================================================
--- bricolage.cc/trunk/templates/XHTML/related_document_button.mc 2005-08-29 16:38:54 \
UTC (rev 6612)
+++ bricolage.cc/trunk/templates/XHTML/related_document_button.mc 2005-08-29 16:45:31 \
UTC (rev 6613) @@ -33,7 +33,6 @@
my $w = $image->get_element->get_data('width');
my $alt = encode_entities($element->get_data('alt_text')) || '';
my $uri = $burner->best_uri($doc)->as_string;
-$uri .= '/' unless $uri eq '/';
my $tip = encode_entities($element->get_data('tooltip')) || '';
my $src = $burner->best_uri($image)->as_string;
my $pos = $element->get_data('position') || 'left';
Modified: bricolage.cc/trunk/templates/XHTML/related_document_link.mc
===================================================================
--- bricolage.cc/trunk/templates/XHTML/related_document_link.mc 2005-08-29 16:38:54 \
UTC (rev 6612)
+++ bricolage.cc/trunk/templates/XHTML/related_document_link.mc 2005-08-29 16:45:31 \
UTC (rev 6613) @@ -6,7 +6,7 @@
. $element->get_place + 1 . ', ' . $element->get_name);
}
$m->comp('/util/xhtml/output_link.mc',
- url => $burner->best_uri($doc)->as_string . '/',
+ url => $burner->best_uri($doc)->as_string,
text => scalar $element->get_data('link_text')
|| $doc->get_title,
tip => encode_entities($element->get_data('tooltip')),
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic