Changeset 1114

Timestamp:

04/30/10 17:21:51 (22 months ago)

Author:

johnnyoffline

Message:

added a class name to the multipleSelect input in aControls. Also added an onClose call attribute to the richDate widget so we can have access to a callback from the template when the calendar is closed

Location:

plugins/apostrophePlugin/trunk

Files:

• lib/widget/sfWidgetFormJQueryDate.class.php (modified) (3 diffs)
• web/css/a.css (modified) (3 diffs)
• web/js/aControls.js (modified) (2 diffs)

plugins/apostrophePlugin/trunk/lib/widget/sfWidgetFormJQueryDate.class.php

@@ -72 +72 @@
       $image = sprintf(', buttonImage: "%s", buttonImageOnly: true', $this->getOption('image'));
     }
+    $onClose = '';
+    if (false !== $attributes['onClose'])
+    {
+      $onClose = sprintf(', onClose: %s', $attributes['onClose']);
+    }
+
     return 
       // Outer div with the prefix ID allows efficient jQuery - Firefox can delay for
@@ -138 +144 @@
     showOn:     "both",
                 showAnim:       "fadeIn"
+                %s
     %s
   }, \$.datepicker.regional["%s"], %s));
@@ -161 +168 @@
       $id,
       min($this->getOption('years')), max($this->getOption('years')),
-      $prefix, $prefix, $image, $this->getOption('culture'), $this->getOption('config')
+      $prefix, $prefix, $onClose, $image, $this->getOption('culture'), $this->getOption('config')
     ) . 
     // Close wrapper div

plugins/apostrophePlugin/trunk/web/css/a.css

@@ -1742 +1742 @@
 }
 
-.a-slot.editing-now ul.a-controls
-{
+.a-slot.editing-now ul.a-controls,
+.a-area.singleton.editing-now ul.a-controls
+{ /* Controls sit on top when editing a singleton slot or a slot in an area */
 z-index: 899;
 }
 
 ul.a-controls li
-{ /* All buttons on the site are wrapped in a list. */
+{ /* All controls buttons are wrapped in a list. */
 float: left;
 display: inline;
@@ -1774 +1775 @@
 
 ul.a-controls.a-area-controls
-{ /* Area Controls - Sit ABOVE all slots */
+{
 position: relative;
 float: left;
@@ -1794 +1795 @@
 .a-area.singleton.aEvent ul.a-controls.a-area-controls,
 .a-area.singleton.aEventSingle ul.a-controls.a-area-controls
-{
+{ /* Singleton Slots that don't allow controls to sit on top of their content */
         position: relative;
         margin-bottom: 0 !important;
-}
-
-.a-area.browsing-history ul.a-controls.a-slot-controls,
-ul.a-controls ul.a-controls-item.history
-{
-z-index: 899;
 }
 

plugins/apostrophePlugin/trunk/web/js/aControls.js

@@ -106 +106 @@
       }
       var html = "<div class='a-multiple-select' id='" + id + "'>";
-      html += "<select name='select-" + name + "'>";
+      html += "<select class='a-multiple-select-input' name='select-" + name + "'>";
       html += "</select>\n";
                         if (addIndex !== undefined)
@@ -240 +240 @@
                                 }
         // Necessary in IE
-        $(select).replaceWith("<select name='select-" + name + "'>" + html + "</select>");
+        $(select).replaceWith("<select class='a-multiple-select-input' name='select-" + name + "'>" + html + "</select>");
         $("#" + id + " select").change(function() { update(false, false); });
                                 if (!initial)