Changeset 8232 for branches/2.5/mobile

Timestamp:

10/08/13 16:20:46 (11 years ago)

Author:

douglas

Message:

Ticket #0000 - Copiadas as alterações do Trunk. Versão final 2.5.1.

Location:

branches/2.5/mobile

Files:

• inc/class.ui_home.inc.php (modified) (4 diffs)
• index.php (modified) (1 diff)
• mobile_header.inc.php (modified) (1 diff)
• setup/setup.inc.php (modified) (2 diffs)
• templates/default/home_index.tpl (modified) (2 diffs)

branches/2.5/mobile/inc/class.ui_home.inc.php

@@ -4 +4 @@
         var $imap_functions;
         var $db;
-        var $bocalendar;
+        //var $bocalendar;
         var $bo_mobilemail;
         var $common;
@@ -22 +22 @@
                 $this->imap_functions   = CreateObject('expressoMail1_2.imap_functions');
                 $this->db       = CreateObject('phpgwapi.db');
-                $this->bocalendar = CreateObject('calendar.bocalendar');
+                //$this->bocalendar = CreateObject('calendar.bocalendar');
                 $this->bo_mobilemail = CreateObject('mobile.bo_mobilemail');
         }
@@ -84 +84 @@
                 $this->template->set_var('quota_used', $this->common->borkb($total_quota["quota_used"]*1024));
                 $this->template->set_var('quota_limit', $this->common->borkb($total_quota["quota_limit"]*1024));
-                
+                /*
                 //pegando os eventos do dia atual
                 $year   = $this->bocalendar->year;
@@ -116 +116 @@
                 }
                 
-                
+                */
                 
                 if($GLOBALS['phpgw']->session->appsession('mobile.layout','mobile')=="mini_desktop") {

branches/2.5/mobile/index.php

@@ -69 +69 @@
 
         if(     array_key_exists('expressoMail1_2',$GLOBALS['phpgw_info']['user']['apps']) === FALSE ||
-                array_key_exists('contactcenter',$GLOBALS['phpgw_info']['user']['apps']) === FALSE ||
-                array_key_exists('calendar',$GLOBALS['phpgw_info']['user']['apps']) === FALSE) {
+                array_key_exists('contactcenter',$GLOBALS['phpgw_info']['user']['apps']) === FALSE /*||
+                array_key_exists('calendar',$GLOBALS['phpgw_info']['user']['apps']) === FALSE*/) {
                         $GLOBALS['phpgw']->session->phpgw_setcookie('lem', null);
                         $GLOBALS['phpgw']->session->phpgw_setcookie('pem', null);                       

branches/2.5/mobile/mobile_header.inc.php

@@ -43 +43 @@
                                 break;
                         case mobilecalendar:
-                                $link = "ui_mobilecalendar.index";
+                        //      $link = "ui_mobilecalendar.index";
+                                $link = "ui_home.index";
                                 break;
                         case mobilecc:

branches/2.5/mobile/setup/setup.inc.php

@@ -14 +14 @@
         $setup_info['mobile']['name']      = 'mobile';
         $setup_info['mobile']['title']     = 'Expresso Mini';
-        $setup_info['mobile']['version']   = '2.5.0';
+        $setup_info['mobile']['version']   = '2.5.1';
         $setup_info['mobile']['app_order'] = 4;
         $setup_info['mobile']['enable']    = 2;
@@ -39 +39 @@
         $setup_info['mobile']['depends'][] = array(
                 'appname' => 'phpgwapi',
-                'versions' => Array('2.5.0')
+                'versions' => Array('2.5.1.1')
         );
 ?>

branches/2.5/mobile/templates/default/home_index.tpl

@@ -54 +54 @@
                         {personal_folders_box}
                 </span>         
-                <dd>                    
+                <!--<dd>                        
                         <div class="limpar_div resultado-titulo">
                                 <label>
@@ -64 +64 @@
                         </div>  
                 </dd>
-                {commitments_box}
+                        {commitments_box}-->
                 <dd>                    
                 <div class="limpar_div resultado-titulo">