Changeset 8004 for extensions/event_cats

Timestamp:

Dec 6, 2010, 3:47:33 AM (14 years ago)

Author:

LucMorizur

Message:

Implement 'Smart Fieldsets'

Location:

extensions/event_cats/admin

Files:

• evntcats_admin.php (modified) (1 diff)
• template/autolog_new.js (modified) (8 diffs)
• template/autolog_new.tpl (modified) (6 diffs)
• template/ec_smart_fieldset.inc.tpl (added)

extensions/event_cats/admin/evntcats_admin.php

@@ -388 +388 @@
 */
 
-$template->assign(
- 'HeaderIncTPL', realpath('plugins/event_cats/admin/template/header.inc.tpl')
-);
-
-$template->assign(
- 'FooterIncTPL', realpath('plugins/event_cats/admin/template/footer.inc.tpl')
-);
+$template->assign(array(
+ 'HeaderIncTPL'        =>
+  realpath('plugins/event_cats/admin/template/header.inc.tpl'),
+ 'SmartFieldsetIncTPL' =>
+  realpath('plugins/event_cats/admin/template/ec_smart_fieldset.inc.tpl'),
+ 'FooterIncTPL'        =>
+  realpath('plugins/event_cats/admin/template/footer.inc.tpl'),
+));
 
 $template->assign(

extensions/event_cats/admin/template/autolog_new.js

@@ -32 +32 @@
 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';
@@ -172 +174 @@
            (ec_selected_old_group) ? 'checked' : '';
           de('ec_act2_id').value                    = '-1';
-          de('first_fieldset_value_id').innerHTML = ec_new_code_text;
+          de('first_cache_id').innerHTML            = ec_new_code_text;
           ec_update_comment(ec_new_comment_text);
         break;
@@ -188 +190 @@
           ec_selected_old_user               =
            ec_lists['user_id'][ec_selected_old_code];
-          de('first_fieldset_value_id').innerHTML =
+          de('first_cache_id').innerHTML     =
            ec_lists['code'][t2.options[t2.selectedIndex].value];
           ec_update_comment(
@@ -244 +246 @@
           de('ec_in_up_newgroup_id').checked       = '';
           de('ec_in_up_usr_list_id').selectedIndex = '-1';
-          de('second_fieldset_value_id').innerHTML = '';
+          de('second_cache_id').innerHTML = '';
         break;
         case 'ec_sel_user_new': // New user
@@ -257 +259 @@
            (ec_selected_old_group) ? 'checked' : '';
           de('ec_in_up_usr_list_id').selectedIndex = '-1';
-          de('second_fieldset_value_id').innerHTML = ec_new_user_text;
+          de('second_cache_id').innerHTML = ec_new_user_text;
         break;
         case 'ec_sel_user_old': // "Old" user
@@ -268 +270 @@
           de('ec_in_up_newgroup_id').checked       = '';
           de('ec_in_up_usr_list_id').value         = ec_selected_old_user;
-          de('second_fieldset_value_id').innerHTML =
+          de('second_cache_id').innerHTML =
            t.options[t.selectedIndex].label;
         break;
@@ -1013 +1015 @@
   }
   ec_mark_help('');
+  ec_init_smart_fieldset('first_fieldset_id', 'first_cache_id',
+   ec_plus_bullet_path, ec_minus_bullet_path, '', false);
+  ec_init_smart_fieldset('second_fieldset_id', 'second_cache_id',
+   ec_plus_bullet_path, ec_minus_bullet_path, '', false);
   jQuery(document).ready(function(){
+    jQuery('#first_cache_id').after(document.createElement('span'));
+    jQuery('#first_cache_id').next().attr('id', 'first_fieldset_comment_id');
     jQuery('#ec_tmp_img').attr(
       'src', jQuery('img.ui-datepicker-trigger:first').attr('src')
     );
     ec_check_validity_on();
-    jQuery('#reduced_first_fieldset_legend_id').click(function(){
-      ec_toggle_fieldset(
-        '#reduced_first_fieldset_id', '#maximized_first_fieldset_id'
-      );
-    });
-    jQuery('#reduced_second_fieldset_legend_id').click(function(){
-      ec_toggle_fieldset(
-        '#reduced_second_fieldset_id', '#maximized_second_fieldset_id'
-      );
-    });
-    jQuery('#maximized_first_fieldset_legend_id').click(function(){
-      ec_toggle_fieldset(
-        '#reduced_first_fieldset_id', '#maximized_first_fieldset_id'
-      );
-    });
-    jQuery('#maximized_second_fieldset_legend_id').click(function(){
-      ec_toggle_fieldset(
-        '#reduced_second_fieldset_id', '#maximized_second_fieldset_id'
-      );
-    });
     jQuery('.ui-datepicker').click(function(){
       ec_validity_check_min();
@@ -1055 +1043 @@
       ec_check_validity_on();
     });
-    jQuery('.reduced_fieldsets').css({
-      'padding-left'   : jQuery('fieldset').css('padding-left'),
-      'padding-right'  : jQuery('fieldset').css('padding-right'),
-      'margin-left'    : jQuery('fieldset').css('margin-left'),
-      'margin-right'   : jQuery('fieldset').css('margin-right'),
-      'margin-top'     : jQuery('fieldset').css('margin-top'),
-      'margin-bottom'  : jQuery('fieldset').css('margin-bottom'),
-    });
-    jQuery('.plus_bullets').css(
-      'padding-left', jQuery('legend').css('padding-left')
-    );
-    jQuery('.reduced_fieldsets_legend').css({
-      'padding-left'   : jQuery('fieldset').css('border-left-width'),
-      'padding-top'    : jQuery('fieldset').css('border-top-width'),
-      'letter-spacing' : jQuery('legend').css('letter-spacing'),
-    });
   });
   return false;

extensions/event_cats/admin/template/autolog_new.tpl

@@ -5 +5 @@
 {include file = $HeaderIncTPL}
 {include file = 'include/datepicker.inc.tpl'}
+{include file = $SmartFieldsetIncTPL}
 
 {* <!-- Specific CSS --> *}
-{html_head} {literal}
+{html_head}
+{literal}
   <link rel = "stylesheet" type = "text/css" href = "{$RACINE_URL}themes/default/js/ui/theme/ui.datepicker.css">
   <style type = "text/css">
@@ -13 +15 @@
       display:none;
     }
-    .reduced_fieldsets {
-      margin:0;
-      padding:0;
-    }
-    .fieldsets_legend {
-      cursor:pointer;
-    }
   </style>
-{/literal} {/html_head}
+{/literal}
+{/html_head}
 
 {* <!-- JS functions --> *}
@@ -59 +55 @@
 {* <!-- Parameters list --> *}
 <form class = "filter" method = "post" name = "ec_new_code" action = "" onsubmit = "return ec_check_submit();">
-  <p>
+  <p style = "display:none;">
     <input type = "hidden" id = "ec_act1_id" name = "ec_act1">
     <input type = "hidden" id = "ec_act2_id" name = "ec_entry_sel">
@@ -84 +80 @@
   
   {* <!-- [ [ [New] / [existing] code] / [Existing entry] ] selection --> *}
-  <div id = "reduced_first_fieldset_id" class = "reduced_fieldsets" style = "display:none;">
-    <span style = "font-weight:bold;" class = "reduced_fieldsets_legend fieldsets_legend" id = "reduced_first_fieldset_legend_id"
-     ><img class = "plus_bullets" alt = "" title = "" src = "{$EVNTCATS_URLS.ROOT}icon/plus.png"
-     >&nbsp;<span id = "first_fieldset_legend_id"
-     >{if $ec_is_creation}{'Code'|@translate}{else}{'Selected entry'|@translate}{/if}</span>&nbsp;: </span
-     ><span id = "first_fieldset_value_id"></span><span id = "first_fieldset_comment_id"></span>
-  </div>
-  <fieldset id = "maximized_first_fieldset_id">
-    <legend style = "font-weight:bold;" class = "fieldsets_legend" id = "maximized_first_fieldset_legend_id">
-      <img class = "minus_bullets" alt = "" title = "" src = "{$EVNTCATS_URLS.ROOT}icon/minus.png">
-      <script type = "text/javascript">d.write(de('first_fieldset_legend_id').innerHTML);</script>
+  <fieldset id = "first_fieldset_id">
+    <legend style = "font-weight:bold;">
+      {if $ec_is_creation}
+        {'Code'|@translate}
+      {else}
+        {'Selected entry'|@translate}
+      {/if}
     </legend>
     <ul>
@@ -188 +180 @@
   
   {* <!-- User to identify --> *}
-  <div id = "reduced_second_fieldset_id" class = "reduced_fieldsets" style = "display:none;">
-    <span style = "font-weight:bold;" class = "reduced_fieldsets_legend fieldsets_legend" id = "reduced_second_fieldset_legend_id"
-     ><img class = "plus_bullets" alt = "" title = "" src = "{$EVNTCATS_URLS.ROOT}icon/plus.png"
-     >&nbsp;{'Identified user'|@translate}&nbsp;: </span><span id = "second_fieldset_value_id"></span>
-  </div>
-  <fieldset id = "maximized_second_fieldset_id">
-    <legend style = "font-weight:bold;" class = "fieldsets_legend" id = "maximized_second_fieldset_legend_id">
-      <img class = "minus_bullets" alt = "" title = "" src = "{$EVNTCATS_URLS.ROOT}icon/minus.png">
+  <fieldset id = "second_fieldset_id">
+    <legend style = "font-weight:bold;">
       {'Identified user'|@translate}
-      <span style = "font-weight:bold; color:red;" id = "ec_in_up_pwd_warn">&nbsp;</span><br>
+      <span style = "font-weight:bold; color:red;" id = "ec_in_up_pwd_warn">&nbsp;</span><br />
     </legend>
       <ul>
@@ -539 +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";
   {if $ec_is_creation}
     {foreach from = $ec_lists.duplicable_codes.ids key = ec_key item = ec_val}