From: Benoît Pin <benoit.pin@gmail.com>
Date: Mon, 31 Mar 2014 07:55:15 +0000 (+0200)
Subject: Abandon de thumb_height et thumb_width au profit de thumb_size.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/commitdiff_plain/3a90429ca4498086cc762cad292071a1c4cb44d9?ds=inline

Abandon de thumb_height et thumb_width au profit de thumb_size.
---

diff --git a/AttachmentTool.py b/AttachmentTool.py
index aea969b..a61b4e4 100644
--- a/AttachmentTool.py
+++ b/AttachmentTool.py
@@ -78,8 +78,8 @@ class AttachmentTool( UniqueObject, SimpleItem):
 		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, '')
diff --git a/profiles/default/properties.xml b/profiles/default/properties.xml
index ab496f7..ca5a87e 100644
--- 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="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="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>
@@ -34,6 +26,8 @@
  <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>
diff --git a/profiles/photo/properties.xml b/profiles/photo/properties.xml
index 427fc86..854f3ec 100644
--- 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="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="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>
@@ -35,6 +27,8 @@
  <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>