Changeset 1390


Ignore:
Timestamp:
02/21/07 15:43:22 (12 years ago)
Author:
jukka
Message:

Fixed #1159. Magic removed.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Collection.py

    r1389 r1390  
    464464        return 'community' 
    465465                 
    466     def redirect(self, REQUEST, url=''): 
    467         """ redirect to collections (self) """ 
    468         prev = self.getPreviousSection(REQUEST) 
    469         REQUEST.SESSION.set('keep_in_section', prev) 
    470         if url: 
    471             return REQUEST.RESPONSE.redirect(url) 
    472         return REQUEST.RESPONSE.redirect(self.absolute_url()) 
    473  
    474466registerType(CollectionsFolder, PROJECTNAME) 
  • trunk/skins/lemill/collection_view.cpt

    r1389 r1390  
    55    <head> 
    66        <style>text-decoration:none</style> 
    7         <span metal:fill-slot="javascript_head_slot" tal:omit-tag=""> 
    8             <script src="js_helpers.js" type="text/javascript" /> 
    9         <script language="JavaScript"> 
    10             function cancelDeletion(){ 
    11                 setIdProperty("delete_button_div", "display", "block"); 
    12                 setIdProperty("delete_confirmation_div", "display", "none"); 
    13             } 
    14             </script> 
    15         </span> 
    167    </head> 
    178 
  • trunk/skins/lemill/portlet_add_activity.pt

    r1385 r1390  
    2020<ul> 
    2121    <li><a i18n:domain="plone" i18n:translate="label_published" href="#" tal:attributes="href string:${portal_url}/methods/published">Published</a></li> 
    22     <li><a i18n:translate="label_collections" href="#" tal:attributes="href string:${portal_url}/community/${user}/collections/redirect">Collections</a></li> 
     22    <li><a i18n:translate="label_collections" href="#" tal:attributes="href string:${portal_url}/community/${user}/collections">Collections</a></li> 
    2323</ul> 
    2424</div> 
  • trunk/skins/lemill/portlet_add_content.pt

    r1141 r1390  
    2121    <li><a i18n:translate="label_drafts" href="#" tal:attributes="href string:${portal_url}/content/drafts">Drafts</a></li> 
    2222    <li><a i18n:domain="plone" i18n:translate="label_published" href="#" tal:attributes="href string:${portal_url}/content/published?filter=resources">Published</a></li> 
    23     <li><a i18n:translate="label_collections" href="#" tal:attributes="href string:${portal_url}/community/${user}/collections/redirect">Collections</a></li> 
     23    <li><a i18n:translate="label_collections" href="#" tal:attributes="href string:${portal_url}/community/${user}/collections">Collections</a></li> 
    2424</ul> 
    2525</div> 
  • trunk/skins/lemill/portlet_add_tool.pt

    r1141 r1390  
    2020<ul> 
    2121    <li><a i18n:domain="plone" i18n:translate="label_published" href="#" tal:attributes="href string:${portal_url}/tools/published">Published</a></li> 
    22     <li><a i18n:translate="label_collections" href="#" tal:attributes="href string:${portal_url}/community/${user}/collections/redirect">Collections</a></li> 
     22    <li><a i18n:translate="label_collections" href="#" tal:attributes="href string:${portal_url}/community/${user}/collections">Collections</a></li> 
    2323</ul> 
    2424</div> 
  • trunk/skins/lemill/portlet_material_actions.pt

    r1381 r1390  
    5959    <ul> 
    6060    <tal:macro metal:define-macro="collection_actions"> 
    61         <li tal:condition="not:isAnon"><a href="" tal:attributes="href python:str(here.absolute_url())+'/collection_add'"><tal:block i18n:translate="label_add_to_collection">Add to collection</tal:block>...</a></li> 
     61        <li tal:condition="not:isAnon"><a href="" tal:attributes="href string:${here/absolute_url}/collection_add'"><tal:block i18n:translate="label_add_to_collection">Add to collection</tal:block>...</a></li> 
    6262        <li tal:condition="colls"> 
    6363            <a href=""  i18n:translate="label_view_collections" 
    64                 tal:attributes="href string:${membersfolder/absolute_url}/${member}/collections/redirect?url=${membersfolder/absolute_url}/${member}/collections/collections_list?obj_id=${context/UID}"> 
     64                tal:attributes="href string:${membersfolder/absolute_url}/${member}/collections/collections_list?obj_id=${context/UID}"> 
    6565                View collections</a>  
    6666            <span tal:replace="python:'('+str(len(colls))+')'">(1)</span> 
Note: See TracChangeset for help on using the changeset viewer.