[Plone-cvs] r6755 - in CMFPlone/branches/2.1: . skins/plone_portlets skins/plone_templates

[rafrombrc <svn...@pl...>]

Author: rafrombrc
Date: Sat Apr 30 00:02:44 2005
New Revision: 6755

Modified:
   CMFPlone/branches/2.1/HISTORY.txt
   CMFPlone/branches/2.1/skins/plone_portlets/portlet_news.pt
   CMFPlone/branches/2.1/skins/plone_templates/news_listing.pt
Log:
Changed portlet_news.pt and news_listing.pt to do the right
thing if the 'news' folder at the root of the site isn't
there.



Modified: CMFPlone/branches/2.1/HISTORY.txt
==============================================================================
--- CMFPlone/branches/2.1/HISTORY.txt	(original)
+++ CMFPlone/branches/2.1/HISTORY.txt	Sat Apr 30 00:02:44 2005
@@ -4,9 +4,14 @@
 
 Plone 2.1 - Plaid - (unreleased)
 
+    - Changed portlet_news.pt and news_listing.pt to do the right
+      thing if the 'news' folder at the root of the site isn't
+      there.
+      [rafrombrc]
+
     - Added some argument type sanity checking to queryCatalog.py;
       it was failing on valid queries b/c it was making assumptions
-      about the types that it was receiving
+      about the types that it was receiving.
       [rafrombrc]
 
     - Add charset info for ZMI pages like addSite.zpt and addPropertySheet.zpt

Modified: CMFPlone/branches/2.1/skins/plone_portlets/portlet_news.pt
==============================================================================
--- CMFPlone/branches/2.1/skins/plone_portlets/portlet_news.pt	(original)
+++ CMFPlone/branches/2.1/skins/plone_portlets/portlet_news.pt	Sat Apr 30 00:02:44 2005
@@ -42,10 +42,20 @@
 
                 <a href=""
                    class="portletMore"
+                   tal:condition="python:'news' in portal.contentIds()"
                    tal:attributes="href string:${utool}/news"
                    i18n:translate="box_morelink"
                    >
-                    More...
+                  More...
+                </a>
+
+                <a href=""
+                   class="portletMore"
+                   tal:condition="python:'news' not in portal.contentIds()"
+                   tal:attributes="href string:${utool}/news_listing"
+                   i18n:translate="box_morelink"
+                   >
+                  More...
                 </a>
 
             </div>

Modified: CMFPlone/branches/2.1/skins/plone_templates/news_listing.pt
==============================================================================
--- CMFPlone/branches/2.1/skins/plone_templates/news_listing.pt	(original)
+++ CMFPlone/branches/2.1/skins/plone_templates/news_listing.pt	Sat Apr 30 00:02:44 2005
@@ -105,7 +105,8 @@
         No news has been posted.
     </p>
 
-    <div tal:define="contentTypes here/getAllowedTypes" tal:omit-tag="python:1">
+    <div tal:define="contentTypes here/getAllowedTypes" tal:omit-tag="python:1"
+         tal:condition="python:'news' in portal.contentIds() and here==portal.news">
         <tal:add_button metal:use-macro="here/folder_contents/macros/add_button"/>
     </div>