install/templates/1.2.0 Beta 1 - 1.2.0 Beta 2.diff

   1 Index: stylevars.txt
   2 ===================================================================
   3 --- stylevars.txt       (.../tags/1.2.0-b1/templates)   (revision 1515)
   4 +++ stylevars.txt       (.../trunk/templates)   (revision 1515)
   5 @@ -1,57 +0,0 @@
   6 -/*=====================================================================*\
   7 -|| ###################################################################
   8 -|| # Bugdar
   9 -|| # Copyright (c)2004-2008 Blue Static
  10 -|| #
  11 -|| # This program is free software; you can redistribute it and/or modify
  12 -|| # it under the terms of the GNU General Public License as published by
  13 -|| # the Free Software Foundation; version 2 of the License.
  14 -|| #
  15 -|| # This program is distributed in the hope that it will be useful, but
  16 -|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
  17 -|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
  18 -|| # more details.
  19 -|| #
  20 -|| # You should have received a copy of the GNU General Public License along
  21 -|| # with this program; if not, write to the Free Software Foundation, Inc.,
  22 -|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  23 -|| ###################################################################
  24 -\*=====================================================================*/
  25 -
  26 -/*
  27 -This file is parsed to create PHP variables that
  28 -are used in templates with the $stylevar[] array.
  29 -It is similar to how a CSS element would be done.
  30 -
  31 -Each line has:
  32 -variablename: value;
  33 -
  34 -Only letters and numbers are valid in variable names;
  35 -everything else is converted to an undescore.
  36 -
  37 -Values only are allowed to have numbers, letters, dashes,
  38 -periods/decimals, the number/pound sign, and the percent sign.
  39 -
  40 -Comments are only valid in C++ style (the type of comment this is).
  41 -*/
  42 -
  43 -/* table elements */
  44 -
  45 -border: 0;
  46 -spacing: 2;
  47 -padding: 2;
  48 -
  49 -/* page elements */
  50 -
  51 -normal-width: 100%;
  52 -alternate-width: 45%;
  53 -
  54 -/* alternate background color used when status colors aren't displayed */
  55 -alt-color: #BFCCCF;
  56 -
  57 -/*=====================================================================*\
  58 -|| ###################################################################
  59 -|| # $HeadURL$
  60 -|| # $Id$
  61 -|| ###################################################################
  62 -\*=====================================================================*/
  63 \ No newline at end of file
  64 Index: search_save.tpl
  65 ===================================================================
  66 --- search_save.tpl     (.../tags/1.2.0-b1/templates)   (revision 1515)
  67 +++ search_save.tpl     (.../trunk/templates)   (revision 1515)
  68 @@ -22,7 +22,7 @@
  69  <input type="hidden" name="searchid" value="{$bugsys->in['searchid']}" />
  70
  71  <div align="center" style="margin-top: 10px">
  72 -       <div class="box" style="width: $stylevar[alternate_width]">
  73 +       <div class="box altwidth">
  74                 <div class="box-head">{@"Save Search"}</div>
  75
  76                 <div class="box-mid">
  77 Index: register.tpl
  78 ===================================================================
  79 --- register.tpl        (.../tags/1.2.0-b1/templates)   (revision 1515)
  80 +++ register.tpl        (.../trunk/templates)   (revision 1515)
  81 @@ -21,7 +21,7 @@
  82  <input type="hidden" name="do" value="insert" />
  83
  84  <div align="center" style="margin-top: 10px">
  85 -       <div class="box" style="width: $stylevar[alternate_width]">
  86 +       <div class="box altwidth">
  87                 <div class="box-head">{@"Register"}</div>
  88
  89                 <div class="box-mid">
  90 Index: email/accountapproved.xml.tpl
  91 ===================================================================
  92 --- email/accountapproved.xml.tpl       (.../tags/1.2.0-b1/templates)   (revision 0)
  93 +++ email/accountapproved.xml.tpl       (.../trunk/templates)   (revision 1515)
  94 @@ -0,0 +1,8 @@
  95 +<email>
  96 +       <subject>Account Approved at {$bugsys->options['trackertitle']}</subject>
  97 +       <bodyText>Hi $user[displayname],
  98 +
  99 +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.
 100 +
 101 +If you have any questions, please don't hesitate to contact the webmaster.</bodyText>
 102 +</email>
 103 \ No newline at end of file
 104
 105 Property changes on: email/accountapproved.xml.tpl
 106 ___________________________________________________________________
 107 Name: svn:keywords
 108    + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
 109
 110 Index: std_message.tpl
 111 ===================================================================
 112 --- std_message.tpl     (.../tags/1.2.0-b1/templates)   (revision 1515)
 113 +++ std_message.tpl     (.../trunk/templates)   (revision 1515)
 114 @@ -17,7 +17,7 @@
 115  </if>
 116
 117  <div align="center" style="margin-top: 10px">
 118 -       <div class="box" style="width: $stylevar[alternate_width]">
 119 +       <div class="box altwidth">
 120                 <div class="box-head" style="text-align: $stylevar[left]"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
 121
 122                 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
 123 Index: history_bit.tpl
 124 ===================================================================
 125 --- history_bit.tpl     (.../tags/1.2.0-b1/templates)   (revision 1515)
 126 +++ history_bit.tpl     (.../trunk/templates)   (revision 1515)
 127 @@ -1,4 +1,4 @@
 128 -<tr style="vertical-align: top<if condition="$bgcolor">; background-color: $bgcolor</if>">
 129 +<tr style="vertical-align: top"<if condition="$bgcolor"> class="$bgcolor"</if>>
 130         <td width="10%"><if condition="$show['group']">$log[user]<else />&nbsp;</if></td>
 131         <td width="20%"><if condition="$show['group']">$log[date]<else />&nbsp;</if></td>
 132         <td width="20%">$log[field]</td>
 133 Index: favorites.tpl
 134 ===================================================================
 135 --- favorites.tpl       (.../tags/1.2.0-b1/templates)   (revision 1515)
 136 +++ favorites.tpl       (.../trunk/templates)   (revision 1515)
 137 @@ -9,7 +9,7 @@
 138
 139  $header
 140
 141 -<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 142 +<table class="table">
 143  <tr class="listinghead">
 144  $headers
 145  </tr>
 146 Index: std_error.tpl
 147 ===================================================================
 148 --- std_error.tpl       (.../tags/1.2.0-b1/templates)   (revision 1515)
 149 +++ std_error.tpl       (.../trunk/templates)   (revision 1515)
 150 @@ -11,7 +11,7 @@
 151  $header
 152
 153  <div align="center" style="margin-top: 10px">
 154 -       <div class="box" style="width: $stylevar[alternate_width]">
 155 +       <div class="box altwidth">
 156                 <div class="box-head" style="text-align: $stylevar[left]">{@"Error"}</div>
 157
 158                 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
 159 Index: userctrl.tpl
 160 ===================================================================
 161 --- userctrl.tpl        (.../tags/1.2.0-b1/templates)   (revision 1515)
 162 +++ userctrl.tpl        (.../trunk/templates)   (revision 1515)
 163 @@ -21,7 +21,7 @@
 164  </div>
 165  </if>
 166
 167 -<table style="width: 100%" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]" border="$stylevar[border]">
 168 +<table class="table">
 169         <tr valign="top">
 170                 <td width="50%">
 171                         <!-- user options -->
 172 @@ -73,17 +73,17 @@
 173                                 <div class="box-head" style="text-align: $stylevar[left]">{@"Email Options"}</div>
 174
 175                                 <div class="box-mid">
 176 -                                       <table cellspacing="2" cellpadding="1" border="0" style="width: 100%">
 177 +                                       <table class="table">
 178                                         <tr style="text-align: center">
 179                                                 <td>&nbsp;</td>
 180 -                                               <td style="background-color: $stylevar[alt_color]"><strong>{@"Reporter"}</strong></td>
 181 +                                               <td class="altcolor"<strong>{@"Reporter"}</strong></td>
 182                                                 <td><strong>{@"Assignee"}</strong></td>
 183 -                                               <td style="background-color: $stylevar[alt_color]"><strong>{@"Favorite"}</strong></td>
 184 +                                               <td class="altcolor"<strong>{@"Favorite"}</strong></td>
 185                                                 <td><strong>{@"Voter"}</strong></td>
 186 -                                               <td style="background-color: $stylevar[alt_color]"><strong>{@"Commenter"}</strong></td>
 187 +                                               <td class="altcolor"<strong>{@"Commenter"}</strong></td>
 188                                         </tr>
 189
 190 -                                       <tr style="text-align: center; background-color: $stylevar[alt_color]">
 191 +                                       <tr class="altcolor textcenter">
 192                                                 <td style="text-align: $stylevar[left]">{@"New bug is added"}</td>
 193                                                 <td colspan="5"><input type="checkbox" name="emailopts[0][2048]"{$checked[0][2048]} value="1" /></td>
 194                                         </tr>
 195 @@ -93,7 +93,7 @@
 196                                                 <td colspan="5"><input type="checkbox" name="emailopts[0][32]"{$checked[0][32]} value="1" /></td>
 197                                         </tr>
 198
 199 -                                       <tr style="text-align: center; background-color: $stylevar[alt_color]">
 200 +                                       <tr class="altcolor textcenter">
 201                                                 <td style="text-align: $stylevar[left]">{@"Status or resolution changes"}</td>
 202                                                 <td><input type="checkbox" name="emailopts[1][64]"{$checked[1][64]} value="1" /></td>
 203                                                 <td><input type="checkbox" name="emailopts[2][64]"{$checked[2][64]} value="1" /></td>
 204 @@ -111,7 +111,7 @@
 205                                                 <td><input type="checkbox" name="emailopts[16][128]"{$checked[16][128]} value="1" /></td>
 206                                         </tr>
 207
 208 -                                       <tr style="text-align: center; background-color: $stylevar[alt_color]">
 209 +                                       <tr class="altcolor textcenter">
 210                                                 <td style="text-align: $stylevar[left]">{@"A new comment is added"}</td>
 211                                                 <td><input type="checkbox" name="emailopts[1][256]"{$checked[1][256]} value="1" /></td>
 212                                                 <td><input type="checkbox" name="emailopts[2][256]"{$checked[2][256]} value="1" /></td>
 213 @@ -129,7 +129,7 @@
 214                                                 <td><input type="checkbox" name="emailopts[16][512]"{$checked[16][512]} value="1" /></td>
 215                                         </tr>
 216
 217 -                                       <tr style="text-align: center; background-color: $stylevar[alt_color]">
 218 +                                       <tr class="altcolor textcenter">
 219                                                 <td style="text-align: $stylevar[left]">{@"Any other field changes"}</td>
 220                                                 <td><input type="checkbox" name="emailopts[1][1024]"{$checked[1][1024]} value="1" /></td>
 221                                                 <td><input type="checkbox" name="emailopts[2][1024]"{$checked[2][1024]} value="1" /></td>
 222 @@ -219,7 +219,7 @@
 223
 224                                         <fieldset>
 225                                                 <legend>{@"Bug List Columns"} $help[columnorder]</legend>
 226 -                                               <table cellspacing="2" cellpadding="1" border="0">
 227 +                                               <table class="table" style="width: auto">
 228                                                 $columnOptions
 229                                                 </table>
 230                                         </fieldset>
 231 Index: lostpassword.tpl
 232 ===================================================================
 233 --- lostpassword.tpl    (.../tags/1.2.0-b1/templates)   (revision 1515)
 234 +++ lostpassword.tpl    (.../trunk/templates)   (revision 1515)
 235 @@ -14,7 +14,7 @@
 236  <input type="hidden" name="do" value="sendpw" />
 237
 238  <div align="center" style="margin-top: 10px">
 239 -       <div class="box" style="width: $stylevar[alternate_width]">
 240 +       <div class="box altwidth">
 241                 <div class="box-head">{@"Lost Password Recovery"}</div>
 242
 243                 <div class="box-mid">
 244 Index: login.tpl
 245 ===================================================================
 246 --- login.tpl   (.../tags/1.2.0-b1/templates)   (revision 1515)
 247 +++ login.tpl   (.../trunk/templates)   (revision 1515)
 248 @@ -15,7 +15,7 @@
 249  <input type="hidden" name="goindex" value="1" />
 250
 251  <div align="center" style="margin-top: 10px">
 252 -       <div class="box" style="width: $stylevar[alternate_width]">
 253 +       <div class="box altwidth">
 254                 <div class="box-head">{@"Login"}</div>
 255
 256                 <div class="box-mid">
 257 Index: trackerhome_bits.tpl
 258 ===================================================================
 259 --- trackerhome_bits.tpl        (.../tags/1.2.0-b1/templates)   (revision 1515)
 260 +++ trackerhome_bits.tpl        (.../trunk/templates)   (revision 1515)
 261 @@ -1,6 +1,6 @@
 262
 263  <!-- bug $bug[bugid] -->
 264 -<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>>
 265 +<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>>
 266  $fields
 267  </tr>
 268  <!-- / bug $bug[bugid] -->
 269 Index: search_results.tpl
 270 ===================================================================
 271 --- search_results.tpl  (.../tags/1.2.0-b1/templates)   (revision 1515)
 272 +++ search_results.tpl  (.../trunk/templates)   (revision 1515)
 273 @@ -15,7 +15,7 @@
 274  <br />
 275  </if>
 276
 277 -<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 278 +<table class="table">
 279  <tr class="listinghead">
 280  $columnHeads
 281  </tr>
 282 Index: global.css
 283 ===================================================================
 284 --- global.css  (.../tags/1.2.0-b1/templates)   (revision 1515)
 285 +++ global.css  (.../trunk/templates)   (revision 1515)
 286 @@ -195,6 +195,33 @@
 287         text-decoration: none;
 288  }
 289
 290 +.table
 291 +{
 292 +       width: 100%;
 293 +       border-collapse: separate;
 294 +       border-spacing: 2px;
 295 +}
 296 +
 297 +.table td
 298 +{
 299 +       padding: 2px;
 300 +}
 301 +
 302 +.altcolor
 303 +{
 304 +       background-color: rgb(191, 204, 207);
 305 +}
 306 +
 307 +.textcenter
 308 +{
 309 +       text-align: center;
 310 +}
 311 +
 312 +.altwidth
 313 +{
 314 +       width: 45%;
 315 +}
 316 +
 317  /*=====================================================================*\
 318  || ###################################################################
 319  || # $HeadURL$
 320 Index: explain_automation.tpl
 321 ===================================================================
 322 --- explain_automation.tpl      (.../tags/1.2.0-b1/templates)   (revision 1515)
 323 +++ explain_automation.tpl      (.../trunk/templates)   (revision 1515)
 324 @@ -11,7 +11,7 @@
 325
 326  <h2>{@"Explication of Automations"}</h2>
 327
 328 -<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 329 +<table class="table">
 330  $automations
 331  </table>
 332
 333 Index: explain_product.tpl
 334 ===================================================================
 335 --- explain_product.tpl (.../tags/1.2.0-b1/templates)   (revision 1515)
 336 +++ explain_product.tpl (.../trunk/templates)   (revision 1515)
 337 @@ -12,11 +12,11 @@
 338  <h2>{@"Explication of Products"}</h2>
 339
 340  <if condition="$globalversions">
 341 -       <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 342 +       <table class="table">
 343         <tr class="listinghead">
 344                 <td colspan="2">{@"Global Versions"}</td>
 345         </tr>
 346 -       <tr style="background-color: $stylevar[alt_color]">
 347 +       <tr class="altcolor">
 348                 <td colspan="2">{@"These versions are avaliable for every product, component, and version."}</td>
 349         </tr>
 350         $globalversions
 351 @@ -25,7 +25,7 @@
 352
 353  <br />
 354
 355 -<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 356 +<table class="table">
 357  <tr class="listinghead">
 358         <td colspan="2">{@"Products (components are in white)"}</td>
 359  </tr>
 360 Index: history.tpl
 361 ===================================================================
 362 --- history.tpl (.../tags/1.2.0-b1/templates)   (revision 1515)
 363 +++ history.tpl (.../trunk/templates)   (revision 1515)
 364 @@ -11,7 +11,7 @@
 365
 366  <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>
 367
 368 -<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 369 +<table class="table">
 370  <tr class="listinghead">
 371         <td>{@"User"}</td>
 372         <td>{@"Date"}</td>
 373 Index: quicksearch.tpl
 374 ===================================================================
 375 --- quicksearch.tpl     (.../tags/1.2.0-b1/templates)   (revision 1515)
 376 +++ quicksearch.tpl     (.../trunk/templates)   (revision 1515)
 377 @@ -11,7 +11,7 @@
 378  $header
 379
 380  <div align="center" style="margin-top: 10px">
 381 -       <div class="box" style="width: $stylevar[alternate_width]">
 382 +       <div class="box altwidth">
 383                 <div class="box-head" style="text-align: $stylevar[left]">{@"Quick Search"}</div>
 384
 385                 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
 386 Index: trackerhome.tpl
 387 ===================================================================
 388 --- trackerhome.tpl     (.../tags/1.2.0-b1/templates)   (revision 1515)
 389 +++ trackerhome.tpl     (.../trunk/templates)   (revision 1515)
 390 @@ -9,7 +9,7 @@
 391
 392  $header
 393
 394 -<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
 395 +<table class="table">
 396  <tr class="listinghead">
 397         $columnHeads</tr>
 398  $bugs
 399 Index: passwordreset.tpl
 400 ===================================================================
 401 --- passwordreset.tpl   (.../tags/1.2.0-b1/templates)   (revision 1515)
 402 +++ passwordreset.tpl   (.../trunk/templates)   (revision 1515)
 403 @@ -22,7 +22,7 @@
 404  </if>
 405
 406  <div align="center" style="margin-top: 10px">
 407 -       <div class="box" style="width: $stylevar[alternate_width]">
 408 +       <div class="box altwidth">
 409                 <div class="box-head">{@"Lost Password Recovery: Password Reset"}</div>
 410
 411                 <div class="box-mid">
 412 Index: std_redirect.tpl
 413 ===================================================================
 414 --- std_redirect.tpl    (.../tags/1.2.0-b1/templates)   (revision 1515)
 415 +++ std_redirect.tpl    (.../trunk/templates)   (revision 1515)
 416 @@ -12,7 +12,7 @@
 417  $header
 418
 419  <div align="center" style="margin-top: 10px">
 420 -       <div class="box" style="width: $stylevar[alternate_width]">
 421 +       <div class="box altwidth">
 422                 <div class="box-head" style="text-align: $stylevar[left]">{@"Redirect..."}</div>
 423
 424                 <div class="box-mid box-overpad" style="text-align: $stylevar[left]">
 425 Index: global.js
 426 ===================================================================
 427 --- global.js   (.../tags/1.2.0-b1/templates)   (revision 1515)
 428 +++ global.js   (.../trunk/templates)   (revision 1515)
 429 @@ -20,7 +20,7 @@
 430
 431  function draw_cancel(location)
 432  {
 433 -       location = (location == "" ? "history.back(1)" : "window.location=\"" + location + "\"");
 434 +       location = (location == "" ? "history.back(1)" : "window.location='" + location + "'");
 435         document.write("<input name=\"cancel\" type=\"button\" value=\"" + lang["Cancel"] + "\" onclick=\"" + location + "\" />");
 436  }
 437