Changeset 4181 for extensions/event_cats/admin

Timestamp:

Nov 4, 2009, 7:14:50 PM (14 years ago)

Author:

LucMorizur

Message:

[Event Cats] Some debugging ; adapt certain labels so that it can be recognized in other modules

(See ​http://fr.piwigo.org/forum/viewtopic.php?pid=122608#p122608 ) mainly

Location:

extensions/event_cats/admin/template

Files:

• autolog_entries.tpl (modified) (4 diffs)
• autolog_new.js (modified) (5 diffs)
• autolog_new.tpl (modified) (4 diffs)

extensions/event_cats/admin/template/autolog_entries.tpl

@@ -7 +7 @@
   {if $ec_ap_ok}
     {'ec_plugin_ap_ok'|@translate}
-    <script type = "text/javascript"><!--
-      var ec_ap_ok = true; //-->
+    <script type = "text/javascript">
+      var ec_ap_ok = true;
     </script>
   {else}
     {'ec_plugin_ap_nok'|@translate}
-    <script type = "text/javascript"><!--
-      var ec_ap_ok = false; //-->
+    <script type = "text/javascript">
+      var ec_ap_ok = false;
     </script>
   {/if}
@@ -24 +24 @@
   
   <div style = "text-align:center; font-weight:bold; font-size:120%;">
-    <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"><label>{'ec_entry_table_title'|@translate}</label></a><br>
+    <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}">
+      <!--[if !IE]> <--> <label> <!--> <![endif]-->
+        {'ec_entry_table_title'|@translate}
+      <!--[if !IE]> <--> </label> <!--> <![endif]-->
+      <!-- What we're able to do for our "prefered" browser |-( ...!  -->
+    </a><br>
   </div><br>
   
@@ -122 +127 @@
 {* <!-- JavaScript functions --> *}
 <script type = "text/javascript" src = "{$RACINE_URL}{$EVNTCATS_PATH}admin/template/autolog_entries.js"></script>
-<script type = "text/javascript"><!--
+<script type = "text/javascript">
   ec_JS_message['ec_confirm_delete']  = "{'ec_confirm_delete'|@translate|@escape:javascript}";
   ec_JS_message['ec_confirm_disable'] = "{'ec_confirm_disable'|@translate|@escape:javascript}";
@@ -129 +134 @@
   ec_JS_message['ec_clk_entry_miss']  = "{'ec_clk_entry_miss'|@translate|@escape:javascript}";
   ec_init();
-//--></script>
+</script>
 
 {include file='../../../plugins/event_cats/admin/template/footer.inc.tpl'}

extensions/event_cats/admin/template/autolog_new.js

@@ -21 +21 @@
 var ec_default_entry            = '';
 var ec_up_code_lbl_forced_txt   = '';
+var ec_original_old_user        = '';
 var ec_selected_old_entry       = '-1';
 var ec_selected_old_code        = '-1';
@@ -72 +73 @@
       ec_selected_user = 'ec_sel_user_old';
       ec_selected_old_user = ec_lists['user_id'][ec_id];
+      ec_original_old_user = ec_selected_old_user;
       if (
         ec_lists['arg1'][ec_id] != '' &&
@@ -551 +553 @@
   var t1 = true;
   var t2 = true;
+  var t3 = false;
   if (ec_dont_check) return true;
   if (ec_is_creation) {
+    t3 = de('ec_sel_code_old').checked != '';
     if ((
       de('ec_sel_code_new').checked != '' &&
@@ -588 +592 @@
       return false;
     }
+    if (
+      de('ec_sel_user_new').checked != '' || (
+        de('ec_sel_user_old').checked != '' &&
+        ec_original_old_user != d.ec_new_code.ec_in_up_usr_list.value
+      )
+    ) if (!confirm(ec_JS_message['ec_confirm_change_user'])) return false;
   }
   if ((
@@ -629 +639 @@
     return false;
   }
-  if ((!ec_is_creation && !t1) ||
-    (de('ec_in_up_forced_id').checked != '' && de('ec_sel_code_old').checked != '')
-  ) return confirm(ec_JS_message['ec_confirm_del_other']);
+  if (!ec_is_creation && !t1)
+   return confirm(ec_JS_message['ec_confirm_del_other']);
+  else if (
+    (!ec_is_creation || t3) &&
+    de('ec_in_up_forced_id').checked != ''
+  ) return confirm(ec_JS_message['ec_confirm_force']);
   return true;
 }

extensions/event_cats/admin/template/autolog_new.tpl

@@ -26 +26 @@
   <div style = "text-align:center;">
     <a style = "font-weight:bold; font-size:120%;" href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}">
-      <label>
+      <!--[if !IE]> <--> <label> <!--> <![endif]-->
         {if $ec_is_creation}
           {'ec_new_entry_title'|@translate}
@@ -32 +32 @@
           {'ec_modify_entry_title'|@translate}
         {/if}
-      </label>
+      <!--[if !IE]> <--> </label> <!--> <![endif]-->
+      <!-- What we're able to do for our "prefered" browser |-( ...!  -->
     </a>
     {if $ec_is_creation}
@@ -172 +173 @@
                 {'ec_new_user_group'|@translate}
               </span><br>
-              <input type = "text" name = "ec_in_up_grp_txt" id = "ec_in_up_grp_txt_id" maxlength = "32"
+              <input type = "text" name = "groupname" id = "ec_in_up_grp_txt_id" maxlength = "32"
                size = "20" onblur = "ec_new_grp_text = this.value; if (this.value != '') ec_selected_old_group = true;"
               />
@@ -274 +275 @@
   ec_JS_message['ec_new_pwd_gen2']        = "{'ec_new_pwd_gen2'|@translate|@escape:javascript}";
   ec_JS_message['ec_act_entry_miss']      = "{'ec_act_entry_miss'|@translate|@escape:javascript}";
+  ec_JS_message['ec_confirm_force']       = "{'ec_confirm_force'|@translate|@escape:javascript}";
   ec_JS_message['ec_confirm_del_other']   = "{'ec_confirm_del_other'|@translate|@escape:javascript}";
   ec_JS_message['ec_user_already_exists'] = "{'ec_user_already_exists'|@translate|@escape:javascript}";
   ec_JS_message['ec_code_already_exists'] = "{'ec_code_already_exists'|@translate|@escape:javascript}";
   ec_JS_message['ec_conf_pwd_dont_match'] = "{'ec_conf_pwd_dont_match'|@translate|@escape:javascript}";
+  ec_JS_message['ec_confirm_change_user'] = "{'ec_confirm_change_user'|@translate|@escape:javascript}";
   ec_JS_message['ec_up_code_lbl_home']    = "{'ec_up_code_lbl_home'|@translate}";
   ec_JS_message['ec_submit_code_miss']    = "{'ec_submit_code_miss'|@translate}";