Merge branch 'master' into saclay

Conflicts:
	chimere/static/chimere/js/utils.js

6 files changed, 61 insertions, 4 deletions

diff --git a/chimere/feeds.py b/chimere/feeds.py
index d5ae5ef..057fe5e 100644
--- a/chimere/feeds.py
+++ b/chimere/feeds.py
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
+# Copyright (C) 2012 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
 # Copyright (C) 2010 Pierre Clarenc <pierre.crc_AT_gmailDOTcom>,
-#                    Samuel Renard <renard.samuel_AT_gmailDOTcom>,
-#                    Étienne Loks <etienne.loks_AT_peacefrogsDOTnet>
+#                    Samuel Renard <renard.samuel_AT_gmailDOTcom>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as
diff --git a/chimere/models.py b/chimere/models.py
index 4d66278..e98c97b 100644
--- a/chimere/models.py
+++ b/chimere/models.py
@@ -20,7 +20,7 @@
 """
 Models description
 """
-import os, datetime, re, string
+import os, datetime, pyexiv2, re, string
 import simplejson as json
 from lxml import etree
 from PIL import Image
@@ -609,11 +609,44 @@ def scale_image(max_x, pair):
     new_y = (float(max_x) / x) * y
     return (int(max_x), int(new_y))
 
+
+IMAGE_EXIF_ORIENTATION_MAP = {
+    1: 0,
+    8: 2,
+    3: 3,
+    6: 4,
+}
+
+PYEXIV2_OLD_API = not hasattr(pyexiv2, 'ImageMetadata')
+
 def picturefile_post_save(sender, **kwargs):
     if not kwargs['instance']:
         return
     picturefile = kwargs['instance']
 
+    if kwargs['created']:
+        filename = picturefile.picture.path
+        metadata = None
+        if PYEXIV2_OLD_API:
+            metadata = pyexiv2.Image(filename)
+            metadata.readMetadata()
+        else:
+            metadata = pyexiv2.ImageMetadata(filename)
+            metadata.read()
+        orientation = metadata['Exif.Image.Orientation'].value \
+                      if 'Exif.Image.Orientation' in metadata else None
+        print "orientation", orientation
+        if orientation and orientation in IMAGE_EXIF_ORIENTATION_MAP \
+           and orientation > 1:
+            metadata['Exif.Image.Orientation'] = 1
+            if PYEXIV2_OLD_API:
+                metadata.writeMetadata()
+            else:
+                metadata.write()
+            im = Image.open(filename)
+            im = im.transpose(IMAGE_EXIF_ORIENTATION_MAP[orientation])
+            im.save(filename)
+
     if not picturefile.thumbnailfile:
         file = picturefile.picture
         # defining the filename and the thumbnail filename
@@ -650,7 +683,7 @@ def picturefile_post_save(sender, **kwargs):
             picturefile.thumbnailfile = short_name
             picturefile.save()
 
-    if not kwargs['instance'] or not kwargs['created']:
+    if not kwargs['created']:
         return
     pfs = PictureFile.objects.filter(marker=picturefile.marker).exclude(
                                      pk=picturefile.pk).order_by('order')
diff --git a/chimere/static/chimere/css/forms.css b/chimere/static/chimere/css/forms.css
index 5740a62..46acdb9 100644
--- a/chimere/static/chimere/css/forms.css
+++ b/chimere/static/chimere/css/forms.css
@@ -124,3 +124,8 @@ div.bottomform{
     display:None
 }
 
+.object-tools{
+    width:90px;
+    overflow:hidden;
+    height:16px;
+}
diff --git a/chimere/static/chimere/js/textareas.js b/chimere/static/chimere/js/textareas.js
index fec83b8..048718d 100644
--- a/chimere/static/chimere/js/textareas.js
+++ b/chimere/static/chimere/js/textareas.js
@@ -20,6 +20,7 @@ See the file COPYING for details.
 tinyMCE.init({
     mode : "textareas",
     theme : "advanced",
+    editor_selector : "mceEditor",
     relative_urls : false,
     theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,bullist,numlist,separator,hr,separator,link",
     theme_advanced_buttons2 : "",
diff --git a/chimere/static/chimere/js/utils.js b/chimere/static/chimere/js/utils.js
index e8981c6..460e843 100644
--- a/chimere/static/chimere/js/utils.js
+++ b/chimere/static/chimere/js/utils.js
@@ -241,3 +241,11 @@ function isValidEmailAddress(emailAddress) {
     var pattern = new RegExp(/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i);
     return pattern.test(emailAddress);
 };
+
+/* remove multiple, leading or trailing spaces */
+function trim(s) {
+    s = s.replace(/(^\s*)|(\s*$)/gi,"");
+    s = s.replace(/[ ]{2,}/gi," ");
+    s = s.replace(/\n /,"\n");
+    return s;
+}
diff --git a/chimere/widgets.py b/chimere/widgets.py
index a096cde..a30b596 100644
--- a/chimere/widgets.py
+++ b/chimere/widgets.py
@@ -145,6 +145,16 @@ class TextareaWidget(forms.Textarea):
     class Media:
         js = ["%stiny_mce.js" % settings.TINYMCE_URL,
               "%schimere/js/textareas.js" % settings.STATIC_URL,]
+    def render(self, *args, **kwargs):
+        if 'attrs' not in kwargs:
+            kwargs['attrs'] = {}
+        if 'class' not in kwargs['attrs']:
+            kwargs['attrs']['class'] = ''
+        else:
+            kwargs['attrs']['class'] += ' '
+        kwargs['attrs']['class'] += 'mceEditor'
+        rendered = super(TextareaWidget, self).render(*args, **kwargs)
+        return mark_safe(rendered)
 
     def render(self, *args, **kwargs):
         rendered = super(TextareaWidget, self).render(*args, **kwargs)