Changeset 7864
- Timestamp:
- Nov 24, 2010, 1:10:15 AM (13 years ago)
- Location:
- extensions/event_cats/admin
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/event_cats/admin/autolog_new.inc.php
r7832 r7864 119 119 "))) == 0), 120 120 'month_list' => $month_list, 121 'ec_days' => $lang['day'], 121 122 'ec_current_day' => intval(date('j')), 122 123 'ec_current_month' => intval(date('n')), -
extensions/event_cats/admin/template/autolog_new.js
r7849 r7864 17 17 var ec_selected_old_group = false; 18 18 var ec_validity_on = false; 19 var ec_validity_day_length = 0; 19 20 var ec_err = ''; 20 21 var ec_selected_img = ''; … … 43 44 var ec_duplic_codes = new Array(); 44 45 var ec_lists_temp = new Array(); 46 var ec_validity_days = new Array(); 45 47 var ec_lists = new Array(); 46 48 ec_lists['code'] = new Array(); … … 697 699 698 700 function ec_get_validity() { 701 validity_date.setMilliseconds(0); 702 validity_date.setSeconds(0); 703 validity_date.setMinutes(de('ec_validity_time_id').value.match(/\d+$/)); 704 validity_date.setHours(de('ec_validity_time_id').value.match(/^\d+/)); 705 validity_date.setDate(de('ec_validity_day_id').selectedIndex); 706 validity_date.setMonth(de('ec_validity_month_id').selectedIndex - 1); 699 707 validity_date.setFullYear(de('ec_validity_year_id').value); 700 validity_date.setMonth(de('ec_validity_month_id').selectedIndex - 1); 701 validity_date.setDate(de('ec_validity_day_id').selectedIndex); 702 validity_date.setHours(de('ec_validity_time_id').value.match(/^\d+/)); 703 validity_date.setMi nutes(de('ec_validity_time_id').value.match(/\d+$/));708 } 709 710 function ec_set_validity() { 711 validity_date.setMilliseconds(0); 704 712 validity_date.setSeconds(0); 705 validity_date.setMilliseconds(0); 706 } 707 708 function ec_set_validity() { 709 de("ec_validity_year_id").value = validity_date.getFullYear(); 710 de("ec_validity_month_id").selectedIndex = validity_date.getMonth() + 1; 711 de("ec_validity_day_id").selectedIndex = validity_date.getDate(); 712 de("ec_validity_time_id").value = 713 de('ec_validity_year_id').value = validity_date.getFullYear(); 714 de('ec_validity_month_id').selectedIndex = validity_date.getMonth() + 1; 715 de('ec_validity_day_id').selectedIndex = validity_date.getDate(); 716 de('ec_validity_time_id').value = 713 717 ec_add_0(validity_date.getHours()) + 714 ":"+718 ':' + 715 719 ec_add_0(validity_date.getMinutes()); 720 de('ec_validity_sel_day').value = 721 ec_validity_days[validity_date.getDay()]; 716 722 } 717 723 718 724 function ec_validity_check_min() { 719 725 var tp = new Date(); 726 tp.setMilliseconds(0); 727 tp.setSeconds(0); 720 728 maintenant = tp; 721 729 tp.setTime(maintenant.getTime() + 120000); // PHP will not allow that … … 728 736 de("ec_min_day_id").selectedIndex = tp.getDate(); 729 737 ec_get_validity(); 730 if (Number(validity_date.getTime()) < Number(tp.getTime())) { 731 validity_date = tp; 732 ec_set_validity(); 733 } 738 if (Number(validity_date.getTime()) < Number(tp.getTime())) 739 validity_date = tp; 740 ec_set_validity(); 734 741 } 735 742 736 743 function ec_mark_now() { 737 744 maintenant = new Date(); 738 validity_date.setTime(maintenant.getTime() + 120000); // Validity739 // [date & time] cannot be less than two minutes745 validity_date.setTime(maintenant.getTime() + 120000); // See two minutes 746 // explanation in function ec_validity_check_min 740 747 ec_set_validity(); 741 748 } … … 782 789 var ts = 0; 783 790 maintenant = tp; 784 tp.setTime(maintenant.getTime() + 120000); // PHP will not allow that 785 // [date & time] is less than [one minute more than current [date & time]]. 786 // Thus considering processing time, JavaScript should not allow a date 787 // less than [two minutes more than current [date & time]] (due to the fact 788 // that base unit for this value is one minute). 791 tp.setTime(maintenant.getTime() + 120000); // See two minutes 792 // explanation in function ec_validity_check_min 789 793 ec_get_validity(); 790 794 validity_date.setHours(v); … … 832 836 de('ec_input_action_home').checked = 'checked'; 833 837 de('ec_input_action_home').checked = ''; 838 for (var i = 0; i <= 6; i++) 839 ec_validity_day_length = 840 (ec_validity_days[i].length > ec_validity_day_length) ? 841 ec_validity_days[i].length : ec_validity_day_length; 842 ec_validity_day_length++; 843 de('ec_validity_sel_day').size = ec_validity_day_length; 834 844 ec_mark_now(); 835 845 ec_validity_set_min(); … … 846 856 ec_validity_check_min(); 847 857 }); 858 $('#ec_validity_sel_day').css( 859 'backgroundColor', $('#content').css('backgroundColor') 860 ); 848 861 }); 849 862 -
extensions/event_cats/admin/template/autolog_new.tpl
r7847 r7864 317 317 _ check if initialize validity date with JS is doable ; DONE 318 318 _ check if ' onchange = "ec_update_ts();" ' can be used ; DONE 319 _ implement JS ; 319 _ implement JS ; DONE 320 320 _ implement PHP ; 321 321 _ commit, and drink a pint! … … 335 335 {'Activate'|@translate} 336 336 </label> 337 </p> 338 <p style = "text-align:left;{* padding:0.5em; border:1px solid #666666; *}"> 339 <input type = "text" id = "ec_validity_sel_day" style = "text-align:right; border:none;" disabled = "disabled"> 340 <select id = "ec_validity_day_id" name = "ec_validity_day" class = "ec_datepicker"> 341 <option value = "0">--</option> 342 {section name=day start=1 loop=32} 343 <option value = "{$smarty.section.day.index}"> 344 {$smarty.section.day.index} 345 </option> 346 {/section} 347 </select> 348 <select id = "ec_validity_month_id" name = "ec_validity_month" class = "ec_datepicker"> 349 {html_options options=$month_list} 350 </select> 351 <input id = "ec_validity_year_id" name = "ec_validity_year" type = "text" size = "4" 352 maxlength = "4" style = "text-align:right; " class = "ec_datepicker"> 353 <input id = "ec_validity_time_id" name = "ec_validity_time" type = "text" class = "ec_datepicker" 354 size = "5" maxlength = "5" title = "{'Hours field tooltip'|@translate}" style = "text-align:right; "> 355 <input id = "ec_linked_date_id" name = "ec_linked_date_id" type = "hidden" size = "10" disabled = "disabled"> 337 356 </p> 338 357 <p style = "text-align:left;"> … … 348 367 {/section} 349 368 </select> 350 </p>351 <p style = "text-align:left;">352 <select id = "ec_validity_day_id" name = "ec_validity_day" class = "ec_datepicker">353 <option value = "0">--</option>354 {section name=day start=1 loop=32}355 <option value = "{$smarty.section.day.index}">356 {$smarty.section.day.index}357 </option>358 {/section}359 </select>360 <select id = "ec_validity_month_id" name = "ec_validity_month" class = "ec_datepicker">361 {html_options options=$month_list}362 </select>363 <input id = "ec_validity_year_id" name = "ec_validity_year" type = "text" size = "4" maxlength = "4" style = "text-align:right;" class = "ec_datepicker">364 <input id = "ec_validity_time_id" name = "ec_validity_time" type = "text" class = "ec_datepicker"365 size = "5" maxlength = "5" title = "{'Hours field tooltip'|@translate}" style = "text-align:right;">366 <input id = "ec_linked_date_id" name = "ec_linked_date_id" type = "hidden" size = "10" disabled = "disabled">367 369 </p> 368 370 <p style = "text-align:left;"> … … 490 492 ec_is_creation = {if $ec_is_creation}true{else}false{/if}; 491 493 ec_validity_on = {if $ec_validity_on}true{else}false{/if}; 492 valid_timestamp = 0{$valid_timestamp};493 494 ec_up_code_lbl_forced_txt = "{'Forced'|@translate}"; 494 495 ec_JS_message['ec_gen_user_act_miss'] = "{'ec_gen_user_act_miss'|@translate|@escape:javascript}"; … … 517 518 {/if} 518 519 {foreach from = $ec_lists.ec_table item = ec_val name = listloop} 519 ec_lists_temp[{$smarty.foreach.listloop.index}] =520 ec_lists_temp[{$smarty.foreach.listloop.index}] = 520 521 "{$ec_val.id};{$ec_val.code};{$ec_val.user_id};{$ec_val.action};{$ec_val.arg1};{$ec_val.arg2};{$ec_val.forced};{$ec_val.comment}"; 522 {/foreach} 523 {foreach from = $ec_days item = ec_day name = listloop} 524 ec_validity_days[{$smarty.foreach.listloop.index}] = "{$ec_day}"; 521 525 {/foreach} 522 526 ec_build_ec_lists(); -
extensions/event_cats/admin/template/footer.inc.tpl
r7832 r7864 11 11 ec_help_banner_in_foot = true; 12 12 //--></script> 13 <div id = "ec_help_banner0" style = "border-top: 1px solid # 000000; border-bottom: 1px solid #000000;">13 <div id = "ec_help_banner0" style = "border-top: 1px solid #666666; border-bottom: 1px solid #666666;"> 14 14 <div id = "ec_help_banner1" style = "text-align:left; display:block;"></div> 15 15 </div> -
extensions/event_cats/admin/template/header.inc.tpl
r7832 r7864 29 29 {if !isset($ec_help_banner_in_foot)} 30 30 <div id = "ec_help_banner0"> 31 <div style = "text-align:right; font-style:italic; border-top: 1px solid # 000000;">31 <div style = "text-align:right; font-style:italic; border-top: 1px solid #666666;"> 32 32 {'Help banner'|@translate} 33 33 <label for = "ec_help_banner_1" onclick = "ec_mark_help('ec_help_banner_1');"> … … 41 41 </label> 42 42 </div> 43 <span id = "ec_help_banner1" style = "text-align:left; display:block; border-bottom: 1px solid # 000000;"></span>43 <span id = "ec_help_banner1" style = "text-align:left; display:block; border-bottom: 1px solid #666666; padding-bottom:0.5em;"></span> 44 44 </div> 45 45 {/if}
Note: See TracChangeset
for help on using the changeset viewer.