Changeset 1488


Ignore:
Timestamp:
03.05.2011 23:10:12 (13 months ago)
Author:
zmsdev
Message:

fixed namespace-problem for int() in dtml in zope-2.13.4 (reported by uni-be)

Location:
ZMS/trunk
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • ZMS/trunk/conf/db/getEntities.Postgres.dtml

    r698 r1488  
    4141   <dtml-call "REQUEST.set('colType','string')"> 
    4242  <dtml-elif "colType.find('int')>0"> 
    43    <dtml-call "REQUEST.set('colSize',int(colType[3:]))"> 
     43   <dtml-call "REQUEST.set('colSize',_.int(colType[3:]))"> 
    4444   <dtml-call "REQUEST.set('colType','int')"> 
    4545  </dtml-if>  

  • ZMS/trunk/dtml/ZMS/f_bodycontent_search.dtml

    r1195 r1488  
    2626################################################################################ 
    2727</dtml-comment> 
    28 <dtml-if "int(searchform)==1"> 
     28<dtml-if "_.int(searchform)==1"> 
    2929 
    3030<script type="text/javascript"> 
    … …  
    7979     <dtml-in "range(1,2+1)"> 
    8080      <option value="<dtml-var sequence-item>" 
    81        <dtml-if "int(REQUEST['search_order_by'])==_['sequence-item']"> 
     81       <dtml-if "_.int(REQUEST['search_order_by'])==_['sequence-item']"> 
    8282        selected="selected" 
    8383       </dtml-if> 
    … …  
    163163  <p class="searchHeader"> 
    164164   <dtml-var "getLangStr('SEARCH_NORESULTS',lang)"> 
    165    (<dtml-var "int((DateTime().timeTime()-qt)*100.0)/100.0"> <dtml-var "getLangStr('SECONDS',lang)">) 
     165   (<dtml-var "DateTime().timeTime()-qt" fmt="%.2f"> <dtml-var "getLangStr('SECONDS',lang)">) 
    166166  </p> 
    167167   
    … …  
    182182 
    183183  <p class="searchHeader"> 
    184    <dtml-var "getLangStr('SEARCH_RETURNEDSTATS',lang)%('<strong>%i</strong>'%int(REQUEST.get('qs')),'<strong>%i</strong>'%int(REQUEST.get('qe')),'<strong>%i</strong>'%len(res),'<strong>%s</strong>'%REQUEST.get('_s').replace('<',''))"> 
    185    (<dtml-var "int((DateTime().timeTime()-qt)*100.0)/100.0"> <dtml-var "getLangStr('SECONDS',lang)">) 
     184   <dtml-var "getLangStr('SEARCH_RETURNEDSTATS',lang)%('<strong>%i</strong>'%_.int(REQUEST.get('qs')),'<strong>%i</strong>'%_.int(REQUEST.get('qe')),'<strong>%i</strong>'%len(res),'<strong>%s</strong>'%REQUEST.get('_s').replace('<',''))"> 
     185   (<dtml-var "DateTime().timeTime()-qt" fmt="%.2f"> <dtml-var "getLangStr('SECONDS',lang)">) 
    186186  </p> 
    187187 

  • ZMS/trunk/dtml/ZMS/f_bodycontent_sitemap.dtml

    r698 r1488  
    11<h1 class="title"><dtml-var "getLangStr('Sitemap',lang)"></h1> 
    22<dtml-let layout="_.getattr(ZMS_THIS,'attr_layoutsitemap',0)"> 
    3  <dtml-if "int(layout)==0"> 
     3 <dtml-if "_.int(layout)==0"> 
    44  <dtml-var sitemap_layout0> 
    5  <dtml-elif "int(layout)==1"> 
     5 <dtml-elif "_.int(layout)==1"> 
    66  <dtml-var sitemap_layout1> 
    7  <dtml-elif "int(layout)==2"> 
     7 <dtml-elif "_.int(layout)==2"> 
    88  <dtml-var sitemap_layout2> 
    9  <dtml-elif "int(layout)==3"> 
     9 <dtml-elif "_.int(layout)==3"> 
    1010  <dtml-var sitemap_layout3> 
    1111 </dtml-if> 

  • ZMS/trunk/dtml/ZMS/manage_customizedesignform.dtml

    r1328 r1488  
    9292    </table> 
    9393    <!-- Textarea --> 
    94     <dtml-let size="int(55)"> 
     94    <dtml-let size="_.int(55)"> 
    9595     <textarea class="form-fixed" name="stylesheet:text" wrap="off" 
    9696       cols="<dtml-var size>" 
    97        style="width:<dtml-var "int(size)*11">px" 
     97       style="width:<dtml-var "_.int(size)*11">px" 
    9898       rows="25" 
    9999     ><dtml-with "getStylesheet(cssId)"><dtml-var raw html_quote></dtml-with></textarea> 

  • ZMS/trunk/dtml/ZMSContainerObject/manage_main.dtml

    r1456 r1488  
    2424><dtml-let childNodes="getObjChildren(id_prefix,REQUEST)"> 
    2525 
    26 <dtml-call "REQUEST.set('pageCountMin',int(getConfProperty('ZMS.compactview.pagecount.min','99999')))"> 
     26<dtml-call "REQUEST.set('pageCountMin',_.int(getConfProperty('ZMS.compactview.pagecount.min','99999')))"> 
    2727<dtml-call "SESSION.set('pageCountMax',REQUEST.form.get('sess_pageCountMax',SESSION.get('pageCountMax',REQUEST.get('pageCountMin'))))"> 
    2828<dtml-call "REQUEST.set('pageCount',0)"> 
    … …  
    9797     <img src="<dtml-var "img.getHref(REQUEST)">" border="0" 
    9898      <dtml-try> 
    99        <dtml-if "int(img.width)>360"> 
    100         width="360" height="<dtml-var "int(360*int(img.height)/int(img.width))">" 
     99       <dtml-if "_.int(img.width)>360"> 
     100        width="360" height="<dtml-var "_.int(360*_.int(img.height)/_.int(img.width))">" 
    101101       <dtml-else> 
    102102        width="<dtml-var "img.width">" height="<dtml-var "img.height">" 
    … …  
    159159><input class="form-checkbox zmi-ids-list" type="checkbox" name="ids:list" value="<dtml-var id>" <dtml-unless "getAutocommit() or coverage.endswith('.'+lang)">disabled="disabled"</dtml-unless> 
    160160><dtml-let l="['CAPTION_EDIT','ACTION_SELECT']" 
    161 ><a name="_<dtml-var id>" class="zmi" href="<dtml-var id>/manage_main?lang=<dtml-var lang>" title="<dtml-var "getZMILangStr(l[int(isPage())])%display_type(REQUEST)">" 
     161><a name="_<dtml-var id>" class="zmi" href="<dtml-var id>/manage_main?lang=<dtml-var lang>" title="<dtml-var "getZMILangStr(l[_.int(isPage())])%display_type(REQUEST)">" 
    162162><dtml-var f_display_icon 
    163163><dtml-var "display_type(REQUEST)" 

  • ZMS/trunk/dtml/ZMSContainerObject/manage_search.dtml

    r1256 r1488  
    5757     <dtml-in "_.range(1,2+1)"> 
    5858      <option value="<dtml-var sequence-item>" 
    59        <dtml-if "int(REQUEST['search_order_by'])==_['sequence-item']"> 
     59       <dtml-if "_.int(REQUEST['search_order_by'])==_['sequence-item']"> 
    6060        selected="selected" 
    6161       </dtml-if> 
    … …  
    151151  </dtml-in> 
    152152 
    153   <div class="form-text"><b><dtml-var "getZMILangStr('SEARCH_RETURNEDSTATS')%(int(qs),int(qe),len(qres),REQUEST['_s'])"></b></div> 
     153  <div class="form-text"><b><dtml-var "getZMILangStr('SEARCH_RETURNEDSTATS')%(_.int(qs),_.int(qe),len(qres),REQUEST['_s'])"></b></div> 
    154154 
    155155  <dtml-call "REQUEST.set('_u',getCatalogNavUrl(REQUEST))"> 

  • ZMS/trunk/dtml/ZMSContainerObject/manage_system.dtml

    r1229 r1488  
    148148  <dtml-var "ob_size / 1048576.0" fmt="%0.02f"> Mb 
    149149  <dtml-else> 
    150   <dtml-var "int(ob_size / 1024)"> Kb 
     150  <dtml-var "_.int(ob_size / 1024)"> Kb 
    151151  </dtml-if> 
    152152  </dtml-let> 

  • ZMS/trunk/dtml/ZMSContainerObject/pageelement_toc.dtml

    r750 r1488  
    1414           isHeadline="format.find('h') >= 0 and index > 0"> 
    1515  <dtml-if isHeadline> 
    16    <dtml-let level="int(format[index:])"> 
     16   <dtml-let level="_.int(format[index:])"> 
    1717    <dtml-call "headlines.append({'level':level,'textarea':textarea})"> 
    1818    <dtml-if "level==1"> 

  • ZMS/trunk/dtml/ZMSContainerObject/sitemap/version0.dtml

    r1234 r1488  
    2929 ><dtml-call "REQUEST.set( 'last_level', -1)" 
    3030 ><dtml-in catalog_items 
    31   ><dtml-let ob=sequence-item index=sequence-index access="hasAccess(REQUEST)" highlight="int(ob in breadcrumbs)" 
     31  ><dtml-let ob=sequence-item index=sequence-index access="hasAccess(REQUEST)" highlight="_.int(ob in breadcrumbs)" 
    3232   ><dtml-call "REQUEST.set( 'ob_id', id)" 
    3333   ><dtml-call "REQUEST.set( 'ob_level', getLevel())" 

  • ZMS/trunk/dtml/ZMSContainerObject/sitemap/version1.dtml

    r1234 r1488  
    4343 ><dtml-call "REQUEST.set( 'last_level', -1)" 
    4444 ><dtml-in catalog_items 
    45   ><dtml-let ob=sequence-item index=sequence-index access="hasAccess(REQUEST)" highlight="int(ob in breadcrumbs)" 
     45  ><dtml-let ob=sequence-item index=sequence-index access="hasAccess(REQUEST)" highlight="_.int(ob in breadcrumbs)" 
    4646   ><dtml-call "REQUEST.set( 'ob_id', id)" 
    4747   ><dtml-call "REQUEST.set( 'ob_level', getLevel())" 

  • ZMS/trunk/dtml/ZMSContainerObject/sitemap/version2.dtml

    r1234 r1488  
    4343 ><dtml-call "REQUEST.set( 'last_level', -1)" 
    4444 ><dtml-in catalog_items 
    45   ><dtml-let ob=sequence-item index=sequence-index access="hasAccess(REQUEST)" highlight="int(ob in breadcrumbs)" 
     45  ><dtml-let ob=sequence-item index=sequence-index access="hasAccess(REQUEST)" highlight="_.int(ob in breadcrumbs)" 
    4646   ><dtml-call "REQUEST.set( 'ob_id', id)" 
    4747   ><dtml-call "REQUEST.set( 'ob_level', getLevel())" 

  • ZMS/trunk/dtml/ZMSContainerObject/sitemap/version3.dtml

    r1289 r1488  
    169169 ><dtml-call "REQUEST.set( 'last_level', -1)" 
    170170 ><dtml-in catalog_items 
    171   ><dtml-let ob=sequence-item index=sequence-index access="hasAccess(REQUEST)" highlight="int(ob in breadcrumbs)" 
     171  ><dtml-let ob=sequence-item index=sequence-index access="hasAccess(REQUEST)" highlight="_.int(ob in breadcrumbs)" 
    172172   ><dtml-if ob 
    173173   ><dtml-unless "seq_index==0 or seq_end" 
    174     ><dtml-call "REQUEST.set( 'offs_level', offs_level+int(meta_type=='ZMS'))" 
     174    ><dtml-call "REQUEST.set( 'offs_level', offs_level+_.int(meta_type=='ZMS'))" 
    175175   ></dtml-unless 
    176176   ><dtml-call "REQUEST.set( 'ob_id', '%s_%s'%(ob.getHome().id,ob.id))" 

  • ZMS/trunk/dtml/ZMSLinkElement/manage_browse_iframe.dtml

    r1346 r1488  
    540540        ><img src="<dtml-var "value.getHref(REQUEST)">" border="1" style="margin:1px;background-image:url(<dtml-var MISC_ZMS>bg_imgpreview.gif);"  
    541541         <dtml-try> 
    542           <dtml-if "max([int(value.width),int(value.height)])>80"> 
    543            <dtml-if "int(value.width)>int(value.height)"> 
     542          <dtml-if "max([_.int(value.width),_.int(value.height)])>80"> 
     543           <dtml-if "_.int(value.width)>_.int(value.height)"> 
    544544            width="80" 
    545545           <dtml-else> 

  • ZMS/trunk/dtml/ZMSLog/manage_main.dtml

    r1229 r1488  
    7171<div> 
    7272<dtml-if entries> 
    73  <dtml-let size="int(20)"> 
     73 <dtml-let size="_.int(20)"> 
    7474  <p> 
    7575   [<a href="getLOG" target="_blank">LOG</a>] 

  • ZMS/trunk/dtml/ZMSMetamodelProvider/manage_main.dtml

    r1464 r1488  
    461461      <td align="center" 
    462462       ><dtml-if "metaObj['type']=='ZMSPackage'" 
    463         ><dtml-var "getCheckbox(fmName='form0',elName='obj_subobjects:int',value=int(metaObj.get('subobjects',1)==1),enabled=True,REQUEST=REQUEST)" 
     463        ><dtml-var "getCheckbox(fmName='form0',elName='obj_subobjects:int',value=_.int(metaObj.get('subobjects',1)==1),enabled=True,REQUEST=REQUEST)" 
    464464        ><div class="form-small"><dtml-var "getZMILangStr('ATTR_SUBOBJECTS')"></div 
    465465       ><dtml-else>&nbsp;</dtml-if 
    … …  
    767767          <td title="<dtml-var "getZMILangStr('ATTR_MANDATORY')">" align="center" 
    768768           ><dtml-if "oAttr['type'] in metaObjIds+['*']" 
    769             ><dtml-var "getCheckbox(fmName='form0',elName='attr_mandatory_%s:int'%oAttr['id'],value=int(oAttr.get('mandatory',0)==1),enabled=metaObj['type']=='ZMSRecordSet' and not oAttr['meta_type'],REQUEST=REQUEST)" 
     769            ><dtml-var "getCheckbox(fmName='form0',elName='attr_mandatory_%s:int'%oAttr['id'],value=_.int(oAttr.get('mandatory',0)==1),enabled=metaObj['type']=='ZMSRecordSet' and not oAttr['meta_type'],REQUEST=REQUEST)" 
    770770           ><dtml-else 
    771             ><dtml-var "getCheckbox(fmName='form0',elName='attr_mandatory_%s:int'%oAttr['id'],value=int(oAttr.get('mandatory',0)==1),enabled=not oAttr['type'] in ['constant'] and not oAttr['meta_type'],REQUEST=REQUEST)" 
     771            ><dtml-var "getCheckbox(fmName='form0',elName='attr_mandatory_%s:int'%oAttr['id'],value=_.int(oAttr.get('mandatory',0)==1),enabled=not oAttr['type'] in ['constant'] and not oAttr['meta_type'],REQUEST=REQUEST)" 
    772772           ></dtml-if 
    773773          ></td> 
    … …  
    775775           <td title="<dtml-var "getZMILangStr('ATTR_DISPLAY')"> (<dtml-var "getZMILangStr('ATTR_COL')">)" align="center" 
    776776            ><dtml-if "oAttr['type'] not in ['constant']" 
    777              ><dtml-var "getCheckbox(fmName='form0',elName='attr_custom_%s:int'%oAttr['id'],value=int(oAttr.get('custom',1)==1),enabled=not _['sequence-start'] and not oAttr['meta_type'],REQUEST=REQUEST)" 
     777             ><dtml-var "getCheckbox(fmName='form0',elName='attr_custom_%s:int'%oAttr['id'],value=_.int(oAttr.get('custom',1)==1),enabled=not _['sequence-start'] and not oAttr['meta_type'],REQUEST=REQUEST)" 
    778778            ><dtml-else 
    779779             ><dtml-var "getCheckbox(fmName='form0',elName='attr_custom_%s_:int'%oAttr['id'],value=False,enabled=False,REQUEST=REQUEST)" 
    … …  
    784784          <dtml-else> 
    785785           <td title="<dtml-var "getZMILangStr('ATTR_MULTILANG')">" align="center" 
    786             ><dtml-var "getCheckbox(fmName='form0',elName='attr_multilang_%s:int'%oAttr['id'],value=int(oAttr.get('multilang',1)==1 and not oAttr['type'] in ['constant']),enabled=not oAttr['meta_type'],REQUEST=REQUEST)" 
     786            ><dtml-var "getCheckbox(fmName='form0',elName='attr_multilang_%s:int'%oAttr['id'],value=_.int(oAttr.get('multilang',1)==1 and not oAttr['type'] in ['constant']),enabled=not oAttr['meta_type'],REQUEST=REQUEST)" 
    787787           ></td> 
    788788          </dtml-if> 
    789789          <dtml-unless "metaObj['type']=='ZMSRecordSet'"> 
    790790           <td title="<dtml-var "getZMILangStr('ATTR_REPETITIVE')">" align="center" 
    791             ><dtml-var "getCheckbox(fmName='form0',elName='attr_repetitive_%s:int'%oAttr['id'],value=int(oAttr.get('repetitive',1)==1),enabled=False,REQUEST=REQUEST)" 
     791            ><dtml-var "getCheckbox(fmName='form0',elName='attr_repetitive_%s:int'%oAttr['id'],value=_.int(oAttr.get('repetitive',1)==1),enabled=False,REQUEST=REQUEST)" 
    792792           ></td> 
    793793          </dtml-unless> 
    … …  
    950950          <td><div class="form-small"><b><dtml-var "getZMILangStr('BTN_%s'%action.upper())"></b></div></td> 
    951951          <dtml-if "action=='insert'"> 
    952            <td align="center"><dtml-var "getCheckbox(fmName='form0',elName='obj_enabled:int',value=int(metaObj['enabled']==1),enabled=True,REQUEST=REQUEST)"></td> 
     952           <td align="center"><dtml-var "getCheckbox(fmName='form0',elName='obj_enabled:int',value=_.int(metaObj['enabled']==1),enabled=True,REQUEST=REQUEST)"></td> 
    953953           <td class="form-small"> 
    954954            <textarea class="form-small" name="access_<dtml-var action>_custom" cols="80" rows="1" wrap="virtual" style="width:200px;height:20px;background-color:white;"><dtml-var "metaObj.get('access',{}).get('%s_custom'%action,'{$}')" html_quote></textarea> 

  • ZMS/trunk/dtml/ZMSMetamodelProvider/manage_metas.dtml

    r1326 r1488  
    235235    <dtml-else> 
    236236    <td class="form-small" align="center"> 
    237      <dtml-var "getCheckbox(fmName='form0',elName='attr_mandatory_%s:int'%metadictAttr['id'],value=int(metadictAttr.get('mandatory',0)==1),enabled=metadictAttr['type'] in metaobj_manager.valid_datatypes,REQUEST=REQUEST)"> 
     237     <dtml-var "getCheckbox(fmName='form0',elName='attr_mandatory_%s:int'%metadictAttr['id'],value=_.int(metadictAttr.get('mandatory',0)==1),enabled=metadictAttr['type'] in metaobj_manager.valid_datatypes,REQUEST=REQUEST)"> 
    238238    </td> 
    239239    <td class="form-small" align="center"> 
    240      <dtml-var "getCheckbox(fmName='form0',elName='attr_multilang_%s:int'%metadictAttr['id'],value=int(metadictAttr.get('multilang',0)==1),enabled=False,REQUEST=REQUEST)"> 
     240     <dtml-var "getCheckbox(fmName='form0',elName='attr_multilang_%s:int'%metadictAttr['id'],value=_.int(metadictAttr.get('multilang',0)==1),enabled=False,REQUEST=REQUEST)"> 
    241241    </td> 
    242242    <td class="form-small" align="center"> 
    243      <dtml-var "getCheckbox(fmName='form0',elName='attr_repetitive_%s:int'%metadictAttr['id'],value=int(metadictAttr.get('repetitive',0)==1),enabled=False,REQUEST=REQUEST)"> 
     243     <dtml-var "getCheckbox(fmName='form0',elName='attr_repetitive_%s:int'%metadictAttr['id'],value=_.int(metadictAttr.get('repetitive',0)==1),enabled=False,REQUEST=REQUEST)"> 
    244244    </td> 
    245245    <td class="form-small" nowrap="nowrap"> 

  • ZMS/trunk/dtml/ZMSRecordSet/actions.dtml

    r1273 r1488  
    8585   <dtml-in "REQUEST.get('qindices',[])"> 
    8686    <dtml-let seqitem=sequence-item> 
    87      <dtml-call "iqindices.append(int(seqitem))"> 
     87     <dtml-call "iqindices.append(_.int(seqitem))"> 
    8888    </dtml-let> 
    8989   </dtml-in> 

  • ZMS/trunk/dtml/ZMSRecordSet/details_grid.dtml

    r1273 r1488  
    9393         <center> 
    9494          <dtml-try> 
    95            <a href="<dtml-var "v.getHref(REQUEST)">" target="_blank"><img src="<dtml-var "v.getHref(REQUEST)">" title="<dtml-var "v.getFilename()">" width="<dtml-var "min(int(v.getWidth()),20)">" height="<dtml-var "min(int(v.getHeight()),20)">" border="0"></a> 
     95           <a href="<dtml-var "v.getHref(REQUEST)">" target="_blank"><img src="<dtml-var "v.getHref(REQUEST)">" title="<dtml-var "v.getFilename()">" width="<dtml-var "min(_.int(v.getWidth()),20)">" height="<dtml-var "min(_.int(v.getHeight()),20)">" border="0"></a> 
    9696          <dtml-except> 
    9797           <a href="<dtml-var "v.getHref(REQUEST)">" target="_blank"><img src="<dtml-var "getMimeTypeIconSrc(v.getContentType())">" title="<dtml-var "v.getFilename()">" border="0"></a> 
    … …  
    120120            <dtml-if "str(row.get(id_id,'undefined'))==str(v)"> 
    121121              <dtml-var "metaobj_record_summary(_,_,metaObj=metaObjDetail)"> 
    122               <dtml-var "string_maxlen(REQUEST['summary'],max(int(200.0/len(metaObj['attrs'])),20))"> 
     122              <dtml-var "string_maxlen(REQUEST['summary'],max(_.int(200.0/len(metaObj['attrs'])),20))"> 
    123123              <dtml-call "REQUEST.set('break',1)"> 
    124124            </dtml-if> 
    … …  
    143143       <dtml-comment>##### Grid.Default #####</dtml-comment> 
    144144       <dtml-elif "type not in ['constant']"> 
    145         <dtml-var "string_maxlen(str(v),max(int(200.0/len(metaObj['attrs'])),20)).replace('<','&lt;')"> 
     145        <dtml-var "string_maxlen(str(v),max(_.int(200.0/len(metaObj['attrs'])),20)).replace('<','&lt;')"> 
    146146       </dtml-if>&nbsp; 
    147147 

  • ZMS/trunk/dtml/ZMSRecordSet/main.dtml

    r1273 r1488  
    7272        ,'qorder':qorder 
    7373        ,'qorderdir':qorderdir 
    74         ,'qstart':qsize*int(qindex/qsize)+1 
     74        ,'qstart':qsize*_.int(qindex/qsize)+1 
    7575        ,'qindex:int':qindex}))"> 
    7676  <dtml-if manage_tabs_message><dtml-call "REQUEST.set('target_url',url_append_params(target_url,{'manage_tabs_message':manage_tabs_message}))"></dtml-if> 

  • ZMS/trunk/dtml/ZMSRecordSet/main_grid.dtml

    r1382 r1488  
    7575<table cellspacing="1" cellpadding="1" border="0" class="neutralColorStrong" width="100%"> 
    7676<colgroup> 
    77  <col width="<dtml-var "24*(int('delete' in grid_options or 'export' in grid_options))">"/> 
    78  <col width="<dtml-var "24*(int('delete' in grid_options)+int('update' in grid_options)+int(qorder=='sort_id')+int('choose' in grid_options))">"/> 
     77 <col width="<dtml-var "24*(_.int('delete' in grid_options or 'export' in grid_options))">"/> 
     78 <col width="<dtml-var "24*(_.int('delete' in grid_options)+_.int('update' in grid_options)+_.int(qorder=='sort_id')+_.int('choose' in grid_options))">"/> 
    7979</colgroup> 
    8080 
    … …  
    261261         <center> 
    262262          <dtml-try> 
    263            <a href="<dtml-var "v.getHref(REQUEST)">" target="_blank"><img src="<dtml-var "v.getHref(REQUEST)">" title="<dtml-var "v.getFilename()">" width="<dtml-var "_.min(int(v.getWidth()),20)">" height="<dtml-var "_.min(int(v.getHeight()),20)">" border="1" align="absmiddle"></a> 
     263           <a href="<dtml-var "v.getHref(REQUEST)">" target="_blank"><img src="<dtml-var "v.getHref(REQUEST)">" title="<dtml-var "v.getFilename()">" width="<dtml-var "_.min(_.int(v.getWidth()),20)">" height="<dtml-var "_.min(_.int(v.getHeight()),20)">" border="1" align="absmiddle"></a> 
    264264          <dtml-except> 
    265265           <a href="<dtml-var "v.getHref(REQUEST)">" target="_blank"><img src="<dtml-var "getMimeTypeIconSrc(v.getContentType())">" title="<dtml-var "v.getFilename()">" border="1" align="absmiddle"></a> 
    … …  
    289289             <dtml-if "str(row.get(id_id,'undefined'))==str(v)"> 
    290290              <dtml-var metaobj_record_summary> 
    291               <dtml-var "string_maxlen(REQUEST['summary'],max(int(200.0/len(metaObj['attrs'])),20))"> 
     291              <dtml-var "string_maxlen(REQUEST['summary'],max(_.int(200.0/len(metaObj['attrs'])),20))"> 
    292292              <dtml-call "REQUEST.set('break',1)"> 
    293293             </dtml-if> 
    … …  
    313313      <dtml-comment>##### Grid.Default #####</dtml-comment> 
    314314       <dtml-else> 
    315         <dtml-var "string_maxlen(str(v),max(int(200.0/len(metaObj['attrs'])),20)).replace('<','&lt;')"> 
     315        <dtml-var "string_maxlen(str(v),max(_.int(200.0/len(metaObj['attrs'])),20)).replace('<','&lt;')"> 
    316316       </dtml-if>&nbsp; 
    317317 

  • ZMS/trunk/dtml/ZMSRecordSet/record_select.dtml

    r1234 r1488  
    6565             <dtml-if "str(row.get(id_id,'undefined'))==str(v)"> 
    6666              <dtml-var metaobj_record_summary> 
    67               <dtml-var "string_maxlen(REQUEST['summary'],max(int(200.0/len(metaObj['attrs'])),20))"> 
     67              <dtml-var "string_maxlen(REQUEST['summary'],max(_.int(200.0/len(metaObj['attrs'])),20))"> 
    6868             </dtml-if> 
    6969            <dtml-except></dtml-try> 

  • ZMS/trunk/dtml/ZMSSqlDb/input_form.dtml

    r1403 r1488  
    423423       <dtml-call "REQUEST.set('sqlStatement',''.join(sqlStatement))"> 
    424424       <dtml-in "query(sqlStatement)['records']" 
    425         ><dtml-let row=sequence-item maxlen="int(fk.get('maxlen',25))" 
     425        ><dtml-let row=sequence-item maxlen="_.int(fk.get('maxlen',25))" 
    426426         ><dtml-unless "row['qvalue']==None"  
    427427         ><dtml-try 
    … …  
    558558         ></dtml-try 
    559559        ></dtml-unless 
    560         ><dtml-let fk="dst['fk']" maxlen="int(fk.get('maxlen',25))" 
     560        ><dtml-let fk="dst['fk']" maxlen="_.int(fk.get('maxlen',25))" 
    561561         ><dtml-call "REQUEST.set('sqlStatement',[])" 
    562562         ><dtml-call "sqlStatement.append('SELECT ' + fk.get('fieldname') + ' AS qkey, ' + fk.get('displayfield') + ' AS qvalue ')" 

  • ZMS/trunk/dtml/ZMSSqlDb/manage_configuration.dtml

    r1288 r1488  
    328328          ></td> 
    329329          <td title="<dtml-var "getZMILangStr('ATTR_DISPLAY')">" align="center" 
    330            ><dtml-var "getCheckbox(fmName='form0',elName='attr_display_%s:int'%column['id'],value=int(column.get('hide',0)==0),enabled=_.True,REQUEST=REQUEST)" 
     330           ><dtml-var "getCheckbox(fmName='form0',elName='attr_display_%s:int'%column['id'],value=_.int(column.get('hide',0)==0),enabled=_.True,REQUEST=REQUEST)" 
    331331          ></td> 
    332332          <td class="form-small" 
    … …  
    344344            <col width="80%"/> 
    345345           </colgroup 
    346            ><dtml-let blob="column.get('blob',{})" style="int(not column.has_key('blob'))*'style=\042display:none;\042'" 
     346           ><dtml-let blob="column.get('blob',{})" style="_.int(not column.has_key('blob'))*'style=\042display:none;\042'" 
    347347            ><tr id="tr_blob_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    348348             ><td class="form-small" nowrap="nowrap">Type</td 
    … …  
    358358            ></tr 
    359359           ></dtml-let 
    360            ><dtml-let details="column.get('details',{})" style="int(not column.has_key('details'))*'style=\042display:none;\042'" 
     360           ><dtml-let details="column.get('details',{})" style="_.int(not column.has_key('details'))*'style=\042display:none;\042'" 
    361361            ><tr id="tr_details_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    362362             ><td class="form-small" nowrap="nowrap">Tablename</td 
    … …  
    368368            ></tr 
    369369           ></dtml-let 
    370            ><dtml-let fk="column.get('fk',{})" style="int(not column.has_key('fk'))*'style=\042display:none;\042'" 
     370           ><dtml-let fk="column.get('fk',{})" style="_.int(not column.has_key('fk'))*'style=\042display:none;\042'" 
    371371            ><tr id="tr_fk_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    372372             ><td class="form-small" nowrap="nowrap">A.Tablename</td 
    … …  
    387387            ><tr id="tr_fk_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    388388             ><td class="form-small" nowrap="nowrap">A.Editable</td 
    389              ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_fk_editable_%s:int'%column['id'],value=int(fk.get('editable',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
     389             ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_fk_editable_%s:int'%column['id'],value=_.int(fk.get('editable',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
    390390            ></tr 
    391391            ><tr id="tr_fk_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    392392             ><td class="form-small" nowrap="nowrap">A.Lazy</td 
    393              ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_fk_lazy_%s:int'%column['id'],value=int(fk.get('lazy',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
     393             ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_fk_lazy_%s:int'%column['id'],value=_.int(fk.get('lazy',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
    394394            ></tr 
    395395            ><tr id="tr_fk_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    396396             ><td class="form-small" nowrap="nowrap">B.MySQL-Set</td 
    397              ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_fk_mysqlset_%s:int'%column['id'],value=int(fk.get('mysqlset',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
     397             ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_fk_mysqlset_%s:int'%column['id'],value=_.int(fk.get('mysqlset',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
    398398            ></tr 
    399399            ><tr id="tr_fk_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    … …  
    402402            ></tr 
    403403            ></dtml-let 
    404            ><dtml-let multiselect="column.get('multiselect',{})" style="int(not column.has_key('multiselect'))*'style=\042display:none;\042'" 
     404           ><dtml-let multiselect="column.get('multiselect',{})" style="_.int(not column.has_key('multiselect'))*'style=\042display:none;\042'" 
    405405            ><tr id="tr_multiselect_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    406406             ><td class="form-small" nowrap="nowrap">A.Tablename</td 
    … …  
    413413            ><tr id="tr_multiselect_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    414414             ><td class="form-small" nowrap="nowrap">A.Lazy</td 
    415              ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_multiselect_lazy_%s:int'%column['id'],value=int(multiselect.get('lazy',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
     415             ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_multiselect_lazy_%s:int'%column['id'],value=_.int(multiselect.get('lazy',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
    416416            ></tr 
    417417            ><tr id="tr_multiselect_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    418418             ><td class="form-small" nowrap="nowrap">B.MySQL-Set</td 
    419              ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_multiselect_mysqlset_%s:int'%column['id'],value=int(multiselect.get('mysqlset',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
     419             ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_multiselect_mysqlset_%s:int'%column['id'],value=_.int(multiselect.get('mysqlset',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
    420420            ></tr 
    421421           ></dtml-let 
    422            ><dtml-let multimultiselect="column.get('multimultiselect',{})" style="int(not column.has_key('multimultiselect'))*'style=\042display:none;\042'" 
     422           ><dtml-let multimultiselect="column.get('multimultiselect',{})" style="_.int(not column.has_key('multimultiselect'))*'style=\042display:none;\042'" 
    423423            ><tr id="tr_multimultiselect_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    424424             ><td class="form-small" nowrap="nowrap">Foreign Key</td 
    … …  
    457457                 ><td class="form-small"><input class="form-small" type="text" name="attr_multimultiselect_tables_displayfield_<dtml-var sx>_<dtml-var "column['id']">" value="<dtml-var "si.get('displayfield','')">" size="5"></td 
    458458                 ><td class="form-small"><input class="form-small" type="text" name="attr_multimultiselect_tables_label_<dtml-var sx>_<dtml-var "column['id']">" value="<dtml-var "si.get('label','')">" size="5"></td 
    459                  ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_multimultiselect_tables_lazy_%i_%s:int'%(sx,column['id']),value=int(si.get('lazy',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
     459                 ><td class="form-small"><dtml-var "getCheckbox(fmName='form0',elName='attr_multimultiselect_tables_lazy_%i_%s:int'%(sx,column['id']),value=_.int(si.get('lazy',0)==1),enabled=_.True,REQUEST=REQUEST)"></td 
    460460                 ><td align="center" title="<dtml-var "getZMILangStr('ATTR_DISPLAY')"> (<dtml-var "getZMILangStr('ATTR_COL')">)" 
    461461                  ><input class="form-checkbox" type="checkbox" name="attr_multimultiselect_tables_display_<dtml-var sx>_<dtml-var "column['id']">:int" value="1" <dtml-unless "si.get('hide')">checked="checked"</dtml-unless> 
    … …  
    482482            ></tr 
    483483           ></dtml-let 
    484            ><dtml-let pk="column.get('pk',{})" style="int(not column.has_key('pk'))*'style=\042display:none;\042'" 
     484           ><dtml-let pk="column.get('pk',{})" style="_.int(not column.has_key('pk'))*'style=\042display:none;\042'" 
    485485            ><tr id="tr_pk_<dtml-var "column['id']">" class="zmiNeutralColorLight0" <dtml-var style> 
    486486             ><td class="form-small" nowrap="nowrap">Auto</td 

  • ZMS/trunk/dtml/ZMSWorkflowProvider/manage_main.dtml

    r1433 r1488  
    231231           <dtml-in "getActivities()" mapping> 
    232232           <dtml-let sidx=sequence-index> 
    233             <td align="center" class="form-small" width="<dtml-var "int(100/len(getActivities()))">%" nowrap="nowrap" 
     233            <td align="center" class="form-small" width="<dtml-var "_.int(100/len(getActivities()))">%" nowrap="nowrap" 
    234234             ><dtml-if "id==itm['id']" 
    235235              ><table cellspacing="0" cellpadding="0" border="0" width="100%" 

  • ZMS/trunk/dtml/objattrs/f_select_displaytype.dtml

    r1361 r1488  
    2727    ><dtml-let i=sequence-item key="displaytypes[i*2]" value="displaytypes[i*2+1]" 
    2828     ><a href="javascript:displaytypeBtnClick('<dtml-var key>',<dtml-var value>)" class="button" 
    29       ><img id="btn_displaytype_<dtml-var key>" src="<dtml-var MISC_ZMS>btn_displaytype_<dtml-var key>.gif" class="button<dtml-var "int(dctDisplaytype.get(str(displaytype),'top')==key)">" 
     29      ><img id="btn_displaytype_<dtml-var key>" src="<dtml-var MISC_ZMS>btn_displaytype_<dtml-var key>.gif" class="button<dtml-var "_.int(dctDisplaytype.get(str(displaytype),'top')==key)">" 
    3030     ></a 
    3131    ></dtml-let 

  • ZMS/trunk/dtml/objattrs/f_select_image.dtml

    r1362 r1488  
    160160                                                <input type="hidden" id="width_<dtml-var elName>" name="width_<dtml-var elName>:int" value="<dtml-var "value.width">"/> 
    161161                                                <input type="hidden" id="height_<dtml-var elName>" name="height_<dtml-var elName>:int" value="<dtml-var "value.height">"/> 
    162                                                 <a href="javascript:ZMSGraphic_extEdit_action('<dtml-var elName>','<dtml-if ZMS_INSERT>meta_id=<dtml-var ZMS_INSERT>&</dtml-if>lang=<dtml-var lang>&key=<dtml-var key>&form_id=<dtml-var "REQUEST.get('ZMI_TIME')">',<dtml-var "int(pilutil().enabled())">)" class="ZMSGraphic_extEdit_action" 
     162                                                <a href="javascript:ZMSGraphic_extEdit_action('<dtml-var elName>','<dtml-if ZMS_INSERT>meta_id=<dtml-var ZMS_INSERT>&</dtml-if>lang=<dtml-var lang>&key=<dtml-var key>&form_id=<dtml-var "REQUEST.get('ZMI_TIME')">',<dtml-var "_.int(pilutil().enabled())">)" class="ZMSGraphic_extEdit_action" 
    163163                                                        ><img id="img_<dtml-var elName>" src="<dtml-var "value.getHref(REQUEST)">" 
    164                                                                 <dtml-if "max([int(value.width),int(value.height)])>80"> 
    165                                                                         <dtml-if "int(value.width)>int(value.height)"> 
     164                                                                <dtml-if "max([_.int(value.width),_.int(value.height)])>80"> 
     165                                                                        <dtml-if "_.int(value.width)>_.int(value.height)"> 
    166166                                                                                width="80" 
    167167                                                                        <dtml-else> 

  • ZMS/trunk/dtml/objattrs/f_select_object.dtml

    r1456 r1488  
    3232     ><input class="form-checkbox" type="checkbox" name="ids:list" value="<dtml-var id>" onclick="zmiActionButtonsRefresh(this)" 
    3333     ><dtml-let l="['CAPTION_EDIT','ACTION_SELECT']" 
    34       ><a name="_<dtml-var id>" class="zmi" href="<dtml-var id>/manage_main?lang=<dtml-var lang>" onclick="javascript:return confirmChanges();" title="<dtml-var "getZMILangStr('CAPTION_EDIT')%display_type(REQUEST)">" title="<dtml-var "getZMILangStr(l[int(isPage())])%display_type(REQUEST)">" 
     34      ><a name="_<dtml-var id>" class="zmi" href="<dtml-var id>/manage_main?lang=<dtml-var lang>" onclick="javascript:return confirmChanges();" title="<dtml-var "getZMILangStr('CAPTION_EDIT')%display_type(REQUEST)">" title="<dtml-var "getZMILangStr(l[_.int(isPage())])%display_type(REQUEST)">" 
    3535      ><dtml-var f_display_icon 
    3636       ><dtml-if "objAttr.get('repetitive',0)==1" 

  • ZMS/trunk/dtml/object/f_recordset_grid.dtml

    r1308 r1488  
    243243       <dtml-else> 
    244244        <dtml-try> 
    245          <dtml-let sv="str(v)" u="string_maxlen(sv,max(int(200.0/len(grid_cols)),grid_col.get('minsize',20)))" 
     245         <dtml-let sv="str(v)" u="string_maxlen(sv,max(_.int(200.0/len(grid_cols)),grid_col.get('minsize',20)))" 
    246246          ><dtml-if "sv.startswith('Set([') and sv.endswith('])')" 
    247247           ><dtml-var "', '.join(map(lambda x: str(x), list(v)))" 

  • ZMS/trunk/dtml/object/f_submitinputfields.dtml

    r1273 r1488  
    7474       <dtml-if "len(seq_desc_langs)>1"> 
    7575        &nbsp; 
    76          <img name="coverageBtn" src="<dtml-var MISC_ZMS>btn_multilang<dtml-var "int(coverage.find('global.')==0)">.gif" title="<dtml-var "getZMILangStr('ATTR_MULTILANG')">" align="absmiddle"> 
     76         <img name="coverageBtn" src="<dtml-var MISC_ZMS>btn_multilang<dtml-var "_.int(coverage.find('global.')==0)">.gif" title="<dtml-var "getZMILangStr('ATTR_MULTILANG')">" align="absmiddle"> 
    7777         <label for="attr_dc_coverage"><dtml-if "getParentLanguage(seq_lang)==''">global<dtml-else>local</dtml-if></label> 
    7878         <dtml-if "lang==seq_lang"> 
    … …  
    8282             title="<dtml-var "getZMILangStr('ATTR_LANGS')">: <dtml-in seq_desc_langs><dtml-var sequence-item><dtml-unless sequence-end>, </dtml-unless></dtml-in>"> 
    8383          <dtml-else> 
    84            <input id="attr_dc_coverage" type="checkbox" disabled="disabled" <dtml-if "int(coverage.find('global.')==0)">checked="checked"</dtml-if> 
     84           <input id="attr_dc_coverage" type="checkbox" disabled="disabled" <dtml-if "_.int(coverage.find('global.')==0)">checked="checked"</dtml-if> 
    8585             title="<dtml-var "getZMILangStr('ATTR_LANGS')">: <dtml-in seq_desc_langs><dtml-var sequence-item><dtml-unless sequence-end>, </dtml-unless></dtml-in>"> 
    8686          </dtml-if> 
    8787         <dtml-else> 
    88            <input id="attr_dc_coverage" type="checkbox" disabled="disabled" <dtml-if "int(coverage.find('global.')==0)">checked="checked"</dtml-if> 
     88           <input id="attr_dc_coverage" type="checkbox" disabled="disabled" <dtml-if "_.int(coverage.find('global.')==0)">checked="checked"</dtml-if> 
    8989             title="<dtml-var "getZMILangStr('ATTR_LANGS')">: <dtml-in seq_desc_langs><dtml-var sequence-item><dtml-unless sequence-end>, </dtml-unless></dtml-in>"> 
    9090         </dtml-if> 

  • ZMS/trunk/dtml/object/manage_page_footer.dtml

    r1465 r1488  
    1717 </select> 
    1818 <dtml-if ZMI_TIME> 
    19  |&nbsp;<dtml-var "float(int((ZopeTime().timeTime()-ZMI_TIME)*100.0)/100.0)"> secs. 
     19 |&nbsp;<dtml-var "ZopeTime().timeTime()-ZMI_TIME" fmt="%.2f"> secs. 
    2020 </dtml-if> 
    2121 <dtml-if meta_id> 

  • ZMS/trunk/dtml/object/manage_tabs.dtml

    r1328 r1488  
    5656<li<dtml-if "REQUEST.get('dtpref_system','0')=='1'"> class="on"</dtml-if>><a href="manage_dtpref?key=dtpref_system&lang=<dtml-var lang>" <dtml-if "REQUEST.get('dtpref_sitemap','0')=='1'">target="_parent"</dtml-if>><img src="<dtml-var MISC_ZMS>zexpdoc.gif" title="System" border="0" width="14" height="14" /></a></li></dtml-if> 
    5757<li<dtml-if "REQUEST.get('dtpref_sitemap','0')=='1'"> class="on"</dtml-if>><a href="manage_dtpref?key=dtpref_sitemap&lang=<dtml-var lang>" <dtml-if "REQUEST.get('dtpref_sitemap','0')=='1'">target="_parent"</dtml-if>><img src="<dtml-var MISC_ZMS>op_sitemap.gif" title="<dtml-var "content.getZMILangStr('TAB_SITEMAP')">" border="0" width="14" height="14" /></a></li> 
    58 <li<dtml-if "URL.find(getTrashcan().id+'/')>0"> class="on"</dtml-if>><a href="<dtml-var "getTrashcan().absolute_url()">/manage_main?lang=<dtml-var lang>"><img src="<dtml-var MISC_ZMS>op_trashcan<dtml-var "int(getTrashcan().isActive(REQUEST))">.gif" title="<dtml-var "content.getZMILangStr('TYPE_ZMSTRASHCAN')">" border="0" width="14" height="14" /></a></li> 
     58<li<dtml-if "URL.find(getTrashcan().id+'/')>0"> class="on"</dtml-if>><a href="<dtml-var "getTrashcan().absolute_url()">/manage_main?lang=<dtml-var lang>"><img src="<dtml-var MISC_ZMS>op_trashcan<dtml-var "_.int(getTrashcan().isActive(REQUEST))">.gif" title="<dtml-var "content.getZMILangStr('TYPE_ZMSTRASHCAN')">" border="0" width="14" height="14" /></a></li> 
    5959</ul> 
    6060</div> 

  • ZMS/trunk/plugins/fileupload/ajax_upload/input.dtml

    r1287 r1488  
    6666                                                        var img = eval('('+data+')'); 
    6767                                                        var elParams = '<dtml-if ZMS_INSERT>meta_id=<dtml-var ZMS_INSERT>&</dtml-if>lang=<dtml-var lang>&key=<dtml-var key>&form_id=<dtml-var "REQUEST.get('ZMI_TIME')">'; 
    68                                                         ZMSGraphic_extEdit_set('<dtml-var elName>', img['src'], img['filename'], img['width'], img['height'],elParams,<dtml-var "int(pilutil().enabled())">); 
     68                                                        ZMSGraphic_extEdit_set('<dtml-var elName>', img['src'], img['filename'], img['width'], img['height'],elParams,<dtml-var "_.int(pilutil().enabled())">); 
    6969                                                } 
    7070                                        ); 
Note: See TracChangeset for help on using the changeset viewer.