[Checkins] SVN: Products.CMFDefault/trunk/Products/CMFDefault/ Not implemented tabs removed. Properties tab replaced by action.
Charlie Clark
charlie at begeistert.org
Sat Oct 2 08:25:08 EDT 2010
Log message for revision 117179:
Not implemented tabs removed. Properties tab replaced by action.
Changed:
U Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py
U Products.CMFDefault/trunk/Products/CMFDefault/dtml/synOverview.dtml
D Products.CMFDefault/trunk/Products/CMFDefault/dtml/synPolicies.dtml
D Products.CMFDefault/trunk/Products/CMFDefault/dtml/synProps.dtml
D Products.CMFDefault/trunk/Products/CMFDefault/dtml/synReports.dtml
-=-
Modified: Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py 2010-10-02 12:24:17 UTC (rev 117178)
+++ Products.CMFDefault/trunk/Products/CMFDefault/SyndicationTool.py 2010-10-02 12:25:08 UTC (rev 117179)
@@ -60,37 +60,13 @@
, 'action' : 'overview'
, 'help' : ( 'CMFDefault'
, 'Syndication-Tool_Overview.stx' )
- }
- ,{ 'label' : 'Properties'
- , 'action' : 'propertiesForm'
- , 'help' : ( 'CMFDefault'
- , 'Syndication-Tool_Properties.stx' )
- }
- ,{ 'label' : 'Policies'
- , 'action' : 'policiesForm'
- , 'help' : ( 'CMFDefault'
- , 'Syndication-Tool_Policies.stx' )
- }
- ,{ 'label' : 'Reports'
- , 'action' : 'reportForm'
- , 'help' : ( 'CMFDefault'
- , 'Syndication-Tool_Reporting.stx' )
- }
+ },
)
)
security.declareProtected(ManagePortal, 'overview')
overview = HTMLFile('synOverview', _dtmldir)
- security.declareProtected(ManagePortal, 'propertiesForm')
- propertiesForm = HTMLFile('synProps', _dtmldir)
-
- security.declareProtected(ManagePortal, 'policiesForm')
- policiesForm = HTMLFile('synPolicies', _dtmldir)
-
- security.declareProtected(ManagePortal, 'reportForm')
- reportForm = HTMLFile('synReports', _dtmldir)
-
security.declareProtected(ManagePortal, 'editProperties')
def editProperties( self
, updatePeriod=None
@@ -124,7 +100,7 @@
pass
if updateBase is not None:
- if type( updateBase ) is type( '' ):
+ if not hasattr(updateBase, 'ISO'):
updateBase = DateTime( updateBase )
self.syUpdateBase = updateBase
else:
@@ -141,12 +117,6 @@
except (AttributeError, KeyError):
pass
- if REQUEST is not None:
- REQUEST['RESPONSE'].redirect( self.absolute_url()
- + '/propertiesForm'
- + '?manage_tabs_message=Tool+Updated.'
- )
-
security.declarePublic( 'editSyInformationProperties' )
def editSyInformationProperties( self
, obj
@@ -180,7 +150,7 @@
syInfo.syUpdateFrequency = self.syUpdateFrequency
if updateBase is not None:
- if type( updateBase ) is type( '' ):
+ if not hasattr(updateBase, 'ISO'):
updateBase = DateTime( updateBase )
syInfo.syUpdateBase = updateBase
else:
Modified: Products.CMFDefault/trunk/Products/CMFDefault/dtml/synOverview.dtml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/dtml/synOverview.dtml 2010-10-02 12:24:17 UTC (rev 117178)
+++ Products.CMFDefault/trunk/Products/CMFDefault/dtml/synOverview.dtml 2010-10-02 12:25:08 UTC (rev 117179)
@@ -17,7 +17,9 @@
<h4>Syndication Tool Overview</h4>
See the online help by clicking the 'Help' link on the Management Forms.
- To turn on syndication, visit the Properties Tab in the management interface.
+ Syndication can be enabled from the 'Site Syndication' action. Syndication
+ settings can be set on a per folder basis through the 'Syndication'
+ action.
</body>
</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/dtml/synPolicies.dtml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/dtml/synPolicies.dtml 2010-10-02 12:24:17 UTC (rev 117178)
+++ Products.CMFDefault/trunk/Products/CMFDefault/dtml/synPolicies.dtml 2010-10-02 12:25:08 UTC (rev 117179)
@@ -1,27 +0,0 @@
-<body bgcolor="#ffffff">
-<dtml-var manage_tabs>
-<h2>Default Syndication Policies</h2>
-<form action="editSyPolicies" method="POST">
-<table width="100%" border="0">
- <tr>
- <th valign="top" align="left">Sy Module Policies</th>
- </tr>
- <tr>
- <td colspan="2">
- <table width="90%" border="1"><tr><td>
- <table>
- <tr>
- <th>Policies are not yet implemented</th>
- <th> </th>
- </tr>
- </table>
- </td></tr></table>
- </td>
- </tr>
- <tr>
- <td> <br /> </td>
- </tr>
-</table>
-</form>
-</body>
-</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/dtml/synProps.dtml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/dtml/synProps.dtml 2010-10-02 12:24:17 UTC (rev 117178)
+++ Products.CMFDefault/trunk/Products/CMFDefault/dtml/synProps.dtml 2010-10-02 12:25:08 UTC (rev 117179)
@@ -1,88 +0,0 @@
-<html><head><title>portal_syndication properties</title></head>
-<body bgcolor="#ffffff">
-<dtml-var manage_tabs>
-<h2>Sitewide Default Syndication Properties</h2>
-<dtml-if expr="portal_syndication.isSiteSyndicationAllowed()">
-<form action="editProperties" method="POST">
-<table width="100%" border="0">
- <tr>
- <th valign="top" align="left">Sy Module Properties</th>
- </tr>
- <tr>
- <td colspan="2">
- <table width="90%" border="1"><tr><td>
- <table>
- <tr>
- <th>Element</th>
- <th>Default Value</th>
- </tr>
- <dtml-with portal_syndication>
- <tr>
- <td>
- UpdatePeriod
- </td>
- <td>
- <select name="updatePeriod">
- <dtml-in buildUpdatePeriods>
- <option value="&dtml-sequence-key;"
- <dtml-if expr="_['sequence-key'] == getUpdatePeriod()">
- selected="selected"</dtml-if>>&dtml-sequence-item;
- </option>
-</dtml-in>
-</select>
- </td>
- </tr>
- <tr>
- <td>
- UpdateFrequency
- </td>
- <td>
- <input type="text" name="updateFrequency"
- value="&dtml-getUpdateFrequency;" size="3">
- </td>
- </tr>
- <tr>
- <td>
- UpdateBase
- </td>
- <td>
- <input type="text" name="updateBase:date"
- value="&dtml-getUpdateBase;" size="70">
- </td>
- </tr>
- <tr>
- <td>
- Max Syndicated Items
- </td>
- <td>
- <input type="text" name="max_items"
- value="&dtml-getMaxItems;" size="3">
- </td>
- </tr>
- </dtml-with>
- <tr>
- <td colspan="2">
- <input type="submit" name="edit" value=" Save ">
- </td>
- </tr>
-
- </table>
- </td></tr></table>
- </td>
- </tr>
- <tr>
- <td> <br /> </td>
- </tr>
-</table>
-</form>
-<form action="editProperties" method="post">
-<input type="submit" value="Disable Syndication"></input>
-<input type="hidden" name="isAllowed:int" value="0"></input>
-</form>
-<dtml-else>
-<form action="editProperties" method="post">
-<input type="submit" value="Enable Syndication">
-<input type="hidden" name="isAllowed:int" value="1">
-</dtml-if>
-</body>
-</html>
Deleted: Products.CMFDefault/trunk/Products/CMFDefault/dtml/synReports.dtml
===================================================================
--- Products.CMFDefault/trunk/Products/CMFDefault/dtml/synReports.dtml 2010-10-02 12:24:17 UTC (rev 117178)
+++ Products.CMFDefault/trunk/Products/CMFDefault/dtml/synReports.dtml 2010-10-02 12:25:08 UTC (rev 117179)
@@ -1,29 +0,0 @@
-<body bgcolor="#ffffff">
-<dtml-var manage_tabs>
-<h2>Sitewide Syndication Reporting Facility</h2>
-<form action="generateSyReport" method="POST">
-<table width="100%" border="0">
- <tr>
- <th valign="top" align="left">Syndication Reports</th>
- </tr>
-
-
- <tr>
- <td colspan="2">
- <table width="90%" border="1"><tr><td>
- <table>
- <tr>
- <th>Reports are not yet implemented</th>
- <th> </th>
- </tr>
- </table>
- </td></tr></table>
- </td>
- </tr>
- <tr>
- <td> <br /> </td>
- </tr>
-</table>
-</form>
-</body>
-</html>
More information about the checkins
mailing list