r2l by Yoav

[squirrelmail.git] / plugins / calendar / day.php

diff --git a/plugins/calendar/day.php b/plugins/calendar/day.php
index 36ae7171bb6acbf8e26cb4c7d645c11d02e84590..7fe61b3dd4bf45bec8886464b03918d9aa974fb2 100644 (file)
--- a/plugins/calendar/day.php
+++ b/plugins/calendar/day.php
@@ -19,20 +19,28 @@ require_once('../functions/date.php');
 require_once('../config/config.php');
 require_once('../functions/page_header.php');
 require_once('../src/load_prefs.php');
+require_once('../functions/html.php');
 
 //displays head of day calendar view
 function day_header() {
     global $color, $month, $day, $year, $prev_year, $prev_month, $prev_day,
            $prev_date, $next_month, $next_day, $next_year, $next_date;
 
-    echo "    <TR BGCOLOR=\"$color[0]\"><TD>" .
-         "         <TABLE WIDTH=100% BORDER=0 CELLPADDING=2 CELLSPACING=1 BGCOLOR=\"$color[0]\">\n" .
-         "         <TR><TH WIDTH=\"5%\" ALIGN=LEFT><A HREF=\"day.php?year=$prev_year&month=$prev_month&day=$prev_day\">&lt;&nbsp;".
-         date_intl('D',$prev_date)."</A></TH>\n" .
-         "         <TH WIDTH=\"75%\">" .
-         date_intl( 'l, F d Y', mktime(0, 0, 0, $month, $day, $year)) . "</TH>\n" .
-         "         <TH ALIGN=RIGHT><A HREF=\"day.php?year=$next_year&month=$next_month&day=$next_day\">".
-         date_intl('D',$next_date)."&nbsp;&gt;</A></TH></TR>\n";
+    echo html_tag( 'tr', '', '', $color[0] ) . "\n".
+                html_tag( 'td', '', 'left' ) .
+                    html_tag( 'table', '', '', $color[0], 'width="100%" border="0" cellpadding="2" cellspacing="1"' ) ."\n" .
+                        html_tag( 'tr', 
+                            html_tag( 'th',
+                                "<a href=\"day.php?year=$prev_year&month=$prev_month&day=$prev_day\">&lt;&nbsp;".
+                                date_intl('D',$prev_date)."</a>",
+                            'left' ) .
+                            html_tag( 'th', date_intl( 'l, F d Y', mktime(0, 0, 0, $month, $day, $year)) ,
+                            '', '', 'width="75%"' ) .
+                            html_tag( 'th',
+                                "<a href=\"day.php?year=$next_year&month=$next_month&day=$next_day\">".
+                                date_intl('D',$next_date)."&nbsp;&gt;</a>" ,
+                            'right' )
+                        );
 }
 
 //events for specific day  are inserted into "daily" array
@@ -73,10 +81,15 @@ function display_events() {
         $ehour = substr($calfoo['key'],0,2);
         $eminute = substr($calfoo['key'],2,2);
         if (!is_array($calfoo['value'])){
-            echo "         <TR BGCOLOR=\"$color[$eo]\"><TD>$ehour:$eminute</TD>\n" .
-                 "              <TD>&nbsp;</TD>\n" .
-                 "              <TD ALIGN=CENTER><FONT SIZE=-1><A HREF=\"event_create.php?year=$year&month=$month&day=$day&hour=".substr($calfoo['key'],0,2)."\">".
-                 _("ADD") . "</A></FONT></TD></TR>\n";
+            echo html_tag( 'tr',
+                       html_tag( 'td', $ehour . ':' . $eminute, 'left' ) .
+                       html_tag( 'td', '&nbsp;', 'left' ) .
+                       html_tag( 'td',
+                           "<font size=\"-1\"><a href=\"event_create.php?year=$year&month=$month&day=$day&hour=".substr($calfoo['key'],0,2)."\">".
+                           _("ADD") . "</a></font>" ,
+                       'center' ) ,
+                   '', $color[$eo]);
+
         } else {
             $calbar=$calfoo['value'];
             if ($calbar['length']!=0){
@@ -84,16 +97,19 @@ function display_events() {
             } else {
                 $elength='';
             }
-            echo "         <TR BGCOLOR=\"$color[$eo]\"><TD>$ehour:$eminute$elength</TD>\n" .
-                 "              <TD>[";
-            echo ($calbar['priority']==1) ? "<FONT COLOR=\"$color[1]\">$calbar[title]</FONT>" : "$calbar[title]";
-            echo"] $calbar[message]&nbsp;</TD>\n" .
-                 "              <TD ALIGN=CENTER><FONT SIZE=-1><nobr>\n" .
-                 "<A HREF=\"event_edit.php?year=$year&month=$month&day=$day&hour=".substr($calfoo['key'],0,2)."&minute=".substr($calfoo['key'],2,2)."\">".
-                 _("EDIT") . "</A>&nbsp;|&nbsp;\n" .
-                 "<A HREF=\"event_delete.php?dyear=$year&dmonth=$month&dday=$day&dhour=".substr($calfoo['key'],0,2)."&dminute=".substr($calfoo['key'],2,2)."&year=$year&month=$month&day=$day\">" .
-                 _("DEL") . '</A>' .
-                 "              </nobr></FONT></TD></TR>\n";
+            echo html_tag( 'tr', '', '', $color[$eo] ) .
+                        html_tag( 'td', $ehour . ':' . $eminute . $elength, 'left' ) .
+                        html_tag( 'td', '', 'left' ) . '[';
+                            echo ($calbar['priority']==1) ? "<font color=\"$color[1]\">$calbar[title]</font>" : "$calbar[title]";
+                            echo"] $calbar[message]&nbsp;" .
+                        html_tag( 'td',
+                            "<font size=\"-1\"><nobr>\n" .
+                            "<a href=\"event_edit.php?year=$year&month=$month&day=$day&hour=".substr($calfoo['key'],0,2)."&minute=".substr($calfoo['key'],2,2)."\">".
+                            _("EDIT") . "</a>&nbsp;|&nbsp;\n" .
+                            "<a href=\"event_delete.php?dyear=$year&dmonth=$month&dday=$day&dhour=".substr($calfoo['key'],0,2)."&dminute=".substr($calfoo['key'],2,2)."&year=$year&month=$month&day=$day\">" .
+                            _("DEL") . '</a>' .
+                            "</nobr></font>\n" ,
+                        'center' );
     }
 }