Changeset 20112
- Timestamp:
- Jan 14, 2013, 12:48:13 AM (11 years ago)
- Location:
- extensions/Piwecard
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
extensions/Piwecard/admin/admin_management.php
r20088 r20112 6 6 $piwecard = get_plugin_data($plugin_id); 7 7 8 if (isset($_POST['nb_ecard_page_submit'])) { 8 $query = 'SELECT * FROM '.PIWECARD_TABLE; 9 10 if (isset($_POST['ecard_form_filter_submit'])) { 11 switch ($_POST['ecard_status']) { 12 case 'valid': 13 $query .= ' WHERE date_validity >= NOW() OR date_validity IS NULL'; 14 break; 15 case 'invalid': 16 $query .= ' WHERE date_validity < NOW() AND date_validity IS NOT NULL'; 17 break; 18 default: 19 break; 20 } 21 22 switch ($_POST['ecard_sort_by']) { 23 case 'date': 24 $query .= ' ORDER BY date_creation'; 25 break; 26 case 'title': 27 $query .= ' ORDER BY title'; 28 break; 29 case 'sender': 30 $query .= ' ORDER BY sender_name'; 31 break; 32 case 'recipient': 33 $query .= ' ORDER BY recipient_name'; 34 break; 35 case 'validity': 36 $query .= ' ORDER BY date_validity'; 37 break; 38 default: 39 $query .= ' ORDER BY date_creation'; 40 break; 41 } 42 43 switch ($_POST['ecard_sort_order']) { 44 case 'asc': 45 $query .= ' ASC'; 46 break; 47 case 'desc': 48 $query .= ' DESC'; 49 break; 50 default: 51 $query .= ' ASC'; 52 break; 53 } 54 $template->assign('ecard_filter', array( 55 'status' => $_POST['ecard_status'], 56 'sort_by' => $_POST['ecard_sort_by'], 57 'sort_order' => $_POST['ecard_sort_order'], 58 ) 59 ); 60 9 61 if (intval($_POST['ecard_nb_ecard_page']) == 0) 10 62 $piwecard->config['nb_ecard_page'] = 1; … … 40 92 $ecard_navbar = create_navigation_bar($management_url, $piwecard->get_nb_ecard(), $start, $piwecard->config['nb_ecard_page']); 41 93 42 $query = 'SELECT * FROM '.PIWECARD_TABLE.' ORDER BY date_creation DESC LIMIT '.$start.','.$piwecard->config['nb_ecard_page'].';'; 94 //DB Query 95 if (strpos($query, 'ORDER BY') === FALSE) { 96 $query .= ' ORDER by date_creation ASC'; 97 } 98 99 $query .= ' LIMIT '.$start.','.$piwecard->config['nb_ecard_page'].';'; 43 100 $result = pwg_query($query); 44 101 -
extensions/Piwecard/admin/template/admin_configuration.tpl
r20109 r20112 109 109 </div> 110 110 <div class="ecard_form_line ecard_email_config"> 111 <label for="ecard_email_subject">{'piwecard_email_subject'|@translate}</label>< br /><span class="ecard_error" id="ecard_email_subject_error" style="{$ecard_errors.email_subject.style_error_text}">{'piwecard_error'|@translate} {'piwecard_error_text'|@translate}</span>111 <label for="ecard_email_subject">{'piwecard_email_subject'|@translate}</label><span class="ecard_error" id="ecard_email_subject_error" style="{$ecard_errors.email_subject.style_error_text}">{'piwecard_error'|@translate} {'piwecard_error_text'|@translate}</span> 112 112 <input type="text" maxlength="255" name="ecard_email_subject" id="ecard_email_subject" {$ecard_errors.email_subject.style_error_input} value="{$ecard_email_subject}" /> 113 113 </div> -
extensions/Piwecard/admin/template/admin_management.tpl
r20109 r20112 18 18 </div> 19 19 <div id="ECardAdminManagement"> 20 <fieldset> 21 <legend>{'piwecard_list'|@translate}</legend> 22 <div class="ecard_last_line"> 23 {$nb_ecard_valid_total} 24 </div> 25 </fieldset> 26 <fieldset> 27 <legend>{'Filter'|@translate}</legend> 28 <form method="post" id="ecard_form_filter" onsubmit="return piwecard_checkForm(this);"> 29 <div class="ecard_error" id="ecard_nb_ecard_page_error"> 30 {'piwecard_error'|@translate} {'piwecard_error_number'|@translate} 31 </div> 32 <span> 33 <label> 34 {'Status'|@translate} 35 <select name="ecard_status"> 36 <option value="all" label="------------">------------</option> 37 <option value="valid" label="{'piwecard_valid'|@translate}" {if $ecard_filter.status=='valid'}selected="selected"{/if}>{'piwecard_valid'|@translate}</option> 38 <option value="invalid" label="{'piwecard_invalid'|@translate}" {if $ecard_filter.status=='invalid'}selected="selected"{/if}>{'piwecard_invalid'|@translate}</option> 39 </select> 40 </label> 41 </span> 42 <span> 43 <label> 44 {'Sort by'|@translate} 45 <select name="ecard_sort_by"> 46 <option value="default" label="------------">------------</option> 47 <option value="date" label="{'Date'|@translate}" {if $ecard_filter.sort_by=='date'}selected="selected"{/if}>{'Date'|@translate}</option> 48 <option value="title" label="{'Title'|@translate}" {if $ecard_filter.sort_by=='title'}selected="selected"{/if}>{'Title'|@translate}</option> 49 <option value="sender" label="{'piwecard_sender_name'|@translate}" {if $ecard_filter.sort_by=='sender'}selected="selected"{/if}>{'piwecard_sender_name'|@translate}</option> 50 <option value="recipient" label="{'piwecard_recipient_name'|@translate}" {if $ecard_filter.sort_by=='recipient'}selected="selected"{/if}>{'piwecard_recipient_name'|@translate}</option> 51 <option value="validity" label="{'piwecard_validity'|@translate}" {if $ecard_filter.sort_by=='validity'}selected="selected"{/if}>{'piwecard_validity'|@translate}</option> 52 </select> 53 </label> 54 </span> 55 <span> 56 <label> 57 {'Sort order'|@translate} 58 <select name="ecard_sort_order"> 59 <option value="asc" label="{'ascending'|@translate}" {if $ecard_filter.sort_order=='asc'}selected="selected"{/if}>{'ascending'|@translate}</option> 60 <option value="desc" label="{'descending'|@translate}" {if $ecard_filter.sort_order=='desc'}selected="selected"{/if}>{'descending'|@translate}</option> 61 </select> 62 </label> 63 </span> 64 <span> 65 <label> 66 {'piwecard_nb_ecard_page'|@translate} 67 <input type="text" maxlength="3" size="3" name="ecard_nb_ecard_page" id="ecard_nb_ecard_page" value="{$ecard_nb_ecard_page}" /> 68 </label> 69 </span> 70 <span> 71 <label> 72 73 <input type="submit" name="ecard_form_filter_submit" value="{'Submit'|@translate}" /> 74 </label> 75 </span> 76 </form> 77 </fieldset> 20 78 {if count($ecard_file)} 21 <fieldset> 22 <legend>{'piwecard_list'|@translate}</legend> 23 <div class="ecard_last_line"> 24 {$nb_ecard_valid_total} 25 </div> 26 </fieldset> 27 <fieldset> 28 <legend>{'Filter'|@translate}</legend> 29 <form method="post" id="ecard_nb_ecard_page_form" onsubmit="return piwecard_checkForm(this);"> 30 <span><label for="ecard_nb_ecard_page">{'piwecard_nb_ecard_page'|@translate}</label></span> 31 <span><input type="text" maxlength="3" size="3" name="ecard_nb_ecard_page" id="ecard_nb_ecard_page" value="{$ecard_nb_ecard_page}" /></span> 32 <span><input type="submit" name="nb_ecard_page_submit" value="{'Submit'|@translate}" /></span> 33 <span class="ecard_error" id="ecard_nb_ecard_page_error">{'piwecard_error'|@translate} {'piwecard_error_number'|@translate}</span> 34 </form> 35 </fieldset> 36 <form method="post" id="delete_selected_form"> 79 <form method="post" id="ecard_form_delete"> 37 80 <table class="table2" width="97%"> 38 81 <thead> 39 82 <tr class="throw"> 40 83 <td> </td> 84 <td>{'Date'|@translate}</td> 41 85 <td>{'Title'|@translate}</td> 42 <td>{'Date'|@translate}</td>43 86 <td>{'piwecard_sender_name'|@translate}</td> 44 87 <td>{'piwecard_recipient_name'|@translate}</td> -
extensions/Piwecard/css/admin.css
r20109 r20112 27 27 width: 75%; 28 28 height: 200px; 29 display: block; 29 30 } 30 31 31 32 #ECardAdminConfiguration .ecard_email_config input { 32 33 width: 75%; 34 display: block; 33 35 } 34 36 … … 60 62 } 61 63 62 #ECardAdminManagement #ecard_ nb_ecard_page_form{64 #ECardAdminManagement #ecard_form_filter { 63 65 text-align: left; 64 66 } 65 67 66 #ECardAdminManagement #ecard_nb_ecard_page_form input { 68 #ECardAdminManagement #ecard_form_filter input, #ECardAdminManagement #ecard_form_filter select { 69 display: block; 70 margin: 0.5em 0px; 71 } 72 73 #ECardAdminManagement #ecard_form_filter input { 67 74 text-align: center; 68 75 } 69 76 70 #ECardAdminManagement #ecard_nb_ecard_page_form span { 71 margin-right: 0.7em; 77 #ECardAdminManagement #ecard_form_filter span { 78 margin-right: 1em; 79 float:left; 72 80 } -
extensions/Piwecard/language/en_UK/plugin.lang.php
r20103 r20112 51 51 $lang['piwecard_list'] = 'List of e-cards'; 52 52 $lang['piwecard_nb_ecard_valid_total'] = '%nb_valid% valid e-cards out of %nb_total% e-cards'; 53 $lang['piwecard_valid'] = 'Valid'; 54 $lang['piwecard_invalid'] = 'Expired'; 53 55 $lang['piwecard_delete_all_invalid'] = 'Delete all expired e-card'; 54 56 $lang['piwecard_validity'] = 'Validity date'; -
extensions/Piwecard/language/fr_FR/plugin.lang.php
r20103 r20112 51 51 $lang['piwecard_list'] = 'Liste des cartes virtuelles'; 52 52 $lang['piwecard_nb_ecard_valid_total'] = '%nb_valid% cartes virtuelles valides sur %nb_total% cartes virtuelles'; 53 $lang['piwecard_valid'] = 'Valides'; 54 $lang['piwecard_invalid'] = 'Périmées'; 53 55 $lang['piwecard_delete_all_invalid'] = 'Supprimer toutes les cartes virtuelles périmées'; 54 56 $lang['piwecard_validity'] = 'Date de péremption'; … … 56 58 $lang['piwecard_deleted'] = 'Les cartes virtuelles sélectionnées ont été supprimées.'; 57 59 $lang['piwecard_invalid_deleted'] = 'Toutes les cartes périmées ont été supprimées.'; 58 $lang['piwecard_nb_ecard_page'] = 'Nombre de cartes virtuellespar page';60 $lang['piwecard_nb_ecard_page'] = 'Nombre de cartes par page'; 59 61 $lang['piwecard_no_ecard'] = 'Aucune carte virtuelle dans la base de données'; 60 62 $lang['piwecard_delete_selected'] = 'Supprimer les cartes virtuelles sélectionnées';
Note: See TracChangeset
for help on using the changeset viewer.