Menu
▾
▴
[Plone-cvs] CMFPlone/skins/plone_portlets about_slot.pt,1.3.2.4,1.3.2.5 calendar_slot.pt,1.4.2.17,1.4.2.18 login_slot.pt,1.2.4.10,1.2.4.11 navigation_tree_slot.pt,1.2.4.10,1.2.4.11 news_slot.pt,1.4.2.5,1.4.2.6 portlet_login.pt,1.1.2.7,1.1.2.8 portlet_news.pt,1.1.2.5,1.1.2.6
|
From: Christian H. <ti...@pr...> - 2004-01-31 15:40:43
|
Update of /cvsroot/plone/CMFPlone/skins/plone_portlets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4139/skins/plone_portlets Modified Files: Tag: Plone-2_0-branch about_slot.pt calendar_slot.pt login_slot.pt navigation_tree_slot.pt news_slot.pt portlet_login.pt portlet_news.pt Log Message: first part of fixing #2537: some pt are *not* using the new names introduced by global_defines Index: news_slot.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_portlets/Attic/news_slot.pt,v retrieving revision 1.4.2.5 retrieving revision 1.4.2.6 diff -u -d -r1.4.2.5 -r1.4.2.6 --- news_slot.pt 15 Jan 2004 05:16:11 -0000 1.4.2.5 +++ news_slot.pt 31 Jan 2004 15:38:30 -0000 1.4.2.6 @@ -11,7 +11,7 @@ , sort_on='Date' , sort_order='reverse' , review_state='published')[:5]); - portal_url here/portal_url;" + " tal:condition="python:test(template.getId()!='news' and results, 1, 0)"> <div class="portlet" id="portlet-news"> Index: portlet_login.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_portlets/portlet_login.pt,v retrieving revision 1.1.2.7 retrieving revision 1.1.2.8 diff -u -d -r1.1.2.7 -r1.1.2.8 --- portlet_login.pt 15 Jan 2004 05:16:11 -0000 1.1.2.7 +++ portlet_login.pt 31 Jan 2004 15:38:30 -0000 1.1.2.8 @@ -12,8 +12,7 @@ tal:condition="isAnon"> <div class="portlet" - tal:define="portal_url portal_url|here/portal_url; - auth nocall:here/cookie_authentication; + tal:define="auth nocall:here/cookie_authentication; ac_name auth/name_cookie; ac_password auth/pw_cookie; ac_persist auth/persist_cookie;" @@ -26,7 +25,7 @@ <div class="portletContent odd"> <form action="logged_in" method="post" - tal:attributes="action string:$portal_url/logged_in"> + tal:attributes="action string:${utool}/logged_in"> <input type="hidden" name="came_from" value="" tal:attributes="value request/URL; @@ -68,7 +67,7 @@ <div class="portletContent even"> <a href="mail_password_form" - tal:attributes="href string:$portal_url/mail_password_form" accesskey="accesskeys-login" i18n:attributes="accesskey" > + tal:attributes="href string:${utool}/mail_password_form" accesskey="accesskeys-login" i18n:attributes="accesskey" > <tal:block replace="structure portal_object/linkTransparent.gif"/> <span tal:omit-tag="" i18n:translate="box_forgot_password_option">Forgot your password?</span> </a> Index: calendar_slot.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_portlets/calendar_slot.pt,v retrieving revision 1.4.2.17 retrieving revision 1.4.2.18 diff -u -d -r1.4.2.17 -r1.4.2.18 --- calendar_slot.pt 16 Jan 2004 04:41:57 -0000 1.4.2.17 +++ calendar_slot.pt 31 Jan 2004 15:38:29 -0000 1.4.2.18 @@ -70,7 +70,7 @@ <span tal:define="begin python:DateTime(begEndTimes[0].timeTime()+86400).ISO(); end python:DateTime(begEndTimes[1].strftime('%m/%d/%y')).ISO(); pss python:modules['Products'].PythonScripts.standard" tal:omit-tag=""> - <a href="" tal:attributes="href python:here.portal_url()+'/search?review_state=published&start:date=%s&start_usage=range:max&end:date=%s&end_usage=range:min'%(pss.url_quote(begin),pss.url_quote(end))"> + <a href="" tal:attributes="href python:utool()+'/search?review_state=published&start:date=%s&start_usage=range:max&end:date=%s&end_usage=range:min'%(pss.url_quote(begin),pss.url_quote(end))"> <span tal:replace="python: daynumber or default"> </span> </a> </span> @@ -113,7 +113,6 @@ </div> <div metal:define-macro="calendarDatePickerBox" tal:define=" - portal_url here/portal_url; tabindex tabindex/next|tabindex|nothing; input_id string:${formname}_${inputname}_${tabindex}; values python:here.date_components_support(inputvalue); Index: portlet_news.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_portlets/portlet_news.pt,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -u -d -r1.1.2.5 -r1.1.2.6 --- portlet_news.pt 15 Jan 2004 05:16:11 -0000 1.1.2.5 +++ portlet_news.pt 31 Jan 2004 15:38:30 -0000 1.1.2.6 @@ -11,7 +11,8 @@ , sort_on='Date' , sort_order='reverse' , review_state='published')[:5]); - portal_url here/portal_url;" + " + tal:condition="python:test(template.getId()!='news' and results, 1, 0)"> <div class="portlet" id="portlet-news"> @@ -42,7 +43,7 @@ <a href="" class="portletMore" - tal:attributes="href string:${portal_url}/news" + tal:attributes="href string:${utool}/news" i18n:translate="box_morelink" > More... Index: about_slot.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_portlets/Attic/about_slot.pt,v retrieving revision 1.3.2.4 retrieving revision 1.3.2.5 diff -u -d -r1.3.2.4 -r1.3.2.5 --- about_slot.pt 20 Jan 2004 14:44:39 -0000 1.3.2.4 +++ about_slot.pt 31 Jan 2004 15:38:29 -0000 1.3.2.5 @@ -9,7 +9,7 @@ <!-- The About box --> <div metal:define-macro="aboutBox" - tal:define="mtool mtool|here/portal_membership; + tal:define="mtool mtool|mtool; isAnon isAnon|mtool/isAnonymousUser" tal:condition="python:test(not site_properties.allowAnonymousViewAbout and isAnon, 0, 1)" tal:omit-tag=""> @@ -41,7 +41,7 @@ <div class="portletContent even"> <img src="" alt="" - tal:attributes="src python:portal_url + '/' + here.getIcon(relative_to_portal=1); + tal:attributes="src python:utool() + '/' + here.getIcon(relative_to_portal=1); alt here/meta_type;" /> <span tal:omit-tag="" tal:content="python:here.getTypeInfo().Title()" Index: navigation_tree_slot.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_portlets/Attic/navigation_tree_slot.pt,v retrieving revision 1.2.4.10 retrieving revision 1.2.4.11 diff -u -d -r1.2.4.10 -r1.2.4.11 --- navigation_tree_slot.pt 15 Jan 2004 05:16:11 -0000 1.2.4.10 +++ navigation_tree_slot.pt 31 Jan 2004 15:38:29 -0000 1.2.4.11 @@ -11,7 +11,7 @@ tal:omit-tag="" tal:define="isContainer here/isPrincipiaFolderish|nothing; navBatchStart request/navBatchStart | python:None; - portalObject here/portal_url/getPortalObject; + portalObject utool/getPortalObject; tree python:here.plone_utils.createNavigationTreeBuilder(portalObject,navBatchStart); showOtherNav python:0; showNav python:0; Index: login_slot.pt =================================================================== RCS file: /cvsroot/plone/CMFPlone/skins/plone_portlets/Attic/login_slot.pt,v retrieving revision 1.2.4.10 retrieving revision 1.2.4.11 diff -u -d -r1.2.4.10 -r1.2.4.11 --- login_slot.pt 15 Jan 2004 05:16:11 -0000 1.2.4.10 +++ login_slot.pt 31 Jan 2004 15:38:29 -0000 1.2.4.11 @@ -13,7 +13,7 @@ tabindex tabindex|Iterator"> <div class="portlet" - tal:define="portal_url portal_url|here/portal_url; + tal:define="portal_url portal_url|utool; auth nocall:here/cookie_authentication; ac_name auth/name_cookie; ac_password auth/pw_cookie; |