Changeset 1481

Timestamp:

03/17/10 20:35:56 (4 months ago)

Author:

nuhaa

bzr:base-revision:

svn-v4:a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk:1468

bzr:committer:

cawanpink <cawan.nuhaa@gmail.com

bzr:file-ids:

app/models/decision.php 1@a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk%2Fapp%2Fmodels%2Fdecision.php
app/vendors/shells/cron.php 165@a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk%2Fapp%2Fvendors%2Fshells%2Fcron.php
app/vendors/shells/install.php 121@a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk%2Fapp%2Fvendors%2Fshells%2Finstall.php
app/views/decisions/printminutes.ctp 1261@a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk%2Fapp%2Fviews%2Fdecisions%2Fprintminutes.ctp
app/views/elements/minutes/display_minute_item.ctp 1065@a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk%2Fapp%2Fviews%2Felements%2Fminutes%2Fdisplay_minute_item.ctp
app/views/meetings/view.ctp 1@a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk%2Fapp%2Fviews%2Fmeetings%2Fview.ctp
app/webroot/css/lpp.css lpp.css-20100317124049-npqgre7m9b6395pp-1
app/webroot/css/minutes.css 437@a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk%2Fapp%2Fwebroot%2Fcss%2Fminutes.css

bzr:mapping-version:

v4

bzr:repository-uuid:

a8d4ffef-5c3f-4892-ae7f-56d30e424451

bzr:revision-id:

cawan.nuhaa@gmail.com-20100317124058-z035t0a8006fm0gi

bzr:revno:

1186

bzr:revprop:branch-nick:

trunk

bzr:root:

trunk

bzr:text-parents:

app/models/decision.php svn-v4:a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk:1454
app/vendors/shells/cron.php svn-v4:a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk:1452
app/vendors/shells/install.php cawan.nuhaa@gmail.com-20100125100755-0nw3v5o8bf00wbhp
app/views/decisions/printminutes.ctp svn-v4:a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk:1391
app/views/elements/minutes/display_minute_item.ctp svn-v4:a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk:1394
app/views/meetings/view.ctp svn-v4:a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk:1436
app/webroot/css/minutes.css svn-v4:a8d4ffef-5c3f-4892-ae7f-56d30e424451:trunk:1393

bzr:timestamp:

2010-03-17 20:40:58.806999922 +0800

bzr:user-agent:

bzr2.1.0+bzr-svn1.0.2

svn:original-date:

2010-03-17T12:40:58.807000Z

Message:

added LPP minutes type with code 'lpp'

Location:

trunk/app

Files:

• models/decision.php (modified) (2 diffs)
• vendors/shells/cron.php (modified) (2 diffs)
• vendors/shells/install.php (modified) (2 diffs)
• views/decisions/printminutes.ctp (modified) (4 diffs)
• views/elements/minutes/display_minute_item.ctp (modified) (2 diffs)
• views/meetings/view.ctp (modified) (1 diff)
• webroot/css/lpp.css (added)
• webroot/css/minutes.css (modified) (1 diff)

trunk/app/models/decision.php

@@ -959 +959 @@
 
 
-        function getArrows($levels, $meetingid){
-                $level_array = array('up'=>1, 'down'=>1);
-                $new_key = $new_level = $new_level_key = array();
-                $total_result = count($levels);
-                $i = $ii = $a = 1;
-                $mainsum = 0;
-
-                if ( count($levels) > 0 ) {
-                        foreach ($levels as $key => $level) { array_push($new_key, $key); }
-
-                        foreach ($levels as $level) {
-                                if ( $level == 0 ) { $mainsum++; }
-                        }
-                        foreach($levels as $key => $level ){
-                                $pre = $next = 99;
-                                $key_value = array_search($key, $new_key);
-                                $current = $levels[$key];
-                        if ( $key_value > 0 ) {
-                            $pre = $levels[$new_key[$key_value-1]];
-                                } 
-                        if ( $i < $total_result ) { 
-                            $next = $levels[$new_key[$key_value+1]];
-                                }
-                                if ( $pre == 99 && $next == 99 ) {
-                                        $a = 4;
-                                } else {
-                                
-                                        if ( $ii < $mainsum ) {
-                                                if ( $pre == 99 ) {
-                                                        $a = 2;
-                                                }
-
-                                                if ( $next == 99 ) {
-                                                        $a = 3;
-                                                }
-                                
-                                                if ( $current > $pre ) {
-                                                        $parent = $this->getparentnode($new_key[$key_value]);
-                                                        $parent = $parent['Decision']['id'];
-                                                        $numberofchild = $this->treeparent($parent, $meetingid);
-                                                        if ( $numberofchild > 1 ) {
-                                                                $a = 2;
-                                                        } else {
-                                                                $a = 4;
-                                                        }       
-                                                } else {
-                                                        if ( $current > $next ) {
-                                                                $a = 3;
-                                                        }
-                                                }
-                                                                
-                                        } else {
-
-                                                if ( $current != 0) {
-                                                        $parent = $this->getparentnode($new_key[$key_value]);
-                                                        $parent = $parent['Decision']['id'];
-                                                        $numberofchild = $this->treeparent($parent, $meetingid);
-                                                        if ( $numberofchild > 1 ) {
-                                                                if ( $current > $pre ) {
-                                                                        $a = 2;
-                                                                } 
-                                                                if ( $next == 99 || ($current > $next) ) {
-                                                                        $a = 3;
-                                                                }
-                                                        } else {
-                                                                $a = 4;
-                                                        }
-                                                } else {
-                                                        $a = 3;
-                                                }
-                                        }
-                                }
-
-                                $level_array = array('up'=>1, 'down'=>1);
-                                if ( $a == 2 ) { $level_array = array('up'=>0, 'down'=>1); }
-                                if ( $a == 3 ) { $level_array = array('up'=>1, 'down'=>0); }
-                                if ( $a == 4 ) { $level_array = array('up'=>0, 'down'=>0); }
-                                array_push($new_level_key, $key);
-                                array_push($new_level, $level_array);
-                                if ( $current == 0 ) {
-                                        $ii++;
-                                }
-                                $i++;
-                                $a = 1;
-                        }
-                        return array_combine($new_level_key, $new_level);
-                } else {
-                        return NULL;
-                }
-
-                
-        }
-        
-
-        function treeparent($parent, $meetingid){
-                $numberofchild = 0;
-                if ( $parent ) {
-                        $child = $this->query("SELECT lft, rght FROM decisions WHERE id=".$parent);
-                        $lft = $child[0]['decisions']['lft'];
-                        $rght = $child[0]['decisions']['rght'];
-                        $diff = $rght - $lft;
-
-                        if ( $diff > 1 ) {
-                                $childlists = $this->query("SELECT count(id) as total FROM decisions WHERE meeting_id =".$meetingid." AND deleted = 0 AND lft > ".$lft." AND rght <=".$rght );
-                                $numberofchild = $childlists[0][0]['total'];
-                        } 
-                }
-                return $numberofchild;
-        }
+    function getArrows($levels, $meetingid){
+        $level_array = array('up'=>1, 'down'=>1);
+        $new_key = $new_level = $new_level_key = array();
+        $total_result = count($levels);
+        $i = $ii = $a = 1;
+        $mainsum = 0;
+
+        if ( count($levels) > 0 ) {
+            foreach ($levels as $key => $level) { array_push($new_key, $key); }
+
+            foreach ($levels as $level) {
+                if ( $level == 0 ) { $mainsum++; }
+            }
+            foreach($levels as $key => $level ){
+                $pre = $next = 99;
+                $key_value = array_search($key, $new_key);
+                $current = $levels[$key];
+                if ( $key_value > 0 ) {
+                    $pre = $levels[$new_key[$key_value-1]];
+                } 
+                if ( $i < $total_result ) { 
+                    $next = $levels[$new_key[$key_value+1]];
+                }
+                if ( $pre == 99 && $next == 99 ) {
+                    $a = 4;
+                } else {
+                
+                    if ( $ii < $mainsum ) {
+                        if ( $pre == 99 ) {
+                            $a = 2;
+                        }
+
+                        if ( $next == 99 ) {
+                            $a = 3;
+                        }
+                
+                        if ( $current > $pre ) {
+                            $parent = $this->getparentnode($new_key[$key_value]);
+                            $parent = $parent['Decision']['id'];
+                            $numberofchild = $this->treeparent($parent, $meetingid);
+                            if ( $numberofchild > 1 ) {
+                                $a = 2;
+                            } else {
+                                $a = 4;
+                            }   
+                        } else {
+                            if ( $current > $next ) {
+                                $a = 3;
+                            }
+                        }
+                                
+                    } else {
+
+                        if ( $current != 0) {
+                            $parent = $this->getparentnode($new_key[$key_value]);
+                            $parent = $parent['Decision']['id'];
+                            $numberofchild = $this->treeparent($parent, $meetingid);
+                            if ( $numberofchild > 1 ) {
+                                if ( $current > $pre ) {
+                                    $a = 2;
+                                } 
+                                if ( $next == 99 || ($current > $next) ) {
+                                    $a = 3;
+                                }
+                            } else {
+                                $a = 4;
+                            }
+                        } else {
+                            $a = 3;
+                        }
+                    }
+                }
+
+                $level_array = array('up'=>1, 'down'=>1);
+                if ( $a == 2 ) { $level_array = array('up'=>0, 'down'=>1); }
+                if ( $a == 3 ) { $level_array = array('up'=>1, 'down'=>0); }
+                if ( $a == 4 ) { $level_array = array('up'=>0, 'down'=>0); }
+                array_push($new_level_key, $key);
+                array_push($new_level, $level_array);
+                if ( $current == 0 ) {
+                    $ii++;
+                }
+                $i++;
+                $a = 1;
+            }
+            return array_combine($new_level_key, $new_level);
+        } else {
+            return NULL;
+        }
+
+        
+    }
+    
+
+    function treeparent($parent, $meetingid){
+        $numberofchild = 0;
+        if ( $parent ) {
+            $child = $this->query("SELECT lft, rght FROM decisions WHERE id=".$parent);
+            $lft = $child[0]['decisions']['lft'];
+            $rght = $child[0]['decisions']['rght'];
+            $diff = $rght - $lft;
+
+            if ( $diff > 1 ) {
+                $childlists = $this->query("SELECT count(id) as total FROM decisions WHERE meeting_id =".$meetingid." AND deleted = 0 AND lft > ".$lft." AND rght <=".$rght );
+                $numberofchild = $childlists[0][0]['total'];
+            } 
+        }
+        return $numberofchild;
+    }
 
     function checkMinuteType($committee){
@@ -1086 +1086 @@
 
     function changetoHTML($invitees){
-        $inviteeList = "<span class='textbold'>Attendance List:</span><div id='minutestable' >";
+        $inviteeList = '';
+        $inviteeList.= "<table cellpadding='2' cellspacing='2' class='att_list'>";
+        $i = 1;
         foreach ( $invitees as $invitee ) {
-            $inviteeList .= "- ".$invitee['User']['name']."<br />";
-        }
-        $inviteeList .= "</div><br>";
+            $inviteeList .= "<tr><td class='number'>".$i++.".</td><td class='name'>".$invitee['User']['name']."</td></tr>";
+            //$inviteeList .= "<tr><td>&nbsp;</td><td class='post'>post</td></tr>";
+        }
+        $inviteeList .= "</table>";
         return $inviteeList;
     }
-        
-        function getMeetingId($decisionID) {
-                $MeetingID = $this->query("SELECT meeting_id, lft, rght, parent_id FROM decisions WHERE id =".$decisionID);
-                return $MeetingID[0]['decisions'];
-        }
-
-        
-        function DecisionMoveDown($DecisionId) {
-                $detail = $this->getdetails($DecisionId);
-                $DownRecord = $this->query("SELECT id, lft, rght FROM decisions WHERE deleted=0 AND meeting_id=".$detail['meeting_id']." AND lft>".$detail['rght']." ORDER BY lft ASC");
-                $DownRecord = $DownRecord[0]['decisions'];
-
-                if ( $DownRecord['id'] ) {
-                        //using moveup to move up the record
-                        $this->DecisionMoveUp($DownRecord['id']);
-                }
-
-        }       
-
-        function DecisionMoveUp($DecisionId){
-                $detail = $this->getdetails($DecisionId);
-                $UpRecord = $this->query("SELECT id, lft, rght FROM decisions WHERE deleted=0 AND meeting_id=".$detail['meeting_id']." AND rght<".$detail['lft']." ORDER BY rght DESC LIMIT 1");
-                $UpRecord = $UpRecord[0]['decisions'];
-                $betweens = $this->query("SELECT id FROM decisions WHERE rght < ".$detail['lft']." AND rght > ".$UpRecord['rght']." ORDER BY lft ASC");
-                $MinReq = $detail['lft']-$UpRecord['lft'];
-                $AddReq = ( $detail['rght'] - $MinReq + 1 ) - $UpRecord['lft'];
-                $uplists = $this->TreeListing($detail['lft'], $detail['rght'], $detail['meeting_id']);
-                $downlists = $this->TreeListing($UpRecord['lft'], $UpRecord['rght'], $detail['meeting_id'] );
-
-                foreach ( $uplists as $uplist ) {
-                        $this->UpdateMoveUp($uplist['decisions']['id'], $MinReq);
-                }
-                
-                foreach ($downlists as $downlist ) {
-                        $this->UpdateMoveDown($downlist['decisions']['id'], $AddReq);
-                }
-
-                foreach ( $betweens as $between ) {
-                        $this->UpdateMoveDown($between['decisions']['id'], $AddReq);
-                }
-        }
-
-        function TreeListing($lft, $rght, $meeting_id) {
-                return $this->query("SELECT id FROM decisions WHERE deleted=0 AND lft>=".$lft." AND rght<=".$rght." AND meeting_id=".$meeting_id." ORDER BY lft");
-        }
-
-        function getdetails($DecisionId) {
-                $details = $this->query("SELECT meeting_id, lft, rght FROM decisions WHERE deleted=0 AND id=".$DecisionId);
-                return $details[0]['decisions'];
-        }
-
-        function UpdateMoveUp($id,$total) {
-                $this->query("UPDATE decisions SET lft=lft-".$total.", rght=rght-".$total." WHERE id=".$id, false);
-        }
-
-        function UpdateMoveDown($id, $total) {
-                $this->query("UPDATE decisions SET lft=lft+".$total.", rght=rght+".$total." WHERE id=".$id, false);
-        }
+    
+    function getMeetingId($decisionID) {
+        $MeetingID = $this->query("SELECT meeting_id, lft, rght, parent_id FROM decisions WHERE id =".$decisionID);
+        return $MeetingID[0]['decisions'];
+    }
+
+    
+    function DecisionMoveDown($DecisionId) {
+        $detail = $this->getdetails($DecisionId);
+        $DownRecord = $this->query("SELECT id, lft, rght FROM decisions WHERE deleted=0 AND meeting_id=".$detail['meeting_id']." AND lft>".$detail['rght']." ORDER BY lft ASC");
+        $DownRecord = $DownRecord[0]['decisions'];
+
+        if ( $DownRecord['id'] ) {
+            //using moveup to move up the record
+            $this->DecisionMoveUp($DownRecord['id']);
+        }
+
+    }   
+
+    function DecisionMoveUp($DecisionId){
+        $detail = $this->getdetails($DecisionId);
+        $UpRecord = $this->query("SELECT id, lft, rght FROM decisions WHERE deleted=0 AND meeting_id=".$detail['meeting_id']." AND rght<".$detail['lft']." ORDER BY rght DESC LIMIT 1");
+        $UpRecord = $UpRecord[0]['decisions'];
+        $betweens = $this->query("SELECT id FROM decisions WHERE rght < ".$detail['lft']." AND rght > ".$UpRecord['rght']." ORDER BY lft ASC");
+        $MinReq = $detail['lft']-$UpRecord['lft'];
+        $AddReq = ( $detail['rght'] - $MinReq + 1 ) - $UpRecord['lft'];
+        $uplists = $this->TreeListing($detail['lft'], $detail['rght'], $detail['meeting_id']);
+        $downlists = $this->TreeListing($UpRecord['lft'], $UpRecord['rght'], $detail['meeting_id'] );
+
+        foreach ( $uplists as $uplist ) {
+            $this->UpdateMoveUp($uplist['decisions']['id'], $MinReq);
+        }
+        
+        foreach ($downlists as $downlist ) {
+            $this->UpdateMoveDown($downlist['decisions']['id'], $AddReq);
+        }
+
+        foreach ( $betweens as $between ) {
+            $this->UpdateMoveDown($between['decisions']['id'], $AddReq);
+        }
+    }
+
+    function TreeListing($lft, $rght, $meeting_id) {
+        return $this->query("SELECT id FROM decisions WHERE deleted=0 AND lft>=".$lft." AND rght<=".$rght." AND meeting_id=".$meeting_id." ORDER BY lft");
+    }
+
+    function getdetails($DecisionId) {
+        $details = $this->query("SELECT meeting_id, lft, rght FROM decisions WHERE deleted=0 AND id=".$DecisionId);
+        return $details[0]['decisions'];
+    }
+
+    function UpdateMoveUp($id,$total) {
+        $this->query("UPDATE decisions SET lft=lft-".$total.", rght=rght-".$total." WHERE id=".$id, false);
+    }
+
+    function UpdateMoveDown($id, $total) {
+        $this->query("UPDATE decisions SET lft=lft+".$total.", rght=rght+".$total." WHERE id=".$id, false);
+    }
        
     /* 

trunk/app/vendors/shells/cron.php

@@ -11 +11 @@
         $this->emails();
     }
+    
+    function mail() { 
+        $this->out("Executing Mail command"); 
+/*
+        $this->SwiftMailer->instance->smtpType = 'ssl'; 
+        $this->SwiftMailer->instance->smtpHost = 'smtp.gmail.com'; 
+        $this->SwiftMailer->instance->smtpPort = 587; 
+        $this->SwiftMailer->instance->smtpUsername = 'admin@cawanpink.net'; 
+        $this->SwiftMailer->instance->smtpPassword = 'ivoryrabbit40'; 
+*/
+        //$this->SwiftMailer->instance->smtpType = 'ssl'; 
+        $this->SwiftMailer->instance->smtpHost = 'mail.msaworldwide.com.my'; 
+        $this->SwiftMailer->instance->smtpPort = 26; 
+        $this->SwiftMailer->instance->smtpUsername = 'nuhaa+msaworldwide.com.my'; 
+        $this->SwiftMailer->instance->smtpPassword = 'nuhaa123'; 
 
+        $this->SwiftMailer->instance->sendAs = 'html'; 
+        $this->SwiftMailer->instance->from = 'my_email@gmail.com'; 
+        $this->SwiftMailer->instance->fromName = 'TEST'; 
+        $this->SwiftMailer->instance->to = array( 
+            'my_email@gmail.com' => 'recepient 1', 
+            'receiver@bad-domain.org' => 'recepient 2' 
+        ); 
+        $this->SwiftMailer->instance->setTimeout = 30;
+         
+        $this->SwiftMailer->set('message', 'Smack my mailer shell'); 
+        $this->SwiftMailer->instance->registerPlugin('LoggerPlugin', new Swift_Plugins_Loggers_EchoLogger());  
+         
+        try { 
+            if(!$this->SwiftMailer->instance->send('im_excited', 'My subject')) { 
+                foreach($this->SwiftMailer->instance->postErrors as $failed_send_to) { 
+                    $this->log("Failed to send email to: $failed_send_to"); 
+                    $this->out("Failed to send email to: $failed_send_to"); 
+                } 
+            } 
+        } 
+        catch(Exception $e) { 
+              $this->log("Failed to send email: ".$e->getMessage()); 
+              $this->out("Failed to send email: ".$e->getMessage()); 
+        } 
+        $this->out("Finished Mail command");     
+    }
+    
     function emails(){
         $this->out("Executing Mail command");
@@ -29 +71 @@
             switch (Configure::read('email_method')){
                 case 'smtp':
+                    //$this->SwiftMailer->instance->smtpType = 'tls';
                     $this->SwiftMailer->instance->smtpHost = Configure::read('smtp_host');
                     $this->SwiftMailer->instance->smtpPort = Configure::read('smtp_port');

trunk/app/vendors/shells/install.php

@@ -275 +275 @@
         App::import('Model','Minutetype');
         $minutetypes=array(
-            array('MAMPU',"[%summary]<br/>[%minutes]<br/>[%signature]<br/>[%attendance]"),
-            array('OSCC',"[%summary]<br/>[%attendance]<br/>[%minutes]<br/>[%signature]"),
+            array('MAMPU',"[%summary]<br/>[%minutes]<br/>[%signature]<br/>[%attendance]",'mampu'),
+            array('OSCC',"[%summary]<br/>[%attendance]<br/>[%minutes]<br/>[%signature]",'oscc'),
+            array('Lembaga Pertubuhan Peladang',"[%summary]<br/>[%attendance]<br/>[%minutes]<br/>[%signature]",'lpp'),
          );
         $this->Minutetype=& new Minutetype(null);
@@ -285 +286 @@
                 $data['type']=$type[0];
                 $data['format']=$type[1];
+                $data['code']=$type[2];
                 $this->Minutetype->create();
                 $this->Minutetype->save($data);

trunk/app/views/decisions/printminutes.ctp

@@ -1 +1 @@
 <?php
 echo $html->css($minuteType['code'],'stylesheet',array(),false);
+?>
+<div id="minutes_container">
 
+<div class="minutes_status">
+<?php
 if ($minutes_approved ) {
-    echo __('Minutes status').': '.__('Approved',true);
+    echo __('Minutes status').": <span class='minutes_status_approved'>".__('Approved',true)."</span>";
 } else {
-    echo __('Minutes status').': '.__('Pending approval',true);
+    echo __('Minutes status').": <span class='minutes_status_pending'>".__('Pending approval',true)."</span>";
     if ($chairperson) {
         echo "<div class='approve_minutes'>";
@@ -12 +16 @@
     }
 }
-
+?>
+</div>
+<?php
 
 $title = (!empty($pengerusis))?strtotitle($pangkat).' '.strtotitle($pengerusis['User']['name']).', '.$pengerusis['User']['job_title']:' ';
-$summary = '<h2>Meeting\'s Minute<br/>'.$meeting['Meeting']['meeting_title'].' '.$meeting['Meeting']['meeting_num'].'</h2>
-    <center>
-        <table border="0" width="600" cellpadding="2" align="center" class="header">
+$summary = 
+    '<div class="minutes_summary">
+    <h2 class="title">'.__('Minutes',true).'<br/>'.$meeting['Meeting']['meeting_title'].'<br/>'.$meeting['Meeting']['meeting_num'].'</h2>
+    
+        <table cellpadding="2" align="center" class="header">
             <tr>            
                 <td align="left" valign="top" width="30%">Date</td>
@@ -44 +52 @@
             </tr>
         </table>
-    </center>
-    <p class="line">&nbsp;</p>  
-    <br/>';
+    </div>
+    ';
 
 
-$minutes = '<div id="minutestable">'.$this->element("minutes/displayminutes",array("decisions"=>$decisions,"meetingid"=>$meetingid)).'</div><br>';
-$attendance = $invitees;
+$minutes = '<div id="minutestable">'.$this->element("minutes/displayminutes",array("decisions"=>$decisions,"meetingid"=>$meetingid)).'</div>';
+
+$attendance = '<div id="att"><h3 class="att_title">'.__("Attendance List",true).':</h3>';
+$attendance.= $invitees.'</div>';
+
 $signature = '<div id="minutestable"><p class="signature">Signature:<br><br><br>---------------------------------</p></div>';
 
-$phrase  = $minuteType['format'];
+$phrase  = '<div id="minutes_wrap">'.$minuteType['format'].'</div>';
 $source = array("[%summary]", "[%attendance]", "[%minutes]", "[%signatures]");
 $list   = array($summary, $attendance, $minutes, $signature);
@@ -60 +70 @@
 echo $newphrase;
 ?>
-   
+</div>

trunk/app/views/elements/minutes/display_minute_item.ctp

@@ -1 +1 @@
 <table cellspacing='0' cellpadding='0' class='minuteitem' id='minuteitem_<?php echo $node;?>' width='100%'>
     <tr>
-        <td width='30' valign="top"><?php echo $numbering[0];?></td>
+        <td width='30' valign="top" class="minuteitem_number"><?php echo $numbering[0];?></td>
         <td width='10'></td>
-        <td colspan='2' valign="top">
-                        <?php
-                        $decision_id = $decision['Decision']['id'];
-                        if ( isset($report) != 1 ) { 
-                                echo "<div >";
-                                if ( $arrows[$decision_id]['up'] == 1 ) { 
-                                        echo $html->link($html->image('icons/go-up.png'),array('committee'=>$dcommittee['Committee']['short_name'],'controller'=>'decisions','action'=>'promote2','id'=>$decision_id),null,null,false);
-                                } else {
-                                        echo $html->image('icons/blank.png');
-                                }
-                                if ( $arrows[$decision_id]['down'] == 1 ) {             
-                                        echo $html->link($html->image('icons/go-down.png'),array('committee'=>$dcommittee['Committee']['short_name'],'controller'=>'decisions','action'=>'demote2','id'=>$decision_id),null,null,false);
-                                }                               
-                                echo "<div>";                   
-                        }
-                        ?>
-                        <?php if ( isset($report) != 1 ) {  ?>            
-                <div id='displayminute_<?php echo $node;?>'>
-                        <?php } ?>
-                                <?php echo $decision['Decision']['description'];?>
-                        <?php if ( isset($report) != 1 ) {  ?>
-                                </div>
-                        <?php } ?>
-                        <?php
-                        if (isset($decision['0'])) {
-                                $num_attach = count($decision['0']);
-                                echo "<span class='attachment'>Attachment:</span> ";
-                                for ($i=0;$i<$num_attach;$i++) {
-                                        echo "<span id='att2".$decision['0'][$i]['id']."'><a href='../../../".$decision['0'][$i]['file']."'>".$decision['0'][$i]['filename']."</a></span>";
-                                        if ($i < $num_attach-1) {
-                                                echo ", ";
-                                        }
-                                }
-                        }
-                        ?>
+        <td colspan='2' valign="top" class="minuteitem_item">
+            <?php
+            $decision_id = $decision['Decision']['id'];
+            if ( isset($report) != 1 ) { 
+                echo "<div >";
+                if ( $arrows[$decision_id]['up'] == 1 ) { 
+                    echo $html->link($html->image('icons/go-up.png'),array('committee'=>$dcommittee['Committee']['short_name'],'controller'=>'decisions','action'=>'promote2','id'=>$decision_id),null,null,false);
+                } else {
+                    echo $html->image('icons/blank.png');
+                }
+                if ( $arrows[$decision_id]['down'] == 1 ) {         
+                    echo $html->link($html->image('icons/go-down.png'),array('committee'=>$dcommittee['Committee']['short_name'],'controller'=>'decisions','action'=>'demote2','id'=>$decision_id),null,null,false);
+                }               
+                echo "<div>";           
+            }
+            ?>
+            <?php if ( isset($report) != 1 ) {  ?>            
+                <div id='displayminute_<?php echo $node;?>'>
+            <?php } ?>
+                <?php echo $decision['Decision']['description'];?>
+            <?php if ( isset($report) != 1 ) {  ?>
+                </div>
+            <?php } ?>
+            <?php
+            if (isset($decision['0'])) {
+                $num_attach = count($decision['0']);
+                echo "<span class='attachment'>Attachment:</span> ";
+                for ($i=0;$i<$num_attach;$i++) {
+                    echo "<span id='att2".$decision['0'][$i]['id']."'><a href='../../../".$decision['0'][$i]['file']."'>".$decision['0'][$i]['filename']."</a></span>";
+                    if ($i < $num_attach-1) {
+                        echo ", ";
+                    }
+                }
+            }
+            ?>
         </td>
     </tr>
@@ -44 +44 @@
         <td>&nbsp;</td>
         <td>
-                        <?php
-                        if ( isset($report) != 1 ) { 
-                        ?>
-                        <div id='displayform_<?php echo $node;?>'>
-                        <?php echo $this->element('minutes/decision_links',array('node'=>$node,'meetingid'=>$meetingid,'id'=>$decision['Decision']['id'])); ?>
-                        </div>
-                        <?php
-                        }
-                        ?>
+            <?php
+            if ( isset($report) != 1 ) { 
+            ?>
+                <div id='displayform_<?php echo $node;?>'>
+                <?php echo $this->element('minutes/decision_links',array('node'=>$node,'meetingid'=>$meetingid,'id'=>$decision['Decision']['id'])); ?>
+                </div>
+            <?php
+            }
+            ?>
         </td>
-        <td class='actionby'>
+        <td class='minuteitem_actionby'>
         <?php
         $new_userlist = isset($decision['Decision']['Userlist'][0])?$decision['Decision']['Userlist'][0]:false;
         $new_grouplist = isset($decision['Decision']['Grouplist'][0])?$decision['Decision']['Grouplist'][0]:false;
         if ( $new_userlist || $new_grouplist ) {
-                        $num_userlist = count($new_userlist);
-                        $num_grouplist = count($new_grouplist);
-                        echo "<span class='actionby'>Action By</span> ";
-                        if ( $num_userlist > 0 ) {
-                                for ($i=0;$i<$num_userlist;$i++) {
-                                        echo $new_userlist[$i];
-                                        if ($i < $num_userlist-1 ||($i==$num_userlist-1 && $num_grouplist >0)) {
-                                                echo ", ";
-                                        }
-                                }
-                        }
-                        if ( $num_grouplist > 0 ) {
-                                for ($i=0;$i<$num_grouplist;$i++) {
-                                        echo $new_grouplist[$i];
-                                        if ($i < $num_grouplist-1) {
-                                                echo ", ";
-                                        }                       
-                                }
-                        }
-                        echo " - <span class='due'>Due</span>  ".$decision['Decision']['deadline'];
-                } else {
-                        echo "<span class='information'>Information</span> ";
-                }
+            $num_userlist = count($new_userlist);
+            $num_grouplist = count($new_grouplist);
+            echo "<span class='actionby'>".__('Action By',true)."</span> ";
+            if ( $num_userlist > 0 ) {
+                for ($i=0;$i<$num_userlist;$i++) {
+                    echo "<span class='name'>".$new_userlist[$i]."</span> ";
+                    if ($i < $num_userlist-1 ||($i==$num_userlist-1 && $num_grouplist >0)) {
+                        echo ", ";
+                    }
+                }
+            }
+            if ( $num_grouplist > 0 ) {
+                for ($i=0;$i<$num_grouplist;$i++) {
+                    echo "<span class='name'>".$new_grouplist[$i]."</span> ";
+                    if ($i < $num_grouplist-1) {
+                        echo ", ";
+                    }           
+                }
+            }
+            echo "<span class='due'>".__('Due',true)."</span>  <span class='duedate'>".$decision['Decision']['deadline']."</span>";
+        } else {
+            echo "<span class='information'>".__('Information',true)."</span> ";
+        }
         ?>
         </td>
     </tr>
 </table>
+<?php
+if ( isset($report) != 1 ) { 
+?>
 <p class="hr_line" >&nbsp;</p>
+<?php
+}
+?>

trunk/app/views/meetings/view.ctp

@@ -46 +46 @@
             echo ' [ '.$html->link(__('View Minutes', true), array('committee'=>$dcommittee['Committee']['short_name'],'action'=>'minutes',$meeting['Meeting']['id']), array('target'=>'_blank')).'] ';
             echo ' [ '.$html->link(__("View Report",true),array('committee'=>$dcommittee['Committee']['short_name'],'controller'=>'reports','action'=>'meeting','id'=>$meeting['Meeting']['id']),array('target'=>'_blank')).' ] ';
-            echo ' [ '.$html->link(__("Print Minutes",true),array('committee'=>$dcommittee['Committee']['short_name'],'controller'=>'decisions','action'=>'printminutes','id'=>$meeting['Meeting']['id'])).' ]';
+            echo ' [ '.$html->link(__("Print Minutes",true),array('committee'=>$dcommittee['Committee']['short_name'],'controller'=>'decisions','action'=>'printminutes','id'=>$meeting['Meeting']['id']),array('target'=>'_blank')).' ]';
         } else if (!$secretariat[$meeting['Meeting']['id']] || !$minutes_approved) {
             __('Not yet approved by the chairperson');

trunk/app/webroot/css/minutes.css

@@ -57 +57 @@
 div.minute_form div.formbox .form {margin: 10px;}
 
+
+div#minutestable {
+    
+}
+div#minutestable .minuteitem_number{
+    
+}
+div#minutestable .minuteitem_item{
+    padding-bottom: 10px;
+}
+div#minutestable .minuteitem_actionby{
+    text-align:right;
+    padding-bottom: 10px;
+}
+div#minutestable .minuteitem_actionby .actionby{
+    font-weight: bold;
+}
+div#minutestable .minuteitem_actionby .name{
+
+}
+div#minutestable .minuteitem_actionby .due{
+    font-weight: bold;
+}
+div#minutestable .minuteitem_actionby .duedate{
+
+}
+div#minutestable .minuteitem_actionby .information{
+
+}
+div#minutestable .minuteitem_actionby .attachment{
+
+}
+
+
 span.textbold{
-        font-weight: bold;
+    font-weight: bold;
 }
 
 p.hr_line{
-        border-top-style: solid;
-        border-width: 1px;
+    border-top-style: solid;
+    border-width: 1px;
 }
 
-span.attachment, span.actionby, span.due, span.information{
-        font-weight: bold;
-}