Changeset 4092 for extensions/event_cats/admin
- Timestamp:
- Oct 23, 2009, 1:48:54 AM (15 years ago)
- Location:
- extensions/event_cats/admin
- Files:
-
- 11 edited
-
autolog_entries.inc.php (modified) (7 diffs)
-
autolog_new.inc.php (modified) (4 diffs)
-
config.inc.php (modified) (1 diff)
-
duplication.inc.php (modified) (1 diff)
-
evntcats_admin.php (modified) (3 diffs)
-
evntcats_theme.css (modified) (1 diff)
-
template/autolog_entries.js (modified) (3 diffs)
-
template/autolog_entries.tpl (modified) (7 diffs)
-
template/autolog_new.js (modified) (14 diffs)
-
template/autolog_new.tpl (modified) (9 diffs)
-
template/header.inc.tpl (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
extensions/event_cats/admin/autolog_entries.inc.php
r4011 r4092 88 88 switch ($ec_entry['action']) { 89 89 90 case 'ec_ok_f_pb' :91 case 'ec_ok_f_pb_img_pb' :92 $page['errors'][$ec_entry['code']] =93 $ec_entry['code'].' : '.l10n('ec_forced_pb');94 90 case 'ec_ok' : 95 91 case 'ec_ok_img_pb' : … … 103 99 case 1: // Category 104 100 case 3: // Image 105 $url_end = ( 106 $ec_entry['forced'] == 'true' and 107 !is_in($ec_entry['action'], '_f_pb') 108 ) ? '' : '&cat='.$arg1; 101 $url_end = ($ec_entry['forced'] == 'true') ? '' : '&cat='.$arg1; 109 102 $dspl = 110 103 l10n('ec_dspl_ok_cat_pre'). … … 148 141 break; 149 142 case 2: // Additional Page 150 $url_end = ( 151 $ec_entry['forced'] == 'true' and 152 !is_in($ec_entry['action'], '_f_pb') 153 ) ? '' : '&ap='.$arg2; 143 $url_end = ($ec_entry['forced'] == 'true') ? '' : '&ap='.$arg2; 154 144 $dspl = ($ec_ap_ok) ? 155 145 l10n('ec_dspl_ok_ap_pre'). … … 182 172 break; 183 173 184 case 'ec_ok_f_pb_ap_pb' :185 $page['errors'][$ec_entry['code']] =186 $ec_entry['code'].' : '.l10n('ec_forced_pb');187 174 case 'ec_nok_ap_pb' : // No need to check here if Additional Pages is 188 175 case 'ec_ok_ap_pb' : // active : we can arrive here only when it is. … … 190 177 $ec_entry['code'].' : '.l10n('ec_add_page_miss'); 191 178 if (is_in($ec_entry['action'], 'ec_ok')) { 192 $url_end = ( 193 $ec_entry['forced'] == 'true' and 194 !is_in($ec_entry['action'], '_f_pb') 195 ) ? '' : '&ap='.$arg2; 179 $url_end = ($ec_entry['forced'] == 'true') ? '' : '&ap='.$arg2; 196 180 $dspl = l10n('ec_dspl_ok_home'); 197 181 } … … 208 192 break; 209 193 210 case 'ec_ok_f_pb_cat_pb' :211 $page['errors'][$ec_entry['code']] =212 $ec_entry['code'].' : '.l10n('ec_forced_pb');213 194 case 'ec_ok_cat_pb' : 214 $url_end = ( 215 $ec_entry['forced'] == 'true' and 216 !is_in($ec_entry['action'], '_f_pb') 217 ) ? '' : '&cat='.$arg1; 195 $url_end = ($ec_entry['forced'] == 'true') ? '' : '&cat='.$arg1; 218 196 $page['errors'][] = 219 197 $ec_entry['code'].' : '.l10n('ec_category_miss'); … … 283 261 'code_URL' => $code_URL, 284 262 'log_OK' => $log_OK, 285 'f_pb' => is_in($ec_entry['action'], '_f_pb'),286 263 ); 287 264 } -
extensions/event_cats/admin/autolog_new.inc.php
r4058 r4092 62 62 if ( 63 63 is_in($ec_entry['action'], 'ec_ok') and 64 !is_in($ec_entry['action'], '_f_pb') and65 64 $ec_entry['forced'] == 'false' 66 65 ) { 67 66 $t[$ec_entry['id']] = $ec_entry['code']; 68 $ec_lists['duplicable_codes'][ $ec_entry['code']]['id'] =67 $ec_lists['duplicable_codes']['codes'][$ec_entry['code']]['id'] = 69 68 $ec_entry['id']; 70 $ec_lists['duplicable_codes'][ $ec_entry['code']]['user_id'] =69 $ec_lists['duplicable_codes']['codes'][$ec_entry['code']]['user_id'] = 71 70 $ec_entry['user_id']; 72 71 } … … 74 73 foreach ($t as $ec_id => $ec_code) { 75 74 $ec_lists['duplicable_codes']['ids'][$ec_id] = 76 $ec_lists['duplicable_codes'][ $ec_code]['id'];75 $ec_lists['duplicable_codes']['codes'][$ec_code]['id']; 77 76 } 78 77 79 78 $ec_def_vals = array(); 80 79 81 $ec_default_action = 'create ';80 $ec_default_action = 'create_ask'; 82 81 $ec_default_entry = '-1'; 83 82 $ec_def_auto_code_dg_nb = read_ec_conf('auto_code_dg_nb'); … … 93 92 ) { 94 93 switch ($_POST['ec_act1']) { 94 case 'duplicate_entry_submit': // submit failed 95 case 'modify_entry_submit': // submit failed 95 96 case 'duplicate_entry_ask': 96 97 case 'modify_entry_ask': 98 case 'create_ask': 97 99 case 'disable': 98 100 case 'create': … … 118 120 (count($ec_lists['user_ids']) == 0) ? 'style = "display:none;"' : '' 119 121 ); 120 $template->assign('ec_is_creation', 121 ($ec_default_action == 'duplicate_entry_ask' or 122 $ec_default_action == 'create') 122 $template->assign('ec_is_creation', ( 123 $ec_default_action == 'duplicate_entry_submit' or 124 $ec_default_action == 'duplicate_entry_ask' or 125 $ec_default_action == 'create_ask' or 126 $ec_default_action == 'create' 127 ) 123 128 ); 124 129 $template->assign('ec_default_action',$ec_default_action); -
extensions/event_cats/admin/config.inc.php
r3999 r4092 1 <?php 2 3 ?> -
extensions/event_cats/admin/duplication.inc.php
r3999 r4092 1 <?php 2 3 ?> -
extensions/event_cats/admin/evntcats_admin.php
r4064 r4092 73 73 ) change_ec_conf('auto_code_dg_nb', $_POST['ec_in_up_auto_code_length']); 74 74 75 $ec_howto = (read_ec_conf('howto') == '0'); 76 if ($ec_howto) change_ec_conf('howto', '1'); 77 75 78 // +-----------------------------------------------------------------------+ 76 79 // | Tabsheet … … 88 91 89 92 if (isset($_POST['ec_act1'])) { 90 if ( /* 91 $_POST['ec_act1'] == 'autolog_new' or // ? */ 93 if ( 92 94 $_POST['ec_act1'] == 'duplicate_entry_ask' or 95 $_POST['ec_act1'] == 'create_ask' or 93 96 $_POST['ec_act1'] == 'disable' or 94 97 $_POST['ec_act1'] == 'modify_entry_ask' … … 146 149 */ 147 150 148 $template->assign('ec_howto', (count($page['errors']) == 0 and count($page['infos']) == 0)); 151 $template->assign('ec_howto', 152 ($ec_howto and (count($page['errors']) ==0 and count($page['infos']) == 0))); 149 153 150 154 $template->assign('EVNTCATS_PATH',EVNTCATS_PATH); -
extensions/event_cats/admin/evntcats_theme.css
r3960 r4092 68 68 color:green; 69 69 } 70 71 img.button { 72 vertical-align:middle; 73 } -
extensions/event_cats/admin/template/autolog_entries.js
r4058 r4092 3 3 /* 4 4 déplacer les liens de test et de suppression en-dessous de la table (en-dessous du champ "URL"), éventuellement en les accompagnant des 5 icônes ; et y rajouter le lien de modification (envoyer $_POST{['ec_act1'] = 'modify_entry_ask' et $_POST{['ec_entry_sel'] = <# entré concernée>)5 icônes ; et y rajouter le lien de modification (envoyer $_POST{['ec_act1'] = 'modify_entry_ask' et $_POST{['ec_entry_sel'] = <# entrée concernée>) 6 6 */ 7 7 8 var ec_checked_line = 0;8 var ec_checked_line = -1; 9 9 var ec_JS_message = new Array(); 10 10 11 11 function ec_mark_line(ec_id) { 12 var t = ''; 12 13 ec_checked_line = ec_id; 13 if (ec_checked_line ==0) {14 if (ec_checked_line < 0) { 14 15 document.getElementById('selection--1').checked = 'checked'; 15 16 document.getElementById('selection--1').checked = ''; 16 document.getElementById('ec_show_URL').value = ''; 17 document.getElementById('ec_show_URL').value = ''; 18 document.getElementById('ec_table_URL').href = 'javascript:void(0);'; 17 19 } 18 20 else { 21 t = document.getElementById('ec_url_id_' + ec_checked_line).innerHTML; 19 22 document.getElementById("selection-" + ec_checked_line).checked = 20 23 'checked'; 21 document.getElementById('ec_show_URL').value = 22 (ec_checked_line < 0) ? '' : 23 document.getElementById('ec_table_URL_' + ec_checked_line).href; 24 document.getElementById('ec_show_URL').value = t; 25 document.getElementById('ec_table_URL').href = t; 24 26 } 25 27 } 26 28 27 function ec_check_d (ec_id, ec_act) {29 function ec_check_ds(ec_id) { 28 30 ec_mark_line(ec_id); 29 if (confirm(ec_JS_message['ec_confirm_' + ec_act])) { 30 document.getElementById('ec_act1_id').value = ec_act; 31 document.getElementById('ec_act1_id').value = 'disable'; 32 document.forms['ec_view_codes'].submit(); 33 } 34 35 function ec_check_dl() { 36 if (ec_checked_line >= 0) { 37 if (confirm(ec_JS_message['ec_confirm_delete'])) { 38 document.getElementById('ec_act1_id').value = 'delete'; 39 document.forms['ec_view_codes'].submit(); 40 } 41 } 42 else alert(ec_JS_message['ec_clk_entry_miss']); 43 } 44 45 function ec_check_m() { 46 if (ec_checked_line >= 0) { 47 document.getElementById('ec_act1_id').value = 'modify_entry_ask'; 31 48 document.forms['ec_view_codes'].submit(); 32 49 } 50 else alert(ec_JS_message['ec_clk_entry_miss']); 51 } 52 53 function ec_check_tst() { 54 if (ec_checked_line < 0) { 55 alert(ec_JS_message['ec_clk_entry_miss']); 56 return false; 57 } 58 else return true; 33 59 } 34 60 … … 49 75 } 50 76 51 function ec_check_tst(ec_id) {52 ec_mark_line(ec_id);53 return confirm(ec_JS_message['ec_confirm_test']);54 }55 56 77 function ec_test() { 57 78 alert('OK.'); … … 59 80 60 81 function ec_init() { 61 ec_checked_line = 0;82 ec_checked_line = -1; 62 83 document.getElementById('ec_act1_id').value = ''; 63 ec_mark_line( 0);84 ec_mark_line(-1); 64 85 } -
extensions/event_cats/admin/template/autolog_entries.tpl
r4058 r4092 24 24 25 25 <div style = "text-align:center; font-weight:bold; font-size:120%;"> 26 <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"> {'ec_entry_table_title'|@translate}</a><br>26 <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"><label>{'ec_entry_table_title'|@translate}</label></a><br> 27 27 </div><br> 28 28 … … 47 47 /> 48 48 <label for = "selection-{$code_line.id}">{$code_line.id}</label> 49 <label id = "ec_url_id_{$code_line.id}" style = "display:none;">{$code_line.code_URL}</label> 49 50 </td> 50 51 <td><label for = "selection-{$code_line.id}" id = "ec_table_code_{$code_line.id}">{$code_line.Code}</label></td> … … 53 54 <td><label for = "selection-{$code_line.id}">{$code_line.Arg1}</label></td> 54 55 <td> 55 <a56 href = "{$code_line.code_URL}" title = "{'ec_test_tooltip'|@translate}"57 id = "ec_table_URL_{$code_line.id}" onclick = "return ec_check_tst({$code_line.id});"58 />59 <img src = "{$EVNTCATS_URLS.ROOT}icon/url2.png" class = "button" style = "border:none"60 alt = "{'ec_test_tooltip'|@translate}" title = "{'ec_test_tooltip'|@translate}" />61 </a>62 <a href = "javascript:void(0);" onclick = "ec_check_d({$code_line.id}, 'delete');">63 <img src = "{$EVNTCATS_URLS.ROOT}icon/delete.png" class = "button"64 alt = "{'ec_url_delete'|@translate}" title = "{'ec_url_delete'|@translate}" />65 </a>66 56 {if $code_line.log_OK} 67 <a href = "javascript:void(0);" onclick = "ec_check_d ({$code_line.id}, 'disable');">57 <a href = "javascript:void(0);" onclick = "ec_check_ds({$code_line.id});"> 68 58 <img src = "{$EVNTCATS_URLS.ROOT}icon/disable.png" class = "button" 69 59 alt = "{'ec_url_disable'|@translate}" title = "{'ec_url_disable'|@translate}" /> … … 72 62 <a href = "javascript:void(0);" title = "{'ec_url_forced'|@translate}" onclick = "ec_toggle_forced({$code_line.id}, false);"> 73 63 <img class = "button" src = "{$EVNTCATS_URLS.ROOT}icon/forced.png" 74 {if $code_line.f_pb} style = "border:solid medium red;" {/if}75 64 alt = "{'ec_url_forced'|@translate}" title = "{'ec_url_forced'|@translate}" 76 65 /> … … 81 70 alt = "{'ec_url_nforced'|@translate}" title = "{'ec_url_nforced'|@translate}"/> 82 71 </a> 83 {if !$code_line.f_pb} 84 <a href = "javascript:void(0);" title = "{'ec_url_duplicate'|@translate}" onclick = "ec_duplicate_entry({$code_line.id});"> 85 <img src = "{$EVNTCATS_URLS.ROOT}icon/duplicate.png" class = "button" style = "border:none" 86 alt = "{'ec_url_duplicate'|@translate}" title = "{'ec_url_duplicate'|@translate}" /> 87 </a> 88 {/if} 72 <a href = "javascript:void(0);" title = "{'ec_url_duplicate'|@translate}" onclick = "ec_duplicate_entry({$code_line.id});"> 73 <img src = "{$EVNTCATS_URLS.ROOT}icon/duplicate.png" class = "button" style = "border:none" 74 alt = "{'ec_url_duplicate'|@translate}" title = "{'ec_url_duplicate'|@translate}" /> 75 </a> 89 76 {/if} 90 77 {/if} … … 98 85 <table class = "table2" width = "97%"> 99 86 <tr class = "row2"> 100 <td style = "text-align:center; padding-top:5px; padding-bottom:5px;"> 87 <td style = "padding-top:5px; padding-bottom:5px; font-weight:bold;"> 88 {'ec_lower_tools_desc'|@translate} 89 </td> 90 <td style = "{* text-align:center; *}padding-top:5px; padding-bottom:5px;"> 101 91 <label title = "{'ec_url_tooltip'|@translate}"> 102 92 {'ec_show_URL'|@translate} 103 93 <input type = "text" id = "ec_show_URL" size = "100%" title = "{'ec_url_tooltip'|@translate}" readonly = "readonly" /> 104 </label> 94 </label><br> 95 <br> 96 <a 97 href = "javascript:void(0);" title = "{'ec_test_tooltip'|@translate}" alt = "{'ec_test_tooltip'|@translate}" 98 id = "ec_table_URL" onclick = "return ec_check_tst();" class = "ec_lower_tools" 99 /> 100 <img src = "{$EVNTCATS_URLS.ROOT}icon/url2.png" class = "button"/> 101 {'ec_test_text'|@translate} 102 </a> 103 104 <a href = "javascript:void(0);" onclick = "ec_check_dl();" id = "ec_del_link_id" class = "ec_lower_tools" 105 alt = "{'ec_url_delete'|@translate}" title = "{'ec_url_delete'|@translate}" 106 > 107 <img src = "{$EVNTCATS_URLS.ROOT}icon/delete.png" class = "button"/> 108 {'ec_delete_text'|@translate} 109 </a> 110 111 <a href = "javascript:void(0);" onclick = "ec_check_m();" id = "ec_mod_link_id" class = "ec_lower_tools" 112 alt = "{'ec_modify_tooltip'|@translate}" title = "{'ec_modify_tooltip'|@translate}" 113 > 114 <img src = "{$EVNTCATS_URLS.ROOT}icon/modify.png" class = "button"/> 115 {'ec_modify_text'|@translate} 116 </a> 105 117 </td> 106 118 </tr> … … 111 123 <script type = "text/javascript" src = "{$RACINE_URL}{$EVNTCATS_PATH}admin/template/autolog_entries.js"></script> 112 124 <script type = "text/javascript"><!-- 113 ec_JS_message['ec_confirm_d isable'] = "{'ec_confirm_disable'|@translate|@escape:javascript}";114 ec_JS_message['ec_confirm_ delete'] = "{'ec_confirm_delete'|@translate|@escape:javascript}";115 ec_JS_message['ec_confirm_ test'] = "{'ec_confirm_test'|@translate|@escape:javascript}";116 ec_JS_message['ec_c onfirm_force'] = "{'ec_confirm_force'|@translate|@escape:javascript}";125 ec_JS_message['ec_confirm_delete'] = "{'ec_confirm_delete'|@translate|@escape:javascript}"; 126 ec_JS_message['ec_confirm_test'] = "{'ec_confirm_test'|@translate|@escape:javascript}"; 127 ec_JS_message['ec_confirm_force'] = "{'ec_confirm_force'|@translate|@escape:javascript}"; 128 ec_JS_message['ec_clk_entry_miss'] = "{'ec_clk_entry_miss'|@translate|@escape:javascript}"; 117 129 ec_init(); 118 130 //--></script> -
extensions/event_cats/admin/template/autolog_new.js
r4064 r4092 1 1 /* Event Cats Javascript functions LucMorizur June - ... 2009 */ 2 2 3 /*4 Attention le résultat du dépôt du formulaire ne peut plus être "create" ou "<numéro de l'entrée dupliquée>"5 car il faut fournir du "create", "duplicate_entry_submit", "modify_entry_submit" avec dans ces deux derniers cas6 le numéro de l'entrée concernée.7 De toutes façons il y a aussi le "cas" modification d'entrée à créer.8 */9 10 3 var ec_avoid_infinite_loop = true; 4 var ec_avoid_infinite_loop2 = true; 11 5 var ec_flag1 = false; 12 6 var ec_flag2 = false; 13 7 var ec_dont_check = false; 14 var ec_is_creation = false;8 var ec_is_creation = true; 15 9 var ec_err = ''; 16 var ec_selected_action = '';17 10 var ec_selected_img = ''; 18 11 var ec_new_code_text = ''; … … 32 25 var ec_selected_AP = '-1'; 33 26 var ec_selected_cat = '-1'; 34 var ec_selected_user = 'ec_sel_user_old'; 35 var ec_selected_code = 'ec_sel_code_new'; 27 var ec_selected_user = '-1'; 28 var ec_selected_code = '-1'; 29 var ec_selected_action = '-1'; 36 30 var ec_JS_message = new Array(); 37 31 var ec_duplic_codes = new Array(); … … 49 43 var t = new Array(); 50 44 var r = /,/g; 51 if (ec_id == '-1') ec_init(); else { 45 if (ec_id == '-1') { 46 ec_avoid_infinite_loop2 = false; 47 ec_init(); 48 ec_avoid_infinite_loop2 = true; 49 } 50 else { 52 51 document.getElementById('ec_act2_id').value = ec_id; 53 52 t = document.getElementById('ec_in_up_entry_list_id').options[ … … 100 99 101 100 function ec_mark_code(ec_id) { 102 if (ec_flag2 || 103 !(document.getElementById('ec_sel_code_old').disabled == 'disabled' || 104 document.getElementById('ec_sel_code_old').disabled == true) 105 ) { 106 var t1 = ''; 107 if (ec_id == 'ec_sel_code_old' && ec_selected_old_code == '-1') { 108 ec_selected_code = 'ec_sel_code_new'; 109 ec_selected_old_code = ec_selected_old_code2; 110 } 111 else ec_selected_code = ec_id; 112 document.getElementById(ec_selected_code).checked = 'checked'; 113 switch (ec_selected_code) { 114 case 'ec_sel_code_new': 115 document.getElementById('ec_act1_id').value = 'create'; 116 document.getElementById('ec_in_up_code_list_id').value = '-1'; 117 document.getElementById('ec_in_up_code_id').value = ec_new_code_text; 118 break; 119 case 'ec_sel_code_old': 120 document.getElementById('ec_act1_id').value = '????'; // Dépend de ce qui a été demandé au départ 121 document.getElementById('ec_act2_id').value = 122 ec_selected_old_code; 123 document.getElementById('ec_in_up_code_list_id').value = 124 ec_selected_old_code; 125 document.getElementById('ec_in_up_code_id').value = ''; 126 t1 = 'disabled'; 127 ec_selected_old_user = 128 document.ec_new_code.ec_in_up_code_list.options[ 129 document.ec_new_code.ec_in_up_code_list.selectedIndex 130 ].label; 131 document.getElementById('ec_in_up_usr_list_id').value = ec_selected_old_user; 132 ec_mark_user('ec_sel_user_old'); 133 break; 134 } 135 document.getElementById('ec_sel_user_new').disabled = t1; 136 document.getElementById('ec_submit_gen_user_id').disabled = t1; 137 document.getElementById('ec_in_up_usr_txt_id').disabled = t1; 138 document.getElementById('ec_in_up_psd_txt_id').disabled = t1; 139 document.getElementById('ec_sel_user_old').disabled = t1; 140 document.getElementById('ec_in_up_usr_list_id').disabled = t1; 101 if (ec_id == '-1') { 102 document.getElementById('ec_sel_code_old').checked = 'checked'; 103 document.getElementById('ec_sel_code_old').checked = ''; 104 } 105 else { 106 if (ec_flag2 || 107 !(document.getElementById('ec_sel_code_old').disabled == 'disabled' || 108 document.getElementById('ec_sel_code_old').disabled == true) 109 ) { 110 var t1 = ''; 111 if (ec_id == 'ec_sel_code_old' && ec_selected_old_code == '-1') { 112 ec_selected_code = 'ec_sel_code_new'; 113 ec_selected_old_code = ec_selected_old_code2; 114 } 115 else ec_selected_code = ec_id; 116 document.getElementById(ec_selected_code).checked = 'checked'; 117 switch (ec_selected_code) { 118 case 'ec_sel_code_new': 119 document.getElementById('ec_act1_id').value = 'create'; 120 document.getElementById('ec_in_up_code_list_id').value = '-1'; 121 document.getElementById('ec_in_up_code_id').value = ec_new_code_text; 122 document.getElementById('ec_act2_id').value = '-1'; 123 break; 124 case 'ec_sel_code_old': 125 document.getElementById('ec_act1_id').value = 126 'duplicate_entry_submit'; 127 document.getElementById('ec_act2_id').value = 128 ec_selected_old_code; 129 document.getElementById('ec_in_up_code_list_id').value = 130 ec_selected_old_code; 131 document.getElementById('ec_in_up_code_id').value = ''; 132 t1 = 'disabled'; 133 ec_selected_old_user = 134 document.ec_new_code.ec_in_up_code_list.options[ 135 document.ec_new_code.ec_in_up_code_list.selectedIndex 136 ].label; 137 document.getElementById('ec_in_up_usr_list_id').value = ec_selected_old_user; 138 ec_mark_user('ec_sel_user_old'); 139 break; 140 } 141 document.getElementById('ec_sel_user_new').disabled = t1; 142 document.getElementById('ec_submit_gen_user_id').disabled = t1; 143 document.getElementById('ec_in_up_usr_txt_id').disabled = t1; 144 document.getElementById('ec_in_up_psd_txt_id').disabled = t1; 145 document.getElementById('ec_sel_user_old').disabled = t1; 146 document.getElementById('ec_in_up_usr_list_id').disabled = t1; 147 } 141 148 } 142 149 } 143 150 144 151 function ec_mark_user(ec_id) { 145 if ( 146 !ec_is_creation && 147 document.getElementById('ec_in_up_entry_list_id').value == '-1' 148 ) { 149 alert(ec_JS_message['ec_act_entry_miss']); 150 return false; 151 } 152 else if (ec_flag1 || 153 !(document.getElementById('ec_sel_user_old').disabled == 'disabled' || 154 document.getElementById('ec_sel_user_old').disabled == true) 155 ) { 156 if (ec_id == 'ec_sel_user_old' && ec_selected_old_user == '-1') { 157 ec_selected_user = 158 (ec_is_creation) ? 'ec_sel_user_new' : 'ec_sel_user_none'; 159 ec_selected_old_user = ec_selected_old_user2; 160 } 161 else ec_selected_user = ec_id; 162 document.getElementById(ec_selected_user).checked = 'checked'; 163 switch (ec_selected_user) { 164 case 'ec_sel_user_none': // None 165 ec_selected_action = 166 (ec_ap_ok && (ec_selected_action != 'ec_input_action_refused')) ? 167 'ec_input_action_add_p' : 'ec_input_action_refused'; 168 document.getElementById('ec_in_up_usr_txt_id').value = ''; 169 document.getElementById('ec_in_up_psd_txt_id').value = ''; 170 document.getElementById('ec_in_up_usr_list_id').value = '-1'; 171 break; 172 case 'ec_sel_user_new': // New user 173 if (ec_selected_action == 'ec_input_action_refused') 174 ec_selected_action = 'ec_input_action_home'; 175 document.getElementById('ec_in_up_usr_txt_id').value = 176 ec_new_user_text; 177 document.getElementById('ec_in_up_psd_txt_id').value = 178 ec_new_psd_text; 179 document.getElementById('ec_in_up_usr_list_id').value = '-1'; 180 break; 181 case 'ec_sel_user_old': // "Old" user 182 if (ec_selected_action == 'ec_input_action_refused') 183 ec_selected_action = 'ec_input_action_home'; 184 document.getElementById('ec_in_up_usr_txt_id').value = ''; 185 document.getElementById('ec_in_up_psd_txt_id').value = ''; 186 document.getElementById('ec_in_up_usr_list_id').value = 187 ec_selected_old_user; 188 break; 189 } 190 ec_check_pwd_text(); 191 if (ec_avoid_infinite_loop) { 192 ec_avoid_infinite_loop = false; 193 ec_mark_action(ec_selected_action); 194 ec_avoid_infinite_loop = true; 152 if (ec_id == '-1') { 153 document.getElementById('ec_sel_user_old').checked = 'checked'; 154 document.getElementById('ec_sel_user_old').checked = ''; 155 } 156 else { 157 if ( 158 !ec_is_creation && 159 document.getElementById('ec_in_up_entry_list_id').value == '-1' 160 ) { 161 alert(ec_JS_message['ec_act_entry_miss']); 162 return false; 163 } 164 else if (ec_flag1 || 165 !(document.getElementById('ec_sel_user_old').disabled == 'disabled' || 166 document.getElementById('ec_sel_user_old').disabled == true) 167 ) { 168 if (ec_id == 'ec_sel_user_old' && ec_selected_old_user == '-1') { 169 ec_selected_user = 170 (ec_is_creation) ? 'ec_sel_user_new' : 'ec_sel_user_none'; 171 ec_selected_old_user = ec_selected_old_user2; 172 } 173 else ec_selected_user = ec_id; 174 document.getElementById(ec_selected_user).checked = 'checked'; 175 switch (ec_selected_user) { 176 case 'ec_sel_user_none': // None 177 ec_selected_action = 178 (ec_ap_ok && (ec_selected_action != 'ec_input_action_refused')) ? 179 'ec_input_action_add_p' : 'ec_input_action_refused'; 180 document.getElementById('ec_in_up_usr_txt_id').value = ''; 181 document.getElementById('ec_in_up_psd_txt_id').value = ''; 182 document.getElementById('ec_in_up_usr_list_id').value = '-1'; 183 break; 184 case 'ec_sel_user_new': // New user 185 if (ec_selected_action == 'ec_input_action_refused') 186 ec_selected_action = 'ec_input_action_home'; 187 document.getElementById('ec_in_up_usr_txt_id').value = 188 ec_new_user_text; 189 document.getElementById('ec_in_up_psd_txt_id').value = 190 ec_new_psd_text; 191 document.getElementById('ec_in_up_usr_list_id').value = '-1'; 192 break; 193 case 'ec_sel_user_old': // "Old" user 194 if (ec_selected_action == 'ec_input_action_refused') 195 ec_selected_action = 'ec_input_action_home'; 196 document.getElementById('ec_in_up_usr_txt_id').value = ''; 197 document.getElementById('ec_in_up_psd_txt_id').value = ''; 198 document.getElementById('ec_in_up_usr_list_id').value = 199 ec_selected_old_user; 200 break; 201 } 202 ec_check_pwd_text(); 203 if (ec_avoid_infinite_loop) { 204 ec_avoid_infinite_loop = false; 205 ec_mark_action(ec_selected_action); 206 ec_avoid_infinite_loop = true; 207 } 195 208 } 196 209 } … … 199 212 200 213 function ec_mark_action(ec_id) { 201 if ( 202 !ec_is_creation && 203 document.getElementById('ec_in_up_entry_list_id').value == '-1' 204 ) { 205 alert(ec_JS_message['ec_act_entry_miss']); 206 return false; 207 } 208 else { 209 ec_selected_action = ec_id; 210 if (ec_selected_action != '') { 214 if (ec_id == '' || ec_id == '-1') { 215 document.getElementById('ec_input_action_home').checked = 'checked'; 216 document.getElementById('ec_input_action_home').checked = ''; 217 } 218 else { 219 if ( 220 !ec_is_creation && 221 document.getElementById('ec_in_up_entry_list_id').value == '-1' 222 ) { 223 alert(ec_JS_message['ec_act_entry_miss']); 224 return false; 225 } 226 else if ( 227 !(document.getElementById(ec_id).disabled == 'disabled' || 228 document.getElementById(ec_id).disabled == true) 229 ) { 230 ec_selected_action = ec_id; 211 231 document.getElementById(ec_selected_action).checked = 'checked'; 212 232 switch (ec_selected_action) { … … 435 455 436 456 function ec_check_submit() { 457 var t1 = true; 458 var t2 = true; 437 459 if (ec_dont_check) return true; 438 if (( 439 document.getElementById('ec_sel_code_new').checked != '' && 440 document.getElementById('ec_in_up_code_id').value == '' 441 ) || ( 442 document.getElementById('ec_sel_code_old').checked != '' && 443 document.getElementById('ec_in_up_code_list_id').value == '-1' 444 ) 445 ) { 446 alert(ec_JS_message['ec_submit_code_miss']); 447 return false; 460 if (ec_is_creation) { 461 if (( 462 document.getElementById('ec_sel_code_new').checked != '' && 463 document.getElementById('ec_in_up_code_id').value == '' 464 ) || ( 465 document.getElementById('ec_sel_code_old').checked != '' && 466 document.getElementById('ec_in_up_code_list_id').value == '-1' 467 ) || ( 468 document.getElementById('ec_sel_code_old').checked == '' && 469 document.getElementById('ec_sel_code_new').checked == '' 470 ) 471 ) { 472 alert(ec_JS_message['ec_submit_code_miss']); 473 return false; 474 } 475 } 476 else { 477 t1 = (document.getElementById('ec_sel_user_none').checked == ''); 478 t2 = (document.getElementById('ec_input_action_refused').checked == ''); 479 if ( 480 !t1 && (( 481 document.getElementById('ec_input_action_add_p').checked != '' && 482 document.ec_new_code.ec_in_up_aps.selectedIndex < 1 483 ) || ( 484 document.getElementById('ec_input_action_add_p').checked == '' && 485 t2 486 ) 487 ) 488 ) { 489 alert(ec_JS_message['ec_submit_action_miss']); 490 return false; 491 } 492 if (document.getElementById('ec_in_up_entry_list_id').selectedIndex ==0) { 493 alert(ec_JS_message['ec_act_entry_miss']); 494 return false; 495 } 448 496 } 449 497 if (( … … 455 503 ) || ( 456 504 document.getElementById('ec_sel_user_new').checked == '' && 457 document.getElementById('ec_sel_user_old').checked == '' 505 document.getElementById('ec_sel_user_old').checked == '' && 506 t1 458 507 ) 459 508 ) { … … 465 514 document.ec_new_code.ec_in_up_cat.selectedIndex < 1 && ( 466 515 document.getElementById('ec_in_up_imgs_id').value == '' || ( 467 document.getElementById('ec_in_up_imgs_id').value != '' && 468 isNaN(document.getElementById('ec_in_up_imgs_id').value) && 469 document.ec_new_code.ec_in_up_cat.selectedIndex < 1 516 document.getElementById('ec_in_up_imgs_id').value != '' && ( 517 isNaN(document.getElementById('ec_in_up_imgs_id').value) || 518 document.ec_new_code.ec_in_up_cat.selectedIndex < 1 519 ) 470 520 ) 471 521 ) && 472 document.getElementById('ec_input_action_home').checked == '' 522 document.getElementById('ec_input_action_home').checked == '' && 523 t2 473 524 ) { 474 525 alert(ec_JS_message['ec_submit_action_miss']); 475 526 return false; 476 527 } 528 if ((!ec_is_creation && !t1) || 529 document.getElementById('ec_in_up_forced_id').checked != '' 530 ) return confirm(ec_JS_message['ec_confirm_del_other']); 531 return true; 477 532 } 478 533 … … 516 571 ec_selected_cat = '-1'; 517 572 ec_selected_old_user2 = '-1'; 518 ec_selected_user = ' ec_sel_user_old';519 ec_selected_code = ' ec_sel_code_new';573 ec_selected_user = '-1'; 574 ec_selected_code = '-1'; 520 575 d.getElementById('ec_style_forced_id').innerHTML = 521 576 ec_up_code_lbl_forced_txt; … … 532 587 d.getElementById('ec_input_action_home').checked = ''; 533 588 534 if ( 535 ec_default_action == 'create' || 536 ec_default_action == 'duplicate_entry_ask' 537 ) { // Entry creation 589 if (ec_is_creation) { // Entry creation 538 590 d.getElementById('ec_in_up_auto_code_length_id').value= 539 591 ec_auto_code_digits_nb; … … 541 593 d.getElementById('ec_sel_code_old').checked = 'checked'; 542 594 d.getElementById('ec_sel_user_old').checked = 'checked'; 543 if (ec_default_action == 'create') { // Create entry from blank 595 if ( 596 ec_default_action == 'create' || 597 ec_default_action == 'create_ask' || 598 ec_default_action == 'duplicate_entry_submit' 599 ) { // Create entry from blank 544 600 d.getElementById('ec_in_up_usr_list_id').value = '-1'; 545 601 d.getElementById('ec_in_up_code_list_id').value = '-1'; … … 559 615 d.getElementById('ec_sel_user_old').disabled = ''; 560 616 d.getElementById('ec_in_up_usr_list_id').disabled = ''; 617 d.getElementById('ec_in_up_forced_id').disabled = ''; 561 618 } 562 619 else { // Duplicate entry 620 d.getElementById('ec_act1_id').value = 621 'duplicate_entry_submit'; 563 622 d.getElementById('ec_in_up_code_list_id').value = 564 623 ec_default_entry; … … 572 631 d.getElementById('ec_sel_code_old').disabled = 'disabled'; 573 632 d.getElementById('ec_in_up_code_list_id').disabled = 'disabled'; 633 d.getElementById('ec_sel_user_new').disabled = 'disabled'; 634 d.getElementById('ec_submit_gen_user_id').disabled = 'disabled'; 635 d.getElementById('ec_in_up_usr_txt_id').disabled = 'disabled'; 636 d.getElementById('ec_in_up_psd_txt_id').disabled = 'disabled'; 637 d.getElementById('ec_sel_user_old').disabled = 'disabled'; 638 d.getElementById('ec_in_up_usr_list_id').disabled = 'disabled'; 639 d.getElementById('ec_in_up_forced_id').disabled = 'disabled'; 574 640 ec_selected_old_code = ec_duplic_codes[ec_default_entry]; 575 641 ec_flag2 = true; … … 577 643 ec_flag2 = false; 578 644 } 579 ec_default_action = 'create ';645 ec_default_action = 'create_ask'; 580 646 } 581 647 else { // Entry modification 582 d.getElementById('ec_sel_user_ old').checked= 'checked';648 d.getElementById('ec_sel_user_none').checked = 'checked'; 583 649 d.getElementById('ec_in_up_forced_id').checked = ''; 584 if (ec_default_action == 'modify_entry_ask') { // Modify entry 585 d.getElementById('ec_in_up_entry_list_id').value = '-1'; 650 d.getElementById('ec_act1_id').value = 651 'modify_entry_submit'; 652 if ( 653 ec_default_action == 'modify_entry_ask' || 654 ec_default_action == 'modify_entry_submit' 655 ) { // Modify entry 656 d.getElementById('ec_in_up_entry_list_id').disabled = ''; 657 d.getElementById('ec_sel_user_none').checked = ''; 658 d.getElementById('ec_in_up_entry_list_id').value = ec_default_entry; 586 659 d.getElementById('ec_in_up_usr_list_id').value = '-1'; 587 d.getElementById('ec_sel_user_ old').checked= '';660 d.getElementById('ec_sel_user_none').disabled = ''; 588 661 d.getElementById('ec_sel_user_new').disabled = ''; 662 d.getElementById('ec_sel_user_old').disabled = ''; 589 663 d.getElementById('ec_submit_gen_user_id').disabled = ''; 590 664 d.getElementById('ec_in_up_usr_txt_id').disabled = ''; 591 665 d.getElementById('ec_in_up_psd_txt_id').disabled = ''; 592 d.getElementById('ec_ sel_user_old').disabled= '';666 d.getElementById('ec_in_up_psd_txt_id').disabled = ''; 593 667 d.getElementById('ec_in_up_usr_list_id').disabled = ''; 668 d.getElementById('ec_in_up_forced_id').disabled = ''; 669 d.getElementById('ec_input_action_cat').disabled = ''; 670 d.getElementById('ec_in_up_cats_id').disabled = ''; 671 d.getElementById('ec_input_action_img').disabled = ''; 672 d.getElementById('ec_in_up_imgs_id').disabled = ''; 673 d.getElementById('ec_input_action_home').disabled = ''; 674 if (ec_avoid_infinite_loop2) ec_mark_entry(ec_default_entry); 675 ec_default_entry = '-1'; 594 676 } 595 677 else { // Outdate entry 678 d.getElementById('ec_in_up_entry_list_id').disabled = 'disabled'; 679 d.getElementById('ec_sel_user_none').disabled = 'disabled'; 680 d.getElementById('ec_sel_user_new').disabled = 'disabled'; 681 d.getElementById('ec_sel_user_old').disabled = 'disabled'; 682 d.getElementById('ec_submit_gen_user_id').disabled = 'disabled'; 683 d.getElementById('ec_in_up_usr_txt_id').disabled = 'disabled'; 684 d.getElementById('ec_in_up_psd_txt_id').disabled = 'disabled'; 685 d.getElementById('ec_in_up_psd_txt_id').disabled = 'disabled'; 686 d.getElementById('ec_in_up_usr_list_id').disabled = 'disabled'; 687 d.getElementById('ec_in_up_forced_id').disabled = 'disabled'; 688 d.getElementById('ec_input_action_cat').disabled = 'disabled'; 689 d.getElementById('ec_in_up_cats_id').disabled = 'disabled'; 690 d.getElementById('ec_input_action_img').disabled = 'disabled'; 691 d.getElementById('ec_in_up_imgs_id').disabled = 'disabled'; 692 d.getElementById('ec_input_action_home').disabled = 'disabled'; 596 693 d.getElementById('ec_in_up_entry_list_id').value = 597 694 ec_default_entry; 598 ec_mark_entry(ec_default_entry);599 695 } 600 696 ec_default_action = -
extensions/event_cats/admin/template/autolog_new.tpl
r4064 r4092 23 23 <input type = "hidden" id = "ec_act2_id" name = "ec_entry_sel" /> 24 24 25 {* <!-- Page title. Can be "New entry" or "New entry / Entry modification" whether some entries already exist or not --> *} 25 26 <div style = "text-align:center;"> 26 27 <span style = "font-weight:bold; font-size:120%;"> … … 28 29 <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"> 29 30 {/if} 30 <label for = "ec_page_type_create" onclick = "ec_mark_type('create');" {if $ec_is_creation} style = "text-decoration:underline;" {/if}> 31 <input type = "radio" id = "ec_page_type_create" onclick = "ec_mark_type('create');" {if $ec_is_creation} checked = "checked" {/if} /> 32 {'ec_new_entry_title'|@translate} 31 <label for = "ec_page_type_create" {if $ec_hidden_when_no_code == ''} onclick = "ec_mark_type('create_ask');" {/if}> 32 {if $ec_hidden_when_no_code == ''} 33 <input type = "radio" id = "ec_page_type_create" onclick = "ec_mark_type('create');" {if $ec_is_creation} checked = "checked" {/if} /> 34 {/if} 35 <span {if $ec_is_creation and $ec_hidden_when_no_code == ''} style = "text-decoration:underline;" {/if}>{'ec_new_entry_title'|@translate}</span> 33 36 </label> 34 37 {if $ec_hidden_when_no_code == ''} 35 <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"> •• 38 <a href = "#ec_top" name = "ec_top" title = "{'ec_top_title'|@translate}"> 39 <label style = "font-weight:bold; font-size:120%;"> // </label> 36 40 {/if} 37 41 </a> 38 <label for = "ec_page_type_modify" onclick = "ec_mark_type('modify_entry_ask');" 39 {$ec_hidden_when_no_code} {if !$ec_is_creation} style = "text-decoration:underline;" {/if} 40 > 42 <label for = "ec_page_type_modify" onclick = "ec_mark_type('modify_entry_ask');" {$ec_hidden_when_no_code}> 41 43 <input type = "radio" id = "ec_page_type_modify" onclick = "ec_mark_type('modify_entry_ask');" {if !$ec_is_creation} checked = "checked" {/if} /> 42 {'ec_modify_entry_title'|@translate}44 <span {if !$ec_is_creation} style = "text-decoration:underline;" {/if}>{'ec_modify_entry_title'|@translate}</span> 43 45 </label> 44 46 </span> … … 50 52 </div><br> 51 53 54 {* <!-- Table (borders not visible) with 3 rows for parameters adjustment --> *} 52 55 <table style = "border-spacing:15px" width = "97%"> 53 56 54 57 <tr> 58 59 {* <!-- [ [New / existing code] / [Existing entry] ] selection --> *} 55 60 <td style = "vertical-align:top; font-weight:bold;"> 56 61 {if $ec_is_creation} … … 62 67 <td> 63 68 {if $ec_is_creation} 64 65 {* <!-- Code selection --> *}66 69 <li> 67 70 {* <!-- New code (to create) --> *} … … 104 107 {* <!-- Known code --> *} 105 108 <label for = "ec_in_up_code_list_id" onclick = "ec_mark_code('ec_sel_code_old');" {$ec_hidden_when_no_code}> 106 <input type = "radio" name = "ec_sel_code" for = "ec_in_up_code_list_id" 109 <input type = "radio" name = "ec_sel_code" for = "ec_in_up_code_list_id" {$ec_hidden_when_no_code} 107 110 value = "old" id = "ec_sel_code_old" onclick = "ec_mark_code('ec_sel_code_old');" 108 111 /> … … 113 116 > 114 117 <option label = "------------" value = "-1">------------</option> 115 {foreach from=$ec_lists.duplicable_codes key=ec_key item=ec_val}118 {foreach from=$ec_lists.duplicable_codes.codes key=ec_key item=ec_val} 116 119 <option label = "{$ec_val.user_id}" value = "{$ec_val.id}">{$ec_key}</option> 117 120 {/foreach} … … 121 124 {else} 122 125 123 {* <!-- E ntry selection --> *}126 {* <!-- Existing entry selection --> *} 124 127 <li> 125 128 {* <!-- Entry choice --> *} … … 146 149 {* <!-- None --> *} 147 150 <label onclick = "return ec_mark_user('ec_sel_user_none');"> 148 <input type = "radio" name = "ec_sel_user" value = "none" id = "ec_sel_user_none" 149 onclick = "return ec_mark_user('ec_sel_user_none');" 150 /> 151 <input type = "radio" name = "ec_sel_user" value = "none" id = "ec_sel_user_none" onclick = "return ec_mark_user('ec_sel_user_none');" /> 151 152 {'ec_up_code_lbl_user_none'|@translate} 152 153 </label><br> … … 293 294 ec_JS_message['ec_new_pwd_gen'] = "{'ec_new_pwd_gen'|@translate|@escape:javascript}"; 294 295 ec_JS_message['ec_act_entry_miss'] = "{'ec_act_entry_miss'|@translate|@escape:javascript}"; 296 ec_JS_message['ec_confirm_del_other'] = "{'ec_confirm_del_other'|@translate|@escape:javascript}"; 295 297 ec_JS_message['ec_up_code_lbl_home'] = "{'ec_up_code_lbl_home'|@translate}"; 296 298 ec_JS_message['ec_submit_code_miss'] = "{'ec_submit_code_miss'|@translate}"; -
extensions/event_cats/admin/template/header.inc.tpl
r4048 r4092 21 21 {'ec_admin_page_howto'|@translate} 22 22 </div> 23 <p> 24 <hr width = 75% size = 3 /> 25 </p> 26 {else} 27 <br> 23 28 {/if} 24 25 <p>26 <hr width = 75% size = 3 />27 </p>
Note: See TracChangeset
for help on using the changeset viewer.
