Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar/includes event.php,1.17,1.18 todo.php,1.10,1.11
|
From: <cl...@us...> - 2003-11-22 19:29:49
|
Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv14909/includes
Modified Files:
event.php todo.php
Log Message:
Finished todo.php re-work. Updated event.php to match.
Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** event.php 22 Nov 2003 09:30:41 -0000 1.17
--- event.php 22 Nov 2003 19:29:46 -0000 1.18
***************
*** 60,64 ****
if ($location) {
if (isset($url)) $location = '<a href="'.$url.'" target="_blank">'.$location.'</a>';
! $display .= $location_lang . ' - ' . $location.'<br>' . "\n";
}
$sheet_href = BASE.'styles/'.$style_sheet.'/default.css';
--- 60,64 ----
if ($location) {
if (isset($url)) $location = '<a href="'.$url.'" target="_blank">'.$location.'</a>';
! $display .= $location_lang . ' - ' . $location.'<br>';
}
$sheet_href = BASE.'styles/'.$style_sheet.'/default.css';
***************
*** 75,83 ****
<link rel="stylesheet" type="text/css" href="{$sheet_href}">
</head>
! <body bgcolor="#eeeeee">
<center>
<table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
<tr>
! <td align="center" width="98%" class="sideback"><div style="height: 17px; margin-top: 3px;"><font class="G10BOLD">{$cal_title_full}</font></div></td>
</tr>
<tr>
--- 75,83 ----
<link rel="stylesheet" type="text/css" href="{$sheet_href}">
</head>
! <body>
<center>
<table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
<tr>
! <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$cal_title_full}</div></td>
</tr>
<tr>
Index: todo.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/todo.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** todo.php 22 Nov 2003 09:30:41 -0000 1.10
--- todo.php 22 Nov 2003 19:29:46 -0000 1.11
***************
*** 15,19 ****
$start_date = (isset($vtodo_array['start_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['start_date'])) : ('');
$due_date = (isset($vtodo_array['due_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['due_date'])) : ('');
! $priority = (isset($vtodo_array['priority'])) ? $vtodo_array['due_date'] : ('');
if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {
--- 15,25 ----
$start_date = (isset($vtodo_array['start_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['start_date'])) : ('');
$due_date = (isset($vtodo_array['due_date'])) ? localizeDate ($dateFormat_day, strtotime($vtodo_array['due_date'])) : ('');
! $priority = (isset($vtodo_array['priority'])) ? $vtodo_array['priority'] : ('');
!
! $cal_title_full = $calendar_name.' '.$calendar_lang;
! $description = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $description);
! $vtodo_text = ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text);
! $sheet_href = BASE.'styles/'.$style_sheet.'/default.css';
!
if ((!isset($status) || $status == "COMPLETED") && isset($completed_date)) {
***************
*** 35,102 ****
}
! ?>
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
! <html>
! <head>
! <meta http-equiv="content-type" content="text/html;charset=UTF-8">
! <title><?php echo $calendar_name; ?></title>
! <link rel="stylesheet" type="text/css" href="<?php echo BASE."styles/$style_sheet/default.css"; ?>">
! </head>
! <body bgcolor="#eeeeee"><center>
! <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
! <tr>
! <td align="left" valign="top" width="1%" class="sideback"><img src="../images/spacer.gif" width="1" height="20" alt=" "></td>
! <td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$calendar_name $calendar_lang"; ?></font></td>
! <td align="right" valign="top" width="1%" class="sideback"></td>
! </tr>
! <tr>
! <td colspan="3"><img src="../images/spacer.gif" width="1" height="6" alt=" "></td>
! </tr>
! <tr>
! <td colspan="3">
! <table width="100%" border="0" cellspacing="0" cellpadding="0">
! <tr>
! <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
! <td align="left" colspan="2" class="V12"><?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]",'<a target="_new" href="\0">\0</a>',$vtodo_text).'<br /><br />'; ?></td>
! </tr>
!
! <?php if ($description) { ?>
! <tr>
! <td width="1%"><img src="../images/spacer.gif" width="6" height="1" alt=" "></td>
! <td align="left" colspan="2" class="V12">
! <?php echo ereg_replace("[[:alpha:]]+://[^<>[:space:]]+[[:alnum:]/]", '<a target="_new" href="\0">\0</a>', $description); ?></td>
! </tr>
! <?php } ?>
! <?php if ($status) { ?>
! <tr>
! <td></td>
! <td align="left" colspan="2" class="V12"><?php echo "$status_lang $status"; ?></td>
! </tr>
! <?php } ?>
! <tr>
! <td></td>
! <td align="left" colspan="2" class="V12"><?php echo "$priority_lang $priority"; ?></td>
! </tr>
! <tr>
! <td></td>
! <td align="left" colspan="2" class="V12"><?php echo "$created_lang $start_date"; ?></td>
! </tr>
! <?php if ($due_date) { ?>
! <tr>
! <td></td>
! <td align="left" colspan="2" class="V12"><?php echo "$due_lang $due_date"; ?></td>
! </tr>
! <?php } ?>
!
! </table>
! </td>
! </tr>
! </table>
! </center>
! </body>
! </html>
--- 41,81 ----
}
! $display = '';
! if ($vtodo_text != '') $display .= $vtodo_text.'<br><br>';
! if ($description != '') $display .= $description.'<br>';
! if ($status != '') $display .= $status_lang.': '.$status.'<br>';
! if ($priority != '') $display .= $priority_lang.' '.$priority.'<br>';
! if ($start_date != '') $display .= $created_lang.' '.$start_date.'<br>';
! if ($due_date != '') $display .= $due_lang.' '.$due_date.'<br>';
! echo <<<END
! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd">
! <html>
! <head>
! <meta http-equiv="content-type" content="text/html;charset=UTF-8">
! <title>{$calendar_name}</title>
! <link rel="stylesheet" type="text/css" href="{$sheet_href}">
! </head>
! <body>
! <center>
! <table border="0" width="430" cellspacing="0" cellpadding="0" class="calborder">
! <tr>
! <td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{$cal_title_full}</div></td>
! </tr>
! <tr>
! <td align="left" class="V12">
! <div style="margin-left: 10px; margin-bottom:10px;">
! <p>{$display}</p>
! </div>
! </td>
! </tr>
! </table>
! </center>
! </body>
! </html>
! END;
! ?>
\ No newline at end of file
|
