Changeset 7844

Timestamp:

02/04/13 14:34:31 (10 years ago)

Author:

cristiano

Message:

Ticket #3336 - Remover módulo calendar (antiga agenda)

Location:

trunk

Files:

• admin/inc/class.uicalendar.inc.php (deleted)
• admin/inc/hook_admin.inc.php (modified) (1 diff)
• admin/templates/default/calendar.tpl (deleted)
• calendar/doc (deleted)
• calendar/egroupware.org (deleted)
• calendar/inc (deleted)
• calendar/js (deleted)
• calendar/setup (deleted)
• calendar/templates (deleted)
• expressoAdmin1_2/inc/class.uishared_accounts.inc.php (modified) (1 diff)
• expressoMail1_2/js/draw_api.js (modified) (1 diff)

trunk/admin/inc/hook_admin.inc.php

@@ -85 +85 @@
                 $file['VoIP settings']         = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uivoip.edit_conf');
         }
-        
-        if (! $GLOBALS['phpgw']->acl->check('site_config_access',1,'admin'))
-        {
-                $file['Calendar settings'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicalendar.edit_conf');
-        }
+
 
         /* Do not modify below this line */

trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php

@@ -107 +107 @@
                             'disabled_empty_inbox' => $this->functions->check_acl($account_lid,'empty_shared_accounts_inbox') ? '' : 'disabled',
                             'display_quota_used' => 'none',
-                            'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none',
-                            'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' : 'none',
-                            'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' : 'ExpressoCalendar',
+                            'aclExpressoCalendar' =>  '' ,
+                            'aclCalendar' => 'none',
+                                        'calendarName' => 'ExpressoCalendar',
                             'sharedAccountsLocation' => isset($davicalConf['sharedAccountsLocation']) ? $davicalConf['sharedAccountsLocation'] : ''
                           );

trunk/expressoMail1_2/js/draw_api.js

@@ -3503 +3503 @@
         subject.innerHTML = html_entities(info_msg.subject); 
         subject.className = "header_message_field";
-        if(defaultCalendar == "expressoCalendar" && $("#expressoCalendarid")[0]){
+        if($("#expressoCalendarid")[0]){
                 var new_task_logo = document.createElement("IMG");
                 new_task_logo.title = "Criar uma nova tarefa a partir deste email.";