Changeset 794 for ZMS/trunk/dtml/ZMS/manage_customizesvnform.dtml

Timestamp:

16.11.2009 15:50:56 (3 years ago)

Author:

cmeier

Message:

zms-2.12.1-01

File:

• ZMS/trunk/dtml/ZMS/manage_customizesvnform.dtml (modified) (3 diffs)

ZMS/trunk/dtml/ZMS/manage_customizesvnform.dtml

@@ -7 +7 @@
 <dtml-var f_bo_area>
 
-<dtml-let basepath="getConfProperty('SVN.path','')" dicon="{
+<dtml-let homeId="getHome().id" basepath="getConfProperty('SVN.path','')" dicon="{
+          'conflict':'%sico_warning.gif'%MISC_ZMS,
           'DTML Method':'/misc_/OFSP/dtmlmethod.gif',
-          'Script (Python)':'/misc_/PythonScripts/pyscript.gif'
-        }"
-      daction="{
-          'delete':'delete1',
+          'Script (Python)':'/misc_/PythonScripts/pyscript.gif',
+          'ZMSMetamodelProvider':'%sZMSMetamodelProvider.gif'%MISC_ZMS,
         }">
 
@@ -23 +22 @@
 
 <dtml-if "action=='outgoing'">
- <dtml-call "REQUEST.set('l',svnCopy(getHome(),getConfProperty(conf_key,conf_value)+'/'+getHome().id))">
+ <dtml-call "REQUEST.set('l',svnCopy(getHome(),getConfProperty(conf_key,conf_value)+'/'+homeId))">
  <dtml-call "REQUEST.set('headline','Copy to Location')">
 <dtml-else>
- <dtml-call "REQUEST.set('l',svnUpdate(getHome(),getConfProperty(conf_key,conf_value)+'/'+getHome().id))">
+ <dtml-call "REQUEST.set('l',svnUpdate(getHome(),getConfProperty(conf_key,conf_value)+'/'+homeId))">
  <dtml-call "REQUEST.set('headline','Update from Location')">
 </dtml-if>
@@ -36 +35 @@
    <td colspan="4"><dtml-var "f_headline(_,_,headline='%s: %s'%(headline,basepath))"></td>
   </tr>
+  <dtml-if "action=='outgoing'">
+   <tr>
+    <td class="form-small">&nbsp;</td>
+    <td class="form-small" colspan="2"><b>Location</b></td>
+    <td class="form-small"><b>ZODB</b></td>
+   </tr>
+  <dtml-else>
+   <tr>
+    <td class="form-small">&nbsp;</td>
+    <td class="form-small" colspan="2"><b>ZODB</b></td>
+    <td class="form-small"><b>Location</b></td>
+   </tr>
+  </dtml-if>
  </dtml-if>
  <tr valign="top" class="zmiTableRow<dtml-if sequence-odd>Odd<dtml-else>Even</dtml-if>">
-  <td class="form-element"><input class="form-checkbox" type="checkbox" name="ids:list" value="<dtml-var filepath>" checked="checked"/></td>
+  <td class="form-element"><input class="form-checkbox" type="checkbox" name="ids:list" value="<dtml-var filepath>" <dtml-unless "action=='conflict'">checked="checked"</dtml-unless>/></td>
   <td class="form-small">
-   <img src="<dtml-var MISC_ZMS>btn_<dtml-var "daction.get(action,action)">.gif" alt="<dtml-var action>" border="0" align="absmiddle"/>
+   <img src="<dtml-var "dicon.get(action,'%s/btn_%s.gif'%(MISC_ZMS,action))">" alt="<dtml-var action>" border="0" align="absmiddle"/>
    <img src="<dtml-var "dicon.get(meta_type,'/misc_/OFSP/%s_icon.gif'%meta_type)">" alt="<dtml-var action>" alt="" title="<dtml-var meta_type>" border="0" align="absmiddle"/>
-   <dtml-var "filepath[len(basepath):]"> (<dtml-var meta_type>)
+   <dtml-var "filepath[len(basepath+'/'+homeId+'/'):]">
   </td>
-  <td class="form-small"><dtml-if mtime><dtml-var "getLangFmtDate(_.DateTime(mtime),lang,'DATETIME_FMT')"></dtml-if></td>
-  <td class="form-small"><dtml-if filemtime><dtml-var "getLangFmtDate(_.DateTime(filemtime),lang,'DATETIME_FMT')"></dtml-if></td>
+  <td class="form-small"><dtml-if mrevision><dtml-var mrevision><dtml-elif mtime><dtml-var "getLangFmtDate(_.DateTime(mtime),lang,'DATETIME_FMT')"></dtml-if></td>
+  <td class="form-small"><dtml-if filemrevision><dtml-var filemrevision><dtml-elif filemtime><dtml-var "getLangFmtDate(_.DateTime(filemtime),lang,'DATETIME_FMT')"></dtml-if></td>
  <dtml-if sequence-end>
   </table>