Changeset 8018 for extensions/event_cats

Timestamp:

Dec 7, 2010, 11:46:18 AM (13 years ago)

Author:

LucMorizur

Message:

Improve Smart Fieldsets, again

Location:

extensions/event_cats/admin/template

Files:

• autolog_new.js (modified) (4 diffs)
• autolog_new.tpl (modified) (3 diffs)
• ec_smart_fieldset.inc.tpl (modified) (3 diffs)

extensions/event_cats/admin/template/autolog_new.js

@@ -12 +12 @@
 var ec_chk_nover_cat            = true;
 var ec_chk_over_grp             = true;
+var ec_ap_ok                    = false;
 var ec_flag1                    = false;
 var ec_flag2                    = false;
@@ -32 +33 @@
 var ec_up_code_lbl_forced_txt   = '';
 var ec_original_old_user        = '';
-var ec_plus_bullet_path         = '';
-var ec_minus_bullet_path        = '';
 var ec_selected_old_entry       = '-1';
 var ec_selected_old_code        = '-1';
@@ -861 +860 @@
   ec_selected_user                                = '-1';
   ec_selected_code                                = '-1';
-  de('ec_valid_offset_id').value             = maintenant.getTimezoneOffset();
+  de('ec_valid_offset_id').value                  =
+   maintenant.getTimezoneOffset();
   de('ec_style_forced_id').innerHTML              = ec_up_code_lbl_forced_txt;
   de('ec_act1_id').value                          = ec_default_action;
@@ -1015 +1015 @@
   }
   ec_mark_help('');
-  sf_init('first_fieldset_id', 'first_cache_id',
-   ec_plus_bullet_path, ec_minus_bullet_path, '', false);
-  sf_init('second_fieldset_id', 'second_cache_id',
-   ec_plus_bullet_path, ec_minus_bullet_path, '', false);
+  sf_init('first_fieldset_id', 'first_cache_id');
+  sf_init('second_fieldset_id', 'second_cache_id');
   jQuery(document).ready(function(){
     jQuery('#first_cache_id').after(document.createElement('span'));

extensions/event_cats/admin/template/autolog_new.tpl

@@ -9 +9 @@
 {* <!-- Specific CSS --> *}
 {html_head}
-{literal}
-  <link rel = "stylesheet" type = "text/css" href = "{$RACINE_URL}themes/default/js/ui/theme/ui.datepicker.css">
-  <style type = "text/css">
-    #ui-datepicker-div {
-      display:none;
-    }
-  </style>
-{/literal}
+  {literal}
+    <link rel = "stylesheet" type = "text/css" href = "{$RACINE_URL}themes/default/js/ui/theme/ui.datepicker.css">
+    <style type = "text/css">
+      #ui-datepicker-div {
+        display:none;
+      }
+    </style>
+  {/literal}
 {/html_head}
 
@@ -40 +40 @@
     {'Additional Pages active'|@translate}
     <script type = "text/javascript">
-      var ec_ap_ok = {if count($ec_lists.add_pages) == 0}false{else}true{/if};
+      ec_ap_ok = {if count($ec_lists.add_pages) == 0}false{else}true{/if};
     </script>
   {else}
     {'Additional Pages inactive'|@translate}
     <script type = "text/javascript">
-      var ec_ap_ok = false;
+      ec_ap_ok = false;
     </script>
   {/if}
@@ -525 +525 @@
   ec_default_entry                        = "{$ec_default_entry}";
   ec_auto_code_digits_nb                  = "{$ec_def_auto_code_dg_nb}";
-  ec_plus_bullet_path                     = "{$EVNTCATS_URLS.ROOT}icon/plus.png";
-  ec_minus_bullet_path                    = "{$EVNTCATS_URLS.ROOT}icon/minus.png";
+  sf_plus_bullet_path                     = "{$EVNTCATS_URLS.ROOT}icon/plus.png";
+  sf_minus_bullet_path                    = "{$EVNTCATS_URLS.ROOT}icon/minus.png";
   {if $ec_is_creation}
     {foreach from = $ec_lists.duplicable_codes.ids key = ec_key item = ec_val}

extensions/event_cats/admin/template/ec_smart_fieldset.inc.tpl

@@ -7 +7 @@
     var sf_minus_bullet_path = '';
     
-    function sf_toggle(maximized, reduced) {
-      reduced.toggle();
-      maximized.toggle();
+    function sf_reduce(fieldset_id) {
+      var f_m = jQuery('#' + fieldset_id);
+      if (!f_m.is(':hidden')) {
+        f_m.toggle();
+        jQuery('#' + fieldset_id + '_reduced').toggle();
+      }
+    }
+    
+    function sf_maximize(fieldset_id) {
+      var f_m = jQuery('#' + fieldset_id);
+      if (f_m.is(':hidden')) {
+        f_m.toggle();
+        jQuery('#' + fieldset_id + '_reduced').toggle();
+      }
     }
     
     function sf_lock(fieldset_id, locked) {
-      var f_m = jQuery('#' + fieldset_id);
+      var l_m = jQuery('#' + fieldset_id + ' legend');
       var l_r = jQuery('#' + fieldset_id + '_reduced_legend');
       if (locked) {
-        if (!f_m.is(':hidden'))
-         sf_toggle(f_m, jQuery('#' + fieldset_id + '_reduced'));
         l_r.css('cursor', 'auto');
         l_r.removeClass('click_ok');
+        l_m.css('cursor', 'auto');
+        l_m.removeClass('click_ok');
       }
       else {
+        l_r.css('cursor', 'pointer');
         l_r.addClass('click_ok');
-        l_r.css('cursor', 'pointer');
+        l_m.css('cursor', 'pointer');
+        l_m.addClass('click_ok');
       }
     }
@@ -32 +45 @@
         var l_m   = jQuery('#' + fieldset_id + ' legend');
         var l_txt = l_m.text();
-        var tx    = '';
         var f_r   = f_m;
-        var l_r   = f_m;
-        var c     = f_m;
+        var l_r   = l_m;
         if (sf_minus_bullet_path != '') l_m.prepend(
           '<img alt = "" title = ""' +
@@ -81 +92 @@
          );
         l_r.after(document.createElement('span'));
-        c = l_r.next();
-        c.attr('id', cache_id);
+        l_r.next().attr('id', cache_id);
         jQuery('.sf_legends').css('cursor', 'pointer');
         l_m.click(function(){
-          if (l_m.hasClass('sf_click_ok')) sf_toggle(f_m, f_r);
+          if (l_m.hasClass('sf_click_ok')) { f_m.toggle(); f_r.toggle(); }
         });
         l_r.click(function(){
-          if (l_r.hasClass('sf_click_ok')) sf_toggle(f_m, f_r);
+          if (l_r.hasClass('sf_click_ok')) { f_m.toggle(); f_r.toggle(); }
         });
       });