[CMF-checkins] CVS: CMF/CMFSetup/www - siteAddForm.zpt:1.2 sutImportSteps.zpt:1.3

[Yvo Schubbe]

Update of /cvs-repository/CMF/CMFSetup/www
In directory cvs.zope.org:/tmp/cvs-serv9332/CMFSetup/www

Modified Files:
	siteAddForm.zpt sutImportSteps.zpt 
Log Message:
Added support for extension profiles:
- added optional 'profile_type' argument to registerProfile()
- runImportStep() and runAllImportSteps() have now None as default for purge_old: None doesn't override the default purge behavior of the profile type
- by default the profile type controls the purge mode: removed checkbox for setting it manually on the 'Import' tab
- replaced _clear() by clear(): registry entries are now accumulated and only cleared by an explicit method call
- the factory and the siteAddForm now allow to specify extension profiles that are imported after the base profile
- duplicate settings no longer raise errors, the last setting always wins


=== CMF/CMFSetup/www/siteAddForm.zpt 1.1 => 1.2 ===
--- CMF/CMFSetup/www/siteAddForm.zpt:1.1	Thu Jul  1 19:14:23 2004
+++ CMF/CMFSetup/www/siteAddForm.zpt	Wed Mar 16 03:22:35 2005
@@ -1,47 +1,51 @@
-<h1 tal:replace="structure here/manage_page_header" >PAGE HEADER</h1>
+<h1 tal:replace="structure context/manage_page_header">PAGE HEADER</h1>
+<h2 tal:define="form_title string:Add Configured CMF Site"
+    tal:replace="structure context/manage_form_title">FORM TITLE</h2>
 
-<p class="form-help">
-Please select a setup profile (path) for this site
-</p>
+<p class="form-help">Please select ID and configuration for the new site.</p>
 
 <form action="addConfiguredSite" method="post">
 <table cellspacing="0" cellpadding="2" border="0">
-  <tr>
-    <td align="left" valign="top">
-    <div class="form-label">
-    Site Id
-    </div>
-    </td>
-    <td align="left" valign="top">
-    <input type="text" name="site_id" />
-    </td>
-  </tr>
-  <tr>
-    <td align="left" valign="top">
-    <div class="form-label">
-    Setup profile
-    </div>
-    </td>
-    <td align="left" valign="top">
+ <tr valign="top">
+  <td>
+   <div class="form-label">Site ID</div>
+  </td>
+  <td>
+   <input type="text" name="site_id" />
+  </td>
+ </tr>
+ <tr valign="top">
+  <td>
+   <div class="form-label">Setup profile</div>
+  </td>
+  <td>
     <select name="profile_id">
       <option value="PROFILE_ID"
-              tal:repeat="info options/profiles"
+              tal:repeat="info options/base_profiles"
               tal:attributes="value info/id"
               tal:content="info/title">PROFILE TITLE</option>
     </select>
-    </td>
-  </tr>
-  <tr>
-    <td align="left" valign="top">
-    </td>
-    <td align="left" valign="top">
-    <div class="form-element">
-    <input class="form-element" type="submit" name="submit" 
-     value=" Add " /> 
-    </div>
-    </td>
-  </tr>
+  </td>
+ </tr>
+ <tr valign="top">
+  <td>
+   <div class="form-label">Optional extensions</div>
+  </td>
+  <td><tal:span tal:repeat="info options/extension_profiles">
+   <input type="checkbox" name="extension_ids:list" value="PROFILE_ID"
+          tal:attributes="value info/id" />
+   <tal:span tal:content="info/title">PROFILE TITLE</tal:span><br /></tal:span>
+  </td>
+ </tr>
+ <tr>
+  <td>
+   &nbsp;
+  </td>
+  <td>
+   <input class="form-element" type="submit" name="submit" value="Add" /> 
+  </td>
+ </tr>
 </table>
 </form>
-<h1 tal:replace="structure here/manage_page_footer" >PAGE FOOTER</h1>
 
+<h1 tal:replace="structure context/manage_page_footer">PAGE FOOTER</h1>


=== CMF/CMFSetup/www/sutImportSteps.zpt 1.2 => 1.3 ===
--- CMF/CMFSetup/www/sutImportSteps.zpt:1.2	Mon May 24 15:53:57 2004
+++ CMF/CMFSetup/www/sutImportSteps.zpt	Wed Mar 16 03:22:35 2005
@@ -62,12 +62,6 @@
     <label for="run_dependencies">Include dependencies?</label>
     &nbsp; &nbsp;
 
-    <input type="hidden" name="purge_old:int:default" value="0" />
-    <input class="form-element" type="checkbox" id="purge_old"
-           name="purge_old:boolean" value="1" checked="checked" />
-    <label for="purge_old">Purge existing setup?</label>
-    &nbsp; &nbsp;
-      
     <input class="form-element" type="submit"
            name="manage_importSelectedSteps:method"
            value=" Import selected steps " />