Changeset 7985

Timestamp:

Dec 2, 2010, 11:12:30 PM (13 years ago)

Author:

LucMorizur

Message:

Implement bullets in autolog_new.tpl

Location:

extensions/event_cats/admin/template

Files:

• autolog_new.js (modified) (12 diffs)
• autolog_new.tpl (modified) (3 diffs)

extensions/event_cats/admin/template/autolog_new.js

@@ -81 +81 @@
 }
 
-function ec_mark_reduced_fieldsets() { /*
-  if (de('ec_sel_code_new').checked == 'checked') {
-  }
-  else { 
-  } */
+function ec_update_comment(ec_id) {
+  if (ec_id == '')
+   de('first_fieldset_comment_id').innerHTML = '';
+  else
+   de('first_fieldset_comment_id').innerHTML = ' <em>(' + ec_id + ')</em>';
 }
 
@@ -146 +146 @@
   }
   ec_chk_nover_cat = true;
-  ec_mark_reduced_fieldsets();
 }
 
 function ec_mark_code(ec_id) {
-  var t3 = d.ec_new_code.ec_in_up_code_list_id;
-  var t2 = '';
+  var t2 = d.ec_new_code.ec_in_up_code_list_id;
   if (ec_id == '-1') {
     de('ec_sel_code_old').checked = 'checked';
@@ -174 +172 @@
            (ec_selected_old_group) ? 'checked' : '';
           de('ec_act2_id').value                    = '-1';
-          t2 = ' <em>(' + de('ec_in_up_comment_id').value + ')</em>';
-          t2 = (t2 == ' <em>()</em>') ? '' : t2
-          de('first_fieldset_value_id').innerHTML = ec_new_code_text + t2;
+          de('first_fieldset_value_id').innerHTML = ec_new_code_text;
+          ec_update_comment(ec_new_comment_text);
         break;
         case 'ec_sel_code_old':
@@ -191 +188 @@
           ec_selected_old_user               =
            ec_lists['user_id'][ec_selected_old_code];
-          t2 =
-            ' <em>(' +
-            ec_lists['comment'][t3.options[t3.selectedIndex].value] +
-            ')</em>'
-          ;
-          t2 = (t2 == ' <em>()</em>') ? '' : t2
           de('first_fieldset_value_id').innerHTML =
-            ec_lists['code'][t3.options[t3.selectedIndex].value] + t2;
+           ec_lists['code'][t2.options[t2.selectedIndex].value];
+          ec_update_comment(
+            ec_lists['comment'][t2.options[t2.selectedIndex].value]
+          );
           ec_flag1 = true;
           ec_mark_user('ec_sel_user_old');
@@ -215 +209 @@
     }
   }
-  ec_mark_reduced_fieldsets();
 }
 
 function ec_mark_user(ec_id) {
+  var t = d.ec_new_code.ec_in_up_usr_list_id;
   if (ec_id == '-1') {
     de('ec_sel_user_old').checked = 'checked';
@@ -231 +225 @@
       de('ec_in_up_usr_list_id').selectedIndex = '-1';
       d.ec_new_code.ec_in_up_entry_list.focus();
-      ec_mark_reduced_fieldsets();
       return false;
     }
@@ -251 +244 @@
           de('ec_in_up_newgroup_id').checked       = '';
           de('ec_in_up_usr_list_id').selectedIndex = '-1';
+          de('second_fieldset_value_id').innerHTML = '';
         break;
         case 'ec_sel_user_new': // New user
@@ -263 +257 @@
            (ec_selected_old_group) ? 'checked' : '';
           de('ec_in_up_usr_list_id').selectedIndex = '-1';
+          de('second_fieldset_value_id').innerHTML = ec_new_user_text;
         break;
         case 'ec_sel_user_old': // "Old" user
           if (ec_selected_action == 'ec_input_action_refused')
            ec_selected_action = 'ec_input_action_home';
-          de('ec_in_up_usr_txt_id').value    = '';
-          de('ec_in_up_psd_txt_id').value    = '';
-          de('ec_confirm_psd_txt_id').value  = '';
-          de('ec_in_up_grp_txt_id').value    = '';
-          de('ec_in_up_newgroup_id').checked = '';
-          de('ec_in_up_usr_list_id').value   = ec_selected_old_user;
+          de('ec_in_up_usr_txt_id').value          = '';
+          de('ec_in_up_psd_txt_id').value          = '';
+          de('ec_confirm_psd_txt_id').value        = '';
+          de('ec_in_up_grp_txt_id').value          = '';
+          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 =
+           t.options[t.selectedIndex].label;
         break;
       }
@@ -283 +280 @@
     }
   }
-  ec_mark_reduced_fieldsets();
   return true;
 }
@@ -302 +298 @@
       de('ec_in_up_imgs_id').value = '';
       d.ec_new_code.ec_in_up_entry_list.focus();
-      ec_mark_reduced_fieldsets();
       return false;
     }
@@ -378 +373 @@
     }
   }
-  ec_mark_reduced_fieldsets();
   return true;
 }
@@ -1029 +1023 @@
       );
     });
+    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'
       );
     });

extensions/event_cats/admin/template/autolog_new.tpl

@@ -87 +87 @@
     <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_id1"
-     >{if $ec_is_creation}{'Code'|@translate}{else}{'Selected entry'|@translate}{/if}</span>&nbsp;: </span>
-    <span id = "first_fieldset_value_id"></span>
+     >&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_id1').innerHTML);</script>
+      <script type = "text/javascript">d.write(de('first_fieldset_legend_id').innerHTML);</script>
     </legend>
     <ul>
@@ -136 +136 @@
             <span style = "font-weight:bold; font-style:italic;">{'Comment'|@translate}</span>
             <input type = "text" name = "ec_in_up_comment" maxlength = "100" size = "50" id = "ec_in_up_comment_id"
-              onchange = "ec_new_comment_text = this.value;"
+              onchange = "ec_new_comment_text = this.value; ec_update_comment(this.value);"
            >
           </label>
@@ -188 +188 @@
   
   {* <!-- User to identify --> *}
-  <fieldset>
-    <legend style = "font-weight:bold;">
+  <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">
       {'Identified user'|@translate}
       <span style = "font-weight:bold; color:red;" id = "ec_in_up_pwd_warn">&nbsp;</span><br>