Changeset 5930 for trunk/prototype/modules
- Timestamp:
- 04/12/12 11:33:33 (12 years ago)
- Location:
- trunk/prototype/modules/filters
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/prototype/modules/filters/edit-filter.ejs
r5894 r5930 20 20 <label class="small"><%= get_lang("Sender")%></label> 21 21 <select name="criteriaOperator[]"> 22 <option value=" ="><%= get_lang("is equal to")%></option>23 <option value=" *"><%= get_lang("contains the phrase")%></option>22 <option value="*"><%= get_lang("contains the phrase")%></option> 23 <option value="="><%= get_lang("is equal to")%></option> 24 24 <option value="!*"><%= get_lang("doesn't contain the phrase")%></option> 25 25 <option value="^"><%= get_lang("starting with")%></option> … … 33 33 <label class="small"><%= get_lang("Receiver")%></label> 34 34 <select name="criteriaOperator[]"> 35 <option value=" ="><%= get_lang("is equal to")%></option>36 <option value=" *"><%= get_lang("contains the phrase")%></option>35 <option value="*"><%= get_lang("contains the phrase")%></option> 36 <option value="="><%= get_lang("is equal to")%></option> 37 37 <option value="!*"><%= get_lang("doesn't contain the phrase")%></option> 38 38 <option value="^"><%= get_lang("starting with")%></option> … … 45 45 <label class="small"><%= get_lang("Subject")%></label> 46 46 <select name="criteriaOperator[]"> 47 <option value=" ="><%= get_lang("is equal to")%></option>48 <option value=" *"><%= get_lang("contains the phrase")%></option>47 <option value="*"><%= get_lang("contains the phrase")%></option> 48 <option value="="><%= get_lang("is equal to")%></option> 49 49 <option value="!*"><%= get_lang("doesn't contain the phrase")%></option> 50 50 <option value="^"><%= get_lang("starting with")%></option> … … 58 58 <label class="small"><%= get_lang("Message")%></label> 59 59 <select name="criteriaOperator[]"> 60 <option value=" ="><%= get_lang("is equal to")%></option>61 <option value=" *"><%= get_lang("contains the phrase")%></option>60 <option value="*"><%= get_lang("contains the phrase")%></option> 61 <option value="="><%= get_lang("is equal to")%></option> 62 62 <option value="!*"><%= get_lang("doesn't contain the phrase")%></option> 63 63 <option value="^"><%= get_lang("starting with")%></option> … … 155 155 <input type="hidden" name="actionParameter[]" value="INBOX"/> 156 156 </fieldset> 157 158 159 160 <fieldset class="fields-search-messages">161 <label>Clique no botão "Buscar" para verificar se existem mensagens na sua Caixa de Entrada que162 atendem aos critérios especificados anteriormente.</label>163 <span class="button search">Buscar na caixa de entrada</span>164 </fieldset>165 <table class="hidden fields-search-messages-grid" id="fields-search-messages-grid"><tr><td/></tr></table>166 <div class="hidden fields-search-messages-grid-pager" id="fields-search-messages-grid-pager"></div>167 168 169 170 157 <div class="menu-container"> 171 158 <a class="button back" href="#" >« <%= get_lang("Previous")%></a> 172 159 <a class="button cancel" href="#"><%= get_lang("Cancel")%></a> 160 <a class="button forth2" href="#"><%= get_lang("Continue")%> »</a> 173 161 <a class="button submit" href="#"><%= get_lang("Save")%></a> 174 162 </div> 175 163 </div> 164 165 166 167 <h3><a href="#"><%= get_lang("Apply filter")%></a></h3> 168 <div> 169 <fieldset> 170 <table class="hidden fields-search-messages-grid" id="fields-search-messages-grid"><tr><td/></tr></table> 171 <div class="hidden fields-search-messages-grid-pager" id="fields-search-messages-grid-pager"></div> 172 <fieldset class="fields-search-messages" style="border: none;"> 173 <span class="button search menu-container">Buscar na caixa de entrada</span> 174 </fieldset> 175 </fieldset> 176 <div class="menu-container"> 177 <a class="button back2" href="#" >« <%= get_lang("Previous")%></a> 178 <a class="button cancel" href="#"><%= get_lang("Cancel")%></a> 179 <a class="button submit" href="#"><%= get_lang("Save")%></a> 180 </div> 181 </div> 182 183 184 185 176 186 </div> 177 187 <div class="vacation-details-container hidden"> -
trunk/prototype/modules/filters/filters.js
r5902 r5930 794 794 list_container.find(".button").button().filter(".forth").click(function(){ 795 795 accord.accordion('activate',1); 796 }).end().filter(".forth2").click(function(){ 797 accord.accordion('activate',2); 796 798 }).end().filter(".back").click(function(){ 797 799 accord.accordion('activate',0); 800 }).end().filter(".back2").click(function(){ 801 accord.accordion('activate',1); 798 802 }).end().filter(".cancel").click(function(){ 799 803 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); … … 878 882 }).end().removeClass("ui-button-icon-only"); 879 883 884 var aa = 0; 885 880 886 list_container.parent().find(".button.add:first").click(function(){ 881 887 list_container.parent().find(".dialog-head-buttonpane").addClass("hidden"); … … 885 891 list_container.find(".button").button().filter(".forth").click(function(){ 886 892 accord.accordion('activate',1); 893 }).end().filter(".forth2").click(function(){ 894 accord.accordion('activate',2); 887 895 }).end().filter(".back").click(function(){ 888 896 accord.accordion('activate',0); 897 }).end().filter(".back2").click(function(){ 898 accord.accordion('activate',1); 889 899 }).end().filter(".cancel").click(function(){ 890 900 DataLayer.render( BASE_PATH + 'modules/filters/init.ejs', {},list_filters); … … 901 911 if(valid_save()) 902 912 { 903 var criteria_list 913 var criteria_list = list_container.find('[name="criteriaValue[]"]'); 904 914 var criteria_operator_list = list_container.find('[name="criteriaOperator[]"]'); 905 915 var criteria_value = ""; … … 929 939 url: DataLayer.basePath + 'folder/INBOX/message&' + $.param( {"filter": criterias_} ), 930 940 dataType: 'json', 931 success: function(data){ 941 success: function(data){ 932 942 allMessages = data; 933 var parametro = ""; 934 (data != false) ? parametro = {"filter": [ "msgNumber", "IN", data ]} : parametro = {"filter": criterias_};943 944 var parametro = { "filter": ( data != false ? [ "msgNumber", "IN", data ] : criterias_ ) }; 935 945 936 grid = showGridButton.addClass('hidden') 937 .siblings(".fields-search-messages-grid, .fields-search-messages-grid-pager") 938 .removeClass('hidden').filter(".fields-search-messages-grid").jqGrid({ 946 if (typeof grid !== "undefined") { 947 grid.jqGrid( 'setGridParam', { url: DataLayer.basePath + 'folder/INBOX/message&' + $.param( parametro ) } ).trigger( 'reloadGrid' ); 948 return; 949 } 950 grid = showGridButton.siblings(".fields-search-messages-grid, .fields-search-messages-grid-pager") 951 .removeClass('hidden').filter(".fields-search-messages-grid").trigger( 'reloadGrid' ).jqGrid({ 939 952 //url: DataLayer.basePath + 'folder/INBOX/message&' + $.param( {"filter": [ "msgNumber", "IN", data ]} ), 940 953 url: DataLayer.basePath + 'folder/INBOX/message&' + $.param( parametro ), … … 967 980 multiselect: true, 968 981 autowidth: true, 969 height:40, 982 reloadAfterEdit: true, 983 reloadAfterSubmit: true, 984 height:200, 970 985 loadComplete: function(data) { 971 986 // // aplica o contador
Note: See TracChangeset
for help on using the changeset viewer.