Changeset 3087 for trunk


Ignore:
Timestamp:
11/03/10 12:41:48 (9 years ago)
Author:
jukka
Message:

Numerous fixes

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/LeMillCatalogTool.py

    r3079 r3087  
    882882            del form['b_start']  
    883883        last_url='?'.join((self.REQUEST.ACTUAL_URL, urlencode(form))) 
    884         new= last_url+'&b_start=%s' 
     884        new= last_url+'&b_start=' 
    885885        return new 
    886886         
  • trunk/Resource.py

    r3086 r3087  
    315315            try: 
    316316                desc=self.getDescription() 
    317             except AttributeError(): 
     317            except AttributeError: 
    318318                try: 
    319319                    desc=self.Description() 
    320                 except AttributeError(): 
     320                except AttributeError: 
    321321                    desc='' 
    322322            if desc: 
  • trunk/skins/lemill/batch_macros.pt

    r3053 r3087  
    66<!-- Navigation --> 
    77<div class="listingBar" metal:define-macro="navigation" tal:define="url_slot context/portal_catalog/batchBaseUrl" tal:condition="python: batch.nextlist or batch.prevlist"> 
    8     <span class="previous" tal:define="p batch/prevlist | nothing" tal:condition="p"><a href="" tal:attributes="href python: url_slot % ((p[-1]-1)*30)">&laquo; <span i18n:translate="batch_previous" tal:omit-tag="">Previous</span></a></span> 
    9     <span class="next" tal:define="n batch/nextlist | nothing" tal:condition="n"><a href="" tal:attributes="href python: url_slot % ((n[0]-1)*30)"><span i18n:translate="batch_next" tal:omit-tag="">Next</span> &raquo;</a></span> 
     8    <span class="previous" tal:define="p batch/prevlist | nothing" tal:condition="p"><a href="" tal:attributes="href python: url_slot + str(((p[-1]-1)*30))">&laquo; <span i18n:translate="batch_previous" tal:omit-tag="">Previous</span></a></span> 
     9    <span class="next" tal:define="n batch/nextlist | nothing" tal:condition="n"><a href="" tal:attributes="href python: url_slot + str(((n[0]-1)*30))"><span i18n:translate="batch_next" tal:omit-tag="">Next</span> &raquo;</a></span> 
    1010    <!-- Link to first --> 
    11     <span tal:condition="python: 1 not in batch.navlist"><a href="" tal:attributes="href python: url_slot % 0">1</a><span tal:condition="python: 2 not in batch.prevlist" tal:omit-tag=""> ... </span></span> 
     11    <span tal:condition="python: 1 not in batch.navlist"><a href="" tal:attributes="href python: url_slot + '0'">1</a><span tal:condition="python: 2 not in batch.prevlist" tal:omit-tag=""> ... </span></span> 
    1212    <!-- Pagelist with links to previous pages for quick navigation --> 
    13     <span tal:repeat="page batch/prevlist" tal:omit-tag="" ><a href="" tal:content="page" tal:attributes="href python: url_slot % ((page-1)*30)" >3</a></span> 
     13    <span tal:repeat="page batch/prevlist" tal:omit-tag="" ><a href="" tal:content="page" tal:attributes="href python: url_slot + str(((page-1)*30))" >3</a></span> 
    1414    <!-- Current page --> 
    1515    <span tal:condition="batch/navlist" tal:omit-tag="">[<span tal:content="batch/pagenumber">Current page number</span>]</span> 
    1616    <!-- Pagelist with links to next pages for quick navigation --> 
    17     <span tal:repeat="page batch/nextlist" tal:omit-tag="" ><a href="" tal:content="page" tal:attributes="href python: url_slot % ((page-1)*30)" ></a></span> 
     17    <span tal:repeat="page batch/nextlist" tal:omit-tag="" ><a href="" tal:content="page" tal:attributes="href python: url_slot + str(((page-1)*30))" ></a></span> 
    1818    <!-- Link to last --> 
    19     <span tal:condition="python:batch.numpages not in batch.navlist"><span tal:condition="python: batch.numpages - 1 not in batch.nextlist" tal:omit-tag=""> ...</span><a href="" tal:attributes="href python: url_slot % ((batch.numpages-1)*30)" tal:content="batch/numpages">3457</a></span> 
     19    <span tal:condition="python:batch.numpages not in batch.navlist"><span tal:condition="python: batch.numpages - 1 not in batch.nextlist" tal:omit-tag=""> ...</span><a href="" tal:attributes="href python: url_slot + str(((batch.numpages-1)*30))" tal:content="batch/numpages">3457</a></span> 
    2020</div> 
    2121 
Note: See TracChangeset for help on using the changeset viewer.