Changeset 5648

Timestamp:

03/06/12 17:21:39 (12 years ago)

Author:

gustavo

Message:

Ticket #2088 - Melhorias no editor de regras de filtro de mensagens do Expresso

Location:

trunk/prototype/modules/filters

Files:

• edit-filter.ejs (modified) (2 diffs)
• filter-list.ejs (modified) (1 diff)
• filters.js (modified) (3 diffs)

trunk/prototype/modules/filters/edit-filter.ejs

@@ -18 +18 @@
                                 </select>
                                 <input type="text" name="criteriaValue[]" />
-                                <input type="hidden" name="criteriaType[]" value="to"/>
+                                <input type="hidden" name="criteriaType[]" value="from"/>
                         </fieldset>
                         <fieldset>
@@ -30 +30 @@
                                 </select>
                                 <input type="text" name="criteriaValue[]" />
-                                <input type="hidden" name="criteriaType[]" value="from"/>
+                                <input type="hidden" name="criteriaType[]" value="to"/>
                         </fieldset>
                         <fieldset>

trunk/prototype/modules/filters/filter-list.ejs

@@ -36 +36 @@
                         <ul class="menu-control">
                                 <li><a href="#<%= data.rules[i].name %>" class="button update" title="Alterar regra '<%= data.rules[i].name %>'"></a></li>
-                                <li><a href="#<%= data.rules[i].name %>" class="button enable<%= (data.rules[i].enabled == "true")? '': ' hidden' %>" title="Habilitar regra"></a></li>
-                                <li><a href="#<%= data.rules[i].name %>" class="button disable<%= (data.rules[i].enabled  == "true")? ' hidden': '' %>" title="Desabilitar regra"></a></li>
+                                <li><a href="#<%= data.rules[i].name %>" class="button enable<%= (data.rules[i].enabled == "true")? '': ' hidden' %>" title="Desabilitar regra"></a></li>
+                                <li><a href="#<%= data.rules[i].name %>" class="button disable<%= (data.rules[i].enabled  == "true")? ' hidden': '' %>" title="Habilitar regra"></a></li>
                                 <li><a href="#<%= data.rules[i].name %>" class="button close" title="Excluir regra '<%= data.rules[i].name %>'"></a></li>
                                 <!--<li class="select" ><input type="checkbox"/></li>-->

trunk/prototype/modules/filters/filters.js

@@ -789 +789 @@
         .filter(".enable").button({
                 icons: {
-                        primary: "ui-icon-circle-check"
+                        primary: "ui-icon-circle-close"
                 },
                 text: false
@@ -802 +802 @@
         .filter(".disable").button({
                 icons: {
-                        primary: "ui-icon-circle-close"
+                        primary: "ui-icon-circle-check"
                 },
                 text: false
@@ -818 +818 @@
                 },
                 text: false
-        }).click(function(){
+        }).click(function(event){
                 $(event.target)
                 .parents("li.rule").find('.id')