Changeset 21 for trunk/calendar

Timestamp:

05/02/07 09:15:15 (17 years ago)

Author:

niltonneto

Message:

* empty log message *

Location:

trunk/calendar

Files:

• doc/change_log.txt (modified) (1 diff)
• inc/class.uicalendar.inc.php (modified) (2 diffs)
• templates/celepar/app_print.css (modified) (1 diff)
• templates/celepar/month_day.tpl (modified) (1 diff)

trunk/calendar/doc/change_log.txt

@@ -3 +3 @@
 Nilton Emilio Buhrer Neto.
 
+02/05/2007 - [0.9.2]
+- Corrigindo bug que mostra todos os alarmes de um evento
+independente do dono. Agora só mostra os eventos do dono.
+
+30/04/2007 - [0.9.2]
+- Ajustado o layout da versão de impressão do calendário.
 
 27/02/2007 - [0.9.2]

trunk/calendar/inc/class.uicalendar.inc.php

@@ -3390 +3390 @@
                         foreach($vars['participants']['data'] as $user => $str)
                         {
-                                if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*) \((.*)\)$',$str,$parts))
+                        if ($this->bo->check_perms(PHPGW_ACL_EDIT,0,$user) && ereg('^(.*) \((.*)\)$',$str,$parts))
                                 {
                                         $vars['participants']['data'][$user] = $parts[1].' (<a href="'.$this->page('edit_status','&cal_id='.$event['id'].'&owner='.$user).'">'.$parts[2].'</a>)';
@@ -3413 +3413 @@
                                 foreach($event['alarm'] as $key => $alarm)
                                 {
-                                        $icon = '<img src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'" width="13" height="13">';
-                                        $var = Array(
-                                                'field' => $icon.$GLOBALS['phpgw']->common->show_date($alarm['time']),
-                                                'data'  => lang('Email Notification for %1',$GLOBALS['phpgw']->common->grab_owner_name($alarm['owner']))
-                                        );
-                                        $this->output_template_array($p,'row','list',$var);
+                                        if ($this->bo->so->owner == $alarm['owner']) // Show only alert from user who is requesting
+                                        {       
+                                                $icon = '<img src="'.$GLOBALS['phpgw']->common->image('calendar',($alarm['enabled']?'enabled':'disabled')).'" width="13" height="13">';
+                                                $var = Array(
+                                                        'field' => $icon.$GLOBALS['phpgw']->common->show_date($alarm['time']),
+                                                        'data'  => lang('Email Notification for %1',$GLOBALS['phpgw']->common->grab_owner_name($alarm['owner']))
+                                                );
+                                                $this->output_template_array($p,'row','list',$var);
+                                        }
                                 }
                         }

trunk/calendar/templates/celepar/app_print.css

@@ -13 +13 @@
 .button {
         font-family: Verdana, Arial, Helvetica, sans-serif;
-        font-size: 10px;
+        font-size: 12px;
         color: 006699;
         background-color: #D4D0C8;
-        border: 1px solid #666666;
+        border: 2px solid #666666;
 }

trunk/calendar/templates/celepar/month_day.tpl

@@ -2 +2 @@
 <!-- BEGIN m_w_table -->
 
-<table id="calendar_m_w_table" class="calendar_m_w_table" width="100%">
+<table id="calendar_m_w_table" class="calendar_print_main" border="1" width="100%">
         <! from month_header.tpl -->
         {row}