From 04c44877e5a06dc5643c2b7156423ff290cfd7f7 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 06:30:59 +0000 Subject: [PATCH 01/16] r290: Finished B2. --- docs/roadmap.txt | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docs/roadmap.txt b/docs/roadmap.txt index 27283db..7db6e1d 100755 --- a/docs/roadmap.txt +++ b/docs/roadmap.txt @@ -5,10 +5,6 @@ SVN: $Id$ ############################################################################### BUGTRACK 1.0 ----------------------------------------- - BETA 2 ----------------------------------------- - ---------------------------------------- BETA 3 ---------------------------------------- -- 2.43.5 From a78c396681243436cd87e46607da07f1ac98c82f Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 06:39:35 +0000 Subject: [PATCH 02/16] r292: Making template files more logically named; part 1 of 2. --- templates/{SHOWREPORT.tpl => showreport.tpl.new} | 0 templates/{TRACKERHOME.tpl => trackerhome.tpl.new} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename templates/{SHOWREPORT.tpl => showreport.tpl.new} (100%) rename templates/{TRACKERHOME.tpl => trackerhome.tpl.new} (100%) diff --git a/templates/SHOWREPORT.tpl b/templates/showreport.tpl.new similarity index 100% rename from templates/SHOWREPORT.tpl rename to templates/showreport.tpl.new diff --git a/templates/TRACKERHOME.tpl b/templates/trackerhome.tpl.new similarity index 100% rename from templates/TRACKERHOME.tpl rename to templates/trackerhome.tpl.new -- 2.43.5 From a69fa113ddbce3ac99da7d87872751e6f5b2f8f6 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 06:40:13 +0000 Subject: [PATCH 03/16] r293: Making template names logical; part 2 of 2. --- templates/{showreport.tpl.new => showreport.tpl} | 0 templates/{trackerhome.tpl.new => trackerhome.tpl} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename templates/{showreport.tpl.new => showreport.tpl} (100%) rename templates/{trackerhome.tpl.new => trackerhome.tpl} (100%) diff --git a/templates/showreport.tpl.new b/templates/showreport.tpl similarity index 100% rename from templates/showreport.tpl.new rename to templates/showreport.tpl diff --git a/templates/trackerhome.tpl.new b/templates/trackerhome.tpl similarity index 100% rename from templates/trackerhome.tpl.new rename to templates/trackerhome.tpl -- 2.43.5 From a1fd8eea11a6ea7e449f671ed55a875a06839439 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 06:48:56 +0000 Subject: [PATCH 04/16] r294: Preparing global templates; removing header code from global.php. --- global.php | 13 +++++-------- templates/doctype.tpl | 3 +-- templates/footer.tpl | 4 ++++ templates/header.tpl | 15 +++++++++++++++ templates/headinclude.tpl | 1 + 5 files changed, 26 insertions(+), 10 deletions(-) diff --git a/global.php b/global.php index bd2cb6c..17ac248 100755 --- a/global.php +++ b/global.php @@ -18,14 +18,6 @@ $bugsys->load('template_fs'); $template->extension = 'tpl'; $template->templatedir = $bugsys->fetch_sourcepath('templates/'); -// ################################################################### -// check for userinfo -- temp -// #*# remove -if ($bugsys->userinfo['userid']) -{ - echo '
You are logged in as ' . construct_user_display($bugsys->userinfo) . ' | [Home] | [New Bug]' . ((can_perform('canadminpanel')) ? ' | [Admin]' : '') . ' | [Logout]
' . "\n\n\n\n"; -} - // ################################################################### // cache templates $globaltemplates = array( @@ -46,6 +38,11 @@ $globaltemplates = array( $template->cache(array_merge($globaltemplates, (array)$fetchtemplates)); +eval('$header = "' . $template->fetch('header') . '";'); +eval('$doctype = "' . $template->fetch('doctype') . '";'); +eval('$headinclude = "' . $template->fetch('headinclude') . '";'); +eval('$footer = "' . $template->fetch('footer') . '";'); + // ################################################################### // initialize template variables $show = array(); diff --git a/templates/doctype.tpl b/templates/doctype.tpl index c642479..f38b71c 100644 --- a/templates/doctype.tpl +++ b/templates/doctype.tpl @@ -1,2 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/templates/footer.tpl b/templates/footer.tpl index e69de29..6c663b9 100644 --- a/templates/footer.tpl +++ b/templates/footer.tpl @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/templates/header.tpl b/templates/header.tpl index e69de29..ab2e099 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -0,0 +1,15 @@ + +
+ You are logged in as {$bugsys->userinfo['displayname']} ({$bugsys->userinfo['email']}) | + [Home] | + [New Bug] + + [Admin] + + [Logout] +
+
+ + + + \ No newline at end of file diff --git a/templates/headinclude.tpl b/templates/headinclude.tpl index e69de29..b92793d 100644 --- a/templates/headinclude.tpl +++ b/templates/headinclude.tpl @@ -0,0 +1 @@ + \ No newline at end of file -- 2.43.5 From 9ec90f81d2ffcbd83fa9ea15252f29c2c7f72166 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 06:56:54 +0000 Subject: [PATCH 05/16] r295: Added global page elements to main pages. --- templates/editattach.tpl | 8 +++++++- templates/editcomment.tpl | 6 ++++++ templates/editreport.tpl | 8 +++++++- templates/history.tpl | 8 +++++++- templates/login.tpl | 8 +++++++- templates/newattach.tpl | 8 +++++++- templates/newcomment.tpl | 8 +++++++- templates/newreport.tpl | 8 +++++++- templates/register.tpl | 8 +++++++- templates/search.tpl | 8 +++++++- templates/search_results.tpl | 8 +++++++- templates/showreport.tpl | 8 +++++++- templates/std_error.tpl | 8 +++++++- templates/std_message.tpl | 8 +++++++- templates/std_redirect.tpl | 8 +++++++- templates/trackerhome.tpl | 8 +++++++- 16 files changed, 111 insertions(+), 15 deletions(-) diff --git a/templates/editattach.tpl b/templates/editattach.tpl index 1961a4f..d97c30c 100644 --- a/templates/editattach.tpl +++ b/templates/editattach.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
@@ -14,4 +18,6 @@ [Delete] -
\ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/editcomment.tpl b/templates/editcomment.tpl index 11e7e5c..61e2c40 100644 --- a/templates/editcomment.tpl +++ b/templates/editcomment.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
Bug: $bug[summary]
Comment posted on: $comment[posttime]
Comment posted by: $comment[postby]
@@ -9,3 +13,5 @@
Comment:
+ +$footer \ No newline at end of file diff --git a/templates/editreport.tpl b/templates/editreport.tpl index e2b472e..8c418a5 100644 --- a/templates/editreport.tpl +++ b/templates/editreport.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
@@ -34,4 +38,6 @@ $customfields
- \ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/history.tpl b/templates/history.tpl index eff4bb2..bf26689 100644 --- a/templates/history.tpl +++ b/templates/history.tpl @@ -1,3 +1,9 @@ +$doctype +$headinclude +$header +

History for $bug[summary] (bugid: $bug[bugid])

-$history \ No newline at end of file +$history + +$footer \ No newline at end of file diff --git a/templates/login.tpl b/templates/login.tpl index 680b0a2..013a6de 100644 --- a/templates/login.tpl +++ b/templates/login.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
@@ -5,4 +9,6 @@ Email:
Password:
Remember Me: Yes
-
\ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/newattach.tpl b/templates/newattach.tpl index 0bff692..51a2331 100644 --- a/templates/newattach.tpl +++ b/templates/newattach.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
@@ -23,4 +27,6 @@ -
\ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/newcomment.tpl b/templates/newcomment.tpl index 8df971c..619461b 100644 --- a/templates/newcomment.tpl +++ b/templates/newcomment.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
New comment for: $bug[summary]
@@ -18,4 +22,6 @@ $bug[comment] - \ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/newreport.tpl b/templates/newreport.tpl index 2121c15..ac9596f 100644 --- a/templates/newreport.tpl +++ b/templates/newreport.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header + @@ -21,4 +25,6 @@
- \ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/register.tpl b/templates/register.tpl index 0107679..81ebc83 100644 --- a/templates/register.tpl +++ b/templates/register.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
Email:
@@ -8,4 +12,6 @@ Confirm Password:
Yes
Language:
-
\ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/search.tpl b/templates/search.tpl index 49ce6f7..9f650b3 100644 --- a/templates/search.tpl +++ b/templates/search.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
Any fields left blank or unselected will be excluded from the search query
@@ -60,4 +64,6 @@ $pcv_select -
\ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/search_results.tpl b/templates/search_results.tpl index 2c63918..f2a1a64 100644 --- a/templates/search_results.tpl +++ b/templates/search_results.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header + Here are the search results: @@ -10,4 +14,6 @@ Here are the search results: $bugs -
Last Post
\ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/showreport.tpl b/templates/showreport.tpl index a548202..05ba521 100644 --- a/templates/showreport.tpl +++ b/templates/showreport.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header +
This bug is hidden!
Bug ID: $bug[bugid]
@@ -75,4 +79,6 @@ $attachments $comments - \ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/std_error.tpl b/templates/std_error.tpl index 62dfa92..6016d42 100644 --- a/templates/std_error.tpl +++ b/templates/std_error.tpl @@ -1,3 +1,9 @@ +$doctype +$headinclude +$header + $errormessage - \ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/std_message.tpl b/templates/std_message.tpl index dd7f69d..f7067ba 100644 --- a/templates/std_message.tpl +++ b/templates/std_message.tpl @@ -1,3 +1,9 @@ +$doctype +$headinclude +$header + $message - \ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/std_redirect.tpl b/templates/std_redirect.tpl index 1cacc9d..5356983 100644 --- a/templates/std_redirect.tpl +++ b/templates/std_redirect.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header + $redirectmessage @@ -5,4 +9,6 @@ $redirectmessage
If you are not redirected in a few seconds, click here. - \ No newline at end of file + + +$footer \ No newline at end of file diff --git a/templates/trackerhome.tpl b/templates/trackerhome.tpl index a389484..f6836da 100644 --- a/templates/trackerhome.tpl +++ b/templates/trackerhome.tpl @@ -1,3 +1,7 @@ +$doctype +$headinclude +$header + @@ -10,4 +14,6 @@ $bugs
Bug ID
-[New Report] \ No newline at end of file +[New Report] + +$footer \ No newline at end of file -- 2.43.5 From 8b3c21e61727020cf54e12e304135478d219f402 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 06:58:23 +0000 Subject: [PATCH 06/16] r296: Drop language.filename --- docs/schema_changes.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/schema_changes.sql b/docs/schema_changes.sql index 901740a..ed43aed 100644 --- a/docs/schema_changes.sql +++ b/docs/schema_changes.sql @@ -13,4 +13,6 @@ CREATE TABLE `vote` ( `votefor` INT(10) UNSIGNED NOT NULL, `voteagainst` INT(10) UNSIGNED NOT NULL, PRIMARY KEY (`bugid`) -); \ No newline at end of file +); + +ALTER TABLE `language` DROP `filename`; \ No newline at end of file -- 2.43.5 From 717c009e81bb1d786d2d46e4f3d776bfba87a6c4 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 19:19:09 +0000 Subject: [PATCH 07/16] r297: Switching to new date formatting system; fixes problems that datelike() has. --- editcomment.php | 2 +- includes/init.php | 6 ++++++ index.php | 2 +- search.php | 2 +- showhistory.php | 2 +- showreport.php | 4 ++-- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/editcomment.php b/editcomment.php index ed5a7c6..dc3f105 100644 --- a/editcomment.php +++ b/editcomment.php @@ -96,7 +96,7 @@ if ($_POST['do'] == 'update') if ($_REQUEST['do'] == 'edit') { - $comment['posttime'] = datelike('standard', $comment['dateline']); + $comment['posttime'] = $datef->format($bugsys->options['dateformat'], $comment['dateline']); $comment['postby'] = construct_user_display($comment); $comment['comment'] = $bugsys->sanitize($comment['comment']); eval('$template->flush("' . $template->fetch('editcomment') . '");'); diff --git a/includes/init.php b/includes/init.php index 1d443d8..4c8a466 100755 --- a/includes/init.php +++ b/includes/init.php @@ -110,6 +110,12 @@ else require_once('./includes/class_language.php'); $bugsys->lang =& lang::init(); +// ################################################################### +// initialize the date system +$bugsys->load('date'); +$datef->usertz = $bugsys->userinfo['timezone']; +$datef->fetch_offset(); + // ################################################################### // Initialize usergroup system $_PERMISSION = array( diff --git a/index.php b/index.php index 812ed17..77ced64 100644 --- a/index.php +++ b/index.php @@ -52,7 +52,7 @@ while ($bug = $db->fetch_array($bugs_fetch)) $bug['lastposttime'] = (($bug['hiddendisplay']) ? $bug['hiddenlastposttime'] : $bug['lastposttime']); $bug['lastpost'] = (($bug['hiddendisplay']) ? $bug['hiddenlastpost'] : $bug['lastpost']); - $bug['lastpostinfo'] = datelike('standard', $bug['lastposttime']) . ' by ' . $bug['lastpost']; + $bug['lastpostinfo'] = $datef->format($bugsys->options['dateformat'], $bug['lastposttime']) . ' by ' . $bug['lastpost']; eval('$bugs .= "' . $template->fetch('trackerhome_bits') . '";'); } diff --git a/search.php b/search.php index 5b39df1..c550386 100644 --- a/search.php +++ b/search.php @@ -257,7 +257,7 @@ if ($_REQUEST['do'] == 'results') $bug['version'] = $bugsys->datastore['version']["$bug[versionid]"]['version']; $bug['status'] = $bugsys->datastore['status']["$bug[status]"]['status']; $bug['resolution'] = $bugsys->datastore['resolution']["$bug[resolution]"]['resolution']; - $bug['lastpostinfo'] = datelike('standard', $bug['lastposttime']) . ' by ' . $bug['lastpost']; + $bug['lastpostinfo'] = $datef->format($bugsys->options['dateformat'], $bug['lastposttime']) . ' by ' . $bug['lastpost']; $bug['urladd'] = "&hilight=$hilight"; eval('$bugs .= "' . $template->fetch('trackerhome_bits') . '";'); } diff --git a/showhistory.php b/showhistory.php index a90cc03..68195b8 100644 --- a/showhistory.php +++ b/showhistory.php @@ -57,7 +57,7 @@ $logs_fetch = $db->query(" while ($log = $db->fetch_array($logs_fetch)) { $log['formatted'] = call_user_func_array(array(lang, 'p'), array_merge(array($log['language']), unserialize($log['arguments']))); - $log['date'] = datelike('standard', $log['dateline']); + $log['date'] = $datef->format($bugsys->options['dateformat'], $log['dateline']); $log['user'] = construct_user_display($log); $logs["$log[dateline]"]["$log[historyid]"] = $log; diff --git a/showreport.php b/showreport.php index b39345f..5b2af36 100644 --- a/showreport.php +++ b/showreport.php @@ -172,7 +172,7 @@ if ($show['getattachments'] OR $show['putattachments']) while ($attachment = $db->fetch_array($attachments_fetch)) { $show['editattach'] = ((can_perform('caneditattach') OR ($attachment['userid'] == $bugsys->userinfo['userid'] AND can_perform('canputattach'))) ? true : false); - $attachment['date'] = datelike('standard', $attachment['dateline']); + $attachment['date'] = $datef->format($bugsys->options['dateformat'], $attachment['dateline']); $attachment['user'] = construct_user_display($attachment, false); eval('$attachments .= "' . $template->fetch('showreport_attachment') . '";'); } @@ -202,7 +202,7 @@ $comments_fetch = $db->query(" ); while ($comment = $db->fetch_array($comments_fetch)) { - $comment['posttime'] = datelike('standard', $comment['dateline']); + $comment['posttime'] = $datef->format($bugsys->options['dateformat'], $comment['dateline']); $comment['postby'] = construct_user_display($comment); $show['editcomment'] = (((can_perform('caneditown') AND $bugsys->userinfo['userid'] == $comment['userid']) OR can_perform('caneditothers')) ? true : false); -- 2.43.5 From 09905501339d3b50d01143b1ee31eead2dc5f192 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 19:24:45 +0000 Subject: [PATCH 08/16] r298: - Removed datelike() [includes/functions.php] - Switching to TIMENOW for inserts and updates in queries instead of time() --- attachment.php | 2 +- includes/functions.php | 13 ------------- newcomment.php | 2 +- newreport.php | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/attachment.php b/attachment.php index fc9d025..6e07e34 100755 --- a/attachment.php +++ b/attachment.php @@ -105,7 +105,7 @@ if ($_POST['do'] == 'insert') } $filedata = $bugsys->escape(file_get_contents($FILE['tmp_name']), true, true); - $time = time(); + $time = TIMENOW; // insert an attachment $db->query(" diff --git a/includes/functions.php b/includes/functions.php index d2ef4fd..15cbbfa 100755 --- a/includes/functions.php +++ b/includes/functions.php @@ -38,19 +38,6 @@ function construct_option_select($name, $array, $selected = 0, $valuekey = '', $ return '"; } -// ########################## Start datelike ######################### -function datelike($format, $timestamp) -{ - global $bugsys; - - if (!$format OR $format == 'standard') - { - $format = $bugsys->options['dateformat']; - } - - return date($format, ($timestamp + (60 * $bugsys->userinfo['timezone']))); -} - // ################### Start construct_user_display ################## // $userinfo needs userid, email, displayname, and showemail function construct_user_display($userinfo, $userid = true) diff --git a/newcomment.php b/newcomment.php index 8f391fc..fcdb10d 100644 --- a/newcomment.php +++ b/newcomment.php @@ -39,7 +39,7 @@ if ($_POST['do'] == 'insert') $bugsys->in['comment_parsed'] = $bugsys->sanitize($bugsys->in['comment_parsed']); } - $time = time(); + $time = TIMENOW; $db->query(" INSERT INTO " . TABLE_PREFIX . "comment diff --git a/newreport.php b/newreport.php index 1c75133..766be86 100755 --- a/newreport.php +++ b/newreport.php @@ -112,7 +112,7 @@ if ($_POST['do'] == 'insert') $bugid = $db->insert_id(); - $time = time(); + $time = TIMENOW; // insert the comment to the database $db->query(" -- 2.43.5 From 60adb154020d4d617be989759d3e576e8b6d0a2c Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 19:32:25 +0000 Subject: [PATCH 09/16] r299: Fixed the dateformat setting; it had the wrong formatter for minutes. --- includes/settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/settings.php b/includes/settings.php index 251f793..6591803 100755 --- a/includes/settings.php +++ b/includes/settings.php @@ -36,7 +36,7 @@ $config['moderatenewusers'] = array('general', 'moderatenewusers', 'yesno', 0, $config['sendwelcomemail'] = array('general', 'sendwelcomemail', 'yesno', 1, false); $config['webmasteremail'] = array('general', 'webmasteremail', 'textbox', '', false); $config['trackertitle'] = array('general', 'trackertitle', 'textbox', '', false); -$config['dateformat'] = array('general', 'dateformat', 'textbox', 'F j, Y h:m:s A', false); +$config['dateformat'] = array('general', 'dateformat', 'textbox', 'F j, Y h:i:s A', false); // ################################################################### -- 2.43.5 From 0501607b1f2b3310eff420d66adc7f6988fa39a6 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 20:27:42 +0000 Subject: [PATCH 10/16] r300: Globalize key element templates. --- includes/class_message_reporter.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/class_message_reporter.php b/includes/class_message_reporter.php index b4efc93..a3bac9b 100755 --- a/includes/class_message_reporter.php +++ b/includes/class_message_reporter.php @@ -21,6 +21,7 @@ class Message_Reporter function error($text = '') { global $bugsys; + global $doctype, $header, $headinclude, $footer; if (is_array($this->phrase) AND empty($this->process)) { @@ -64,6 +65,7 @@ class Message_Reporter function redirect($text = '', $url = '') { global $bugsys; + global $doctype, $header, $headinclude, $footer; if (is_array($this->phrase) AND empty($this->process)) { @@ -94,6 +96,7 @@ class Message_Reporter function message($text = '') { global $bugsys; + global $doctype, $header, $headinclude, $footer; if (is_array($this->phrase) AND empty($this->process)) { -- 2.43.5 From a9ff9023fc4c6a609985814c5decaf6835a0b171 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 21:28:33 +0000 Subject: [PATCH 11/16] r301: Adding base template structure to the system. --- global.php | 5 +++ templates/footer.tpl | 1 + templates/header.tpl | 19 ++++-------- templates/headinclude.tpl | 3 +- templates/images/clock.gif | Bin 0 -> 76 bytes templates/style.css | 61 +++++++++++++++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 14 deletions(-) create mode 100644 templates/images/clock.gif create mode 100644 templates/style.css diff --git a/global.php b/global.php index 17ac248..2044dab 100755 --- a/global.php +++ b/global.php @@ -18,6 +18,11 @@ $bugsys->load('template_fs'); $template->extension = 'tpl'; $template->templatedir = $bugsys->fetch_sourcepath('templates/'); +// ################################################################### +// global template variables + +$datetime = $datef->format('l, F j, Y g:i A'); + // ################################################################### // cache templates $globaltemplates = array( diff --git a/templates/footer.tpl b/templates/footer.tpl index 6c663b9..3aa53ea 100644 --- a/templates/footer.tpl +++ b/templates/footer.tpl @@ -1,3 +1,4 @@ + diff --git a/templates/header.tpl b/templates/header.tpl index ab2e099..e10fd98 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -1,15 +1,8 @@ - -
- You are logged in as {$bugsys->userinfo['displayname']} ({$bugsys->userinfo['email']}) | - [Home] | - [New Bug] - - [Admin] - - [Logout] + -
- - - \ No newline at end of file +
\ No newline at end of file diff --git a/templates/headinclude.tpl b/templates/headinclude.tpl index b92793d..f920192 100644 --- a/templates/headinclude.tpl +++ b/templates/headinclude.tpl @@ -1 +1,2 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/templates/images/clock.gif b/templates/images/clock.gif new file mode 100644 index 0000000000000000000000000000000000000000..08b3dc4fe689e02170d4aa4f771bfbe1183fc531 GIT binary patch literal 76 zcmZ?wbhEHb Date: Sun, 10 Jul 2005 21:38:53 +0000 Subject: [PATCH 12/16] r302: Closing un-cloesd divs. --- showreport.php | 2 +- templates/editreport.tpl | 6 +++--- templates/newcomment.tpl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/showreport.php b/showreport.php index 5b2af36..5671136 100644 --- a/showreport.php +++ b/showreport.php @@ -138,7 +138,7 @@ foreach ($fieldlist AS $fieldid => $field) { $customfields .= (($value) ? 'True' : 'False'); } - $customfeilds .= "
\n\n"; + $customfields .= "
\n\n"; } // ------------------------------------------------------------------- diff --git a/templates/editreport.tpl b/templates/editreport.tpl index 8c418a5..dacf7cd 100644 --- a/templates/editreport.tpl +++ b/templates/editreport.tpl @@ -21,9 +21,9 @@ $header
Assigned to:
-
Duplicate of: $bug[duplicateof]" /> $duplicate[summary] +
Duplicate of: $bug[duplicateof]" /> $duplicate[summary]
-
Dependencies: $dependencies +
Dependencies: $dependencies
Product/Component/Version:
$pcv_select
@@ -37,7 +37,7 @@ $header $customfields -
+
$footer \ No newline at end of file diff --git a/templates/newcomment.tpl b/templates/newcomment.tpl index 619461b..7b743a5 100644 --- a/templates/newcomment.tpl +++ b/templates/newcomment.tpl @@ -9,7 +9,7 @@ $header
Comment:
-
+

-- 2.43.5 From 009039afdc934549022e01f7de0348cffb17556a Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 21:45:26 +0000 Subject: [PATCH 13/16] r303: Added SVN constant to user files; now ISSO debug information shows SVN details. --- attachment.php | 2 ++ editcomment.php | 2 ++ editreport.php | 2 ++ favourite.php | 2 ++ index.php | 2 ++ login.php | 2 ++ newcomment.php | 2 ++ newreport.php | 2 ++ register.php | 2 ++ search.php | 2 ++ showhistory.php | 2 ++ showreport.php | 2 ++ viewattachment.php | 2 ++ vote.php | 2 ++ 14 files changed, 28 insertions(+) diff --git a/attachment.php b/attachment.php index 6e07e34..8d9cb65 100755 --- a/attachment.php +++ b/attachment.php @@ -15,6 +15,8 @@ $fetchtemplates = array( 'editattach' ); +define('SVN', '$Id$'); + require_once('./global.php'); if (isset($bugsys->in['attachmentid'])) diff --git a/editcomment.php b/editcomment.php index dc3f105..0a85ddb 100644 --- a/editcomment.php +++ b/editcomment.php @@ -14,6 +14,8 @@ $fetchtemplates = array( 'editcomment' ); +define('SVN', '$Id$'); + require_once('./global.php'); $comment = $db->query_first(" diff --git a/editreport.php b/editreport.php index 7eb8b94..e25c2c0 100644 --- a/editreport.php +++ b/editreport.php @@ -15,6 +15,8 @@ $fetchtemplates = array( 'pcv_select_row' ); +define('SVN', '$Id$'); + require_once('./global.php'); $bug = $db->query_first(" diff --git a/favourite.php b/favourite.php index bbad2e2..d6c770a 100644 --- a/favourite.php +++ b/favourite.php @@ -10,6 +10,8 @@ || ################################################################### || \*=====================================================================*/ +define('SVN', '$Id$'); + require_once('./global.php'); if (!$bugsys->userinfo['userid']) diff --git a/index.php b/index.php index 77ced64..15773b5 100644 --- a/index.php +++ b/index.php @@ -15,6 +15,8 @@ $fetchtemplates = array( 'trackerhome_bits' ); +define('SVN', '$Id$'); + require_once('./global.php'); if (!can_perform('canviewbugs')) diff --git a/login.php b/login.php index a2adcc1..4340c0a 100755 --- a/login.php +++ b/login.php @@ -14,6 +14,8 @@ $fetchtemplates = array( 'login' ); +define('SVN', '$Id$'); + require_once('./global.php'); // ################################################################### diff --git a/newcomment.php b/newcomment.php index fcdb10d..52d033e 100644 --- a/newcomment.php +++ b/newcomment.php @@ -14,6 +14,8 @@ $fetchtemplates = array( 'newcomment' ); +define('SVN', '$Id$'); + require_once('./global.php'); if (!can_perform('canpostcomments')) diff --git a/newreport.php b/newreport.php index 766be86..f3c830a 100755 --- a/newreport.php +++ b/newreport.php @@ -15,6 +15,8 @@ $fetchtemplates = array( 'pcv_select_row' ); +define('SVN', '$Id$'); + require_once('./global.php'); if (!can_perform('cansubmitbugs')) diff --git a/register.php b/register.php index 84aef95..0fad45d 100755 --- a/register.php +++ b/register.php @@ -14,6 +14,8 @@ $fetchtemplates = array( 'register' ); +define('SVN', '$Id$'); + require_once('./global.php'); // ################################################################### diff --git a/search.php b/search.php index c550386..5f9e733 100644 --- a/search.php +++ b/search.php @@ -15,6 +15,8 @@ $fetchtemplates = array( 'search_results' ); +define('SVN', '$Id$'); + require_once('./global.php'); if (!can_perform('cansearch')) diff --git a/showhistory.php b/showhistory.php index 68195b8..d10212b 100644 --- a/showhistory.php +++ b/showhistory.php @@ -16,6 +16,8 @@ $fetchtemplates = array( 'history_bit' ); +define('SVN', '$Id$'); + require_once('./global.php'); $bug = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . intval($bugsys->in['bugid'])); diff --git a/showreport.php b/showreport.php index 5671136..9be557d 100644 --- a/showreport.php +++ b/showreport.php @@ -16,6 +16,8 @@ $fetchtemplates = array( 'showreport_comment' ); +define('SVN', '$Id$'); + require_once('./global.php'); if (!can_perform('canviewbugs')) diff --git a/viewattachment.php b/viewattachment.php index c7c4bd0..2ab6912 100755 --- a/viewattachment.php +++ b/viewattachment.php @@ -12,6 +12,8 @@ ob_start(); +define('SVN', '$Id$'); + require_once('./global.php'); $attachment = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "attachment WHERE attachmentid = " . intval($bugsys->in['attachmentid'])); diff --git a/vote.php b/vote.php index f121eba..e4d3043 100644 --- a/vote.php +++ b/vote.php @@ -10,6 +10,8 @@ || ################################################################### || \*=====================================================================*/ +define('SVN', '$Id$'); + require_once('./global.php'); // ################################################################### -- 2.43.5 From db36bde36e3407baaccd97b8df5443ad9fc56a2d Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 23:05:36 +0000 Subject: [PATCH 14/16] r304: Added tab navigation system. --- attachment.php | 2 ++ editcomment.php | 2 ++ editreport.php | 2 ++ favourite.php | 2 ++ global.php | 1 - includes/class_message_reporter.php | 6 ++--- index.php | 2 ++ login.php | 2 ++ newreport.php | 2 ++ register.php | 2 ++ search.php | 2 ++ showhistory.php | 2 ++ showreport.php | 2 ++ templates/header.tpl | 8 +++++++ templates/style.css | 36 +++++++++++++++++++++++++---- viewattachment.php | 2 ++ vote.php | 2 ++ 17 files changed, 69 insertions(+), 8 deletions(-) diff --git a/attachment.php b/attachment.php index 8d9cb65..d089a2a 100755 --- a/attachment.php +++ b/attachment.php @@ -17,6 +17,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['showreport'] = 'focus'; + require_once('./global.php'); if (isset($bugsys->in['attachmentid'])) diff --git a/editcomment.php b/editcomment.php index 0a85ddb..97d6758 100644 --- a/editcomment.php +++ b/editcomment.php @@ -16,6 +16,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['showreport'] = 'focus'; + require_once('./global.php'); $comment = $db->query_first(" diff --git a/editreport.php b/editreport.php index e25c2c0..b9bd379 100644 --- a/editreport.php +++ b/editreport.php @@ -17,6 +17,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['showreport'] = 'focus'; + require_once('./global.php'); $bug = $db->query_first(" diff --git a/favourite.php b/favourite.php index d6c770a..4badda8 100644 --- a/favourite.php +++ b/favourite.php @@ -12,6 +12,8 @@ define('SVN', '$Id$'); +$focus['showreport'] = 'focus'; + require_once('./global.php'); if (!$bugsys->userinfo['userid']) diff --git a/global.php b/global.php index 2044dab..4f070f5 100755 --- a/global.php +++ b/global.php @@ -20,7 +20,6 @@ $template->templatedir = $bugsys->fetch_sourcepath('templates/'); // ################################################################### // global template variables - $datetime = $datef->format('l, F j, Y g:i A'); // ################################################################### diff --git a/includes/class_message_reporter.php b/includes/class_message_reporter.php index a3bac9b..afba72c 100755 --- a/includes/class_message_reporter.php +++ b/includes/class_message_reporter.php @@ -21,7 +21,7 @@ class Message_Reporter function error($text = '') { global $bugsys; - global $doctype, $header, $headinclude, $footer; + global $doctype, $header, $headinclude, $footer, $focus, $show; if (is_array($this->phrase) AND empty($this->process)) { @@ -65,7 +65,7 @@ class Message_Reporter function redirect($text = '', $url = '') { global $bugsys; - global $doctype, $header, $headinclude, $footer; + global $doctype, $header, $headinclude, $footer, $focus, $show; if (is_array($this->phrase) AND empty($this->process)) { @@ -96,7 +96,7 @@ class Message_Reporter function message($text = '') { global $bugsys; - global $doctype, $header, $headinclude, $footer; + global $doctype, $header, $headinclude, $footer, $focus, $show; if (is_array($this->phrase) AND empty($this->process)) { diff --git a/index.php b/index.php index 15773b5..5a797ba 100644 --- a/index.php +++ b/index.php @@ -17,6 +17,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['index'] = 'focus'; + require_once('./global.php'); if (!can_perform('canviewbugs')) diff --git a/login.php b/login.php index 4340c0a..6acd02f 100755 --- a/login.php +++ b/login.php @@ -16,6 +16,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['user'] = 'focus'; + require_once('./global.php'); // ################################################################### diff --git a/newreport.php b/newreport.php index f3c830a..a0900c7 100755 --- a/newreport.php +++ b/newreport.php @@ -17,6 +17,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['newreport'] = 'focus'; + require_once('./global.php'); if (!can_perform('cansubmitbugs')) diff --git a/register.php b/register.php index 0fad45d..fa45d42 100755 --- a/register.php +++ b/register.php @@ -16,6 +16,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['user'] = 'focus'; + require_once('./global.php'); // ################################################################### diff --git a/search.php b/search.php index 5f9e733..4511216 100644 --- a/search.php +++ b/search.php @@ -17,6 +17,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['search'] = 'focus'; + require_once('./global.php'); if (!can_perform('cansearch')) diff --git a/showhistory.php b/showhistory.php index d10212b..e625d71 100644 --- a/showhistory.php +++ b/showhistory.php @@ -18,6 +18,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['showreport'] = 'focus'; + require_once('./global.php'); $bug = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "bug WHERE bugid = " . intval($bugsys->in['bugid'])); diff --git a/showreport.php b/showreport.php index 9be557d..a07b886 100644 --- a/showreport.php +++ b/showreport.php @@ -18,6 +18,8 @@ $fetchtemplates = array( define('SVN', '$Id$'); +$focus['showreport'] = 'focus'; + require_once('./global.php'); if (!can_perform('canviewbugs')) diff --git a/templates/header.tpl b/templates/header.tpl index e10fd98..f7d5d1c 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -5,4 +5,12 @@ $datetime
+
\ No newline at end of file diff --git a/templates/style.css b/templates/style.css index 77ff79d..d44a9aa 100644 --- a/templates/style.css +++ b/templates/style.css @@ -29,7 +29,7 @@ body { color: inherit; text-decoration: none; - font-family: "Trebuchet MS", Helvetica, Arial, Tahoma, sans-serif; + font-family: Helvetica, Arial, Tahoma, sans-serif; font-size: 44px; text-shadow: 2px 2px 3px gray; font-weight: 300; @@ -45,12 +45,40 @@ body vertical-align: super; } +#tabbar +{ + margin: 10px 20px 0px 20px; + padding: 4px 16px 5px 0px; +} + + #tabbar .tab, .tabfocus + { + background-color: rgb(204, 204, 204); + padding: 4px 15px 4px 15px; + color: rgb(0, 0, 0); + text-decoration: none; + margin: 0px 7px 0px 0px; + } + + #tabbar .tab:hover + { + background-color: rgb(255, 255, 255); + text-decoration: underline; + } + + #tabbar .tabfocus + { + background-color: rgb(255, 255, 255); + border-bottom: none; + padding-bottom: 5px; + font-weight: bold; + } + #content { background-color: rgb(255, 255, 255); - padding: 5px; - margin: 20px 20px 5px 20px; - border: 2px solid rgb(153, 153, 153); + padding: 10px; + margin: 0px 20px 5px 20px; } /*=====================================================================*\ diff --git a/viewattachment.php b/viewattachment.php index 2ab6912..9a51f4a 100755 --- a/viewattachment.php +++ b/viewattachment.php @@ -14,6 +14,8 @@ ob_start(); define('SVN', '$Id$'); +$focus['showreport'] = 'focus'; + require_once('./global.php'); $attachment = $db->query_first("SELECT * FROM " . TABLE_PREFIX . "attachment WHERE attachmentid = " . intval($bugsys->in['attachmentid'])); diff --git a/vote.php b/vote.php index e4d3043..18e3071 100644 --- a/vote.php +++ b/vote.php @@ -12,6 +12,8 @@ define('SVN', '$Id$'); +$focus['showreport'] = 'focus'; + require_once('./global.php'); // ################################################################### -- 2.43.5 From 3279429e4d93f286b0f1d26051e204103b8789ad Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 23:19:56 +0000 Subject: [PATCH 15/16] r305: Font updates. --- templates/style.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/templates/style.css b/templates/style.css index d44a9aa..0c9aa6a 100644 --- a/templates/style.css +++ b/templates/style.css @@ -13,7 +13,7 @@ body { margin: 0px; padding: 0px; - font-family: "Lucida Grande", Lucida, Verdana, Tahoma, Arial, sans-serif; + font-family: Verdana, Tahoma, Geneva, "Lucida Grande", Arial, sans-serif; font-size: 11px; background-color: rgb(102, 102, 102); } @@ -23,6 +23,7 @@ body background-color: rgb(51, 51, 51); color: rgb(255, 255, 255); padding: 5px; + padding-left: 10px; } #header #title, #header #title a @@ -30,7 +31,7 @@ body color: inherit; text-decoration: none; font-family: Helvetica, Arial, Tahoma, sans-serif; - font-size: 44px; + font-size: 35px; text-shadow: 2px 2px 3px gray; font-weight: 300; } -- 2.43.5 From fe9064f2a689c1086c692e362ac263e8cd4f1621 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sun, 10 Jul 2005 23:26:33 +0000 Subject: [PATCH 16/16] r306: Adding copyright notice. --- global.php | 2 ++ templates/footer.tpl | 5 +++++ templates/header.tpl | 1 + templates/style.css | 6 ++++++ 4 files changed, 14 insertions(+) diff --git a/global.php b/global.php index 4f070f5..789aa36 100755 --- a/global.php +++ b/global.php @@ -21,6 +21,8 @@ $template->templatedir = $bugsys->fetch_sourcepath('templates/'); // ################################################################### // global template variables $datetime = $datef->format('l, F j, Y g:i A'); +$year = $datef->format('Y'); +$version = $bugsys->options['trackerversion']; // ################################################################### // cache templates diff --git a/templates/footer.tpl b/templates/footer.tpl index 3aa53ea..b299c4d 100644 --- a/templates/footer.tpl +++ b/templates/footer.tpl @@ -1,5 +1,10 @@
+ + \ No newline at end of file diff --git a/templates/header.tpl b/templates/header.tpl index f7d5d1c..baf25b8 100644 --- a/templates/header.tpl +++ b/templates/header.tpl @@ -13,4 +13,5 @@ userinfo['userid']">userctrl.php">My Controlslogin.php">Login/Register Help
+
\ No newline at end of file diff --git a/templates/style.css b/templates/style.css index 0c9aa6a..841825a 100644 --- a/templates/style.css +++ b/templates/style.css @@ -82,6 +82,12 @@ body margin: 0px 20px 5px 20px; } +#copyright +{ + text-align: center; + font-size: 10px; +} + /*=====================================================================*\ || ################################################################### || # $HeadURL$ -- 2.43.5