Changeset 1773 for ZMS


Ignore:
Timestamp:
15.12.2011 22:15:32 (5 months ago)
Author:
zmsdev
Message:

minor fixes for zmi (2)

Location:
ZMS/trunk
Files:
3 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • ZMS/trunk/dtml/ZMSContainerObject/manage_main_change.dtml

    r1225 r1773  
    33 
    44<dtml-comment>#####  Author & Date  #############################</dtml-comment> 
    5 <dtml-let info="[]"> 
    6 <dtml-if "getObjProperty('change_uid',REQUEST)"> 
    7  <dtml-call "info.append(string_maxlen(getObjProperty('change_uid',REQUEST),15)+'\n')"> 
     5<dtml-let info="[]" change_uid="attr('change_uid')" change_dt="attr('change_dt')"> 
     6<dtml-if change_uid> 
     7 <dtml-call "info.append(string_maxlen(change_uid,15)+'\n')"> 
    88</dtml-if> 
    9 <dtml-if "getObjProperty('change_dt',REQUEST)"> 
    10  <dtml-call "info.append(getLangFmtDate(getObjProperty('change_dt',REQUEST),manage_lang,'SHORTDATETIME_FMT')+'\n')"> 
     9<dtml-if change_dt> 
     10 <dtml-if "daysBetween(change_dt,ZopeTime())>getConfProperty('ZMS.shortDateFormat.daysBetween',5)"> 
     11  <dtml-call "info.append('<span title=\042'+getLangFmtDate(change_dt,manage_lang,'SHORTDATETIME_FMT')+'\042>'+getLangFmtDate(change_dt,manage_lang,'SHORTDATE_FMT')+'</span>\n')"> 
     12 <dtml-else> 
     13  <dtml-call "info.append(getLangFmtDate(change_dt,manage_lang,'SHORTDATETIME_FMT')+'\n')"> 
     14 </dtml-if> 
    1115</dtml-if> 
    1216<dtml-if lenChildNodes> 
    1317 <dtml-call "info.append('%i %s\n'%(lenChildNodes,getZMILangStr('ATTR_OBJECTS')))"> 
    1418</dtml-if> 
    15 <dtml-comment> 
    16 <dtml-if "isPage()"> 
    17  <dtml-call "info.append('%i %s\n'%(len(getChildNodes(REQUEST)),getZMILangStr('ATTR_OBJECTS')))"> 
    18 <dtml-else> 
    19  <dtml-call "info.append(getDataSizeStr(get_size(REQUEST))+'\n')"> 
    20 </dtml-if> 
    21 </dtml-comment> 
    2219<div class="form-small"><dtml-var "''.join(info)" newline_to_br></div> 
    2320</dtml-let> 

  • ZMS/trunk/dtml/objattrs/f_select_align.dtml

    r750 r1773  
    11<script language="javascript"> 
    2 <!--// 
    32 
    4   function switchAlignBtns( fmName) { 
    5       var fm = document.forms[ fmName]; 
    6       for (i=0; i<document.images.length; i++) { 
    7           sName = document.images[i].name; 
    8           iAlignBtn = sName.indexOf("AlignBtn") 
    9           if (iAlignBtn > 0) { 
    10               align= sName.substring(0,iAlignBtn).toLowerCase(); 
    11               if (fm.textalign.value.toLowerCase()!=align) 
    12                   document.images[i].src = '<dtml-var MISC_ZMS>icon_align_' + align.toLowerCase() + '.gif'; 
    13               else 
    14                   document.images[i].src = '<dtml-var MISC_ZMS>icon_align_' + align.toLowerCase() + '_on.gif'; 
    15           } 
    16       } 
    17   } 
     3function alignBtnClick( sender, align) { 
     4        var fm = $($(sender).parents("form")[0]); 
     5        $("input[name=textalign]").val(align.toUpperCase()); 
     6        $("img[name$=AlignBtn].button1") 
     7                .removeClass("button1") 
     8                .addClass("button0"); 
     9        $("img[name="+align.toLowerCase()+"AlignBtn]") 
     10                .removeClass("button0") 
     11                .addClass("button1"); 
     12} 
    1813 
    19   function alignBtnClick( fmName, align) { 
    20       var fm = document.forms[ fmName]; 
    21       fm.textalign.value = align.toUpperCase(); 
    22       switchAlignBtns( fmName); 
    23   } 
    24  
    25 //--> 
    2614</script> 
    2715 
    … …  
    3220   <dtml-in "['left','right','center']"> 
    3321    <td valign="middle" 
    34      ><a href="javascript:alignBtnClick('<dtml-var fmName>','<dtml-var sequence-item>')" class="button" 
     22     ><a href="javascript:alignBtnClick(this,'<dtml-var sequence-item>')" class="button" 
    3523      ><img name="<dtml-var sequence-item>AlignBtn" border="0" align="absmiddle" 
    36        <dtml-if "_.has_key('textalign') and _['textalign'].lower()==_['sequence-item'].lower()"> 
    37         src="<dtml-var MISC_ZMS>icon_align_<dtml-var sequence-item>_on.gif" 
    38        <dtml-else> 
    39         src="<dtml-var MISC_ZMS>icon_align_<dtml-var sequence-item>.gif" 
    40        </dtml-if> 
     24       class="button<dtml-var "_.int(_.has_key('textalign') and _['textalign'].lower()==_['sequence-item'].lower())">" 
     25       src="<dtml-var MISC_ZMS>icon_align_<dtml-var sequence-item>.gif" 
    4126       title="<dtml-var "getZMILangStr('ALIGN%i'%(_['sequence-index']+1))">" 
    4227     ></a 
    … …  
    4429   </dtml-in> 
    4530  <dtml-else> 
    46    <td valign="middle"><img border="0" src="<dtml-var MISC_ZMS>icon_align_<dtml-var "textalign.lower()">_on.gif"></td> 
     31   <td valign="middle"><img border="0" class="button1" src="<dtml-var MISC_ZMS>icon_align_<dtml-var "textalign.lower()">.gif"></td> 
    4732  </dtml-if> 
    4833  <td> &nbsp; </td> 

  • ZMS/trunk/dtml/object/manage_page_request.dtml

    r1756 r1773  
    33><dtml-call "RESPONSE.setHeader('Pragma', 'no-cache')" 
    44 
     5><dtml-call "REQUEST.set( 'preview','preview')" 
    56><dtml-call "REQUEST.set('ZMI_TIME',ZopeTime().timeTime())" 
    67><dtml-call "REQUEST.set('ZMS_CHARSET',REQUEST.get('ZMS_CHARSET','utf-8'))" 

  • ZMS/trunk/dtml/versionmanager/version_object_state.dtml

    r1321 r1773  
    1616</dtml-comment> 
    1717<dtml-if "len(getLangIds())>1"> 
    18 <dtml-if "getObjProperty('change_uid',REQUEST)"> 
     18<dtml-if "attr('change_uid')"> 
    1919<dtml-let coverage="getDCCoverage(REQUEST)" 
    2020          seq_lang="coverage[coverage.find('.')+1:]" 
    … …  
    5252<dtml-unless "getAutocommit()"> 
    5353<dtml-unless ZMS_VERSION> 
    54 <dtml-let wfStates="getWfStates(REQUEST)" 
    55 ><dtml-if "getObjProperty('work_uid',REQUEST)" 
    56 ><dtml-if "getObjProperty('work_dt',REQUEST)" 
     54<dtml-let wfStates="getWfStates(REQUEST)" work_uid="attr('work_uid')" work_dt="attr('work_dt')" 
     55><dtml-if work_uid 
     56><dtml-if work_dt 
    5757><dtml-in wfStates 
    5858><dtml-let wfState=sequence-item itm="getWfActivity(wfState)" 
    5959><dtml-if "itm.get('icon')"> 
    60 <img src="<dtml-var "itm['icon']">" title="<dtml-var "itm['name']"> <dtml-var "getZMILangStr('BY')"> <dtml-var "getObjProperty('work_uid',REQUEST)"> (<dtml-var "getLangFmtDate(getObjProperty('work_dt',REQUEST))">)" border="0" align="absmiddle" /> 
     60<img src="<dtml-var "itm['icon']">" title="<dtml-var "itm['name']"> <dtml-var "getZMILangStr('BY')"> <dtml-var work_uid> (<dtml-var "getLangFmtDate(work_dt)">)" border="0" align="absmiddle" /> 
    6161</dtml-if 
    6262></dtml-let 
    … …  
    8989<dtml-if "getHistory()"> 
    9090<dtml-if "REQUEST.form.has_key('ZMS_VERSION_%s'%id)"><b><i></dtml-if> 
    91 v.<dtml-var "getObjProperty('master_version',REQUEST)">.<dtml-var "getObjProperty('major_version',REQUEST)">.<dtml-var "getObjProperty('minor_version',REQUEST)"><dtml-if "REQUEST.get('ZMS_VERSION_%s'%id,'').find(str(version_live_id))>=0"> - <dtml-var "getZMILangStr('TAB_LIVE')"><dtml-elif "REQUEST.get('ZMS_VERSION_%s'%id,'').find(str(version_work_id))>=0"> - <dtml-var "getZMILangStr('TAB_PREVIEW')"></dtml-if> 
     91v.<dtml-var "attr('master_version')">.<dtml-var "attr('major_version')">.<dtml-var "attr('minor_version')"><dtml-if "REQUEST.get('ZMS_VERSION_%s'%id,'').find(str(version_live_id))>=0"> - <dtml-var "getZMILangStr('TAB_LIVE')"><dtml-elif "REQUEST.get('ZMS_VERSION_%s'%id,'').find(str(version_work_id))>=0"> - <dtml-var "getZMILangStr('TAB_PREVIEW')"></dtml-if> 
    9292<dtml-if "REQUEST.form.has_key('ZMS_VERSION_%s'%id)"></i></b></dtml-if> 
    9393</dtml-if> 
    … …  
    9898+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+- 
    9999</dtml-comment> 
    100 <dtml-var "getObjProperty('version_object_state',REQUEST)"> 
     100<dtml-var "attr('version_object_state')"> 
    101101<dtml-try><dtml-var my_version_object_state><dtml-except></dtml-try> 

  • ZMS/trunk/plugins/www/manage_page_style-min.css

    r1751 r1773  
    7272img.hbutton,a.hbutton img{width:20px;height:8px} 
    7373a.button img{padding:2px;border:none} 
    74 img.button,a.button:link img,a.button:visited img,img.vbutton,a.vbutton:link img,a.vbutton:visited img,img.hbutton,a.hbutton:link img,a.hbutton:visited img{border-top:solid 1px #E6E4E6;border-left:solid 1px #E6E4E6;border-right:solid 1px #B6B4B6;border-bottom:solid 1px #B6B4B6} 
    75 a.button:hover img,a.button:active img,a.vbutton:hover img,a.vbutton:active img,a.hbutton:hover img,a.hbutton:active img{background-color:#E8E8E8;border-top:solid 1px #FFF;border-left:solid 1px #FFF;border-right:solid 1px #000;border-bottom:solid 1px #000} 
    76 img.button0,a.button:link img.button0,a.button:visited img.button0{border-top:solid 1px #E6E4E6;border-left:solid 1px #E6E4E6;border-right:solid 1px #B6B4B6;border-bottom:solid 1px #B6B4B6} 
    77 img.button1,a.button:hover img.button0,a.button:active img.button0,a.button:link img.button1,a.button:visited img.button1,a.button:hover img.button1,a.button:active img.button1{background-color:#F2F3EE;border-top:solid 1px black;border-left:solid 1px black;border-right:solid 1px white;border-bottom:solid 1px white} 
     74a.button:hover img,a.button:active img,a.vbutton:hover img,a.vbutton:active img,a.hbutton:hover img,a.hbutton:active img{background-color:#DFF1FF} 
     75img.button0,a.button img.button0{} 
     76img.button1,a.button img.button1{background-color:#A3D7FF} 
     77a.button:hover img.button0,a.button:hover img.button1{background-color:#DFF1FF} 
    7878.zmiHSep{background-color:#B6B4B6;border-bottom:#E6E4E6 solid 1px} 
    7979.zmiVSep{background-color:#B6B6B6;border-right:solid #E6E4E6 1px;height:22px;width:1px} 

  • ZMS/trunk/plugins/www/manage_page_style.css

    r1751 r1773  
    381381} 
    382382 
    383 img.button, a.button:link img, a.button:visited img, 
    384 img.vbutton, a.vbutton:link img, a.vbutton:visited img, 
    385 img.hbutton, a.hbutton:link img, a.hbutton:visited img { 
    386         border-top: solid 1px #E6E4E6; 
    387         border-left: solid 1px #E6E4E6; 
    388         border-right: solid 1px #B6B4B6; 
    389         border-bottom: solid 1px #B6B4B6; 
    390 } 
    391383a.button:hover img, a.button:active img, 
    392384a.vbutton:hover img, a.vbutton:active img, 
    393385a.hbutton:hover img, a.hbutton:active img { 
    394         background-color: #E8E8E8; 
    395         border-top: solid 1px #FFF; 
    396         border-left: solid 1px #FFF; 
    397         border-right: solid 1px #000; 
    398         border-bottom: solid 1px #000; 
    399 } 
    400  
    401 img.button0, 
    402 a.button:link img.button0, a.button:visited img.button0 { 
    403         border-top: solid 1px #E6E4E6; 
    404         border-left: solid 1px #E6E4E6; 
    405         border-right: solid 1px #B6B4B6; 
    406         border-bottom: solid 1px #B6B4B6; 
    407 } 
    408 img.button1, 
    409 a.button:hover img.button0, a.button:active img.button0, 
    410 a.button:link img.button1, a.button:visited img.button1, 
    411 a.button:hover img.button1, a.button:active img.button1 { 
    412         background-color: #F2F3EE; 
    413         border-top: solid 1px black; 
    414         border-left: solid 1px black; 
    415         border-right: solid 1px white; 
    416         border-bottom: solid 1px white; 
     386        background-color: #DFF1FF; 
     387} 
     388 
     389img.button0, a.button img.button0 { 
     390} 
     391img.button1, a.button img.button1 { 
     392        background-color: #A3D7FF; 
     393} 
     394a.button:hover img.button0, 
     395a.button:hover img.button1 { 
     396        background-color: #DFF1FF; 
    417397} 
    418398 
Note: See TracChangeset for help on using the changeset viewer.