r252483 - in plonetheme.arnolfini/trunk: . docs plonetheme/arnolfini/browser plonetheme/arnolfini/profiles/default

Author: davidjonas
Date: Mon Jul  8 18:08:16 2013
New Revision: 252483

Modified:
   plonetheme.arnolfini/trunk/docs/HISTORY.txt
   plonetheme.arnolfini/trunk/plonetheme/arnolfini/browser/views.py
   plonetheme.arnolfini/trunk/plonetheme/arnolfini/profiles/default/metadata.xml
   plonetheme.arnolfini/trunk/setup.py
Log:
another merge issue

Modified: plonetheme.arnolfini/trunk/docs/HISTORY.txt
==============================================================================
--- plonetheme.arnolfini/trunk/docs/HISTORY.txt	(original)
+++ plonetheme.arnolfini/trunk/docs/HISTORY.txt	Mon Jul  8 18:08:16 2013
@@ -1,5 +1,9 @@
 Changelog
 =========
+0.93 (2013-07-08)
+---------------------
+- Fix in the merged views that blocked the cropping interface.
+
 0.92 (2013-07-05)
 ---------------------
 - Merging back because of event work that was unfinished on the repository

Modified: plonetheme.arnolfini/trunk/plonetheme/arnolfini/browser/views.py
==============================================================================
--- plonetheme.arnolfini/trunk/plonetheme/arnolfini/browser/views.py	(original)
+++ plonetheme.arnolfini/trunk/plonetheme/arnolfini/browser/views.py	Mon Jul  8 18:08:16 2013
@@ -218,10 +218,17 @@
                 lead = None
             
         if lead is not None:
+            canCrop = self.checkPermission(item, "Modify portal content") and scale == 'crop'
+            crop = ""
+            
+            if canCrop:
+                cropLink = "%s/@@croppingeditor"%lead
+                crop = '<div class="cropButton" onclick="window.location = \'%s\'; return false;">Crop</div>'%cropLink
+            
             if hasattr(item, 'getURL'):
-                return '<img src="%(url)s" alt="%(title)s" title="%(title)s" />'%{'url': "%s/image_%s"%(lead, scale), 'title':item.Title}
+                return '<img src="%(url)s" alt="%(title)s" title="%(title)s" />%(crop)s'%{'url': "%s/image_%s"%(lead, scale), 'title':item.Title, 'crop':crop}
             else:
-                return '<img src="%(url)s" alt="%(title)s" title="%(title)s" />'%{'url': "%s/image_%s"%(lead, scale), 'title':item.Title()}
+                return '<img src="%(url)s" alt="%(title)s" title="%(title)s" />%(crop)s'%{'url': "%s/image_%s"%(lead, scale), 'title':item.Title(), 'crop':crop}
         else:
             return ""
 

Modified: plonetheme.arnolfini/trunk/plonetheme/arnolfini/profiles/default/metadata.xml
==============================================================================
--- plonetheme.arnolfini/trunk/plonetheme/arnolfini/profiles/default/metadata.xml	(original)
+++ plonetheme.arnolfini/trunk/plonetheme/arnolfini/profiles/default/metadata.xml	Mon Jul  8 18:08:16 2013
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>0.92</version>
+  <version>0.93</version>
   <dependencies>
        <dependency>profile-plonetheme.intkBase:default</dependency>
  </dependencies>

Modified: plonetheme.arnolfini/trunk/setup.py
==============================================================================
--- plonetheme.arnolfini/trunk/setup.py	(original)
+++ plonetheme.arnolfini/trunk/setup.py	Mon Jul  8 18:08:16 2013
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '0.92'
+version = '0.93'
 
 setup(name='plonetheme.arnolfini',
       version=version,

------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev