Changeset 1593
- Timestamp:
- 11/05/09 15:23:41 (14 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
-
calendar/inc/class.uicalendar.inc.php (modified) (25 diffs)
-
phpgwapi/themes/azul.theme (modified) (1 diff)
-
phpgwapi/themes/blue.theme (modified) (previous)
-
phpgwapi/themes/theme.template (modified) (previous)
Legend:
- Unmodified
- Added
- Removed
-
trunk/calendar/inc/class.uicalendar.inc.php
r1587 r1593 176 176 $GLOBALS['phpgw_info']['flags']['app_header'] = $event['id'] ? lang('Calendar - Edit') : lang('Calendar - Add'); 177 177 $GLOBALS['phpgw']->common->phpgw_header(); 178 178 179 179 $ldap_manager = CreateObject('contactcenter.bo_ldap_manager'); 180 180 $_SESSION['phpgw_info']['expressomail']['user'] = $GLOBALS['phpgw_info']['user']; 181 181 $_SESSION['phpgw_info']['expressomail']['user']['owner'] = $event['owner']; 182 182 $_SESSION['phpgw_info']['expressomail']['server'] = $GLOBALS['phpgw_info']['server']; 183 $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null; 183 $_SESSION['phpgw_info']['expressomail']['ldap_server'] = $ldap_manager ? $ldap_manager->srcs[1] : null; 184 184 $context = $GLOBALS['phpgw_info']['server']['ldap_context']; 185 185 $user_context = array(); … … 189 189 } 190 190 // Prepara o contexto do usuario com sua OU raiz, pois ele pode pertencer a uma OU de nivel N. 191 $user_ou = explode(",",str_replace($context,"",implode(",",$user_context))); 191 $user_ou = explode(",",str_replace($context,"",implode(",",$user_context))); 192 192 $user_context = trim(strtolower($user_ou[count($user_ou) - 2].",".$context)); 193 // Fim 193 // Fim 194 194 // Verifica o tipo da visualização da árvore LDAP, configurado no admin da Agenda 195 195 $recursive = $GLOBALS['phpgw_info']['server']['cal_type_tree_participants'] == '1' ? true : false; … … 197 197 198 198 $var = array( 199 "module_name" => $module_name, 200 "lang_loading" => lang("Loading"), 201 "lang_searching" => lang("Searching"), 202 "lang_users" => lang("Users"), 203 "lang_groups" => lang("Groups"), 204 "recursive" => ($recursive)?"":"search", 205 "options" => $combo_org , 206 "id_event" => $_REQUEST["id_event"], 207 "delegator" => $_REQUEST["delegator"], 208 "lang_avaliable_users" => lang("Available Users and Groups"), 209 "lang_search_for" => lang("Search for"), 210 "lang_ou" => lang("Organization"), 211 "date" => $_REQUEST["date"], 212 "Delegate" => lang("Delegate"), 213 'url_template' => 'calendar/templates/'.$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set'] 214 ); 215 199 "module_name" => $module_name, 200 "lang_loading" => lang("Loading"), 201 "lang_searching" => lang("Searching"), 202 "lang_users" => lang("Users"), 203 "lang_groups" => lang("Groups"), 204 "recursive" => ($recursive)?"":"search", 205 "options" => $combo_org, 206 "id_event" => $_REQUEST["id_event"], 207 "eventArray" => $_REQUEST["eventArray"], 208 "delegator" => $_REQUEST["delegator"], 209 "lang_avaliable_users" => lang("Available Users and Groups"), 210 "lang_search_for" => lang("Search for"), 211 "lang_ou" => lang("Organization"), 212 "min_num_characters" => $GLOBALS['phpgw_info']['server']['min_num_characters'], 213 "date" => $_REQUEST["date"], 214 "eventDelegation" => 1, 215 "Delegate" => lang("Delegate"), 216 'url_template' => 'calendar/templates/'.$_SESSION['phpgw_info']['calendar']['user']['preferences']['common']['template_set'] 217 ); 218 216 219 if(isset($_REQUEST["error"])) 217 220 $var['error_msg'] = lang("Problems delegating. Make sure you haven't delegated to a person that was also invited to the meeting"); 218 221 219 222 $template = CreateObject('phpgwapi.Template',$this->template_dir); 220 223 $template->set_file( 221 222 223 224 224 array( 225 "screen"=>"delegate.tpl" 226 ) 227 ); 225 228 $template->set_var($var); 226 229 print $template->fp('out','screen'); … … 229 232 230 233 function delegate_event($params=NULL) { 231 $ldap = CreateObject('expressoMail1_2.ldap_functions'); 232 $delegated = $ldap->uid2uidnumber($_REQUEST['delegated']); 234 //$ldap = CreateObject('expressoMail1_2.ldap_functions'); 235 //$delegated = $ldap->uid2uidnumber($_REQUEST['delegated']); 236 system('echo "request[date]: '.$_REQUEST['date'].'" >>/tmp/controle'); 233 237 try { 234 $this->bo->delegar($_REQUEST['delegator'], 235 $delegated,$_REQUEST['event']); 236 header("Location: index.php?menuaction=calendar.uicalendar.day&date=".$_REQUEST['date']); 238 $this->bo->delegar($_REQUEST['delegator'],$_REQUEST['delegated']/*$delegated*/,$_REQUEST['event']); 239 header("Location: index.php?menuaction=calendar.uicalendar.day&date=".$_REQUEST['date']); 237 240 }catch(Exception $e) { 238 241 header("Location: index.php?menuaction=calendar.uicalendar.screen_delegate_event&id_event=". $_REQUEST["event"]."&delegator=".$_REQUEST["delegator"]."&date=".$_REQUEST["date"]."&error=1"); 239 242 } 240 243 241 244 242 245 } 243 246 … … 832 835 $date = $cal_date ? $cal_date : 0; 833 836 $date = $date ? $date : (int)$_GET['date']; 834 837 835 838 // First, make sure they have permission to this entry 836 839 if ($cal_id < 1) … … 1407 1410 1408 1411 function disponibility($params) { 1409 1412 1410 1413 if(!isset($_SESSION['phpgw_info']['expresso']['expressoAdmin'])) { 1411 1414 $c = CreateObject('phpgwapi.config','expressoAdmin1_2'); 1412 1415 $c->read_repository(); 1413 1416 $current_config = $c->config_data; 1414 1417 1415 1418 $ldap_manager = CreateObject('contactcenter.bo_ldap_manager'); 1416 1419 1417 1420 $_SESSION['phpgw_info']['expresso']['user'] = $GLOBALS['phpgw_info']['user']; 1418 1421 $_SESSION['phpgw_info']['expresso']['server'] = $GLOBALS['phpgw_info']['server']; … … 1441 1444 } 1442 1445 } 1443 1446 1444 1447 $date = explode("/",$_GET['date']); 1445 1448 $freetime = $GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$date[1],$date[0],$date[2]) - $GLOBALS['phpgw']->datetime->tz_offset); … … 1470 1473 start[0] = hour; 1471 1474 start[1] = minute; 1472 paint_interval(start,start,'#00 00FF',true);1475 paint_interval(start,start,'#009ACD',true); 1473 1476 } 1474 1477 else if (end == null) { … … 1477 1480 end[1] = minute; 1478 1481 if(is_lower(start,end)) 1479 paint_interval(start,end,'#00 00FF',true);1482 paint_interval(start,end,'#009ACD',true); 1480 1483 else { 1481 paint_interval(end,start,'#00 00FF',true);1484 paint_interval(end,start,'#009ACD',true); 1482 1485 temp = start; 1483 1486 start = end; … … 1486 1489 } 1487 1490 parent.document.getElementById('start_hour').value=start[0]; 1488 parent.document.getElementById('start_minute').value=start[1]; 1491 parent.document.getElementById('start_minute').value=start[1]; 1489 1492 parent.document.getElementById('end_hour').value=end[0]; 1490 1493 parent.document.getElementById('end_minute').value=end[1]; … … 1498 1501 repaint(); 1499 1502 1500 paint_interval(start,start,'#00 00FF',true);1503 paint_interval(start,start,'#009ACD',true); 1501 1504 } 1502 1505 } … … 1510 1513 document.getElementsByName(name)[i].bgColor=color; 1511 1514 else 1512 document.getElementsByName(name)[i].bgColor='".$this->theme['bg 01']."';1515 document.getElementsByName(name)[i].bgColor='".$this->theme['bg11']."'; 1513 1516 } 1514 1517 } … … 1523 1526 cells.item(i).bgColor=color; 1524 1527 else 1525 cells.item(i).bgColor='".$this->theme['bg 01']."';1528 cells.item(i).bgColor='".$this->theme['bg11']."'; 1526 1529 } 1527 1530 } … … 1529 1532 } 1530 1533 } 1531 1534 1532 1535 function repaint() { 1533 1536 temp_start = new Array(); … … 1539 1542 paint_interval(temp_start,temp_end,'#FFFFFF',false); 1540 1543 } 1541 1544 1542 1545 //Considera sempre name1 <= name2 1543 1546 function paint_interval(name1,name2,color,force) { … … 1568 1571 } 1569 1572 } 1570 1573 1571 1574 function is_lower(array1,array2) { 1572 1575 if(array1[0]<array2[0]) … … 1583 1586 </script></head><body> 1584 1587 "; 1585 1588 1586 1589 $str.= "<table border=\'1\' bgcolor=\"#FFFFFF\" width=\"100%\" height=\"100%\"><tr><td>"; 1587 1590 1588 1591 1589 1592 if(!is_array($param)) 1590 1593 { … … 1684 1687 break; 1685 1688 case '-': 1686 $time_slice[$index]['color'] = $this->theme['bg 01'];1689 $time_slice[$index]['color'] = $this->theme['bg11']; 1687 1690 $link = $this->page('view','&cal_id='.$time_slice[$index]['id'].'&date='.$date['full']); 1688 1691 //$extra =' title="'.$time_slice[$index]['description'].'" onClick="location.href=\''.$link.'\';" style="cursor:pointer; cursor:hand;"'; … … 3295 3298 $texttime=$time; 3296 3299 $texttitle=$this->bo->get_short_field($event,$is_private,'title'); 3300 3301 $account_name = $_POST['user'] ? 3302 $_POST['user'] : 3303 ($_GET['account_name'] ? 3304 $_GET['account_name'] : ''); 3305 3306 $accounts = CreateObject('phpgwapi.accounts'); 3307 $accountId = $accounts->name2id($account_name); 3308 3309 $prefs = CreateObject('phpgwapi.preferences', $accountId); 3310 $account_prefs = $prefs->read(); 3311 3312 $titleView = $account_prefs['calendar']['title_view']; 3313 if($titleView == "1"){ 3314 $textdesc = ''; 3315 }else{ 3297 3316 $textdesc=(!$is_private && $event['description'] ? $this->bo->get_short_field($event,$is_private,'description'):''); 3317 } 3318 3298 3319 // added $textlocation but this must be activated in the actual pict_link.tpl file of the used template set 3299 3320 $textlocation=$this->bo->get_short_field($event,$is_private,'location'); … … 4315 4336 { 4316 4337 $vars['participants']['data'][$user] = $parts[1].' (<a href="'.$this->page('edit_status','&cal_id='.$event['id'].'&owner='.$user).'">'.$parts[2].'</a>)'; 4317 $vars['participants']['data'][$user].=' (<a href=\'index.php?menuaction=calendar.uicalendar.screen_delegate_event&id_event='.$event['id'].'&delegator='.$user.'&date='.$_REQUEST["date"].'\'>'.lang("Delegate event").'</a>)'; 4338 $vars['participants']['data'][$user].=' (<a href=\'index.php?menuaction=calendar.uicalendar.screen_delegate_event&id_event='.$event['id'].'&delegator='.$user.'&date='.$_REQUEST["date"].'&eventArray='.$event.'\'>'.lang("Delegate event").'</a>)'; 4339 //system('echo "event: '.$event['start'].'" >>/tmp/controle'); 4318 4340 } 4319 4341 } … … 5018 5040 <iframe src=\'#\' id=\'frame_disponibility\' width=\'500\' marginHeight=\'0\' marginWidth=\'0\'></iframe> 5019 5041 </div> 5020 '.lang('Participants'), 5042 '.lang('Participants'), 5021 5043 'data' => ' 5022 <font color="#000088"><span onclick=\'show_disponibility()\' style="cursor:hand;cursor:pointer">Mapa de disponibilidade</span></font><br>5023 5044 <input type="hidden" id="txt_loading" value="'.lang("Loading").'">' . 5024 5045 '<input type="hidden" id="txt_searching" value="'.lang("Searching").'">' . … … 5027 5048 '<table width="100%" border="0">'. 5028 5049 '<tr>'. 5029 '<td width="25%"><br>'. 5030 '<button type="button" onClick="javascript:add_user();"><img src="calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images/add.png" style="vertical-align: middle;" > '.lang("Add").'</button>'. 5031 ' <button type="button" onClick="javascript:remove_user();"><img src="calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images/rem.png" style="vertical-align: middle;" > '.lang("Remove").'</button>'. 5050 '<td width="25%"><br><br>'. 5032 5051 '<br><br> <b>'.lang("Event's participants").'</b><br>'. 5033 5052 ' <select id="user_list" name="participants[]" style="width: 300px" multiple size="13">'.$str.'</select>'. … … 5044 5063 ' <b>'.lang("Available users and groups").'</b><br>'. 5045 5064 ' <select id="user_list_in" style="width: 300px" multiple size="13"></select>'. 5065 '</td>'. 5066 '</tr>'. 5067 '<tr>'. 5068 '<td width="25%">'. 5069 '<button type="button" id="time_map" onClick="javascript:show_disponibility();">'.lang("Disponibility map").'</button>'. 5070 '</td>'. 5071 '<td width="30px" valign="middle" align="center"> '. 5046 5072 '</td>'. 5073 '<td valign="bottom">'. 5074 '<button type="button" onClick="javascript:add_user();"><img src="calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images/add.png" style="vertical-align: middle;" > '.lang("Add").'</button>'. 5075 ' <button type="button" onClick="javascript:remove_user();"><img src="calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images/rem.png" style="vertical-align: middle;" > '.lang("Remove").'</button>'. 5076 '</td>'. 5047 5077 '</tr>'. 5048 5078 '</table>'. … … 5060 5090 } 5061 5091 5062 $var['participants']['data'] .= '< a id="a_ext_participants" title="'.lang("It types below the email addresses, if you want to invite other people out" .5092 $var['participants']['data'] .= '<br /><a id="a_ext_participants" title="'.lang("It types below the email addresses, if you want to invite other people out" . 5063 5093 " of this system").'" name="a_ext_participants" onClick="javascript:showExParticipants(this,\''.$module_name.'\')" href="#a_ext_participants"><b>'.lang("Inform").' '.lang("external participants").'</b> <img align="top" ' . 5064 5094 'src="calendar/templates/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'].'/images/sent.gif"></a><table id="tbl_ext_participants" width="100%" border="0" style="display:none">'. … … 5245 5275 case 'recure_type': 5246 5276 $p->set_var('tr_color',$this->theme['th_bg']); 5247 $p->set_var('hr_text','<center id="rpt_label"><b>'.lang('Repeating Event Information').'</b></center>');5277 $p->set_var('hr_text','<center name="cal[rpt_label]"><b>'.lang('Repeating Event Information').'</b></center>'); 5248 5278 $p->parse('row','hr',True); 5249 5279 $this->output_template_array($p,'row','list',$var['recure_type']); -
trunk/phpgwapi/themes/azul.theme
r1025 r1593 36 36 $phpgw_info['theme']['bg09'] = '#da8a8a'; 37 37 $phpgw_info['theme']['bg10'] = '#da7a7a'; 38 $phpgw_info['theme']['bg11'] = '#da3a3a'; 38 39 39 40 // Theses are for the calendar only
Note: See TracChangeset
for help on using the changeset viewer.
