Changeset 930

Timestamp:

10.03.2010 18:53:13 (2 years ago)

Author:

zmsdev

Message:

Added support for overwriting configuration

File:

• ZMS/trunk/manage_addzmsform.dtml (modified) (2 diffs)

ZMS/trunk/manage_addzmsform.dtml

@@ -152 +152 @@
  <td><div class="form-text">Theme</div></td>
  <td>
+
+  <dtml-call "REQUEST.set('themes',None)">
+  <dtml-if "REQUEST.get('themes') is None"><dtml-call "REQUEST.set('themes',misc_.zms['initutil'].import_instance_home(this(),'www/themes.zcml'))"></dtml-if>
+  <dtml-if "REQUEST.get('themes') is None"><dtml-call "REQUEST.set('themes',misc_.zms['initutil'].http_import('%s/misc_/zms/themes.zcml'%BASE0.replace('https','http')))"></dtml-if>
+  <dtml-if "REQUEST.get('themes') is not None"><dtml-call "REQUEST.set('themes',misc_.zms['initutil'].re_sub('<!--(.|\s)*?-->','',themes))"></dtml-if>
+  <dtml-call "REQUEST.set('themes',misc_.zms['initutil'].re_search('source location=\042(.*?)\042/>',themes))">
   <select class="form-element" name="theme:required" onchange="themeChange(this);" onkeyup="themeChange(this);">
 
@@ -169 +175 @@
      <dtml-call "REQUEST.set('default_img_theme','spacer.gif')">
     </dtml-unless>
-    <dtml-call "REQUEST.set('themes',None)">
-    <dtml-if "REQUEST.get('themes') is None"><dtml-call "REQUEST.set('themes',misc_.zms['initutil'].import_instance_home(this(),'www/themes.zcml'))"></dtml-if>
-    <dtml-if "REQUEST.get('themes') is None"><dtml-call "REQUEST.set('themes',misc_.zms['initutil'].http_import('%s/misc_/zms/themes.zcml'%BASE0.replace('https','http')))"></dtml-if>
-    <dtml-if "REQUEST.get('themes') is None"><dtml-call "REQUEST.set('themes',misc_.zms['initutil'].re_sub('<!--(.*?)-->','',themes))"></dtml-if>
-    <dtml-call "REQUEST.set('themes',misc_.zms['initutil'].re_search('source location=\042([.\\s]*?)\042/>',themes))">
     <dtml-in themes>
      <dtml-let theme=sequence-item>