r1128: Adding the template diff.
authorRobert Sesek <rsesek@bluestatic.org>
Tue, 22 Aug 2006 02:33:50 +0000 (02:33 +0000)
committerRobert Sesek <rsesek@bluestatic.org>
Tue, 22 Aug 2006 02:33:50 +0000 (02:33 +0000)
install/templates/1.1.0 Beta 1 - 1.1.0 Beta 2.diff [new file with mode: 0644]

diff --git a/install/templates/1.1.0 Beta 1 - 1.1.0 Beta 2.diff b/install/templates/1.1.0 Beta 1 - 1.1.0 Beta 2.diff
new file mode 100644 (file)
index 0000000..50dbeb3
--- /dev/null
@@ -0,0 +1,310 @@
+Index: favourites.tpl
+===================================================================
+--- favourites.tpl     (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ favourites.tpl     (.../trunk/templates)   (revision 1127)
+@@ -1,32 +0,0 @@
+-$doctype
+-<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
+-<head>
+-$headinclude
+-      <title>{$bugsys->options['trackertitle']} - {@"My Favourite Bugs"}</title>
+-</head>
+-
+-<body>
+-
+-$header
+-
+-<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+-<tr class="listinghead">
+-      <td>{@"ID"}</td>
+-      <td>{@"Summary/Reporter"}</td>
+-      <td>{@"Product/Version"}</td>
+-      <td>{@"Status/Resolution"}</td>
+-      <td>{@"Priority/Severity"}</td>
+-      <td>{@"Last Post"}</td>
+-</tr>
+-$bugs
+-</table>
+-
+-<if condition="$show['pagenav']">
+-<!-- pagenav -->
+-<div align="right">
+-$pagenav
+-</div>
+-<!-- / pagenav -->
+-</if>
+-
+-$footer
+\ No newline at end of file
+Index: newreport.tpl
+===================================================================
+--- newreport.tpl      (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ newreport.tpl      (.../trunk/templates)   (revision 1127)
+@@ -119,7 +119,7 @@
+ <div id="submitrow">
+       <input type="submit" name="submit" value="  {@"Submit Report"} " accesskey="s" />
+       <input type="reset" name="reset" value="  {@"Reset Fields"}  " accesskey="r" />
+-      <input type="submit" name="submit_reload" value="  {@"Submit Report and Add Another Bug"} " accesskey="s" />
++      <input type="submit" name="submit_reload" value="  {@"Submit Report and Add Another Bug"} " accesskey="e" />
+ </div>
+ <!-- / submit row -->
+Index: history_bit.tpl
+===================================================================
+--- history_bit.tpl    (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ history_bit.tpl    (.../trunk/templates)   (revision 1127)
+@@ -1,4 +1,4 @@
+-<tr style="vertical-align: top<if condition="$bgcolour">; background-color: $bgcolour</if>">
++<tr style="vertical-align: top<if condition="$bgcolor">; background-color: $bgcolor</if>">
+       <td width="10%"><if condition="$show['group']">$log[user]<else />&nbsp;</if></td>
+       <td width="20%"><if condition="$show['group']">$log[date]<else />&nbsp;</if></td>
+       <td width="20%">$log[field]</td>
+Index: favorites.tpl
+===================================================================
+--- favorites.tpl      (.../tags/1.1.0-b1/templates)   (revision 0)
++++ favorites.tpl      (.../trunk/templates)   (revision 1127)
+@@ -0,0 +1,32 @@
++$doctype
++<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
++<head>
++$headinclude
++      <title>{$bugsys->options['trackertitle']} - {@"My Favorite Bugs"}</title>
++</head>
++
++<body>
++
++$header
++
++<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
++<tr class="listinghead">
++      <td>{@"ID"}</td>
++      <td>{@"Summary/Reporter"}</td>
++      <td>{@"Product/Version"}</td>
++      <td>{@"Status/Resolution"}</td>
++      <td>{@"Priority/Severity"}</td>
++      <td>{@"Last Post"}</td>
++</tr>
++$bugs
++</table>
++
++<if condition="$show['pagenav']">
++<!-- pagenav -->
++<div align="right">
++$pagenav
++</div>
++<!-- / pagenav -->
++</if>
++
++$footer
+\ No newline at end of file
+
+Property changes on: favorites.tpl
+___________________________________________________________________
+Name: svn:keywords
+   + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
+
+Index: userctrl.tpl
+===================================================================
+--- userctrl.tpl       (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ userctrl.tpl       (.../trunk/templates)   (revision 1127)
+@@ -41,9 +41,9 @@
+                                       </fieldset>
+                                       
+                                       <fieldset>
+-                                              <legend>{@"Show Status Colours on Bug Listings"}</legend>
+-                                              <input type="radio" name="showcolours" value="1"<if condition="$userinfo['showcolours']"> checked="checked"</if> /> {@"Yes"}
+-                                              <input type="radio" name="showcolours" value="0"<if condition="!$userinfo['showcolours']"> checked="checked"</if> /> {@"No"}
++                                              <legend>{@"Show Status Colors on Bug Listings"}</legend>
++                                              <input type="radio" name="showcolors" value="1"<if condition="$userinfo['showcolors']"> checked="checked"</if> /> {@"Yes"}
++                                              <input type="radio" name="showcolors" value="0"<if condition="!$userinfo['showcolors']"> checked="checked"</if> /> {@"No"}
+                                       </fieldset>
+                                       
+                                       <fieldset>
+@@ -115,14 +115,14 @@
+                                       <table cellspacing="2" cellpadding="1" border="0" style="width: 100%">
+                                       <tr style="text-align: center">
+                                               <td>&nbsp;</td>
+-                                              <td style="background-color: $stylevar[alt_colour]"><strong>{@"Reporter"}</strong></td>
++                                              <td style="background-color: $stylevar[alt_color]"><strong>{@"Reporter"}</strong></td>
+                                               <td><strong>{@"Assignee"}</strong></td>
+-                                              <td style="background-color: $stylevar[alt_colour]"><strong>{@"Favourite"}</strong></td>
++                                              <td style="background-color: $stylevar[alt_color]"><strong>{@"Favorite"}</strong></td>
+                                               <td><strong>{@"Voter"}</strong></td>
+-                                              <td style="background-color: $stylevar[alt_colour]"><strong>{@"Commenter"}</strong></td>
++                                              <td style="background-color: $stylevar[alt_color]"><strong>{@"Commenter"}</strong></td>
+                                       </tr>
+                                       
+-                                      <tr style="text-align: center; background-color: $stylevar[alt_colour]">
++                                      <tr style="text-align: center; background-color: $stylevar[alt_color]">
+                                               <td style="text-align: left">{@"New bug is added"}</td>
+                                               <td colspan="5"><input type="checkbox" name="emailopts[0][2048]"{$checked[0][2048]} value="1" /></td>
+                                       </tr>
+@@ -132,7 +132,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_colour]">
++                                      <tr style="text-align: center; background-color: $stylevar[alt_color]">
+                                               <td style="text-align: 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>
+@@ -150,7 +150,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_colour]">
++                                      <tr style="text-align: center; background-color: $stylevar[alt_color]">
+                                               <td style="text-align: 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>
+@@ -168,7 +168,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_colour]">
++                                      <tr style="text-align: center; background-color: $stylevar[alt_color]">
+                                               <td style="text-align: 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>
+@@ -195,12 +195,12 @@
+                                       
+                                       <fieldset>
+                                               <legend>{@"Default Sort Order Column"}</legend>
+-                                              <select name="defaultsortkey">$defaultsortkey</select>
++                                              $defaultsortkey
+                                       </fieldset>
+                                       
+                                       <fieldset>
+                                               <legend>{@"Default Sort Order Direction"}</legend>
+-                                              <select name="defaultsortas">$defaultsortas</select>
++                                              $defaultsortas
+                                       </fieldset>
+                               </div>
+                       </div>
+Index: search.tpl
+===================================================================
+--- search.tpl (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ search.tpl (.../trunk/templates)   (revision 1127)
+@@ -141,18 +141,18 @@
+               <!-- / severity -->
+               
+               <if condition="$bugsys->userinfo['userid']">
+-              <!-- favourite -->
++              <!-- favorite -->
+               <fieldset>
+-                      <legend>{@"Favourite"}</legend>
++                      <legend>{@"Favorite"}</legend>
+                       <div class="field">
+-                              <select name="favourite">
+-                                      <option value="-1">{@"Ignore favourite status"}</option>
+-                                      <option value="1">{@"Yes, search for favourites only"}</option>
+-                                      <option value="0">{@"No, exclude all favourites"}</option>
++                              <select name="favorite">
++                                      <option value="-1">{@"Ignore favorite status"}</option>
++                                      <option value="1">{@"Yes, search for favorites only"}</option>
++                                      <option value="0">{@"No, exclude all favorites"}</option>
+                               </select>
+                       </div>
+               </fieldset>
+-              <!-- / favourite -->
++              <!-- / favorite -->
+               </if>
+               
+               $customfields[right]
+Index: login.tpl
+===================================================================
+--- login.tpl  (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ login.tpl  (.../trunk/templates)   (revision 1127)
+@@ -3,7 +3,7 @@
+ <head>
+ $headinclude
+       <link rel="stylesheet" href="templates/box.css" media="screen" />
+-      <title>{$bugsys->options['trackertitle']} - Login</title>
++      <title>{$bugsys->options['trackertitle']} - {@"Login"}</title>
+ </head>
+ <body>
+Index: showreport.tpl
+===================================================================
+--- showreport.tpl     (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ showreport.tpl     (.../trunk/templates)   (revision 1127)
+@@ -35,7 +35,7 @@
+                               </if>
+                               
+                               / [<a href="showhistory.php?bugid=$bug[bugid]">{@"Show Bug History"}</a>]
+-                              <if condition="$show['subscribe']">/ [<a href="favourite.php?do=handle&amp;bugid=$bug[bugid]">$favouritetext</a>]</if>
++                              <if condition="$show['subscribe']">/ [<a href="favorite.php?do=handle&amp;bugid=$bug[bugid]">$favoritetext</a>]</if>
+                               <if condition="$show['delete']">/ [<a href="editreport.php?do=delete&amp;bugid=$bug[bugid]">{@"Delete"}</a>]</if>
+                       </div>
+               </fieldset>
+Index: trackerhome_bits.tpl
+===================================================================
+--- trackerhome_bits.tpl       (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ trackerhome_bits.tpl       (.../trunk/templates)   (revision 1127)
+@@ -1,6 +1,6 @@
+ <!-- bug $bug[bugid] -->
+-<tr<if condition="$bug[bgcolour] OR $bug[hidden]"> style="<if condition="$bug[bgcolour]">background-color: $bug[bgcolour]</if><if condition="$bug['hidden']">; font-style: italic</if>"</if>>
++<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>>
+       <td>$bug[bugid]</td>
+       <td>
+               <div><a href="showreport.php?bugid=$bug[bugid]$bug[urladd]">$bug[summary]</a></div>
+Index: header.tpl
+===================================================================
+--- header.tpl (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ header.tpl (.../trunk/templates)   (revision 1127)
+@@ -12,7 +12,7 @@
+ </if>
+ <div id="tabbar">
+-      <span style="float: right" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="@{"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
++      <span style="float: right" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="{@"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
+       
+       <a class="tab$focus[index]" href="index.php">{@"Listing"}</a>
+       <if condition="$show['newreport']">
+@@ -23,7 +23,7 @@
+               <a class="tab$focus[search]" href="search.php">{@"Search"}</a>
+       </if>
+       <if condition="$bugsys->userinfo['userid']">
+-              <a class="tab$focus[favourites]" href="favourite.php">{@"My Favourites"}</a>
++              <a class="tab$focus[favorites]" href="favorite.php">{@"My Favorites"}</a>
+       </if>
+       <a class="tab$focus[user]" href="<if condition="$bugsys->userinfo['userid']">userctrl.php">{@"My Controls"}<else />login.php">{@"Login/Register"}</if></a>
+       <if condition="$show['admin']">
+Index: explain_product.tpl
+===================================================================
+--- explain_product.tpl        (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ explain_product.tpl        (.../trunk/templates)   (revision 1127)
+@@ -16,7 +16,7 @@
+       <tr class="listinghead">
+               <td colspan="2">{@"Global Versions"}</td>
+       </tr>
+-      <tr style="background-color: $stylevar[alt_colour]">
++      <tr style="background-color: $stylevar[alt_color]">
+               <td colspan="2">{@"These versions are avaliable for every product, component, and version."}</td>
+       </tr>
+       $globalversions
+@@ -27,7 +27,7 @@
+ <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
+ <tr class="listinghead">
+-      <td colspan="2">{@"Products"} (components are in white)</td>
++      <td colspan="2">{@"Products (components are in white)"}</td>
+ </tr>
+ $productlist
+ </table>
+Index: stylevars.txt
+===================================================================
+--- stylevars.txt      (.../tags/1.1.0-b1/templates)   (revision 1127)
++++ stylevars.txt      (.../trunk/templates)   (revision 1127)
+@@ -46,8 +46,8 @@
+ normal-width: 100%;
+ alternate-width: 45%;
+-/* alternate background colour used when status colours aren't displayed */
+-alt-colour: #BFCCCF;
++/* alternate background color used when status colors aren't displayed */
++alt-color: #BFCCCF;
+ /*=====================================================================*\
+ || ###################################################################