[Zope-Checkins] SVN: Zope/branches/andig-catalog-report/src/Products/ZCatalog/ Some more style and avoid abbreviations

[Hanno Schlichting]

Log message for revision 115011:
  Some more style and avoid abbreviations
  

Changed:
  U   Zope/branches/andig-catalog-report/src/Products/ZCatalog/ZCatalog.py
  U   Zope/branches/andig-catalog-report/src/Products/ZCatalog/dtml/catalogReport.dtml

-=-
Modified: Zope/branches/andig-catalog-report/src/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/branches/andig-catalog-report/src/Products/ZCatalog/ZCatalog.py	2010-07-24 14:47:25 UTC (rev 115010)
+++ Zope/branches/andig-catalog-report/src/Products/ZCatalog/ZCatalog.py	2010-07-24 14:51:33 UTC (rev 115011)
@@ -1028,25 +1028,24 @@
                               'manage_resetCatalogReport')
     def manage_resetCatalogReport(self, REQUEST=None, RESPONSE=None, URL1=None):
         """ resets the catalog reports """
-
         self._catalog.getCatalogReport().reset()
 
         if REQUEST and RESPONSE:
             RESPONSE.redirect(
               URL1 +
-              '/manage_catalogReport?manage_tabs_message=Report%20Cleared')    
+              '/manage_catalogReport?manage_tabs_message=Report%20cleared')
 
-    security.declareProtected(manage_zcatalog_entries, 'manage_editCatalogReport')
+    security.declareProtected(manage_zcatalog_entries,
+                              'manage_editCatalogReport')
     def manage_editCatalogReport(self, RESPONSE, URL1, long_query_time=0.1, REQUEST=None):
         """ edit the long query time """
-        if type(long_query_time) is not type(1.0):
-            long_query_time=float(long_query_time)
+        if not isinstance(long_query_time, float):
+            long_query_time = float(long_query_time)
 
-        # transform to seconds
         self.long_query_time = long_query_time
 
         RESPONSE.redirect(
-            URL1 + '/manage_catalogReport?manage_tabs_message=Long Query Time%20Changed')
+            URL1 + '/manage_catalogReport?manage_tabs_message=Long%20query%20time%20changed')
 
 
 InitializeClass(ZCatalog)

Modified: Zope/branches/andig-catalog-report/src/Products/ZCatalog/dtml/catalogReport.dtml
===================================================================
--- Zope/branches/andig-catalog-report/src/Products/ZCatalog/dtml/catalogReport.dtml	2010-07-24 14:47:25 UTC (rev 115010)
+++ Zope/branches/andig-catalog-report/src/Products/ZCatalog/dtml/catalogReport.dtml	2010-07-24 14:51:33 UTC (rev 115011)
@@ -97,7 +97,7 @@
         <tr>
             <td align="right" valign="middle">
                 <div class="list-item">
-                    Threshold
+                    Threshold (in seconds)
                 </div>
             </td>
             <td align="left" valign="middle">
@@ -108,7 +108,7 @@
             <td align="left" valign="middle">
                 <p class="form-help">Only queries whose execution
                 takes longer than the configured threshold are considered
-                being slow. (Default:&nbsp;0.1&nbsp;s).</p>
+                being slow. (Default:&nbsp;0.1&nbsp;seconds).</p>
         </tr>
     </table>
     <input class="form-element" type="submit" value="Apply settings">