Etria Lists

Thu Sep 20 20:10:47 UTC 2007

Author: tomster
Date: Thu Sep 20 20:10:47 2007
New Revision: 49799

Modified:
   quills.app/trunk/quills/app/browser/weblog_view.pt
   quills.app/trunk/quills/app/skins/Quills/quills_header_macros.pt
Log:
#100: fixed insertion of the feed links into the head for the weblog view

Modified: quills.app/trunk/quills/app/browser/weblog_view.pt
==============================================================================

--- quills.app/trunk/quills/app/browser/weblog_view.pt	(original)
+++ quills.app/trunk/quills/app/browser/weblog_view.pt	Thu Sep 20 20:10:47 2007
@@ -4,9 +4,13 @@
       metal:use-macro="here/main_template/macros/master"
       i18n:domain="quills">
 
-  <metal:macro use-macro="context/quills_header_macros/macros/feed-links" />
 
   <body>
+    <metal:feed fill-slot="head_slot"
+         tal:define="weblog view/getWeblog;">
+         <metal:block metal:use-macro="context/quills_header_macros/macros/feed-links-base"></metal:block>
+         
+    </metal:feed>
     <div metal:fill-slot="main"
          tal:define="weblog view/getWeblog;
                      weblog_content view/getWeblogContent">

Modified: quills.app/trunk/quills/app/skins/Quills/quills_header_macros.pt
==============================================================================
--- quills.app/trunk/quills/app/skins/Quills/quills_header_macros.pt	(original)
+++ quills.app/trunk/quills/app/skins/Quills/quills_header_macros.pt	Thu Sep 20 20:10:47 2007
@@ -9,6 +9,11 @@
 
     <metal:block define-macro="feed-links">
       <tal:block define="weblog view/getParentWeblog">
+         <metal:block metal:use-macro="context/quills_header_macros/macros/feed-links-base"></metal:block>
+      </tal:block>
+    </metal:block>
+
+    <metal:block define-macro="feed-links-base">
         <link
             rel="alternate"
             type="application/atom+xml"
@@ -36,7 +41,6 @@
             title="RDF 1.1 feed"
             i18n:attributes="title"
             tal:attributes="href string:${weblog/absolute_url}/feed11.rdf" />
-      </tal:block>
     </metal:block>
 
   </head>

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Collective-checkins mailing list
Collective-checkins at lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/collective-checkins



Etria Lists

[quills-dev] [Collective-checkins] r49799 - in quills.app/trunk/quills/app: browser skins/Quills