Correct bad interaction between DatePicker and Autocomplete fields (closes #431) + minor CSS

1 files changed, 5 insertions, 3 deletions

diff --git a/ishtar/furnitures/widgets.py b/ishtar/furnitures/widgets.py
index 596abf784..d70f08dda 100644
--- a/ishtar/furnitures/widgets.py
+++ b/ishtar/furnitures/widgets.py
@@ -92,9 +92,11 @@ class JQueryDate(forms.TextInput):
 class JQueryDate(forms.TextInput):

     def render(self, name, value=None, attrs=None):

         rendered = super(JQueryDate, self).render(name, value, attrs)

+        # use window.onload to be sure that datepicker don't interfere

+        # with autocomplete fields

         rendered += """

 <script type="text/javascript"><!--//

-    $(function() {

+    $(window).load(function() {

         $("#id_%(name)s").datepicker($.datepicker.regional["%(country)s"]);

         var val = $("#id_%(name)s").val();

         if(val){

@@ -177,8 +179,8 @@ objects.get(pk=value))
         if self.new:

             model_name = self.associated_model._meta.object_name.lower()

             url_new = reverse('new-' + model_name, args=[attrs_select['id']])

-            new = u'  <a href="#" onclick="open_window(\'%s\');">%s</a>' % (

-                                                url_new, unicode(_(u"Add")))

+            new = u'  <a href="#" class="add-button" '\

+                  u'onclick="open_window(\'%s\');">+</a>' % url_new

         html = u'''<input%(attrs_select)s/>%(new)s\

 <input type="hidden"%(attrs_hidden)s/>\

         <script type="text/javascript"><!--//