Changeset 3462

Timestamp:

11/04/10 13:44:14 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1390 - inclui contagem de emails não lidos.

Location:

branches/2.2/mobile

Files:

• inc/class.ui_mobilemail.inc.php (modified) (5 diffs)
• setup/phpgw_pt-br.lang (modified) (1 diff)
• templates/default/mobilemail.tpl (modified) (4 diffs)

branches/2.2/mobile/inc/class.ui_mobilemail.inc.php

@@ -461 +461 @@
                         // Cria a lista de e-mails
                         $mail_rows = '';
+            $unread_msg_count = 0;
                         if ($this->number_of_messages != 0)
                         {
+                                $unread_msg_count = 0;
                                 foreach ($messages as $index => $msg)
                                 {
@@ -473 +475 @@
                                         $p->set_block('mobilemail_t', 'mail_row');
                                         $p->set_block('mobilemail_t', 'end_strong');
-                                        $p->set_block('mobilemail_t', 'begin_strong');
-                                        $p->set_var('unseen_bkg', "#FFFFFF");
+                                        $p->set_block('mobilemail_t', 'begin_strong');
+                                        $p->set_var('unseen_bkg', "#FFFFFF");
+                                        $p->set_var('itememail_access_key', "0");
+                                        $p->set_var('str_new_message', "");
 
                                         if (is_numeric($index))
@@ -480 +484 @@
                                                 !empty($msg['from']['name']) ? $from = $msg['from']['name'] : $from = $msg['from']['email'];
                                                 !empty($msg['subject']) ? $subject = $msg['subject'] : $subject = lang('[empty subject]');
-                                                if ($msg['Unseen'] == 'U'){ //Setando as mensagens nao lidas
-                                                        $p->set_var('strong_unseen_begin', trim($p->fp('mobilemail_t', 'begin_strong')));
-                                                        $p->set_var('strong_unseen_end', trim($p->fp('mobilemail_t', 'end_strong')));
-                                                        $p->set_var('unseen_bkg', "#E0ECFF");
-                                                        //$p->set_var('unseen_bkg', "#E8EEF7");
-                                        }
+                                                if ($msg['Unseen'] == 'U')
+                                                { //Setando as mensagens nao lidas
+                                                        $p->set_var('strong_unseen_begin', trim($p->fp('mobilemail_t', 'begin_strong')));
+                                                        $p->set_var('strong_unseen_end', trim($p->fp('mobilemail_t', 'end_strong')));
+                                                        $p->set_var('unseen_bkg', "#E0ECFF");
+                                                        $p->set_var('itememail_access_key', "9");
+                                                        $unread_msg_count = $unread_msg_count + 1;
+                                                        $p->set_var('str_new_message', lang("New message"));
+                                                }
                                                 $p->set_var('from', $from);
                                                 $p->set_var('subject', $subject);
@@ -505 +512 @@
                                 $p->set_block('mobilemail_t', 'mail_list');
                                 $p->set_var('mail_rows', $mail_rows);
-
+                                $p->set_var('messages_total', $this->number_of_messages);
+                                $p->set_var('unread_messages_total', $unread_msg_count);
+                                if ($unread_msg_count)
+                                {
+                                        $p->set_var('(unread_messages_total)', '('.$unread_msg_count.')');
+                                }
+                                
                                 //$p->pfp('out', 'mail_list');
                                 $GLOBALS['phpgw_info']['mobiletemplate']->set_content($p->fp('out', 'mail_list'));
@@ -708 +721 @@
                 
                         if($params)
+                        {
                                 $msg = $this->imap_functions->get_info_msg($params);
-
+                        }
 
                         $p->set_block('new_msg_t', 'msg_header');

branches/2.2/mobile/setup/phpgw_pt-br.lang

@@ -87 +87 @@
 minutes ago     mobile  pt-br   minutos atrás
 minute ago      mobile  pt-br   minuto atrás
+New message     mobile  pt-br   Nova mensagem

branches/2.2/mobile/templates/default/mobilemail.tpl

@@ -2 +2 @@
 <form id="folders_list_form" method="get" action="/naoseiainda.php">
 <!-- Adicionar Label antes e um botão após -->
-        <p>&nbsp;&nbsp;<select id="select_current_folder" name="current_folder" onchange="document.getElementById('folders_list_form').submit();">
+        <p><select id="select_current_folder" name="current_folder" onchange="document.getElementById('folders_list_form').submit();">
                 {folder_items}
         </select></p>
@@ -10 +10 @@
 
 <!-- BEGIN inbox_folder_list -->
-<p>&nbsp;&nbsp;<strong>{lang_folder}</strong>: {lang_inbox}</p>
+<h1><strong>{lang_folder}</strong>: {lang_inbox}
+<!-- END inbox_folder_list -->
+<!-- BEGIN mail_list -->
+<b> {(unread_messages_total)}</b></h1>
 <hr />
-<!-- END inbox_folder_list -->
+<!-- END mail_list -->
 
 <!-- BEGIN folder_item -->
@@ -29 +32 @@
 
 <!-- BEGIN mail_footer -->
-<p>&nbsp;&nbsp;{previous}{space}{pages}{next}</p>
+<p>{previous}{space}{pages}{next}</p>
 <!-- END mail_footer -->
 
@@ -61 +64 @@
 
 <!-- BEGIN empty_list -->
-<p>&nbsp;&nbsp;{empty_message}</p>
+<p>{empty_message}</p>
 <!-- END empty_list -->