diff -ur achievo-0.9.4/atk/atktools.inc styled-achievo-0.9.4/atk/atktools.inc --- achievo-0.9.4/atk/atktools.inc Mon Mar 31 13:54:47 2003 +++ styled-achievo-0.9.4/atk/atktools.inc Tue Jul 8 17:09:07 2003 @@ -69,7 +69,7 @@ echo ""; echo ''; - echo "$level: $msg
\n"; + echo "$level: $msg
\n"; die("Halted."); } else @@ -199,7 +199,8 @@ $newlevel = $currentlevel+1; break; } - case SESSION_BACK: { + case SESSION_BACK: + { $newlevel = max(0,$currentlevel-$levelskip); break; } diff -ur achievo-0.9.4/atk/attributes/class.atkfileattribute.inc styled-achievo-0.9.4/atk/attributes/class.atkfileattribute.inc --- achievo-0.9.4/atk/attributes/class.atkfileattribute.inc Wed Apr 16 15:08:02 2003 +++ styled-achievo-0.9.4/atk/attributes/class.atkfileattribute.inc Wed May 7 14:48:34 2003 @@ -323,7 +323,7 @@ } else { - return $filename."(".text("file_not_exist").")"; + return $filename."(".text("file_not_exist").")"; } } } diff -ur achievo-0.9.4/atk/attributes/class.atkmultiselectattribute.inc styled-achievo-0.9.4/atk/attributes/class.atkmultiselectattribute.inc --- achievo-0.9.4/atk/attributes/class.atkmultiselectattribute.inc Sun Mar 16 09:59:08 2003 +++ styled-achievo-0.9.4/atk/attributes/class.atkmultiselectattribute.inc Tue Jul 8 16:00:38 2003 @@ -106,13 +106,13 @@ // todo: configurable rows if (count($this->m_values)>4) { - $result.='
+ $result.='
['. text("check_all"). ' '. text("check_none"). ' '. - text("invert_selection").']
'; + text("invert_selection").']
'; } $result .="\n\n"; $explode = array(); diff -ur achievo-0.9.4/atk/class.layout.inc styled-achievo-0.9.4/atk/class.layout.inc --- achievo-0.9.4/atk/class.layout.inc Mon Mar 31 13:54:47 2003 +++ styled-achievo-0.9.4/atk/class.layout.inc Wed May 7 14:48:00 2003 @@ -150,7 +150,7 @@ { // only show errors in debugmode, or when display_errors is // true. - $res.='
error: '.implode("
\nerror: ",$g_error_msg).''; + $res.='
error: '.implode("
\nerror: ",$g_error_msg).''; } // also send a mail report with errormessages.. // (even when display of errors is turned off) @@ -261,7 +261,8 @@ else { $key = 'title_'.$nodetype.'_'.$action; - if ($GLOBALS["txt_".$key]!="") { + if ($GLOBALS["txt_".$key]!="") + { return text($key); } else @@ -471,7 +472,8 @@ global $g_theme; $template=$this->ret_tpl("data_bottom"); - if ($template=="") { + if ($template=="") + { if (!isset($g_theme["border"])) { $template='
'; diff -ur achievo-0.9.4/atk/lock/lock.js.php styled-achievo-0.9.4/atk/lock/lock.js.php --- achievo-0.9.4/atk/lock/lock.js.php Thu Jan 9 17:31:11 2003 +++ styled-achievo-0.9.4/atk/lock/lock.js.php Thu Jan 9 16:31:10 2003 @@ -11,7 +11,7 @@ * for a certain record / item. * * @author Peter C. Verhage - * @version $Revision: 1.5 $ + * @version $Revision: 1.5 $ */ var atkLock = new Object(); @@ -44,35 +44,35 @@ setTimeout('atkLockTimer()', 30000); } -/** - * Check the DOM XML document response. - * @param XMLDocument the DOM XML document +/** + * Check the DOM XML document response. + * @param XMLDocument the DOM XML document */ function atkLockCheckResponse(XMLdocument) { - try - { - var root = XMLdocument.getElementsByTagName("response"); - if (root.length == 0) throw Error("Invalid lock response document."); - var response = root.item(0); - - // success? - if (response.getElementsByTagName("success").length > 0) - { - // lock lease extended, do nothing at this time - } - - // failure? - else if (response.getElementsByTagName("failure").length > 0) - { - throw Error("Lock has expired"); - } - - // invalid response? - else - { - throw Error("Invalid lock response document."); - } + try + { + var root = XMLdocument.getElementsByTagName("response"); + if (root.length == 0) throw Error("Invalid lock response document."); + var response = root.item(0); + + // success? + if (response.getElementsByTagName("success").length > 0) + { + // lock lease extended, do nothing at this time + } + + // failure? + else if (response.getElementsByTagName("failure").length > 0) + { + throw Error("Lock has expired"); + } + + // invalid response? + else + { + throw Error("Invalid lock response document."); + } } // failure @@ -94,16 +94,16 @@ if (atkLock.type == 'xml') { var xmlHttp = XmlHttp.create(); - xmlHttp.open("GET", sURI, true); - xmlHttp.onreadystatechange = function () - { + xmlHttp.open("GET", sURI, true); + xmlHttp.onreadystatechange = function () + { if (xmlHttp.readyState == 4) { atkLockCheckResponse(xmlHttp.responseXML); - } + } } - - xmlHttp.send(null); + + xmlHttp.send(null); } else diff -ur achievo-0.9.4/atk/themes/ananda/block_top.tmpl styled-achievo-0.9.4/atk/themes/ananda/block_top.tmpl --- achievo-0.9.4/atk/themes/ananda/block_top.tmpl Fri Jun 8 14:19:59 2001 +++ styled-achievo-0.9.4/atk/themes/ananda/block_top.tmpl Tue Jul 8 17:20:09 2003 @@ -4,7 +4,7 @@
-[HEADER]
+[HEADER]


diff -ur achievo-0.9.4/atk/themes/ananda/login_top.tmpl styled-achievo-0.9.4/atk/themes/ananda/login_top.tmpl --- achievo-0.9.4/atk/themes/ananda/login_top.tmpl Sat Aug 3 15:12:06 2002 +++ styled-achievo-0.9.4/atk/themes/ananda/login_top.tmpl Tue Jul 8 17:18:58 2003 @@ -4,7 +4,7 @@
-[HEADER]
+[HEADER]


diff -ur achievo-0.9.4/atk/themes/default/block_top.tmpl styled-achievo-0.9.4/atk/themes/default/block_top.tmpl --- achievo-0.9.4/atk/themes/default/block_top.tmpl Thu Jun 7 20:52:19 2001 +++ styled-achievo-0.9.4/atk/themes/default/block_top.tmpl Tue Jul 8 17:22:25 2003 @@ -3,8 +3,7 @@ - + diff -ur achievo-0.9.4/atk/themes/kuro5hin/block_top.tmpl styled-achievo-0.9.4/atk/themes/kuro5hin/block_top.tmpl --- achievo-0.9.4/atk/themes/kuro5hin/block_top.tmpl Thu Jun 7 20:52:19 2001 +++ styled-achievo-0.9.4/atk/themes/kuro5hin/block_top.tmpl Tue Jul 8 17:56:09 2003 @@ -4,8 +4,8 @@
-[HEADER][HEADER]
diff -ur achievo-0.9.4/atk/themes/default/layout.inc styled-achievo-0.9.4/atk/themes/default/layout.inc --- achievo-0.9.4/atk/themes/default/layout.inc Tue Dec 11 09:00:08 2001 +++ styled-achievo-0.9.4/atk/themes/default/layout.inc Tue Jul 8 16:48:01 2003 @@ -54,4 +54,12 @@ $g_theme["RowColor2"] = "#eeeeee"; $g_theme["RowMouseOver"] = "#ccffcc"; + + // Template header settings + $g_theme["TmplHeaderFontFamily"] = "Verdana, Helvetica, Arial"; // Font + $g_theme["TmplHeaderFontSize"] = "12"; // Font size in pt. + $g_theme["TmplHeaderFontWeight"] = "Bold"; // FontWeight (bold) + $g_theme["TmplHeaderFgColor"] = "#000000"; // Table font color; + $g_theme["TmplHeaderWidth"] = "100%"; // Table font color; + ?> diff -ur achievo-0.9.4/atk/themes/default/login_top.tmpl styled-achievo-0.9.4/atk/themes/default/login_top.tmpl --- achievo-0.9.4/atk/themes/default/login_top.tmpl Sat Aug 3 15:12:06 2002 +++ styled-achievo-0.9.4/atk/themes/default/login_top.tmpl Tue Jul 8 17:23:04 2003 @@ -3,8 +3,7 @@ - + +
-[HEADER][HEADER]
diff -ur achievo-0.9.4/atk/themes/kuro5hin/block_bottom.tmpl styled-achievo-0.9.4/atk/themes/kuro5hin/block_bottom.tmpl --- achievo-0.9.4/atk/themes/kuro5hin/block_bottom.tmpl Mon Apr 23 10:21:28 2001 +++ styled-achievo-0.9.4/atk/themes/kuro5hin/block_bottom.tmpl Tue Jul 8 17:56:56 2003 @@ -1,4 +1,4 @@ -
- + diff -ur achievo-0.9.4/atk/themes/kuro5hin/login_top.tmpl styled-achievo-0.9.4/atk/themes/kuro5hin/login_top.tmpl --- achievo-0.9.4/atk/themes/kuro5hin/login_top.tmpl Sat Aug 3 15:12:06 2002 +++ styled-achievo-0.9.4/atk/themes/kuro5hin/login_top.tmpl Tue Jul 8 17:57:40 2003 @@ -4,8 +4,8 @@
-[HEADER] +[HEADER]
- + diff -ur achievo-0.9.4/atk/themes/moronic/block_top.tmpl styled-achievo-0.9.4/atk/themes/moronic/block_top.tmpl --- achievo-0.9.4/atk/themes/moronic/block_top.tmpl Thu Jun 7 20:52:19 2001 +++ styled-achievo-0.9.4/atk/themes/moronic/block_top.tmpl Tue Jul 8 17:59:58 2003 @@ -2,12 +2,10 @@
-[HEADER] +[HEADER]
- - + + - diff -ur achievo-0.9.4/atk/themes/newsforge/block_top.tmpl styled-achievo-0.9.4/atk/themes/newsforge/block_top.tmpl --- achievo-0.9.4/atk/themes/newsforge/block_top.tmpl Thu Jun 7 20:52:19 2001 +++ styled-achievo-0.9.4/atk/themes/newsforge/block_top.tmpl Tue Jul 8 18:04:11 2003 @@ -1,20 +1,20 @@
-
-[HEADER]
-
+[HEADER]
\ No newline at end of file + \ No newline at end of file diff -ur achievo-0.9.4/atk/themes/moronic/login_top.tmpl styled-achievo-0.9.4/atk/themes/moronic/login_top.tmpl --- achievo-0.9.4/atk/themes/moronic/login_top.tmpl Sat Aug 3 15:12:06 2002 +++ styled-achievo-0.9.4/atk/themes/moronic/login_top.tmpl Tue Jul 8 18:01:21 2003 @@ -3,11 +3,10 @@ - - - + +
-
-[HEADER]
+		 +[HEADER]
\ No newline at end of file +
\ No newline at end of file diff -ur achievo-0.9.4/atk/themes/newsforge/block_bottom.tmpl styled-achievo-0.9.4/atk/themes/newsforge/block_bottom.tmpl --- achievo-0.9.4/atk/themes/newsforge/block_bottom.tmpl Mon Apr 23 10:21:28 2001 +++ styled-achievo-0.9.4/atk/themes/newsforge/block_bottom.tmpl Tue Jul 8 18:01:54 2003 @@ -1,4 +1,4 @@ -
- - + + - +
-[HEADER]
+[HEADER]
- +style="background:#efefef;"> +
+style="background:#efefef;"> -
+ diff -ur achievo-0.9.4/atk/themes/newsforge/login_top.tmpl styled-achievo-0.9.4/atk/themes/newsforge/login_top.tmpl --- achievo-0.9.4/atk/themes/newsforge/login_top.tmpl Sat Aug 3 15:12:07 2002 +++ styled-achievo-0.9.4/atk/themes/newsforge/login_top.tmpl Tue Jul 8 18:06:01 2003 @@ -1,20 +1,20 @@ - - + + - +
-[HEADER]
+[HEADER]
- +style="background:#efefef"> + - +
+style="background:#efefef"> - +
+ diff -ur achievo-0.9.4/atk/themes/outlook/tab_normal.tmpl styled-achievo-0.9.4/atk/themes/outlook/tab_normal.tmpl --- achievo-0.9.4/atk/themes/outlook/tab_normal.tmpl Mon Mar 4 16:08:48 2002 +++ styled-achievo-0.9.4/atk/themes/outlook/tab_normal.tmpl Tue Jul 8 18:07:34 2003 @@ -2,7 +2,7 @@ - +
 [TITLE]  [TITLE] 
diff -ur achievo-0.9.4/atk/themes/slash/block_bottom.tmpl styled-achievo-0.9.4/atk/themes/slash/block_bottom.tmpl --- achievo-0.9.4/atk/themes/slash/block_bottom.tmpl Mon Apr 23 10:21:28 2001 +++ styled-achievo-0.9.4/atk/themes/slash/block_bottom.tmpl Tue Jul 8 18:09:17 2003 @@ -1,11 +1,11 @@ -
diff -ur achievo-0.9.4/atk/themes/slash/block_top.tmpl styled-achievo-0.9.4/atk/themes/slash/block_top.tmpl --- achievo-0.9.4/atk/themes/slash/block_top.tmpl Fri Jun 8 14:19:59 2001 +++ styled-achievo-0.9.4/atk/themes/slash/block_top.tmpl Tue Jul 8 18:12:02 2003 @@ -1,21 +1,21 @@ - - + + - + - +
[HEADER][HEADER]
- + - - +
+ -
+ diff -ur achievo-0.9.4/atk/themes/slash/login_top.tmpl styled-achievo-0.9.4/atk/themes/slash/login_top.tmpl --- achievo-0.9.4/atk/themes/slash/login_top.tmpl Sat Aug 3 15:12:07 2002 +++ styled-achievo-0.9.4/atk/themes/slash/login_top.tmpl Tue Jul 8 18:13:41 2003 @@ -1,21 +1,21 @@ - + - + - +
[HEADER][HEADER]
- + - - +
+ - "; + $tmpLegend .= ""; $tmpLegend .= ""; $legend .= $tmpLegend; } @@ -371,7 +371,7 @@ { $buff .= "
+ Only in styled-achievo-0.9.4: font.find Only in styled-achievo-0.9.4: font.todo diff -ur achievo-0.9.4/logout.php styled-achievo-0.9.4/logout.php --- achievo-0.9.4/logout.php Tue Nov 26 10:30:40 2002 +++ styled-achievo-0.9.4/logout.php Tue Jul 8 16:10:08 2003 @@ -7,7 +7,7 @@ $g_layout->body(); $g_layout->ui_top($txt_app_title); - $g_layout->output("Thanks for using Achievo"); + $g_layout->output("Thanks for using Achievo"); $g_layout->output("
"); $g_layout->output('
Login
'); $g_layout->ui_bottom(); diff -ur achievo-0.9.4/modules/calendar/class.base_dayview.inc styled-achievo-0.9.4/modules/calendar/class.base_dayview.inc --- achievo-0.9.4/modules/calendar/class.base_dayview.inc Thu Apr 17 21:59:58 2003 +++ styled-achievo-0.9.4/modules/calendar/class.base_dayview.inc Tue Jul 8 17:06:51 2003 @@ -95,9 +95,9 @@ $nextTime = date("Y-m-d", mktime(0,0,0,$this->month, $this->day+1, $this->year)); $nextUrl = $_SERVER["PHP_SELF"]."?view=dayview&viewdate=$nextTime&user=".$this->showGlobal; - $this->title = "".text(strtolower(date("l", mktime(0, 0, 0, $this->month, $this->day, $this->year))))." ".$this->day."-".$this->month."-".$this->year.""; + $this->title = "".text(strtolower(date("l", mktime(0, 0, 0, $this->month, $this->day, $this->year))))." ".$this->day."-".$this->month."-".$this->year.""; - return "".href($prevUrl, text("previous_day")).""." "."".href($thisUrl, text("today")).""." "."".href($nextUrl, text("next_day")).""; + return "".href($prevUrl, text("previous_day")).""." "."".href($thisUrl, text("today")).""." "."".href($nextUrl, text("next_day")).""; } /** @@ -174,7 +174,7 @@ $tmpLegend = "
\n"; $tmpLegend .= "
"; - $tmpLegend .= "		".$r[$i]["description"]."".$r[$i]["description"]."
\n"; $buff .= "\n"; - $buff .= "\n"; + $buff .= "\n"; $buff .= "\n"; for ($i=0;$i<=count($this->allDayItems)-1;$i++) @@ -409,19 +409,19 @@ $buff .= "\n"; - $buff .= ""; + $buff .= ""; if ($cols == 0) { @@ -501,7 +501,7 @@ // generate header (contains title, info and link to edit/view item) $header = "
".text("allday_appointments")."".text("allday_appointments")."
"; $header = "\n"; - $header .= ""; + $header .= ""; $header .= "
".$title." (".$this->allDayItems[$i]["owneruser"]["userid"].")"; - if (count($attendees) > 0 || $this->allDayItems[$i]["all_users"]) $header .= "
".$att."		".$title." (".$this->allDayItems[$i]["owneruser"]["userid"].")"; + if (count($attendees) > 0 || $this->allDayItems[$i]["all_users"]) $header .= "
".$att."		"; if ($this->allDayItems[$i]["owner"] == $this->owner || $found == 1 || $info["all_users"]) { - $header .= href($_SERVER["PHP_SELF"]."?atkaction=view&atkselector=".rawurlencode("schedule.id=".$this->allDayItems[$i]["id"]), "".text("view")."", SESSION_NESTED); + $header .= href($_SERVER["PHP_SELF"]."?atkaction=view&atkselector=".rawurlencode("schedule.id=".$this->allDayItems[$i]["id"]), "".text("view")."", SESSION_NESTED); } if ($this->allDayItems[$i]["owner"] == $this->owner || (is_allowed("calendar.schedule", "edit_attendee") && ($found == 1 || $info["all_users"]))) { - $header .= "  ".href($_SERVER["PHP_SELF"]."?atkaction=edit&atkselector=".rawurlencode("schedule.id=".$this->allDayItems[$i]["id"]), "".text("Edit")."", SESSION_NESTED); - $header .= "  ".href($_SERVER["PHP_SELF"]."?atkaction=delete&atkselector=".rawurlencode("schedule.id=".$this->allDayItems[$i]["id"]), "".text("Delete")."", SESSION_NESTED); + $header .= "  ".href($_SERVER["PHP_SELF"]."?atkaction=edit&atkselector=".rawurlencode("schedule.id=".$this->allDayItems[$i]["id"]), "".text("Edit")."", SESSION_NESTED); + $header .= "  ".href($_SERVER["PHP_SELF"]."?atkaction=delete&atkselector=".rawurlencode("schedule.id=".$this->allDayItems[$i]["id"]), "".text("Delete")."", SESSION_NESTED); } $header .= "
"; @@ -444,7 +444,7 @@ $addurl = $_SERVER["PHP_SELF"]."?atkaction=add&atknodetype=calendar.schedule&date=$now&time=$time"; $buff .= "
".href($addurl, "".$time."",SESSION_NESTED)."".href($addurl, "".$time."",SESSION_NESTED)."
\n"; - $header .= "\n"; + $header .= "\n"; $header .= "\n"; @@ -548,9 +548,9 @@ $buff .= $header; if ($timeLap > 1) { - $buff .= "".$descr."
"; + $buff .= "".$descr."
"; } - if (count($attendees) > 0 || $info["all_users"]) $buff .= "".$att.""; + if (count($attendees) > 0 || $info["all_users"]) $buff .= "".$att.""; $buff .= ""; } @@ -563,9 +563,9 @@ if ($timeLap > 1) { - $buff .= "".$descr."
"; + $buff .= "".$descr."
"; } - if (count($attendees) > 0 || $info["all_users"]) $buff .= "".$att."
"; + if (count($attendees) > 0 || $info["all_users"]) $buff .= "".$att."
"; $buff .= "\n"; $buff .= $this->fancyEnd; diff -ur achievo-0.9.4/modules/calendar/class.base_employeeview.inc styled-achievo-0.9.4/modules/calendar/class.base_employeeview.inc --- achievo-0.9.4/modules/calendar/class.base_employeeview.inc Tue Feb 25 23:14:15 2003 +++ styled-achievo-0.9.4/modules/calendar/class.base_employeeview.inc Wed May 7 15:22:28 2003 @@ -46,12 +46,12 @@ $buff .= "
".$title.$dspOwner.$status."".$title.$dspOwner.$status.""; $attendees = $this->get_attendees($info["id"]); @@ -530,13 +530,13 @@ if ($this->allDayItems[$i]["owner"] == $this->owner || $found == 1 || $info["all_users"]) { - $header .= href($_SERVER["PHP_SELF"]."?atkaction=view&atkselector=".rawurlencode("schedule.id=".$info["id"]), "".text("View")."", SESSION_NESTED); + $header .= href($_SERVER["PHP_SELF"]."?atkaction=view&atkselector=".rawurlencode("schedule.id=".$info["id"]), "".text("View")."", SESSION_NESTED); } if ($info["owner"] == $this->owner || (is_allowed("calendar.schedule", "edit_attendee") && ($found == 1 || $info["all_users"]))) { - $header .= "  ".href($_SERVER["PHP_SELF"]."?atkaction=edit&atkselector=".rawurlencode("schedule.id=".$info["id"]), "".text("Edit")."", SESSION_NESTED); - $header .= "  ".href($_SERVER["PHP_SELF"]."?atkaction=delete&atkselector=".rawurlencode("schedule.id=".$info["id"]), "".text("Delete")."", SESSION_NESTED); + $header .= "  ".href($_SERVER["PHP_SELF"]."?atkaction=edit&atkselector=".rawurlencode("schedule.id=".$info["id"]), "".text("Edit")."", SESSION_NESTED); + $header .= "  ".href($_SERVER["PHP_SELF"]."?atkaction=delete&atkselector=".rawurlencode("schedule.id=".$info["id"]), "".text("Delete")."", SESSION_NESTED); } $header .= "
\n"; $buff .= "\n"; - $buff .= ""; + $buff .= ""; for ($i=0;$iworkHours);$i++) { $time = $this->workHours[$i]; $addurl = $_SERVER["PHP_SELF"]."?atkaction=add&atknodetype=calendar.schedule&viewdate=$date&time=$time"; - $buff .= ""; + $buff .= ""; } $buff .= "\n"; @@ -75,7 +75,7 @@ for ($i=0;$i"; + $buff .= ""; for ($j=0;$jworkHours);$j++) { diff -ur achievo-0.9.4/modules/calendar/class.base_monthview.inc styled-achievo-0.9.4/modules/calendar/class.base_monthview.inc --- achievo-0.9.4/modules/calendar/class.base_monthview.inc Thu Apr 17 21:59:58 2003 +++ styled-achievo-0.9.4/modules/calendar/class.base_monthview.inc Wed May 7 15:20:36 2003 @@ -51,9 +51,9 @@ $nextTime = date("Y-m-d", mktime(0,0,0,$this->month+1, 1, $this->year)); $nextUrl = $_SERVER["PHP_SELF"]."?view=monthview&viewdate=$nextTime&dayview=".$this->showGlobal; - $this->title = "".text(strtolower(date("F", mktime(0,0,0,$this->month,1,$this->year))))." ".$this->year.""; + $this->title = "".text(strtolower(date("F", mktime(0,0,0,$this->month,1,$this->year))))." ".$this->year.""; - return "".href($prevUrl, text("previous_month")).""." "."".href($thisUrl, text("this_month")).""." "."".href($nextUrl, text("next_month")).""; + return "".href($prevUrl, text("previous_month")).""." "."".href($thisUrl, text("this_month")).""." "."".href($nextUrl, text("next_month")).""; } /** @@ -111,14 +111,14 @@ $buff .= "
".text("employee")."".text("employee")."".href($addurl, "".$this->workHours[$i]."",SESSION_NESTED)."".href($addurl, "".$this->workHours[$i]."",SESSION_NESTED)."
".$employees[$i]["userid"]."
\n"; $buff .= "\n"; - $buff .= ""; - $buff .= ""; - $buff .= ""; - $buff .= ""; - $buff .= ""; - $buff .= ""; - $buff .= ""; - $buff .= ""; + $buff .= ""; + $buff .= ""; + $buff .= ""; + $buff .= ""; + $buff .= ""; + $buff .= ""; + $buff .= ""; + $buff .= ""; $buff .= "\n"; $w = 0; @@ -127,7 +127,7 @@ $weekno = strftime("%W", mktime(0,0,0,substr($this->items[$item]["date"],5,2), substr($this->items[$item]["date"],8,2), substr($this->items[$item]["date"],0,4))); $href = $_SERVER["PHP_SELF"]."?view=weekview&viewdate=".$this->items[$item]["date"]; $buff .= ""; - $buff .= ""; + $buff .= ""; for ($j=0;$j<=6;$j++) { @@ -150,7 +150,7 @@ if (count($allItems) == 0) { $bgcolor = "#FFCC33"; } else { $bgcolor = "FF0000"; } } - $buff .= ""; + $buff .= ""; $item++; } $buff .= ""; diff -ur achievo-0.9.4/modules/calendar/class.base_weekview.inc styled-achievo-0.9.4/modules/calendar/class.base_weekview.inc --- achievo-0.9.4/modules/calendar/class.base_weekview.inc Thu Apr 24 08:16:11 2003 +++ styled-achievo-0.9.4/modules/calendar/class.base_weekview.inc Wed May 7 15:18:26 2003 @@ -4,26 +4,26 @@ // typical usage: // // $dummy = new weekview(25,7,2001); // show July 25th 2001 - // $dummy->showGlobal = "wim"; // for user wim + // $dummy->showGlobal = "wim"; // for user wim // $dummy->owner = $g_user["name"]; // remember who is currently logged in // $dummy->generate(); // generate the matrix // $dummy->dumpMatrix(); // show it to the audience .... // - // - + // + class weekView { var $day = 0; var $month = 0; var $year = 0; - var $appointments = array(); + var $appointments = array(); var $weekdates = array(); var $title = ""; - var $showGlobal; + var $showGlobal; var $owner; - var $viewerWidth = "100%"; + var $viewerWidth = "100%"; var $title = ""; - + /** * constructor * @param $day (if 0, then current day) @@ -33,7 +33,7 @@ function weekView($day=0, $month=0, $year=0) { $this->year = ($year == 0) ? date("Y") : $year; - $this->month = ($month == 0) ? date("m") : $month; + $this->month = ($month == 0) ? date("m") : $month; $this->day = ($day == 0) ? date("d") : $day; } @@ -42,7 +42,7 @@ * fills several info arrays */ function generate() - { + { $viewdate = $this->year."-".$this->month."-".$this->day; if ($viewdate!="") { @@ -66,11 +66,11 @@ $this->appointments = $this->getAppointments($this->showGlobal, $this->weekdates[1]['date'], $this->weekdates[7]['date']); } - + /** * get the items for the specified week * fills an array with the items - */ + */ function getAppointments($user, $begindate, $enddate) { // crosscomparison to match all appointments in range. @@ -135,13 +135,13 @@ } return $appointments; - } - - /** - * daypart - * determine whether a time is in the morning, in the afternoon of in the evening - * @returns morning, afternoon or evening - */ + } + + /** + * daypart + * determine whether a time is in the morning, in the afternoon of in the evening + * @returns morning, afternoon or evening + */ function daypart($time) { $hour = (int)$time["hours"]; @@ -157,7 +157,7 @@ { return "evening"; } - } + } /** * weekNav @@ -173,11 +173,11 @@ $nextTime = $this->weekdates[8]['date']; $nextUrl = $PHP_SELF."?view=weekview&viewdate=$nextTime&user=".$this->showGlobal; - + $date = $this->year."-".$this->month."-".$this->day; - $this->title = "".text("week")." ".strftime("%V", mktime(0,0,0,substr($date,5,2), substr($date,8,2), substr($date,0,4))).""; + $this->title = "".text("week")." ".strftime("%V", mktime(0,0,0,substr($date,5,2), substr($date,8,2), substr($date,0,4))).""; - return "".href($prevUrl, text('previousweek')).""." "."".href($nextUrl, text('nextweek')).""; + return "".href($prevUrl, text('previousweek')).""." "."".href($nextUrl, text('nextweek')).""; } /** @@ -188,7 +188,7 @@ { global $g_layout, $g_user; - $buff = $g_layout->initGUI(); + $buff = $g_layout->initGUI(); $buff .= $g_layout->data_top(); $buff .= $g_layout->tr_top(); diff -ur achievo-0.9.4/modules/calendar/class.schedule.inc styled-achievo-0.9.4/modules/calendar/class.schedule.inc --- achievo-0.9.4/modules/calendar/class.schedule.inc Thu Apr 24 08:16:11 2003 +++ styled-achievo-0.9.4/modules/calendar/class.schedule.inc Wed May 7 15:16:52 2003 @@ -185,11 +185,11 @@ $records = $g_db->getrows($sql); if ($selemployee["all"] == "all") { $sel="CHECKED"; } else { $sel=""; } - $employee_code=''.text("allusers")."
"; + $employee_code=''.text("allusers")."
"; for($i=0;$i'.$records[$i]["lastname"].', '.$records[$i]["firstname"]."(".$records[$i]["userid"].")
"; + $employee_code.=''.$records[$i]["lastname"].', '.$records[$i]["firstname"]."(".$records[$i]["userid"].")
"; } return $employee_code; } @@ -253,19 +253,19 @@ $tmpLegend = ""; + $tmpLegend .= ""; $tmpLegend .= ""; $tmpLegend .= ""; + $tmpLegend .= ""; $tmpLegend .= ""; $tmpLegend .= ""; + $tmpLegend .= ""; $tmpLegend .= ""; $tmpLegend .= ""; + $tmpLegend .= ""; $tmpLegend .= ""; $legend .= $tmpLegend; @@ -320,7 +320,7 @@ $dummy->viewerWidth = "600"; $buff = href($_SERVER["PHP_SELF"]."?view=dayview&viewdate=$viewdate",text("dayview"))."

"; - $buff .= "".text("seluserdate")."

"; + $buff .= "".text("seluserdate")."

"; // assign our output buffer $buff .= "
".text("week")."".text("mon")."".text("tue")."".text("wed")."".text("thu")."".text("fri")."".text("sat")."".text("sun")."".text("week")."".text("mon")."".text("tue")."".text("wed")."".text("thu")."".text("fri")."".text("sat")."".text("sun")."
".href($href, $weekno)."".href($href, $weekno)."".href($url, $day)."".href($url, $day)."
\n"; $tmpLegend .= "
"; - $tmpLegend .= "		".text("no_appointments")."".text("no_appointments")."
\n"; $tmpLegend .= "
"; - $tmpLegend .= "		".text("appointments")."".text("appointments")."
\n"; $tmpLegend .= "
"; - $tmpLegend .= "		".text("today")."".text("today")."
\n"; $tmpLegend .= "
"; - $tmpLegend .= "		".text("today_and_appointments")."".text("today_and_appointments")."
"; diff -ur achievo-0.9.4/modules/calendar/class.schedule_types.inc styled-achievo-0.9.4/modules/calendar/class.schedule_types.inc --- achievo-0.9.4/modules/calendar/class.schedule_types.inc Thu Feb 20 23:48:07 2003 +++ styled-achievo-0.9.4/modules/calendar/class.schedule_types.inc Tue Jul 8 17:08:09 2003 @@ -38,7 +38,7 @@ $fgcolor = $record["fgcolor"]; $buff = "
"; - $buff .= ""; + $buff .= ""; $buff .= "
 Scheduler item  Scheduler item 
"; return $buff; } diff -ur achievo-0.9.4/modules/todo/class.todo.inc styled-achievo-0.9.4/modules/todo/class.todo.inc --- achievo-0.9.4/modules/todo/class.todo.inc Thu Apr 17 21:27:14 2003 +++ styled-achievo-0.9.4/modules/todo/class.todo.inc Tue Jul 8 16:18:47 2003 @@ -63,11 +63,11 @@ switch ($prio) { case 1: - $result = "".$org.""; + $result = "".$org.""; break; case 2: - $result = "".$org.""; + $result = "".$org.""; break; default: diff -ur achievo-0.9.4/scheduler/view_scheduler_item.inc styled-achievo-0.9.4/scheduler/view_scheduler_item.inc --- achievo-0.9.4/scheduler/view_scheduler_item.inc Thu Oct 10 21:22:30 2002 +++ styled-achievo-0.9.4/scheduler/view_scheduler_item.inc Tue Jul 8 16:05:35 2003 @@ -14,43 +14,43 @@
- - + +
- - + + - - + + - - + + - - + + - - + + - - + + - - + + - +
- + - +
diff -ur achievo-0.9.4/style.php styled-achievo-0.9.4/style.php --- achievo-0.9.4/style.php Tue Jan 21 20:52:41 2003 +++ styled-achievo-0.9.4/style.php Tue Jul 8 17:17:46 2003 @@ -100,3 +100,29 @@ background-color: ; } +// start KPG additions +.error +{ + font: #ff0000; +} +.small +{ + font: smaller; +} +.tiny +{ + font: smallest; +} +.huge +{ + font: largest; +} +.schedule +{ + color: #000000; + font: verdana smaller; +} +.alert +{ + font: #A00000; +} \ No newline at end of file diff -ur achievo-0.9.4/themes/achievo_classic/block_bottom.tmpl styled-achievo-0.9.4/themes/achievo_classic/block_bottom.tmpl --- achievo-0.9.4/themes/achievo_classic/block_bottom.tmpl Fri May 11 15:23:03 2001 +++ styled-achievo-0.9.4/themes/achievo_classic/block_bottom.tmpl Tue Jul 8 18:25:19 2003 @@ -1,4 +1,3 @@ -
diff -ur achievo-0.9.4/themes/achievo_classic/block_top.tmpl styled-achievo-0.9.4/themes/achievo_classic/block_top.tmpl --- achievo-0.9.4/themes/achievo_classic/block_top.tmpl Fri May 11 15:23:03 2001 +++ styled-achievo-0.9.4/themes/achievo_classic/block_top.tmpl Tue Jul 8 18:28:28 2003 @@ -1,14 +1,14 @@
- - +
-   [HEADER] + +   [HEADER]
- - +
+ diff -ur achievo-0.9.4/themes/achievo_classic/login_top.tmpl styled-achievo-0.9.4/themes/achievo_classic/login_top.tmpl --- achievo-0.9.4/themes/achievo_classic/login_top.tmpl Sat Aug 3 14:49:30 2002 +++ styled-achievo-0.9.4/themes/achievo_classic/login_top.tmpl Tue Jul 8 18:30:02 2003 @@ -1,14 +1,14 @@
- - +
-   [HEADER] + +   [HEADER]
- - +
+