Changeset 54218 in spip-zone

Timestamp:

Nov 8, 2011, 5:28:38 PM (8 years ago)

Author:

cedric@…

Message:

suppression des vieux js qui ne servent plus
ajout du js qui etend le date-picker de jQuery UI pour l'utiliser en multi-selection pour les repetitions
ajustements de style
retablissement de la saisie des repetitions dans le formulaire editer evenement

Location:

_plugins_/agenda/trunk

Files:

• formulaires/editer_evenement.html (modified) (2 diffs)
• formulaires/editer_evenement.php (modified) (1 diff)
• javascript/dates.js (deleted)
• javascript/jquery-ui.multidatespicker.js (added)
• javascript/jquery.datePicker.js (deleted)
• javascript/jquery.timePicker.js (deleted)
• javascript/mots_evenements.js (deleted)
• prive/style_prive_plugin_agenda.html (modified) (1 diff)

_plugins_/agenda/trunk/formulaires/editer_evenement.html

@@ -46 +46 @@
                         <li class="editer_repetitions[ (#ENV**{erreurs}|table_valeur{repetitions}|oui)erreur]">
                                 <label for="repetitions"><:agenda:evenement_repetitions:></label>[
-                                (#ENV{repetitions}|non)<a href='#' onclick="$(this).next().removeClass('cachee');return false;"><:agenda:ajouter_repetition:></a>
-                                <div class='ajouter_repetitions'>][
+                                (#ENV{repetitions}|non)<a href='#' onclick="$(this).hide().next().show('fast');return false;"><:agenda:ajouter_repetition:></a>
+                                <div class='ajouter_repetitions none'>][
                                 <span class='erreur_message'>(#ENV**{erreurs}|table_valeur{repetitions})</span>
                                 ]<div id='repetitions_picker'></div>
-                                <textarea name='repetitions' id='repetitions'>#ENV{repetitions}</textarea>[
+                                <textarea name='repetitions' id='repetitions' readonly="readonly">#ENV{repetitions}</textarea>[
                                 (#ENV{repetitions}|non)</div>]
                         </li>
@@ -88 +88 @@
         ]
 </div>
+<script type="text/javascript">
+        var repetitions_done = false;
+        jQuery(document).bind('datePickerLoaded',function(){
+                if (!repetitions_done){
+                        repetitions_done = true;
+                        jQuery.getScript('#CHEMIN{javascript/jquery-ui.multidatespicker.js}',function(){
+                                var repetitions = jQuery('#repetitions').html();
+                                repetitions = repetitions.split(',');
+                                jQuery('#repetitions_picker')
+                                        .multiDatesPicker(jQuery.extend(
+                                                                date_picker_options(),
+                                                                {
+                                                                        altField: '#repetitions',
+                                                                        addDates: repetitions
+                                                                }
+                                        ))
+                                        .addClass('.pickable'); // une seule fois;
+                        });
+                }
+        });
+</script>

_plugins_/agenda/trunk/formulaires/editer_evenement.php

@@ -39 +39 @@
 
         // les repetitions
-        $valeurs['repetitions'] = '';
+        $valeurs['repetitions'] = array();
         if (intval($id_evenement)){
                 $repetitons = sql_allfetsel("date_debut","spip_evenements","id_evenement_source=".intval($id_evenement),'','date_debut');
                 foreach($repetitons as $d)
-                        $valeurs['repetitions'] .= date('d/m/Y',strtotime($d['date_debut'])).' ';
+                        $valeurs['repetitions'][] = date('d/m/Y',strtotime($d['date_debut']));
         }
+        $valeurs['repetitions'] = implode(',',$valeurs['repetitions']);
 
         // dispatcher date et heure

_plugins_/agenda/trunk/prive/style_prive_plugin_agenda.html

@@ -80 +80 @@
 
 /* le picker */
-a.dp-choose-date { display: inline-block; padding: 0; margin: 3px 0 0 -19px; vertical-align: bottom; }
-#repetitions_picker {float:left;}
-li.editer_repetitions textarea {float:left;width:110px;height:11em;}
 
-div.time-picker {font-size:11px;  width:5em; /* needed for IE */}
+/* begin: jQuery UI Datepicker moving pixels fix */
+        table.ui-datepicker-calendar {border-collapse: separate;}
+        .ui-datepicker-calendar td {border: 1px solid transparent;}
+/* end: jQuery UI Datepicker moving pixels fix */
+/* begin: jQuery UI Datepicker emphasis on selected dates */
+.ui-datepicker .ui-datepicker-calendar .ui-state-highlight a {
+        background: #ENV{foncee}; /* a color that fits the widget theme */
+        color: white; /* a color that is readeable with the color above */
+}
+/* end: jQuery UI Datepicker emphasis on selected dates */
 
-/* selecteur de mots */
-.formulaire_editer_evenement li.editer_mots ul#mots_sel {display:block;}
-.formulaire_editer_evenement li.editer_mots ul#mots_sel li {padding:2px;background:#eee;border:1px solid #999;display:block;float:left;margin:0 4px 3px 0;width:auto;clear:none;font-size:0.9em;}
-.formulaire_editer_evenement li.editer_mots ul#mots_sel li em {display:none;}
-.formulaire_editer_evenement li.editer_mots ul#mots_sel li.show {font-weight:bold;}
-.formulaire_editer_evenement li.editer_mots .mots_chemin {clear:left;margin:1em 0 0.5em 0;border-bottom:1px solid #eee;}
-.formulaire_editer_evenement li.editer_mots ul.groupes_contenus {clear:left;}
-.formulaire_editer_evenement li.editer_mots ul.groupes_contenus li {padding:0;margin:0;border:0;clear:none;float:left;width:48%;margin-right:5px;}
-.formulaire_editer_evenement li.editer_mots ul.groupes_contenus li.groupe a {background:url(triangle-droite.gif) no-repeat center right;padding-right:12px;}
-.formulaire_editer_evenement li.editer_mots ul.groupes_contenus li.mot a {color:#ENV{claire};}
-
-.formulaire_editer_evenement li.editer_repetitions div.ajouter_repetitions.cachee #repetitions_picker {display:none;}
-.formulaire_editer_evenement li.editer_repetitions div.ajouter_repetitions.cachee textarea {margin:0;padding:0;height:1px;visibility:hidden;} /* bug ff : si on le met hidden on ne peut plus saisir dedans apres */
+#repetitions_picker {}
+.editer_repetitions textarea {width:100%;height:4em;color:#999;border:1px solid #999;}
 
 /* Calendrier */