[CMF-checkins] CVS: CMF/CMFSetup/www - sutCompare.zpt:1.2 sutProperties.zpt:1.2

[Yvo Schubbe]

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

Modified Files:
	sutCompare.zpt sutProperties.zpt 
Log Message:
- made configuration selectable from a list of registered profiles and stored snapshots (http://collector.zope.org/CMF/264)
- removed getProfileProduct, getProfileDirectory and setProfileDirectory
- added getImportContextId and setImportContext
- synced parts of sutCompare.zpt with sutProperties.zpt


=== CMF/CMFSetup/www/sutCompare.zpt 1.1 => 1.2 ===
--- CMF/CMFSetup/www/sutCompare.zpt:1.1	Tue Jul 20 12:13:53 2004
+++ CMF/CMFSetup/www/sutCompare.zpt	Thu Jan 20 14:00:19 2005
@@ -1,5 +1,5 @@
-<h1 tal:replace="structure here/manage_page_header">PAGE HEADER</h1>
-<h1 tal:replace="structure here/manage_tabs">TABS</h1>
+<h1 tal:replace="structure context/manage_page_header">PAGE HEADER</h1>
+<h2 tal:replace="structure context/manage_tabs">TABS</h2>
 
 <style type="text/css">
 .file-to-dir {
@@ -70,47 +70,25 @@
 </p>
 
 <p>Configurations to compare:</p>
-<form method="POST" action="."
-      tal:attributes="action string:${here/absolute_url}">
+<form method="post" action="."
+      tal:attributes="action string:${context/absolute_url}">
 
 <select name="lhs">
-
-  <option value="snapshot-SNAPSHOT_ID"
-          tal:repeat="s_info here/listSnapshotInfo"
-          tal:attributes="selected python:lhs.endswith( s_info['id'] );
-                          value string:snapshot-${s_info/id};
-                         "
-          tal:content="s_info/title"
-  >SNAPSHOT_TITLE</option>
-
-  <option value="profile-PROFILE_ID"
-          tal:repeat="p_info here/listProfileInfo"
-          tal:attributes="selected python:lhs.endswith( p_info['id'] );
-                          value string:profile-${p_info/id};
-                         "
-          tal:content="p_info/title"
-  >PROFILE_TITLE</option>
-
+ <option value="context-CONTEXT_ID"
+    tal:repeat="context_info context/listContextInfos"
+    tal:attributes="selected python:lhs == context_info['id'];
+                    value context_info/id"
+    tal:content="context_info/title"
+ >CONTEXT_TITLE</option>
 </select>
 
 <select name="rhs">
-
-  <option value="snapshot-SNAPSHOT_ID"
-          tal:repeat="s_info here/listSnapshotInfo"
-          tal:attributes="selected python:rhs.endswith( s_info['id'] );
-                          value string:snapshot-${s_info/id};
-                         "
-          tal:content="s_info/title"
-  >SNAPSHOT_TITLE</option>
-
-  <option value="profile-PROFILE_ID"
-          tal:repeat="p_info here/listProfileInfo"
-          tal:attributes="selected python:rhs.endswith( p_info['id'] );
-                          value string:profile-${p_info/id};
-                         "
-          tal:content="p_info/title"
-  >PROFILE_TITLE</option>
-
+ <option value="context-CONTEXT_ID"
+    tal:repeat="context_info context/listContextInfos"
+    tal:attributes="selected python:rhs == context_info['id'];
+                    value context_info/id"
+    tal:content="context_info/title"
+ >CONTEXT_TITLE</option>
 </select>
 
 <br />
@@ -140,14 +118,14 @@
     
 <div tal:define="mae request/missing_as_empty | nothing;
                  ib request/ignore_blanks | nothing;
-                 mcc nocall: here/manage_compareConfigurations;
+                 mcc nocall: context/manage_compareConfigurations;
                  comparison python:mcc( lhs, rhs, mae, ib )"
 >
 <p>
 Comparison of <span tal:replace="request/lhs">LHS</span>
           and <span tal:replace="request/rhs">RHS</span>:</p>
 
-<span tal:replace="structure python: here.markupComparison( comparison )"
+<span tal:replace="structure python: context.markupComparison( comparison )"
 >COMPARISON HERE</span>
 
 </div>
@@ -155,4 +133,4 @@
 
 </div>
 
-<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/sutProperties.zpt 1.1 => 1.2 ===
--- CMF/CMFSetup/www/sutProperties.zpt:1.1	Mon May 24 10:36:52 2004
+++ CMF/CMFSetup/www/sutProperties.zpt	Thu Jan 20 14:00:19 2005
@@ -1,32 +1,26 @@
-<h1 tal:replace="structure here/manage_page_header"> PAGE HEADER </h1>
-<h2 tal:replace="structure here/manage_tabs"> PAGE HEADER </h2>
+<h1 tal:replace="structure context/manage_page_header">PAGE HEADER</h1>
+<h2 tal:replace="structure context/manage_tabs">TABS</h2>
 
 <h3> Setup Tool Properties </h3>
 
-<form method="POST" action="manage_updateToolProperties">
-<table>
+<form method="post" action="manage_updateToolProperties">
 
- <tr valign="top">
-  <td>
-   <div class="form-label">Profile directory:</div>
-  </td>
-  <td>
-   <input class="form-element" type="text" name="profile_directory"
-          tal:attributes="value python: here.getProfileDirectory( True )" />
-   <span class="form-help"> May be either absolute (beginning with '/')
-    or relative to the product defined below. </span>
-  </td>
- </tr>
+<table>
 
  <tr valign="top">
   <td>
-   <div class="form-label">Profile product:</div>
+   <div class="form-label">Active site configuration:</div>
   </td>
   <td>
-   <input class="form-element" type="text" name="profile_product"
-          tal:attributes="value here/getProfileProduct" />
-   <span class="form-help"> The name of the product to which the profile
-    directory is relative. </span>
+   <select name="context_id"
+      tal:define="context_id context/getImportContextID">
+    <option value="context-CONTEXT_ID"
+       tal:repeat="context_info context/listContextInfos"
+       tal:attributes="selected python:context_id == context_info['id'];
+                       value context_info/id"
+       tal:content="context_info/title"
+    >CONTEXT_TITLE</option>
+   </select>
   </td>
  </tr>
 
@@ -40,4 +34,4 @@
 </table>
 </form>
 
-<h1 tal:replace="structure here/manage_page_footer"> PAGE FOOTER </h1>
+<h1 tal:replace="structure context/manage_page_footer">PAGE FOOTER</h1>