]> src.bluestatic.org Git - bugdar.git/blob - install/templates/1.1.0 Beta 1 - 1.1.0 Beta 2.diff
Updated attachment.php to work, sans NotificationCenter
[bugdar.git] / install / templates / 1.1.0 Beta 1 - 1.1.0 Beta 2.diff
1 Index: favourites.tpl
2 ===================================================================
3 --- favourites.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
4 +++ favourites.tpl (.../trunk/templates) (revision 1127)
5 @@ -1,32 +0,0 @@
6 -$doctype
7 -<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
8 -<head>
9 -$headinclude
10 - <title>{$bugsys->options['trackertitle']} - {@"My Favourite Bugs"}</title>
11 -</head>
12 -
13 -<body>
14 -
15 -$header
16 -
17 -<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
18 -<tr class="listinghead">
19 - <td>{@"ID"}</td>
20 - <td>{@"Summary/Reporter"}</td>
21 - <td>{@"Product/Version"}</td>
22 - <td>{@"Status/Resolution"}</td>
23 - <td>{@"Priority/Severity"}</td>
24 - <td>{@"Last Post"}</td>
25 -</tr>
26 -$bugs
27 -</table>
28 -
29 -<if condition="$show['pagenav']">
30 -<!-- pagenav -->
31 -<div align="right">
32 -$pagenav
33 -</div>
34 -<!-- / pagenav -->
35 -</if>
36 -
37 -$footer
38 \ No newline at end of file
39 Index: newreport.tpl
40 ===================================================================
41 --- newreport.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
42 +++ newreport.tpl (.../trunk/templates) (revision 1127)
43 @@ -119,7 +119,7 @@
44 <div id="submitrow">
45 <input type="submit" name="submit" value=" {@"Submit Report"} " accesskey="s" />
46 <input type="reset" name="reset" value=" {@"Reset Fields"} " accesskey="r" />
47 - <input type="submit" name="submit_reload" value=" {@"Submit Report and Add Another Bug"} " accesskey="s" />
48 + <input type="submit" name="submit_reload" value=" {@"Submit Report and Add Another Bug"} " accesskey="e" />
49 </div>
50 <!-- / submit row -->
51
52 Index: history_bit.tpl
53 ===================================================================
54 --- history_bit.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
55 +++ history_bit.tpl (.../trunk/templates) (revision 1127)
56 @@ -1,4 +1,4 @@
57 -<tr style="vertical-align: top<if condition="$bgcolour">; background-color: $bgcolour</if>">
58 +<tr style="vertical-align: top<if condition="$bgcolor">; background-color: $bgcolor</if>">
59 <td width="10%"><if condition="$show['group']">$log[user]<else />&nbsp;</if></td>
60 <td width="20%"><if condition="$show['group']">$log[date]<else />&nbsp;</if></td>
61 <td width="20%">$log[field]</td>
62 Index: favorites.tpl
63 ===================================================================
64 --- favorites.tpl (.../tags/1.1.0-b1/templates) (revision 0)
65 +++ favorites.tpl (.../trunk/templates) (revision 1127)
66 @@ -0,0 +1,32 @@
67 +$doctype
68 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
69 +<head>
70 +$headinclude
71 + <title>{$bugsys->options['trackertitle']} - {@"My Favorite Bugs"}</title>
72 +</head>
73 +
74 +<body>
75 +
76 +$header
77 +
78 +<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
79 +<tr class="listinghead">
80 + <td>{@"ID"}</td>
81 + <td>{@"Summary/Reporter"}</td>
82 + <td>{@"Product/Version"}</td>
83 + <td>{@"Status/Resolution"}</td>
84 + <td>{@"Priority/Severity"}</td>
85 + <td>{@"Last Post"}</td>
86 +</tr>
87 +$bugs
88 +</table>
89 +
90 +<if condition="$show['pagenav']">
91 +<!-- pagenav -->
92 +<div align="right">
93 +$pagenav
94 +</div>
95 +<!-- / pagenav -->
96 +</if>
97 +
98 +$footer
99 \ No newline at end of file
100
101 Property changes on: favorites.tpl
102 ___________________________________________________________________
103 Name: svn:keywords
104 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
105
106 Index: userctrl.tpl
107 ===================================================================
108 --- userctrl.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
109 +++ userctrl.tpl (.../trunk/templates) (revision 1127)
110 @@ -41,9 +41,9 @@
111 </fieldset>
112
113 <fieldset>
114 - <legend>{@"Show Status Colours on Bug Listings"}</legend>
115 - <input type="radio" name="showcolours" value="1"<if condition="$userinfo['showcolours']"> checked="checked"</if> /> {@"Yes"}
116 - <input type="radio" name="showcolours" value="0"<if condition="!$userinfo['showcolours']"> checked="checked"</if> /> {@"No"}
117 + <legend>{@"Show Status Colors on Bug Listings"}</legend>
118 + <input type="radio" name="showcolors" value="1"<if condition="$userinfo['showcolors']"> checked="checked"</if> /> {@"Yes"}
119 + <input type="radio" name="showcolors" value="0"<if condition="!$userinfo['showcolors']"> checked="checked"</if> /> {@"No"}
120 </fieldset>
121
122 <fieldset>
123 @@ -115,14 +115,14 @@
124 <table cellspacing="2" cellpadding="1" border="0" style="width: 100%">
125 <tr style="text-align: center">
126 <td>&nbsp;</td>
127 - <td style="background-color: $stylevar[alt_colour]"><strong>{@"Reporter"}</strong></td>
128 + <td style="background-color: $stylevar[alt_color]"><strong>{@"Reporter"}</strong></td>
129 <td><strong>{@"Assignee"}</strong></td>
130 - <td style="background-color: $stylevar[alt_colour]"><strong>{@"Favourite"}</strong></td>
131 + <td style="background-color: $stylevar[alt_color]"><strong>{@"Favorite"}</strong></td>
132 <td><strong>{@"Voter"}</strong></td>
133 - <td style="background-color: $stylevar[alt_colour]"><strong>{@"Commenter"}</strong></td>
134 + <td style="background-color: $stylevar[alt_color]"><strong>{@"Commenter"}</strong></td>
135 </tr>
136
137 - <tr style="text-align: center; background-color: $stylevar[alt_colour]">
138 + <tr style="text-align: center; background-color: $stylevar[alt_color]">
139 <td style="text-align: left">{@"New bug is added"}</td>
140 <td colspan="5"><input type="checkbox" name="emailopts[0][2048]"{$checked[0][2048]} value="1" /></td>
141 </tr>
142 @@ -132,7 +132,7 @@
143 <td colspan="5"><input type="checkbox" name="emailopts[0][32]"{$checked[0][32]} value="1" /></td>
144 </tr>
145
146 - <tr style="text-align: center; background-color: $stylevar[alt_colour]">
147 + <tr style="text-align: center; background-color: $stylevar[alt_color]">
148 <td style="text-align: left">{@"Status or resolution changes"}</td>
149 <td><input type="checkbox" name="emailopts[1][64]"{$checked[1][64]} value="1" /></td>
150 <td><input type="checkbox" name="emailopts[2][64]"{$checked[2][64]} value="1" /></td>
151 @@ -150,7 +150,7 @@
152 <td><input type="checkbox" name="emailopts[16][128]"{$checked[16][128]} value="1" /></td>
153 </tr>
154
155 - <tr style="text-align: center; background-color: $stylevar[alt_colour]">
156 + <tr style="text-align: center; background-color: $stylevar[alt_color]">
157 <td style="text-align: left">{@"A new comment is added"}</td>
158 <td><input type="checkbox" name="emailopts[1][256]"{$checked[1][256]} value="1" /></td>
159 <td><input type="checkbox" name="emailopts[2][256]"{$checked[2][256]} value="1" /></td>
160 @@ -168,7 +168,7 @@
161 <td><input type="checkbox" name="emailopts[16][512]"{$checked[16][512]} value="1" /></td>
162 </tr>
163
164 - <tr style="text-align: center; background-color: $stylevar[alt_colour]">
165 + <tr style="text-align: center; background-color: $stylevar[alt_color]">
166 <td style="text-align: left">{@"Any other field changes"}</td>
167 <td><input type="checkbox" name="emailopts[1][1024]"{$checked[1][1024]} value="1" /></td>
168 <td><input type="checkbox" name="emailopts[2][1024]"{$checked[2][1024]} value="1" /></td>
169 @@ -195,12 +195,12 @@
170
171 <fieldset>
172 <legend>{@"Default Sort Order Column"}</legend>
173 - <select name="defaultsortkey">$defaultsortkey</select>
174 + $defaultsortkey
175 </fieldset>
176
177 <fieldset>
178 <legend>{@"Default Sort Order Direction"}</legend>
179 - <select name="defaultsortas">$defaultsortas</select>
180 + $defaultsortas
181 </fieldset>
182 </div>
183 </div>
184 Index: search.tpl
185 ===================================================================
186 --- search.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
187 +++ search.tpl (.../trunk/templates) (revision 1127)
188 @@ -141,18 +141,18 @@
189 <!-- / severity -->
190
191 <if condition="$bugsys->userinfo['userid']">
192 - <!-- favourite -->
193 + <!-- favorite -->
194 <fieldset>
195 - <legend>{@"Favourite"}</legend>
196 + <legend>{@"Favorite"}</legend>
197 <div class="field">
198 - <select name="favourite">
199 - <option value="-1">{@"Ignore favourite status"}</option>
200 - <option value="1">{@"Yes, search for favourites only"}</option>
201 - <option value="0">{@"No, exclude all favourites"}</option>
202 + <select name="favorite">
203 + <option value="-1">{@"Ignore favorite status"}</option>
204 + <option value="1">{@"Yes, search for favorites only"}</option>
205 + <option value="0">{@"No, exclude all favorites"}</option>
206 </select>
207 </div>
208 </fieldset>
209 - <!-- / favourite -->
210 + <!-- / favorite -->
211 </if>
212
213 $customfields[right]
214 Index: login.tpl
215 ===================================================================
216 --- login.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
217 +++ login.tpl (.../trunk/templates) (revision 1127)
218 @@ -3,7 +3,7 @@
219 <head>
220 $headinclude
221 <link rel="stylesheet" href="templates/box.css" media="screen" />
222 - <title>{$bugsys->options['trackertitle']} - Login</title>
223 + <title>{$bugsys->options['trackertitle']} - {@"Login"}</title>
224 </head>
225
226 <body>
227 Index: showreport.tpl
228 ===================================================================
229 --- showreport.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
230 +++ showreport.tpl (.../trunk/templates) (revision 1127)
231 @@ -35,7 +35,7 @@
232 </if>
233
234 / [<a href="showhistory.php?bugid=$bug[bugid]">{@"Show Bug History"}</a>]
235 - <if condition="$show['subscribe']">/ [<a href="favourite.php?do=handle&amp;bugid=$bug[bugid]">$favouritetext</a>]</if>
236 + <if condition="$show['subscribe']">/ [<a href="favorite.php?do=handle&amp;bugid=$bug[bugid]">$favoritetext</a>]</if>
237 <if condition="$show['delete']">/ [<a href="editreport.php?do=delete&amp;bugid=$bug[bugid]">{@"Delete"}</a>]</if>
238 </div>
239 </fieldset>
240 Index: trackerhome_bits.tpl
241 ===================================================================
242 --- trackerhome_bits.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
243 +++ trackerhome_bits.tpl (.../trunk/templates) (revision 1127)
244 @@ -1,6 +1,6 @@
245
246 <!-- bug $bug[bugid] -->
247 -<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>>
248 +<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>>
249 <td>$bug[bugid]</td>
250 <td>
251 <div><a href="showreport.php?bugid=$bug[bugid]$bug[urladd]">$bug[summary]</a></div>
252 Index: header.tpl
253 ===================================================================
254 --- header.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
255 +++ header.tpl (.../trunk/templates) (revision 1127)
256 @@ -12,7 +12,7 @@
257 </if>
258
259 <div id="tabbar">
260 - <span style="float: right" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="@{"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
261 + <span style="float: right" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="{@"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
262
263 <a class="tab$focus[index]" href="index.php">{@"Listing"}</a>
264 <if condition="$show['newreport']">
265 @@ -23,7 +23,7 @@
266 <a class="tab$focus[search]" href="search.php">{@"Search"}</a>
267 </if>
268 <if condition="$bugsys->userinfo['userid']">
269 - <a class="tab$focus[favourites]" href="favourite.php">{@"My Favourites"}</a>
270 + <a class="tab$focus[favorites]" href="favorite.php">{@"My Favorites"}</a>
271 </if>
272 <a class="tab$focus[user]" href="<if condition="$bugsys->userinfo['userid']">userctrl.php">{@"My Controls"}<else />login.php">{@"Login/Register"}</if></a>
273 <if condition="$show['admin']">
274 Index: explain_product.tpl
275 ===================================================================
276 --- explain_product.tpl (.../tags/1.1.0-b1/templates) (revision 1127)
277 +++ explain_product.tpl (.../trunk/templates) (revision 1127)
278 @@ -16,7 +16,7 @@
279 <tr class="listinghead">
280 <td colspan="2">{@"Global Versions"}</td>
281 </tr>
282 - <tr style="background-color: $stylevar[alt_colour]">
283 + <tr style="background-color: $stylevar[alt_color]">
284 <td colspan="2">{@"These versions are avaliable for every product, component, and version."}</td>
285 </tr>
286 $globalversions
287 @@ -27,7 +27,7 @@
288
289 <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
290 <tr class="listinghead">
291 - <td colspan="2">{@"Products"} (components are in white)</td>
292 + <td colspan="2">{@"Products (components are in white)"}</td>
293 </tr>
294 $productlist
295 </table>
296 Index: stylevars.txt
297 ===================================================================
298 --- stylevars.txt (.../tags/1.1.0-b1/templates) (revision 1127)
299 +++ stylevars.txt (.../trunk/templates) (revision 1127)
300 @@ -46,8 +46,8 @@
301 normal-width: 100%;
302 alternate-width: 45%;
303
304 -/* alternate background colour used when status colours aren't displayed */
305 -alt-colour: #BFCCCF;
306 +/* alternate background color used when status colors aren't displayed */
307 +alt-color: #BFCCCF;
308
309 /*=====================================================================*\
310 || ###################################################################