Index: stylevars.txt
===================================================================
--- stylevars.txt (.../tags/1.2.0-b1/templates) (revision 1515)
+++ stylevars.txt (.../trunk/templates) (revision 1515)
@@ -1,57 +0,0 @@
-/*=====================================================================*\
-|| ###################################################################
-|| # Bugdar
-|| # Copyright (c)2004-2008 Blue Static
-|| #
-|| # This program is free software; you can redistribute it and/or modify
-|| # it under the terms of the GNU General Public License as published by
-|| # the Free Software Foundation; version 2 of the License.
-|| #
-|| # This program is distributed in the hope that it will be useful, but
-|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-|| # more details.
-|| #
-|| # You should have received a copy of the GNU General Public License along
-|| # with this program; if not, write to the Free Software Foundation, Inc.,
-|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-|| ###################################################################
-\*=====================================================================*/
-
-/*
-This file is parsed to create PHP variables that
-are used in templates with the $stylevar[] array.
-It is similar to how a CSS element would be done.
-
-Each line has:
-variablename: value;
-
-Only letters and numbers are valid in variable names;
-everything else is converted to an undescore.
-
-Values only are allowed to have numbers, letters, dashes,
-periods/decimals, the number/pound sign, and the percent sign.
-
-Comments are only valid in C++ style (the type of comment this is).
-*/
-
-/* table elements */
-
-border: 0;
-spacing: 2;
-padding: 2;
-
-/* page elements */
-
-normal-width: 100%;
-alternate-width: 45%;
-
-/* alternate background color used when status colors aren't displayed */
-alt-color: #BFCCCF;
-
-/*=====================================================================*\
-|| ###################################################################
-|| # $HeadURL$
-|| # $Id$
-|| ###################################################################
-\*=====================================================================*/
\ No newline at end of file
Index: search_save.tpl
===================================================================
--- search_save.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ search_save.tpl (.../trunk/templates) (revision 1515)
@@ -22,7 +22,7 @@
<input type="hidden" name="searchid" value="{$bugsys->in['searchid']}" />
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head">{@"Save Search"}</div>
<div class="box-mid">
Index: register.tpl
===================================================================
--- register.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ register.tpl (.../trunk/templates) (revision 1515)
@@ -21,7 +21,7 @@
<input type="hidden" name="do" value="insert" />
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head">{@"Register"}</div>
<div class="box-mid">
Index: email/accountapproved.xml.tpl
===================================================================
--- email/accountapproved.xml.tpl (.../tags/1.2.0-b1/templates) (revision 0)
+++ email/accountapproved.xml.tpl (.../trunk/templates) (revision 1515)
@@ -0,0 +1,8 @@
+<email>
+ <subject>Account Approved at {$bugsys->options['trackertitle']}</subject>
+ <bodyText>Hi $user[displayname],
+
+Your account was awaiting moderation at {$bugsys->options['trackertitle']}. Today, an administrator approved your registration and you are now able to use the bug tracker fully.
+
+If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
+</email>
\ No newline at end of file
Property changes on: email/accountapproved.xml.tpl
___________________________________________________________________
Name: svn:keywords
+ LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
Index: std_message.tpl
===================================================================
--- std_message.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ std_message.tpl (.../trunk/templates) (revision 1515)
@@ -17,7 +17,7 @@
</if>
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head" style="text-align: $stylevar[left]"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
<div class="box-mid box-overpad" style="text-align: $stylevar[left]">
Index: history_bit.tpl
===================================================================
--- history_bit.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ history_bit.tpl (.../trunk/templates) (revision 1515)
@@ -1,4 +1,4 @@
-<tr style="vertical-align: top<if condition="$bgcolor">; background-color: $bgcolor</if>">
+<tr style="vertical-align: top"<if condition="$bgcolor"> class="$bgcolor"</if>>
<td width="10%"><if condition="$show['group']">$log[user]<else /> </if></td>
<td width="20%"><if condition="$show['group']">$log[date]<else /> </if></td>
<td width="20%">$log[field]</td>
Index: favorites.tpl
===================================================================
--- favorites.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ favorites.tpl (.../trunk/templates) (revision 1515)
@@ -9,7 +9,7 @@
$header
-<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+<table class="table">
<tr class="listinghead">
$headers
</tr>
Index: std_error.tpl
===================================================================
--- std_error.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ std_error.tpl (.../trunk/templates) (revision 1515)
@@ -11,7 +11,7 @@
$header
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head" style="text-align: $stylevar[left]">{@"Error"}</div>
<div class="box-mid box-overpad" style="text-align: $stylevar[left]">
Index: userctrl.tpl
===================================================================
--- userctrl.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ userctrl.tpl (.../trunk/templates) (revision 1515)
@@ -21,7 +21,7 @@
</div>
</if>
-<table style="width: 100%" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]" border="$stylevar[border]">
+<table class="table">
<tr valign="top">
<td width="50%">
<!-- user options -->
@@ -73,17 +73,17 @@
<div class="box-head" style="text-align: $stylevar[left]">{@"Email Options"}</div>
<div class="box-mid">
- <table cellspacing="2" cellpadding="1" border="0" style="width: 100%">
+ <table class="table">
<tr style="text-align: center">
<td> </td>
- <td style="background-color: $stylevar[alt_color]"><strong>{@"Reporter"}</strong></td>
+ <td class="altcolor"<strong>{@"Reporter"}</strong></td>
<td><strong>{@"Assignee"}</strong></td>
- <td style="background-color: $stylevar[alt_color]"><strong>{@"Favorite"}</strong></td>
+ <td class="altcolor"<strong>{@"Favorite"}</strong></td>
<td><strong>{@"Voter"}</strong></td>
- <td style="background-color: $stylevar[alt_color]"><strong>{@"Commenter"}</strong></td>
+ <td class="altcolor"<strong>{@"Commenter"}</strong></td>
</tr>
- <tr style="text-align: center; background-color: $stylevar[alt_color]">
+ <tr class="altcolor textcenter">
<td style="text-align: $stylevar[left]">{@"New bug is added"}</td>
<td colspan="5"><input type="checkbox" name="emailopts[0][2048]"{$checked[0][2048]} value="1" /></td>
</tr>
@@ -93,7 +93,7 @@
<td colspan="5"><input type="checkbox" name="emailopts[0][32]"{$checked[0][32]} value="1" /></td>
</tr>
- <tr style="text-align: center; background-color: $stylevar[alt_color]">
+ <tr class="altcolor textcenter">
<td style="text-align: $stylevar[left]">{@"Status or resolution changes"}</td>
<td><input type="checkbox" name="emailopts[1][64]"{$checked[1][64]} value="1" /></td>
<td><input type="checkbox" name="emailopts[2][64]"{$checked[2][64]} value="1" /></td>
@@ -111,7 +111,7 @@
<td><input type="checkbox" name="emailopts[16][128]"{$checked[16][128]} value="1" /></td>
</tr>
- <tr style="text-align: center; background-color: $stylevar[alt_color]">
+ <tr class="altcolor textcenter">
<td style="text-align: $stylevar[left]">{@"A new comment is added"}</td>
<td><input type="checkbox" name="emailopts[1][256]"{$checked[1][256]} value="1" /></td>
<td><input type="checkbox" name="emailopts[2][256]"{$checked[2][256]} value="1" /></td>
@@ -129,7 +129,7 @@
<td><input type="checkbox" name="emailopts[16][512]"{$checked[16][512]} value="1" /></td>
</tr>
- <tr style="text-align: center; background-color: $stylevar[alt_color]">
+ <tr class="altcolor textcenter">
<td style="text-align: $stylevar[left]">{@"Any other field changes"}</td>
<td><input type="checkbox" name="emailopts[1][1024]"{$checked[1][1024]} value="1" /></td>
<td><input type="checkbox" name="emailopts[2][1024]"{$checked[2][1024]} value="1" /></td>
@@ -219,7 +219,7 @@
<fieldset>
<legend>{@"Bug List Columns"} $help[columnorder]</legend>
- <table cellspacing="2" cellpadding="1" border="0">
+ <table class="table" style="width: auto">
$columnOptions
</table>
</fieldset>
Index: lostpassword.tpl
===================================================================
--- lostpassword.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ lostpassword.tpl (.../trunk/templates) (revision 1515)
@@ -14,7 +14,7 @@
<input type="hidden" name="do" value="sendpw" />
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head">{@"Lost Password Recovery"}</div>
<div class="box-mid">
Index: login.tpl
===================================================================
--- login.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ login.tpl (.../trunk/templates) (revision 1515)
@@ -15,7 +15,7 @@
<input type="hidden" name="goindex" value="1" />
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head">{@"Login"}</div>
<div class="box-mid">
Index: trackerhome_bits.tpl
===================================================================
--- trackerhome_bits.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ trackerhome_bits.tpl (.../trunk/templates) (revision 1515)
@@ -1,6 +1,6 @@
<!-- bug $bug[bugid] -->
-<tr<if condition="$bug[bgcolor] OR $bug[hidden]"> style="<if condition="$bug[bgcolor]">background-color: $bug[bgcolor]</if><if condition="$bug['hidden']">; font-style: italic</if>"</if>>
+<tr<if condition="$bugsys->userinfo['showcolors']"> style="background-color: $bug[bgcolor]<if condition="$bug['hidden']">; font-style: italic</if>"<else /> class="$bug[bgcolor]"<if condition="$bug['hidden']"> style="font-style: italic"</if></if>>
$fields
</tr>
<!-- / bug $bug[bugid] -->
Index: search_results.tpl
===================================================================
--- search_results.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ search_results.tpl (.../trunk/templates) (revision 1515)
@@ -15,7 +15,7 @@
<br />
</if>
-<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+<table class="table">
<tr class="listinghead">
$columnHeads
</tr>
Index: global.css
===================================================================
--- global.css (.../tags/1.2.0-b1/templates) (revision 1515)
+++ global.css (.../trunk/templates) (revision 1515)
@@ -195,6 +195,33 @@
text-decoration: none;
}
+.table
+{
+ width: 100%;
+ border-collapse: separate;
+ border-spacing: 2px;
+}
+
+.table td
+{
+ padding: 2px;
+}
+
+.altcolor
+{
+ background-color: rgb(191, 204, 207);
+}
+
+.textcenter
+{
+ text-align: center;
+}
+
+.altwidth
+{
+ width: 45%;
+}
+
/*=====================================================================*\
|| ###################################################################
|| # $HeadURL$
Index: explain_automation.tpl
===================================================================
--- explain_automation.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ explain_automation.tpl (.../trunk/templates) (revision 1515)
@@ -11,7 +11,7 @@
<h2>{@"Explication of Automations"}</h2>
-<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+<table class="table">
$automations
</table>
Index: explain_product.tpl
===================================================================
--- explain_product.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ explain_product.tpl (.../trunk/templates) (revision 1515)
@@ -12,11 +12,11 @@
<h2>{@"Explication of Products"}</h2>
<if condition="$globalversions">
- <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+ <table class="table">
<tr class="listinghead">
<td colspan="2">{@"Global Versions"}</td>
</tr>
- <tr style="background-color: $stylevar[alt_color]">
+ <tr class="altcolor">
<td colspan="2">{@"These versions are avaliable for every product, component, and version."}</td>
</tr>
$globalversions
@@ -25,7 +25,7 @@
<br />
-<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+<table class="table">
<tr class="listinghead">
<td colspan="2">{@"Products (components are in white)"}</td>
</tr>
Index: history.tpl
===================================================================
--- history.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ history.tpl (.../trunk/templates) (revision 1515)
@@ -11,7 +11,7 @@
<h2><lang 1="$bug[summary]" 2="$bug[bugid]">{@"History for <a href="showreport.php?bugid=%2$d"><em>%1$s</em></a> (bugid: %2$s)"}</lang></h2>
-<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+<table class="table">
<tr class="listinghead">
<td>{@"User"}</td>
<td>{@"Date"}</td>
Index: quicksearch.tpl
===================================================================
--- quicksearch.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ quicksearch.tpl (.../trunk/templates) (revision 1515)
@@ -11,7 +11,7 @@
$header
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head" style="text-align: $stylevar[left]">{@"Quick Search"}</div>
<div class="box-mid box-overpad" style="text-align: $stylevar[left]">
Index: trackerhome.tpl
===================================================================
--- trackerhome.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ trackerhome.tpl (.../trunk/templates) (revision 1515)
@@ -9,7 +9,7 @@
$header
-<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+<table class="table">
<tr class="listinghead">
$columnHeads</tr>
$bugs
Index: passwordreset.tpl
===================================================================
--- passwordreset.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ passwordreset.tpl (.../trunk/templates) (revision 1515)
@@ -22,7 +22,7 @@
</if>
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head">{@"Lost Password Recovery: Password Reset"}</div>
<div class="box-mid">
Index: std_redirect.tpl
===================================================================
--- std_redirect.tpl (.../tags/1.2.0-b1/templates) (revision 1515)
+++ std_redirect.tpl (.../trunk/templates) (revision 1515)
@@ -12,7 +12,7 @@
$header
<div align="center" style="margin-top: 10px">
- <div class="box" style="width: $stylevar[alternate_width]">
+ <div class="box altwidth">
<div class="box-head" style="text-align: $stylevar[left]">{@"Redirect..."}</div>
<div class="box-mid box-overpad" style="text-align: $stylevar[left]">
Index: global.js
===================================================================
--- global.js (.../tags/1.2.0-b1/templates) (revision 1515)
+++ global.js (.../trunk/templates) (revision 1515)
@@ -20,7 +20,7 @@
function draw_cancel(location)
{
- location = (location == "" ? "history.back(1)" : "window.location=\"" + location + "\"");
+ location = (location == "" ? "history.back(1)" : "window.location='" + location + "'");
document.write("<input name=\"cancel\" type=\"button\" value=\"" + lang["Cancel"] + "\" onclick=\"" + location + "\" />");
}