From 55b4fc42ee6d3eff626185767009776407a4e739 Mon Sep 17 00:00:00 2001 From: Di-Pol Date: Wed, 28 Jun 2017 20:58:45 +0300 Subject: [PATCH 1/4] fix editing, deleting, task opening in the Timetracker --- templates/standard/userProfileTimetracker.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/standard/userProfileTimetracker.tpl b/templates/standard/userProfileTimetracker.tpl index dd6a835d..be81247b 100644 --- a/templates/standard/userProfileTimetracker.tpl +++ b/templates/standard/userProfileTimetracker.tpl @@ -70,13 +70,13 @@ {if $userpermissions.timetracker.edit} {literal} {/if} {if $userpermissions.timetracker.del} {literal} {/if} @@ -92,7 +92,7 @@ From 17a2218e6002c44315cd6acd5d6d609802b77d93 Mon Sep 17 00:00:00 2001 From: Di-Pol Date: Fri, 7 Jul 2017 19:00:01 +0300 Subject: [PATCH 2/4] display total hours in timetracker report (fix) --- templates/standard/tracker_project.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/standard/tracker_project.tpl b/templates/standard/tracker_project.tpl index 609bb5b3..62844eaa 100644 --- a/templates/standard/tracker_project.tpl +++ b/templates/standard/tracker_project.tpl @@ -122,7 +122,7 @@ {#totalhours#}: {literal} - {{additionalData.totalHours}}   + {{{additionalData.totalHours}}}   {/literal} From 3477121a8c94ca952ab6a45b182472cece3cded0 Mon Sep 17 00:00:00 2001 From: Di-Pol Date: Sun, 9 Jul 2017 00:27:04 +0300 Subject: [PATCH 3/4] implemented multi-byte safe substr() to fill task select --- managetimetracker.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/managetimetracker.php b/managetimetracker.php index d14be60c..cb6e2ee5 100644 --- a/managetimetracker.php +++ b/managetimetracker.php @@ -134,9 +134,9 @@ } for ($i = 0; $i < count($tasks); $i++) { if (empty($tasks[$i]["title"])) { - $name = substr($tasks[$i]["text"], 0, 30); + $name = mb_substr($tasks[$i]["text"], 0, 50); } else { - $name = substr($tasks[$i]["title"], 0, 30); + $name = mb_substr($tasks[$i]["title"], 0, 50); } $tasks[$i]["name"] = $name; } From e636850f34152da71202d5a5f6e98ca1736a35da Mon Sep 17 00:00:00 2001 From: Di-Pol Date: Tue, 2 Jan 2018 15:46:31 +0300 Subject: [PATCH 4/4] cleanup after merge --- .gitignore | 3 +- config/standard/installedPlugins.json | 7 - managetimetracker.php | 449 +------------------------ plugins/plugin.taskComments.php | 81 +++++ templates/standard/tracker_project.tpl | 171 ---------- 5 files changed, 93 insertions(+), 618 deletions(-) create mode 100644 plugins/plugin.taskComments.php diff --git a/.gitignore b/.gitignore index 936e4f4b..d138a185 100644 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,5 @@ include/class.myDavFile.php *.sql dav.php dav.php -dav.php \ No newline at end of file +dav.php +nbproject/ diff --git a/config/standard/installedPlugins.json b/config/standard/installedPlugins.json index f0340986..466ed76f 100644 --- a/config/standard/installedPlugins.json +++ b/config/standard/installedPlugins.json @@ -1,11 +1,4 @@ [ - ["ganttChart", true], - ["globalTaskOverview", true], - ["projectTemplates", true], - ["conference", true], ["taskComments", true], - ["autoTimetracker", true], - ["mobileWebApp", true], ["test", false] - ] \ No newline at end of file diff --git a/managetimetracker.php b/managetimetracker.php index db888a94..3a71acba 100644 --- a/managetimetracker.php +++ b/managetimetracker.php @@ -1,4 +1,3 @@ -<<<<<<< HEAD -======= -assign("loginerror", 0); - $template->display("login.tpl"); - die(); -} -$language = Array(); -$language['a_meta_charset'] = 'UTF-8'; -$language['a_meta_dir'] = 'ltr'; -$language['a_meta_language'] = 'en'; -$language['w_page'] = 'page'; - -// create timetracker instance -$tracker = new timetracker(); - -//Get data from $_POST and $_GET filtered and sanitized by htmlpurifier -$cleanGet = cleanArray($_GET); -$cleanPost = cleanArray($_POST); - -$action = getArrayVal($_GET, "action"); -$redir = getArrayVal($_GET, "redir"); -$mode = getArrayVal($_GET, "mode"); -$id = getArrayVal($_GET, "id"); - - -/** - * Get strings from the langfile and decode them to ASCII/ANSI - * Needed for PDF - */ -$strproj = utf8_decode($langfile["project"]); -$strtimetrack = utf8_decode($langfile["timetracker"]); -$struser = utf8_decode($langfile["user"]); -$strstarted = utf8_decode($langfile["started"]); -$strday = utf8_decode($langfile["day"]); -$strended = utf8_decode($langfile["ended"]); -$strhours = utf8_decode($langfile["hours"]); -$strtask = utf8_decode($langfile["task"]); -// $strtimetable = utf8_decode($langfile["timetable"]); -$strcomment = utf8_decode($langfile["comment"]); - -if (empty($cleanGet["usr"])) { - $cleanGet["usr"] = 0; -} -if (empty($cleanGet["task"])) { - $cleanGet["task"] = 0; -} - -$template->assign("mode", $mode); -if (isset($id)) { - $project = array('ID' => $id); - $template->assign("project", $project); -} - -$classes = array("overview" => "overview", "msgs" => "msgs", "tasks" => "tasks", "miles" => "miles", "files" => "files", "users" => "users", "tracker" => "tracking_active"); -$template->assign("classes", $classes); - -/* - * VIEW ROUTES - * These are routes that render HTML views to the browser or create side effects - */ - - -if ($action == "add") { - if (!$userpermissions["timetracker"]["add"]) { - $template->assign("errortext", "Permission denied."); - $template->assign("mode", "error"); - $template->display("error.tpl"); - die(); - } - - $worked = $_POST["worked"]; - $ajaxreq = $_GET["ajaxreq"]; - if ($ajaxreq == 1) { - $lodate = date("d.m.Y"); - $cleanPost["started"] = date("H:i:s", $cleanPost["started"]); - $cleanPost["ended"] = date("H:i:s", $cleanPost["ended"]); - - $cleanPost["comment"] = ""; - } - - if ($tracker->add($userid, $cleanPost["project"], $cleanPost["ttask"], $cleanPost["comment"], $cleanPost["started"], $cleanPost["ended"], $cleanPost["ttday"], $cleanPost["ttendday"])) { - $redir = urldecode($redir); - if ($redir) { - $redir = $url . $redir; - header("Location: $redir"); - } elseif ($ajaxreq == 1) { - echo "ok"; - } else { - echo "ok"; - } - } else { - $goback = $langfile["goback"]; - $endafterstart = $langfile["endafterstart"]; - $template->assign("mode", "error"); - $template->assign("errortext", "$endafterstart
$goback"); - $template->display("error.tpl"); - } -} elseif ($action == "editform") { - if (!$userpermissions["timetracker"]["edit"]) { - $template->assign("errortext", "Permission denied."); - $template->assign("mode", "error"); - $template->display("error.tpl"); - die(); - } - // create task and user instance - $cleanPost["ttask"] = new task(); - $cleanGet["user"] = new user(); - // get track to edit - $track = $tracker->getTrack($cleanGet["tid"]); - // get username - $member = $cleanGet["user"]->getProfile($track["user"]); - $track["username"] = $member["name"]; - if ($track["task"] != 0) { - // get task - $thetask = $cleanPost["ttask"]->getTask($track["task"]); - if (empty($thetask["title"])) { - $taskname = substr($thetask["text"], 0, 30); - } else { - $taskname = substr($thetask["title"], 0, 30); - } - $track["taskname"] = $taskname; - } - $template->assign("track", $track); - // get current and closed tasks - $newtasks = $cleanPost["ttask"]->getProjectTasks($id); - $oldtasks = $cleanPost["ttask"]->getProjectTasks($id, false); - // if the project has both - merge them into one array - if ($newtasks and $oldtasks) { - $tasks = array_merge($newtasks, $oldtasks); - } else { - $tasks = $newtasks; - } - for ($i = 0; $i < count($tasks); $i++) { - if (empty($tasks[$i]["title"])) { - $name = substr($tasks[$i]["text"], 0, 30); - } else { - $name = substr($tasks[$i]["title"], 0, 30); - } - $tasks[$i]["name"] = $name; - } - $template->assign("tasks", $tasks); - - $title = $langfile['edittimetracker']; - $template->assign("title", $title); - - $template->display("edittrackform.tpl"); -} elseif ($action == "edit") { - if (!$userpermissions["timetracker"]["edit"]) { - $template->assign("errortext", "Permission denied."); - $template->assign("mode", "error"); - $template->display("error.tpl"); - die(); - } - // construct timestamps; - $cleanPost["started"] = $cleanPost["day"] . " " . $cleanPost["started"]; - $cleanPost["started"] = strtotime($cleanPost["started"]); - $cleanPost["ended"] = $cleanPost["endday"] . " " . $cleanPost["ended"]; - $cleanPost["ended"] = strtotime($cleanPost["ended"]); - //edit the entry - if ($tracker->edit($cleanGet["tid"], $cleanPost["ttask"], $cleanPost["comment"], $cleanPost["started"], $cleanPost["ended"])) { - if ($redir) { - $redir = $url . $redir; - header("Location: $redir"); - } else { - $loc = $url . "managetimetracker.php?action=showproject&id=$id&mode=edited"; - header("Location: $loc"); - } - } -} elseif ($action == "del") { - if (!$userpermissions["timetracker"]["del"]) { - $template->assign("errortext", "Permission denied."); - $template->assign("mode", "error"); - $template->display("error.tpl"); - die(); - } - - if ($tracker->del($cleanGet["tid"])) { - $redir = urldecode($redir); - if ($redir) { - $loc = $url . $redir; - header("Location: $loc"); - } else { - // $loc = $url . "managetimetracker.php?action=showproject&id=$id&mode=deleted"; - echo "ok"; - } - } -} elseif ($action == "projectxls") { - if (!chkproject($userid, $id)) { - $errtxt = $langfile["notyourproject"]; - $noperm = $langfile["accessdenied"]; - $template->assign("errortext", "$errtxt
$noperm"); - $template->assign("mode", "error"); - $template->display("error.tpl"); - die(); - } - //create a new CSV file - $excelFile = fopen(CL_ROOT . "/files/" . CL_CONFIG . "/ics/timetrack-$id.csv", "w"); - - //put the column headers to csv - $line = array($struser, $strtask, $strcomment, $strday, $strstarted, $strended, $strhours); - fputcsv($excelFile, $line); - - if (!empty($cleanGet["start"]) and !empty($cleanGet["end"])) { - $track = $tracker->getProjectTrack($id, $cleanGet["usr"], $cleanGet["task"], $cleanGet["start"], $cleanGet["end"], false); - } else { - $track = $tracker->getProjectTrack($id, $cleanGet["usr"], $cleanGet["task"], 0, 0, false); - } - - if (!empty($track)) { - foreach ($track as $tra) { - $hrs = round($tra["hours"], 2); - $hrs = str_replace(".", ",", $hrs); - $myArr = array($tra["uname"], $tra["tname"], $tra["comment"], $tra["daystring"], $tra["startstring"], $tra["endstring"], $hrs); - fputcsv($excelFile, $myArr); - } - } - - fclose($excelFile); - $loc = $url . "files/" . CL_CONFIG . "/ics/timetrack-$id.csv"; - header("Location: $loc"); -} elseif ($action == "projectpdf") { - if (!chkproject($userid, $id)) { - $errtxt = $langfile["notyourproject"]; - $noperm = $langfile["accessdenied"]; - $template->assign("errortext", "$errtxt
$noperm"); - $template->display("error.tpl"); - die(); - } - global $conn; - - $id = (int)$id; - // get the project name - $projectNameQuery = $conn->query("SELECT name FROM projekte WHERE ID = $id"); - $projectName = $projectNameQuery->fetchColumn(); - // create a new PDF in portrait orientation, A4 format - $pdf = new MYPDF("P", PDF_UNIT, "A4", true); - // Set the header - $headstr = $langfile["timetable"] . " " . $projectName; - $pdf->setup($headstr, array(239, 232, 229)); - - // headers for table columns - $headers = array($langfile["user"], $langfile["task"], $langfile["comment"], $langfile["started"] . " - " . $langfile["ended"], $langfile["hours"]); - - // if a filter has been applied, get only those timetracks - if (!empty($cleanGet["start"]) and !empty($cleanGet["end"])) { - $track = $tracker->getProjectTrack($id, $cleanGet["usr"], $cleanGet["task"], $cleanGet["start"], $cleanGet["end"], false); - } else { - $track = $tracker->getProjectTrack($id, $cleanGet["usr"], $cleanGet["task"], 0, 0, false); - } - // array representing the content of the table. each field is a column - $thetrack = array(); - if (!empty($track)) { - $i = 0; - foreach ($track as $timetrack) { - if (empty($timetrack["tname"])) { - $timetrack["tname"] = ""; - } - $hrs = round($timetrack["hours"], 2); - $hrs = number_format($hrs, 2, ",", "."); - - $timetrack["comment"] = strip_tags($timetrack["comment"]); - - $i = $i + 1; - // write the table line - array_push($thetrack, array($timetrack["uname"], $timetrack["tname"], $timetrack["comment"], $timetrack["daystring"] . "/" . $timetrack["startstring"] . "-" . $timetrack["endstring"], $hrs)); - } - } - // put it all to the PDF and output the file - $pdf->table($headers, $thetrack); - $pdf->Output("project-$id-timetable.pdf", "D"); -} elseif ($action == "userxls") { - $excelFile = fopen(CL_ROOT . "/files/" . CL_CONFIG . "/ics/user-$id-timetrack.csv", "w"); - - $line = array($strproj, $strtask, $strcomment, $strday, $strstarted, $strended, $strhours); - fputcsv($excelFile, $line); - if (!empty($cleanGet["start"]) and !empty($cleanGet["end"])) { - $track = $tracker->getUserTrack($id, $cleanGet["project"], $cleanGet["task"], $cleanGet["start"], $cleanGet["end"], false); - } else { - $track = $tracker->getUserTrack($id, $cleanGet["project"], $cleanGet["task"], 0, 0, false); - } - if (!empty($track)) { - foreach ($track as $tra) { - $hrs = round($tra["hours"], 2); - $hrs = str_replace(".", ",", $hrs); - $myArr = array($tra["pname"], $tra["tname"], $tra["comment"], $tra["daystring"], $tra["startstring"], $tra["endstring"], $hrs); - fputcsv($excelFile, $myArr); - } - } - fclose($excelFile); - $loc = $url . "files/" . CL_CONFIG . "/ics/user-$id-timetrack.csv"; - header("Location: $loc"); -} elseif ($action == "userpdf") { - if (!empty($cleanGet["start"]) and !empty($cleanGet["end"])) { - $track = $tracker->getUserTrack($id, $cleanGet["project"], $cleanGet["task"], $cleanGet["start"], $cleanGet["end"], false); - } else { - $track = $tracker->getUserTrack($id, $cleanGet["project"], $cleanGet["task"], 0, 0, false); - } - $thetrack = array(); - - $totaltime = $tracker->getTotalTrackTime($track); - $totaltime = str_replace(".", ",", $totaltime); - $uname = $conn->query("SELECT name FROM user WHERE ID = {$conn->quote($id)}")->fetch(); - $uname = $uname[0]; - - $pdf = new MYPDF("P", PDF_UNIT, "A4", true); - $pdf->setup($langfile["timetable"] . " " . $uname, array(239, 232, 229)); - - $headers = array($langfile["project"], $langfile["task"], $langfile["comment"], $langfile["started"] . " - " . $langfile["ended"], $langfile["hours"]); - - $thetrack = array(); - if (!empty($track)) { - foreach ($track as $tra) { - if (empty($tra["tname"])) { - $tra["tname"] = ""; - } - $hrs = round($tra["hours"], 2); - $hrs = number_format($hrs, 2, ",", "."); - - $tra["comment"] = strip_tags($tra["comment"]); - array_push($thetrack, array($tra["pname"], $tra["tname"], $tra["comment"], $tra["daystring"] . "/" . $tra["startstring"] . "-" . $tra["endstring"], $hrs)); - } - - $totaltime = $tracker->getTotalTrackTime($track); - $totaltime = str_replace(".", ",", $totaltime); - - $pdf->table($headers, $thetrack); - $pdf->Output("user-$uname-timetable.pdf", "D"); - } -} elseif ($action == "showproject") { - if (!$userpermissions["timetracker"]["view"]) { - $errtxt = $langfile["nopermission"]; - $noperm = $langfile["accessdenied"]; - $template->assign("errortext", "$errtxt
$noperm"); - $template->display("error.tpl"); - die(); - } - // Check if the user belongs to this project - if (!chkproject($userid, $id)) { - $errtxt = $langfile["notyourproject"]; - $noperm = $langfile["accessdenied"]; - $template->assign("errortext", "$errtxt
$noperm"); - $template->display("error.tpl"); - die(); - } - $start = getArrayVal($_POST, "start"); - $end = getArrayVal($_POST, "end"); - $usr = getArrayVal($_POST, "usr"); - $task = getArrayVal($_POST, "task"); - // get open project tasks for filtering - $projectObj = new project(); - $projectUsers = $projectObj->getProjectMembers($id, 1000, false); - $project = $projectObj->getProject($id); - - $taskObj = new task(); - $projectTasks = $taskObj->getProjectTasks($id, 1); - - - $template->assign("projectname", $project["name"]); - $template->assign("users", $projectUsers); - $title = $langfile["timetracker"]; - $template->assign("title", $title); - $template->assign("ptasks", $projectTasks); - $template->assign("usr", $cleanGet["usr"]); - $template->assign("task", $cleanGet["task"]); - - - $template->display("tracker_project.tpl"); -} /* - * DATA ROUTES - * These are routes that render JSON data structures - */ -elseif ($action == "projectTimetracker") { - if (!$userpermissions["timetracker"]["view"]) { - $errtxt = $langfile["nopermission"]; - $noperm = $langfile["accessdenied"]; - $template->assign("errortext", "$errtxt
$noperm"); - $template->display("error.tpl"); - die(); - } - // Check if the user belongs to this project - if (!chkproject($userid, $id)) { - $errtxt = $langfile["notyourproject"]; - $noperm = $langfile["accessdenied"]; - $template->assign("errortext", "$errtxt
$noperm"); - $template->display("error.tpl"); - die(); - } - // If the user can not read tt entries from other user, set the user filter to the current user id. - if (!$cleanGet["usr"]) { - if (!$userpermissions["timetracker"]["read"]) { - $cleanGet["usr"] = $userid; - } else { - $cleanGet["usr"] = 0; - } - } - - $offset = 0; - if (isset($cleanGet["offset"])) { - $offset = $cleanGet["offset"]; - } - $limit = 25; - if (isset($cleanGet["limit"])) { - $limit = $cleanGet["limit"]; - } - if (!empty($cleanGet["start"]) and !empty($cleanGet["end"])) { - $track = $tracker->getProjectTrack($id, $cleanGet["usr"], $cleanGet["task"], $cleanGet["start"], $cleanGet["end"], $limit, $offset); - $trackCount = count($tracker->getProjectTrack($id, $cleanGet["usr"], $cleanGet["task"], $cleanGet["start"], $cleanGet["end"], 100000000)); - } else { - $track = $tracker->getProjectTrack($id, $cleanGet["usr"], $cleanGet["task"], 0, 0, $limit, $offset); - $trackCount = count($tracker->getProjectTrack($id, $cleanGet["usr"], $cleanGet["task"], 0, 0, 10000000000)); - } - if (!empty($track)) { - $projectTrack["items"] = $track; - $projectTrack["additionalData"]["totalHours"] = $tracker->getTotalTrackTime($track); - $projectTrack["count"] = $trackCount; - - echo json_encode($projectTrack); - } else { - echo json_encode(array()); - } - -} - -?> ->>>>>>> Collabtive/master diff --git a/plugins/plugin.taskComments.php b/plugins/plugin.taskComments.php new file mode 100644 index 00000000..523685e1 --- /dev/null +++ b/plugins/plugin.taskComments.php @@ -0,0 +1,81 @@ + "taskCommentsplugin", + "second" => "taskCommentspluginTwo" + ]; + + private static $pluginTemplates = [ + "main" => "taskComments.tpl" + ]; + + private $filterFunctions = ["taskComments::activateMainHook", "taskComments::activateSecondHook"]; + + public function install() + { + // TODO: Implement install() method. + } + + function activate() + { + global $pluginManager; + $templateTags = [ + ["tag" => taskComments::$pluginHooks["main"]], + ["tag" => taskComments::$pluginHooks["second"]] + ]; + $pluginManager->registerPlugin($templateTags, "taskComments"); + $pluginManager->registerHook($this->filterFunctions); + } + public function deactivate(){ + + } + + public function getCommentsByTask($id){ + return "taskComments " . $id; + } + + /* + * Implement the main plugin hook + * + * This function is registered as a smarty pre-filter + * It is passed the unprocessed smarty template source, as well as an object representing the current template + * @implements collabtivePlugin + * @param str $source String representing the unmodified Smarty template, as read from the .tpl files + * @param obj $localTemplateObj Object representing the template + */ + static function activateMainHook($source, Smarty_Internal_Template $localTemplateObj) + { + return preg_replace("//i", "{" . taskComments::$pluginHooks["main"] . "}", $source); + } + + static function activateSecondHook($source, Smarty_Internal_Template $localTemplateObj) + { + return preg_replace("//i", "{" . taskComments::$pluginHooks["second"] . "}", $source); + } + + /* + * Implement the main template. Each plugin has to have a main template + * This returns the string that is inserted for the {hook} created with activateHeaderHook. + * The return value is inserted into the $localTemplateObj at compile time + * + * This function is registered as a smarty plugin. + * It is passed parameters, as well as an object representing the current template + * @implements collabtivePlugin + * @param str $params Parameters bound to the plugin + * @param obj $localTemplateObj Object representing the template + */ + static function getMainTemplate($params, Smarty_Internal_Template $templateObj) + { + global $template; + + $taskObj = new project(); + $allTask = $taskObj->getMyProjects($_SESSION["userid"]); + + $template->assign("irgendwas", $allTask); + + return $template->fetch(CL_ROOT . "/plugins/templates/" . taskComments::$pluginTemplates["main"]); + } +} + diff --git a/templates/standard/tracker_project.tpl b/templates/standard/tracker_project.tpl index d36c5b4b..609bb5b3 100644 --- a/templates/standard/tracker_project.tpl +++ b/templates/standard/tracker_project.tpl @@ -1,173 +1,3 @@ -<<<<<<< HEAD -{include file="header.tpl" jsload = "ajax" } -{include file="tabsmenue-project.tpl" timetab = "active"} - -
-
-
- - - -

{$projectname|truncate:45:"...":true}/ {#timetracker#}

-
-
- - -
- - -
- {#export#} - -
{*at one item*} - {#pdfexport#} - {#excelexport#} -
-
- -
- {#filterreport#} -
-
- -

- {#report#} - -

-
- -
- - {*Filter End*} - -
- - - - - - - - - - - - - - - - - - - {literal} - - - - - - - - - - - {literal} - - - - - {/literal} - - - - - {literal} - - - {/literal} - - -
{#user#}{#day#}{#started#}{#ended#}{#hours#}  
-
- - - {{*track.uname | truncate '30' }} - -
- 		{{*track.daystring}}{{*track.startstring}}{{*track.endstring}}{{*track.hours}}   - {/literal} - {if $userpermissions.timetracker.edit} - {literal} - - {/if} - {if $userpermissions.timetracker.del} - - {/if} -
-
-
- {/literal}{#comment#}:{literal}
{{{*track.comment}}} - -

- {/literal}{#task#}{literal}:
- {{{*track.tname}}} -

-
-
-
{#totalhours#}:{{{additionalData.totalHours}}}  
-
{*smooth End*} - -
-
- {#filterreport#} -
-
-
{*block END*} - -
{*timetrack END*} - -
- - {literal} - - - - {/literal} - -
{*Timetracking END*} -
{*content-left-in END*} -
{*content-left END*} - -{include file="sidebar-a.tpl"} -======= {include file="header.tpl" jsload = "ajax" } {include file="tabsmenue-project.tpl" timetab = "active"} @@ -336,5 +166,4 @@ {*content-left END*} {include file="sidebar-a.tpl"} ->>>>>>> Collabtive/master {include file="footer.tpl"} \ No newline at end of file