From 581b7a87f85b52355354abd7b951a83c1eedbf89 Mon Sep 17 00:00:00 2001 From: Robert Sesek Date: Sat, 8 Oct 2005 01:55:21 +0000 Subject: [PATCH] r498: Changing
s drawn with t* classes to use the new box.css model --- includes/class_history.php | 33 +++++------- templates/box.css | 86 ++++++++++++++++++++++++++++++++ templates/editattach.tpl | 24 +++++---- templates/editcomment.tpl | 22 +++++--- templates/login.tpl | 11 ++-- templates/newattach.tpl | 39 +++++++++------ templates/quicksearch.tpl | 8 +-- templates/register.tpl | 11 ++-- templates/showreport.tpl | 1 + templates/showreport_comment.tpl | 9 ++-- templates/std_error.tpl | 8 +-- templates/std_message.tpl | 8 +-- templates/std_redirect.tpl | 8 +-- 13 files changed, 191 insertions(+), 77 deletions(-) create mode 100644 templates/box.css diff --git a/includes/class_history.php b/includes/class_history.php index 6b13c4e..91629bb 100644 --- a/includes/class_history.php +++ b/includes/class_history.php @@ -13,7 +13,7 @@ class History { var $bugid = 0; - var $allowempty = false; + var $fieldid = 0; // ------------------------------------------------------------------- // -- Create a log entry @@ -23,6 +23,7 @@ class History global $bugsys; $this->bugid = intval($this->bugid); + $this->fieldid = intval($this->fieldid); if ($diffdata == -1) { @@ -31,26 +32,18 @@ class History if (!$diffdata) { - $bugsys->db->query(" - INSERT INTO " . TABLE_PREFIX . "history - (bugid, dateline, userid) - VALUES - (" . $this->bugid . ", " . LOG_TIME . ", " . $bugsys->userinfo['userid'] . " - )" - ); - } - else - { - $bugsys->db->query(" - INSERT INTO " . TABLE_PREFIX . "history - (bugid, dateline, userid, field, original, changed) - VALUES - (" . $this->bugid . ", " . LOG_TIME . ", " . $bugsys->userinfo['userid'] . ", - '" . $bugsys->escape($diffdata['field']) . "', '" . $bugsys->escape($diffdata['initial']) . "', - '" . $bugsys->escape($diffdata['final']) . "' - )" - ); + return; } + + $bugsys->db->query(" + INSERT INTO " . TABLE_PREFIX . "history + (bugid, dateline, userid, field, fieldid, original, changed) + VALUES + (" . $this->bugid . ", " . LOG_TIME . ", " . $bugsys->userinfo['userid'] . ", + '" . $bugsys->escape($diffdata['field']) . "', " . $this->fieldid . ", + '" . $bugsys->escape($diffdata['initial']) . "', '" . $bugsys->escape($diffdata['final']) . "' + )" + ); } // ------------------------------------------------------------------- diff --git a/templates/box.css b/templates/box.css new file mode 100644 index 0000000..d86dfbb --- /dev/null +++ b/templates/box.css @@ -0,0 +1,86 @@ +/*=====================================================================*\ +|| ################################################################### || +|| # BugStrike [#]version[#] +|| # --------------------------------------------------------------- # || +|| # Copyright ©2002-[#]year[#] by Iris Studios, Inc. All Rights Reserved. # || +|| # This file may not be reproduced in any way without permission. # || +|| # --------------------------------------------------------------- # || +|| # User License Agreement at http://www.iris-studios.com/license/ # || +|| ################################################################### || +\*=====================================================================*/ + +.box +{ + background-color: rgb(71, 71, 71); + padding: 1px; + text-align: left; +} + +.box-head +{ + font-weight: bold; + background-color: rgb(51, 51, 51); + color: rgb(255, 255, 255); + padding: 4px; + margin-bottom: 1px; +} + + .box-head a + { + color: rgb(255, 255, 255); + text-decoration: none; + } + + .box-head a:hover + { + text-decoration: underline; + } + +.box-mid +{ + background-color: rgb(255, 255, 255); + padding: 2px; +} + +.box-foot +{ + background-color: rgb(191, 204, 207); + margin-top: 1px; + padding: 2px; +} + +/* ################################################################### */ + +.box-modmarg-none +{ + margin: 0px; +} + +.box-margmod-top +{ + margin: 0px; + margin-top: 1px; +} + +.box-margmod-bottom +{ + margin: 0pz; + margin-bottom: 1px; +} + +.box-center +{ + text-align: center; +} + +.box-overpad +{ + padding: 8px; +} + +/*=====================================================================*\ +|| ################################################################### +|| # $HeadURL$ +|| # $Id$ +|| ################################################################### +\*=====================================================================*/ \ No newline at end of file diff --git a/templates/editattach.tpl b/templates/editattach.tpl index faee8f2..337e42e 100644 --- a/templates/editattach.tpl +++ b/templates/editattach.tpl @@ -2,6 +2,7 @@ $doctype $headinclude + $attachment[filename] - $bug[summary] @@ -12,22 +13,27 @@ $header -
-
+
+
{@"Attachment #%1$s for Bug #%2$s %3$s"}
-
+ +
{@"Attachment"}: {@"View"} [$attachment[filename]]
-
+ +
{@"Description"}:
{@"Obsolete"}: checked="checked" />
-
- - - [{@"Delete"}] -
+
+ +
+ +
+ + + [{@"Delete"}]
diff --git a/templates/editcomment.tpl b/templates/editcomment.tpl index d257c04..cf05153 100644 --- a/templates/editcomment.tpl +++ b/templates/editcomment.tpl @@ -2,6 +2,7 @@ $doctype $headinclude + <lang 1="$comment[commentid]">{@"Edit Comment %1$s"}</lang> - $bug[summary] @@ -11,19 +12,24 @@ $header -
-
+
+
{@"Comment #%1$s in bug #%2$s %3$s"}
-
{@"Posted on %1$s by %2$s"}
-
+ +
{@"Posted on %1$s by %2$s"}
+ +
style="color: red">{@"Hidden"}: checked="checked" />
-
- - -
+
+ +
+ +
+ +
$footer \ No newline at end of file diff --git a/templates/login.tpl b/templates/login.tpl index 8934ce4..b65a94b 100644 --- a/templates/login.tpl +++ b/templates/login.tpl @@ -2,6 +2,7 @@ $doctype $headinclude + {$bugsys->options['trackertitle']} - Login @@ -12,16 +13,18 @@ $header
-
-
{@"Login"}
-
+
+
{@"Login"}
+ +
{@"Email"}:
{@"Password"}:
{@"Remember Me"}: {@"Yes"}

{@"Click here if you do not have an account..."}
-
+ +
diff --git a/templates/newattach.tpl b/templates/newattach.tpl index 72789b9..2181525 100644 --- a/templates/newattach.tpl +++ b/templates/newattach.tpl @@ -2,6 +2,7 @@ $doctype $headinclude + {@"New Attachment"} - $bug[summary] @@ -13,32 +14,38 @@ $header -
-
{@"New Attachment for Bug #%1$s %2$s"}
-
+
+
{@"New Attachment for Bug #%1$s %2$s"}
+ +
{@"Description"}:
+ -
-
{@"Mark the Following Attachments Obsolete"}: - $obsoletes -
+
+
{@"Mark the Following Attachments Obsolete"}: + $obsoletes
+
+ -
-
{@"Add Comment"}: -
- -
+
+
{@"Add Comment"}: +
+
- -
- -
+ +
+ +
+ +
+ +
diff --git a/templates/quicksearch.tpl b/templates/quicksearch.tpl index 28dd4e6..4dcea00 100644 --- a/templates/quicksearch.tpl +++ b/templates/quicksearch.tpl @@ -2,15 +2,17 @@ $doctype $headinclude + {$bugsys->options['trackertitle']} - {@"Quick Search"} $header
-
-
{@"Quick Search"}
-
+
+
{@"Quick Search"}
+ +
$error
 diff --git a/templates/register.tpl b/templates/register.tpl index 772bed4..2b7388f 100644 --- a/templates/register.tpl +++ b/templates/register.tpl @@ -2,6 +2,7 @@ $doctype $headinclude + {$bugsys->options['trackertitle']} - {@"Register"} @@ -11,9 +12,10 @@ $header
-
-
{@"Register"}
-
+
+
{@"Register"}
+ +
{@"Email"}:
{@"Confirm Email"}:
{@"Display Name"}:
@@ -22,7 +24,8 @@ $header
{@"Show My Email Publicly"}: {@"Yes"}
{@"Language"}:
-
+ +
diff --git a/templates/showreport.tpl b/templates/showreport.tpl index fa56d7d..8549da3 100644 --- a/templates/showreport.tpl +++ b/templates/showreport.tpl @@ -3,6 +3,7 @@ $doctype $headinclude + <lang 1="$bug[bugid]">{@"Bug Report %1$s"}</lang> - $bug[summary] diff --git a/templates/showreport_comment.tpl b/templates/showreport_comment.tpl index 9185e8c..7604d38 100644 --- a/templates/showreport_comment.tpl +++ b/templates/showreport_comment.tpl @@ -1,16 +1,17 @@ -
-
+
+
$comment[posttime] $comment[postby]
-
+ +
$comment[comment_parsed]
-
+
[{@"Edit Comment"}] diff --git a/templates/std_error.tpl b/templates/std_error.tpl index 2c00cbd..5b50aa0 100644 --- a/templates/std_error.tpl +++ b/templates/std_error.tpl @@ -2,15 +2,17 @@ $doctype $headinclude + {$bugsys->options['trackertitle']} - {@"Error"} $header
-
-
{@"Error"}
-
+
+
{@"Error"}
+ +
{$this->process}
diff --git a/templates/std_message.tpl b/templates/std_message.tpl index 3c35944..c88d615 100644 --- a/templates/std_message.tpl +++ b/templates/std_message.tpl @@ -2,15 +2,17 @@ $doctype $headinclude + {$bugsys->options['trackertitle']} - {@"Notice"} $header
-
-
{@"Notice"}
-
+
+
{@"Notice"}
+ +
{$this->process}
diff --git a/templates/std_redirect.tpl b/templates/std_redirect.tpl index 96711ea..d8b3487 100644 --- a/templates/std_redirect.tpl +++ b/templates/std_redirect.tpl @@ -2,6 +2,7 @@ $doctype $headinclude + {$bugsys->options['trackertitle']} - {@"Redirect..."} @@ -9,9 +10,10 @@ $headinclude $header
-
-
{@"Redirect..."}
-
+
+
{@"Redirect..."}
+ +
{$this->process}
-- 2.22.5