Changeset 5571 for trunk/prototype/modules/mail/templates

Timestamp:

02/28/12 08:12:32 (12 years ago)

Author:

adriano

Message:

Ticket #2486 - correcoes de diversos bugs e refactory de parte do codigo dos alarms

Location:

trunk/prototype/modules/mail/templates

Files:

• followupflag_alarm_list.ejs (modified) (1 diff)
• followupflag_configure.ejs (modified) (4 diffs)

trunk/prototype/modules/mail/templates/followupflag_alarm_list.ejs

@@ -1 @@
-<p class="title"><strong>Você tem <%= data.alarmInRange.length %> <%= (data.alarmInRange.length == 1) ? 'mensagem sinalizada para hoje.' : 'mensagens sinalizadas para hoje.'%> </p></strong>
-                                        <ul class="alert-flags" style="overflow: hidden; height: 70px;">
-        
+<p class="title"><strong><%= data.caption %> </strong></p>
+
+<ul class="message-list">
 <%
 for(var i=0; i<data.alarmInRange.length; i++){
+
+        var openMessageScript = "cExecute('$this.imap_functions.get_info_msg&msg_number="+data.alarmInRange[i].messageNumber+"&msg_folder="+data.alarmInRange[i].folderName+"', show_msg);";
 %>
-
-        <li><a onclick="cExecute('$this.imap_functions.get_info_msg&msg_number=<%=data.alarmInRange[i].messageNumber %>&msg_folder=<%= data.alarmInRange[i].folderName %>', show_msg);"><%= data.alarmInRange[i].alarmDeadline %> - <%= data.alarmInRange[i].followupflag.name %> - <%= data.alarmInRange[i].message.headers.subject %></a></li>
+        <li class="message-item">
+                <a onclick="<%=openMessageScript%>">
+                        <%= data.alarmInRange[i].alarmDeadline %> - <%= data.alarmInRange[i].followupflag.name %> - <%= data.alarmInRange[i].message.headers.subject %>
+                </a>
+        </li>
 <%
 }
 %>
-                                        </ul> 
-                                        
-<br>
-<a class="footerMais">ver mais</a><a class="footerMenos">ver menos</a>
-<br><br>
-        <input type="checkbox" name="fadeModel2"> Não mostrar essa janela por hoje.
+</ul> 
+
+<div class="display-options">
+        <a class="display-option more">ver mais</a>
+        <a class="display-option less" style="display:none;">ver menos</a>
+</div>
+<fieldset class="alert-options">
+        <input type="checkbox" name="stopAlert"> <label>Não mostrar essa janela por hoje.</label>
+</fieldset>

trunk/prototype/modules/mail/templates/followupflag_configure.ejs

@@ -40 +40 @@
                 }
         }
-typeFlag = DataLayer.get("followupflag", id = data.messages[0].followupflagged.followupflagId ).name;
-//followupflagged.followupflag.name
 %>
 <div class="followupflag-container">
@@ -52 +50 @@
                                 <% for(var i=0; i<data.followupflags.length; i++) {  %>
                                         
-                                        <% var selected = (data.followupflags[i].name == typeFlag ) ? 'selected="selected"' : '' %> 
+                                        <% var selected = (data.followupflags[i].id == followupflagged.followupflagId ) ? 'selected="selected"' : '' %> 
                                         <option value="<%= data.followupflags[i].id %>" <%= selected %>><%= data.followupflags[i].name %></option>
                                 <% } %>
@@ -87 +85 @@
                                 }
                         %>
-                        <select id="selectCor" name="setColor">
-                                <option value="default" <%= (defaultColor) ? 'selected="selected"' : ''%> ><%= get_lang("Default")%></option>
-                                <option value="custom" <%= (!defaultColor) ? 'selected="selected"' : ''%> ><%= get_lang("Custom")%></option>
+                        <select name="setColor">
+                                <option value="default" <%= (defaultColor && !followupflagged.backgroundColor) ? 'selected="selected"' : ''%> ><%= get_lang("Default")%></option>
+                                <option value="custom" <%= (!defaultColor && followupflagged.backgroundColor) ? 'selected="selected"' : ''%> ><%= get_lang("Custom")%></option>
                         </select>
                 </div>
@@ -116 +114 @@
         </div>
 </div> 
-
-<!--
-        TODO
-        ** Vai ter que ser arrumado a parte de buscar o tipo do sinalizador atual.
--->