Changeset 3405 in products

Timestamp:

Apr 3, 2012 3:36:19 PM (13 years ago)

Author:

potar

Message:

fixed deleteVerificationFile(); added method absolute_url to template, new changes to HISTORY.txt

Location:

quintagroup.plonegooglesitemaps/branches/1.7.1

Files:

• docs/HISTORY.txt (modified) (1 diff)
• quintagroup/plonegooglesitemaps/browser/configletview.py (modified) (2 diffs)
• quintagroup/plonegooglesitemaps/browser/configure.zcml (modified) (2 diffs)
• quintagroup/plonegooglesitemaps/browser/resources/verify_file.css (modified) (1 diff)
• quintagroup/plonegooglesitemaps/profiles/default/cssregistry.xml (modified) (1 diff)
• quintagroup/plonegooglesitemaps/skins/plonegooglesitemaps/prefs_gsm_verification.cpt (modified) (4 diffs)
• setup.py (modified) (1 diff)

quintagroup.plonegooglesitemaps/branches/1.7.1/docs/HISTORY.txt

@@ -1 +1 @@
 Changelog
 =========
+
+1.7.1 - unreleased
+------------------
+
+* Added deleting (button) the verification file
+  [potar]
+
+* Updated view quintagroup.plonegooglesitemaps (tabs)
+  [potar]
 
 1.7.0 (2011-10-28)

quintagroup.plonegooglesitemaps/branches/1.7.1/quintagroup/plonegooglesitemaps/browser/configletview.py

@@ -5 +5 @@
 from OFS.ObjectManager import BadRequestException
 from Products.Five import BrowserView
+
+import urlparse
 
 
@@ -144 +146 @@
         return (size, entries)
 
-    def deleteVerificationFile(self):
+    def deleteGSMVerificationFile(self):
         portal = self.pps.portal()
         portal.manage_delObjects([self.request.id, ])
-        if 'HTTP_REFERER' in self.request.keys():
-            url = self.request.HTTP_REFERER
-        else:
-            url = self.context + 'prefs_gsm_verification'
-        self.request.RESPONSE.redirect(url)
+        self.request.RESPONSE.redirect(
+                                urlparse.urljoin(self.context.absolute_url,
+                                'prefs_gsm_verification'))
 
     def getVerificationFiles(self):

quintagroup.plonegooglesitemaps/branches/1.7.1/quintagroup/plonegooglesitemaps/browser/configure.zcml

@@ -52 +52 @@
     <browser:page
       for="Products.CMFPlone.interfaces.IPloneSiteRoot"
-      name="deleteVerificationFile"
+      name="deleteGSMVerificationFile"
       class=".configletview.ConfigletSettingsView"
       permission="cmf.ManagePortal"
-      attribute="deleteVerificationFile"
+      attribute="deleteGSMVerificationFile"
     />
 
     <browser:resource                                                           
-      name="trash.gif"                                                          
-      image="./images/trash.gif"                                                
+      name="quintagroup.plonegooglesitemaps.trash.gif"
+      image="images/trash.gif"                                                
       layer="quintagroup.plonegooglesitemaps.interfaces.IGoogleSitemapsLayer"
       permission="cmf.ManagePortal"
@@ -66 +66 @@
     
     <browser:resource
-      name="verify_file.css"
+      name="quintagroup.plonegooglesitemaps.verify_file.css"
       file="resources/verify_file.css"
       layer="quintagroup.plonegooglesitemaps.interfaces.IGoogleSitemapsLayer"

quintagroup.plonegooglesitemaps/branches/1.7.1/quintagroup/plonegooglesitemaps/browser/resources/verify_file.css

@@ -1 +1 @@
 .delete {                                           
-    background:url(++resource++trash.gif) 5px 50% no-repeat;     
+    background:url(++resource++quintagroup.plonegooglesitemaps.trash.gif) 5px 50% no-repeat;     
     display:none;
     font-size:80%;                     

quintagroup.plonegooglesitemaps/branches/1.7.1/quintagroup/plonegooglesitemaps/profiles/default/cssregistry.xml

@@ -2 +2 @@
 <object name="portal_css">
 <stylesheet
-    id="++resource++verify_file.css"
+    id="++resource++quintagroup.plonegooglesitemaps.verify_file.css"
     media="" rel="stylesheet" rendering="import"
     cacheable="True" compression="safe" cookable="True"

quintagroup.plonegooglesitemaps/branches/1.7.1/quintagroup/plonegooglesitemaps/skins/plonegooglesitemaps/prefs_gsm_verification.cpt

@@ -18 +18 @@
                     <li class="">
                         <a href=""
-                        tal:attributes="href string: prefs_gsm_overview"
+                        tal:attributes="href string: ${context/absolute_url}/prefs_gsm_overview"
                         i18n:translate="label_properties">Overview</a>
                     </li>
@@ -24 +24 @@
                     <li class="selected">
                         <a href=""
-                        tal:attributes="href string:${template/id}"
+                        tal:attributes="href string: ${context/absolute_url}/${template/id}"
                         i18n:translate="label_properties">Verification</a>
                     </li>
@@ -30 +30 @@
                     <li class="">
                     <a href=""
-                        tal:attributes="href string:prefs_gsm_settings">
+                        tal:attributes="href string: ${context/absolute_url}/prefs_gsm_settings">
                         Settings</a>
                     </li>
@@ -80 +80 @@
                                     <a tal:attributes="href string: ${vf/id}" tal:content="vf/id"></a>
                                     <span tal:replace="string: (${vf/title})">comment to verification file</span>
-                                    <a tal:attributes="href string: ${context/absolute_url}/@@deleteVerificationFile?id=${vf/id}; class string:delete">Delete</a>
+                                    <a tal:attributes="href string: ${context/absolute_url}/@@deleteGSMVerificationFile?id=${vf/id}; class string:delete">Delete</a>
                             </li></ul>
                         </li>

quintagroup.plonegooglesitemaps/branches/1.7.1/setup.py

@@ -3 +3 @@
 import os
 
-version = '1.7.0'
+version = '1.7.1'
 
 tests_require = ['zope.testing',