Abandon de thumb_height et thumb_width au profit de thumb_size.

diff --git a/AttachmentTool.py b/AttachmentTool.py
index aea969bc66b0f45e6a4bc386dfcb9ed58c2ad16e..a61b4e4ebbd2b534b9dba41d8a3f80d732f6de58 100644 (file)
--- a/AttachmentTool.py
+++ b/AttachmentTool.py
@@ -78,8 +78,8 @@ class AttachmentTool( UniqueObject, SimpleItem):
                id = makeValidId(attachments, title)
                
                if typeName == 'Photo':
                id = makeValidId(attachments, title)
                
                if typeName == 'Photo':

-                       thumbSize = {'thumb_height'     : portal.getProperty('thumb_height', 128),
-                                                'thumb_width'  : portal.getProperty('thumb_width', 128)}
+                       thumbSize = {'thumb_height'     : portal.getProperty('thumb_size', 128),
+                                                'thumb_width'  : portal.getProperty('thumb_size', 128)}

                        fileOb = Photo(id, title, file, **thumbSize)
                elif typeName == 'File' :
                        fileOb = File(id, title, '')
                        fileOb = Photo(id, title, file, **thumbSize)
                elif typeName == 'File' :
                        fileOb = File(id, title, '')

diff --git a/profiles/default/properties.xml b/profiles/default/properties.xml
index ab496f714e19608830106da37c083e8ff758b828..ca5a87ea51cb767624898f4d1dd163ce6d4e5b4a 100644 (file)
--- a/profiles/default/properties.xml
+++ b/profiles/default/properties.xml
@@ -6,17 +6,9 @@
  <property name="email_from_address"
     type="string">postmaster@localhost</property>
  <property name="email_from_name" type="string"></property>
  <property name="email_from_address"
     type="string">postmaster@localhost</property>
  <property name="email_from_name" type="string"></property>

- <property name="thumb_height" type="int">192</property>
- <property name="thumb_width" type="int">192</property>
- <property name="available_editors" type="lines">
-  <element value="None"/>
-  <element value="Epoz"/>
-  <element value="FCK"/>
- </property>

  <property name="enable_permalink" type="boolean">True</property>
  <property name="default_language" type="string">fr</property>
  <property name="validate_email" type="boolean">False</property>
  <property name="enable_permalink" type="boolean">True</property>
  <property name="default_language" type="string">fr</property>
  <property name="validate_email" type="boolean">False</property>

- <property name="slide_size" type="int">222</property>

  <property name="untitled_content_form" type="string">Untitled-</property>
  <property name="default_charset" type="string">utf-8</property>
  <property name="management_page_charset" type="string">utf-8</property>
  <property name="untitled_content_form" type="string">Untitled-</property>
  <property name="default_charset" type="string">utf-8</property>
  <property name="management_page_charset" type="string">utf-8</property>


@@ -34,6 +26,8 @@
  <property name="ajax_config" type="int">2</property>
  <property name="copyright_notice"
     type="string"></property>
  <property name="ajax_config" type="int">2</property>
  <property name="copyright_notice"
     type="string"></property>

+ <property name="thumb_size" type="int">192</property>
+ <property name="slide_size" type="int">222</property>

  <property name="tiles_background_color" type="string">#ffffff</property>
  <property name="tiles_min_zoom" type="int">25</property>
  <property name="tiles_max_zoom" type="int">100</property>
  <property name="tiles_background_color" type="string">#ffffff</property>
  <property name="tiles_min_zoom" type="int">25</property>
  <property name="tiles_max_zoom" type="int">100</property>

diff --git a/profiles/photo/properties.xml b/profiles/photo/properties.xml
index 427fc86e2401c7857c88b097d54bf613e69f134f..854f3ec4254beed2efa0bc57309867b68d1a8947 100644 (file)
--- a/profiles/photo/properties.xml
+++ b/profiles/photo/properties.xml
@@ -6,17 +6,9 @@
  <property name="email_from_address"
     type="string">postmaster@localhost</property>
  <property name="email_from_name" type="string"></property>
  <property name="email_from_address"
     type="string">postmaster@localhost</property>
  <property name="email_from_name" type="string"></property>

- <property name="thumb_height" type="int">192</property>
- <property name="thumb_width" type="int">192</property>
- <property name="available_editors" type="lines">
-  <element value="None"/>
-  <element value="Epoz"/>
-  <element value="FCK"/>
- </property>

  <property name="enable_permalink" type="boolean">True</property>
  <property name="default_language" type="string">fr</property>
  <property name="validate_email" type="boolean">False</property>
  <property name="enable_permalink" type="boolean">True</property>
  <property name="default_language" type="string">fr</property>
  <property name="validate_email" type="boolean">False</property>

- <property name="slide_size" type="int">222</property>

  <property name="untitled_content_form" type="string">Untitled-</property>
  <property name="default_charset" type="string">utf-8</property>
  <property name="management_page_charset" type="string">utf-8</property>
  <property name="untitled_content_form" type="string">Untitled-</property>
  <property name="default_charset" type="string">utf-8</property>
  <property name="management_page_charset" type="string">utf-8</property>


@@ -35,6 +27,8 @@
  <property name="ajax_config" type="int">2</property>
  <property name="copyright_notice"
     type="string"></property>
  <property name="ajax_config" type="int">2</property>
  <property name="copyright_notice"
     type="string"></property>

+ <property name="thumb_size" type="int">192</property>
+ <property name="slide_size" type="int">222</property>

  <property name="tiles_background_color" type="string">#484848</property>
  <property name="tiles_min_zoom" type="int">25</property>
  <property name="tiles_max_zoom" type="int">100</property>
  <property name="tiles_background_color" type="string">#484848</property>
  <property name="tiles_min_zoom" type="int">25</property>
  <property name="tiles_max_zoom" type="int">100</property>