[CMF-checkins] SVN: CMF/trunk/GenericSetup/ - fixed some 'Import' tab issues

[Yvo Schubbe]

Log message for revision 40876:
  - fixed some 'Import' tab issues

Changed:
  U   CMF/trunk/GenericSetup/tool.py
  U   CMF/trunk/GenericSetup/www/sutImportSteps.zpt

-=-
Modified: CMF/trunk/GenericSetup/tool.py
===================================================================
--- CMF/trunk/GenericSetup/tool.py	2005-12-18 21:23:12 UTC (rev 40875)
+++ CMF/trunk/GenericSetup/tool.py	2005-12-18 21:35:11 UTC (rev 40876)
@@ -404,22 +404,22 @@
                                   ):
         """ Import the steps selected by the user.
         """
+        messages = {}
         if not ids:
-            summary = 'No+steps+selected.'
+            summary = 'No steps selected.'
 
         else:
             steps_run = []
-            messages = {}
             for step_id in ids:
                 result = self.runImportStep(step_id, run_dependencies)
                 steps_run.extend(result['steps'])
                 messages.update(result['messages'])
 
-            summary = 'Steps+run:%s' % '+,'.join(steps_run)
+            summary = 'Steps run: %s' % ', '.join(steps_run)
 
-        if create_report:
-            name = self._mangleTimestampName('import-selected', 'log')
-            self._createReport(name, result['steps'], result['messages'])
+            if create_report:
+                name = self._mangleTimestampName('import-selected', 'log')
+                self._createReport(name, result['steps'], result['messages'])
 
         return self.manage_importSteps(manage_tabs_message=summary,
                                        messages=messages)
@@ -430,7 +430,7 @@
         """ Import all steps.
         """
         result = self.runAllImportSteps()
-        steps_run = 'Steps+run:%s' % '+,'.join(result['steps'])
+        steps_run = 'Steps run: %s' % ', '.join(result['steps'])
 
         if create_report:
             name = self._mangleTimestampName('import-all', 'log')

Modified: CMF/trunk/GenericSetup/www/sutImportSteps.zpt
===================================================================
--- CMF/trunk/GenericSetup/www/sutImportSteps.zpt	2005-12-18 21:23:12 UTC (rev 40875)
+++ CMF/trunk/GenericSetup/www/sutImportSteps.zpt	2005-12-18 21:35:11 UTC (rev 40876)
@@ -1,5 +1,6 @@
-<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:define="manage_tabs_message options/manage_tabs_message | nothing"
+    tal:replace="structure context/manage_tabs">TABS</h2>
 
 <h2> Site Configuration Import Steps </h2>
 
@@ -11,7 +12,7 @@
 <h3>Available Import Steps</h3>
 
 <form action="." method="POST"
-      tal:attributes="action here/absolute_url" >
+      tal:attributes="action context/absolute_url" >
 <input type="hidden" name="ids:default:tokens" value="" />
 
 <table cellspacing="0" cellpadding="4">
@@ -25,7 +26,7 @@
   </tr>
  </thead>
 
- <tbody tal:define="registry here/getImportStepRegistry;
+ <tbody tal:define="registry context/getImportStepRegistry;
                     step_ids registry/sortSteps;
                    ">
   <tal:loop tal:repeat="step_id step_ids">
@@ -89,5 +90,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>