Merge branch 'master' into saclay

Conflicts:
	chimere/locale/fr/LC_MESSAGES/django.po
	chimere/static/chimere/css/styles.css
	chimere/static/chimere/js/jquery.chimere.js
	chimere/templates/chimere/detail.html
	chimere/templatetags/chimere_tags.py
	chimere/utils.py
	chimere/views.py
	example_project/settings.py

1 files changed, 60 insertions, 0 deletions

diff --git a/chimere/static/bsmSelect/js/jquery.bsmselect.compatibility.js b/chimere/static/bsmSelect/js/jquery.bsmselect.compatibility.js
new file mode 100644
index 0000000..a743a07
--- /dev/null
+++ b/chimere/static/bsmSelect/js/jquery.bsmselect.compatibility.js
@@ -0,0 +1,60 @@
+/*
+ * Better Select Multiple Compatibility Plugin - jQuery Plugin
+ *
+ * Copyright (c) 2010 by Victor Berchet - http://www.github.com/vicb
+ *
+ * Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * version: v1.0.0 - 2010-09-05
+ */
+(function($) {
+  $.bsmSelect.plugins.compatibility = function()
+  {
+    if (!(this instanceof arguments.callee)) {
+      return new arguments.callee();
+    }
+  }
+
+  $.extend($.bsmSelect.plugins.compatibility.prototype, {
+    init: function(bsm) {
+
+      var o = bsm.options;
+
+      if (typeof o.animate != 'undefined')
+      {
+        if (o.animate === true) {
+          o.showEffect = $.bsmSelect.effects.verticalListAdd;
+          o.hideEffect = $.bsmSelect.effects.verticalListRemove;
+        } else if ($.isFunction(o.animate.add)) {
+          o.showEffect = o.animate.add;
+        } else if (typeof(o.animate.add) == 'string' && $.isFunction($.bsmSelect.effects[o.animate.add])) {
+          o.showEffect = $.bsmSelect.effects[o.animate.add];
+        } else {
+          o.showEffect = $.bsmSelect.effects.show;
+        }        
+
+        if ($.isFunction(o.animate.drop)) {
+          o.hideEffect = o.animate.drop;
+        } else if (typeof(o.animate.drop) == 'string' && $.isFunction($.bsmSelect.effects[o.animate.drop])) {
+          o.hideEffect = $.bsmSelect.effects[o.animate.drop];
+        } else {
+          o.hideEffect = $.bsmSelect.effects.remove;
+        }
+      }
+
+      if (typeof o.highlight != 'undefined')
+      {
+        if (o.highlight === true) {
+          o.highlightEffect = $.bsmSelect.effects.highlight;
+        } else if ($.isFunction(o.highlight)) {
+          o.highlightEffect = o.highlight;
+        } else if (typeof(o.highlight) == 'string' && $.isFunction($.bsmSelect.effects[o.highlight])) {
+          o.highlightEffect = $.bsmSelect.effects[o.highlight];
+        }
+      }
+
+    }
+
+  });
+})(jQuery);
+