Changeset 7844
- Timestamp:
- 02/04/13 14:34:31 (10 years ago)
- Location:
- trunk
- Files:
-
- 8 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/inc/hook_admin.inc.php
r5804 r7844 85 85 $file['VoIP settings'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uivoip.edit_conf'); 86 86 } 87 88 if (! $GLOBALS['phpgw']->acl->check('site_config_access',1,'admin')) 89 { 90 $file['Calendar settings'] = $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicalendar.edit_conf'); 91 } 87 92 88 93 89 /* Do not modify below this line */ -
trunk/expressoAdmin1_2/inc/class.uishared_accounts.inc.php
r5907 r7844 107 107 'disabled_empty_inbox' => $this->functions->check_acl($account_lid,'empty_shared_accounts_inbox') ? '' : 'disabled', 108 108 'display_quota_used' => 'none', 109 'aclExpressoCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'expressoCalendar')) ? '' : 'none',110 'aclCalendar' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? '' :'none',111 'calendarName' => (isset($config['defaultCalendar']) && ($config['defaultCalendar'] == 'calendar')) ? 'Calendar' :'ExpressoCalendar',109 'aclExpressoCalendar' => '' , 110 'aclCalendar' => 'none', 111 'calendarName' => 'ExpressoCalendar', 112 112 'sharedAccountsLocation' => isset($davicalConf['sharedAccountsLocation']) ? $davicalConf['sharedAccountsLocation'] : '' 113 113 ); -
trunk/expressoMail1_2/js/draw_api.js
r7800 r7844 3503 3503 subject.innerHTML = html_entities(info_msg.subject); 3504 3504 subject.className = "header_message_field"; 3505 if( defaultCalendar == "expressoCalendar" &&$("#expressoCalendarid")[0]){3505 if($("#expressoCalendarid")[0]){ 3506 3506 var new_task_logo = document.createElement("IMG"); 3507 3507 new_task_logo.title = "Criar uma nova tarefa a partir deste email.";
Note: See TracChangeset
for help on using the changeset viewer.