]> src.bluestatic.org Git - bugdar.git/blob - install/templates/1.0.0 - 1.1.0 Beta 1.diff
Fix entity typos
[bugdar.git] / install / templates / 1.0.0 - 1.1.0 Beta 1.diff
1 Index: box.css
2 ===================================================================
3 --- box.css (.../1.0.1/templates) (revision 1087)
4 +++ box.css (.../1.1.0-b1/templates) (revision 1087)
5 @@ -1,12 +1,21 @@
6 /*=====================================================================*\
7 -|| ################################################################### ||
8 +|| ###################################################################
9 || # Bugdar
10 -|| # --------------------------------------------------------------- # ||
11 -|| # Copyright (c)2004-2008 by Iris Studios, Inc. All Rights Reserved. # ||
12 -|| # This file may not be reproduced in any way without permission. # ||
13 -|| # --------------------------------------------------------------- # ||
14 -|| # User License Agreement at http://www.iris-studios.com/license/ # ||
15 -|| ################################################################### ||
16 +|| # Copyright (c)2004-2008 Blue Static
17 +|| #
18 +|| # This program is free software; you can redistribute it and/or modify
19 +|| # it under the terms of the GNU General Public License as published by
20 +|| # the Free Software Foundation; version 2 of the License.
21 +|| #
22 +|| # This program is distributed in the hope that it will be useful, but
23 +|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
24 +|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
25 +|| # more details.
26 +|| #
27 +|| # You should have received a copy of the GNU General Public License along
28 +|| # with this program; if not, write to the Free Software Foundation, Inc.,
29 +|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
30 +|| ###################################################################
31 \*=====================================================================*/
32
33 .box
34 Index: register.tpl
35 ===================================================================
36 --- register.tpl (.../1.0.1/templates) (revision 1087)
37 +++ register.tpl (.../1.1.0-b1/templates) (revision 1087)
38 @@ -34,7 +34,7 @@
39 <div><strong>{@"Language"}:</strong> <select name="languageid">$opts</select></div>
40 </div>
41
42 - <div class="box-foot + box-center">
43 + <div class="box-foot box-center">
44 <input type="submit" name="submit" value=" {@"Register"} " accesskey="s" />
45 <input type="reset" name="reset" value=" {@"Reset"} " accesskey="r" />
46 </div>
47 Index: newreport.tpl
48 ===================================================================
49 --- newreport.tpl (.../1.0.1/templates) (revision 1087)
50 +++ newreport.tpl (.../1.1.0-b1/templates) (revision 1087)
51 @@ -55,6 +55,8 @@
52 </fieldset>
53 <!-- / severity -->
54
55 + $customfields[left]
56 +
57 </div>
58 <!-- / LEFT COLUMN -->
59
60 @@ -94,12 +96,14 @@
61 </fieldset>
62 <!-- / priority -->
63 </if>
64 -
65 +
66 + $customfields[right]
67 +
68 </div>
69 <!-- / RIGHT COLUMN -->
70 </div>
71
72 -<div id="clear-spill"></div>
73 +<div class="clearspill"></div>
74
75 <!-- new reply -->
76 <div>
77 Index: footer.tpl
78 ===================================================================
79 --- footer.tpl (.../1.0.1/templates) (revision 1087)
80 +++ footer.tpl (.../1.1.0-b1/templates) (revision 1087)
81 @@ -2,7 +2,7 @@
82
83 <div id="copyright">
84 <div><lang 1="$version">{@"Powered by Bugdar %1$s"}</lang></div>
85 - <div>{@"Copyright"} &copy;2002 - $year, Iris Studios, Inc.</div>
86 + <div>{@"Copyright"} &copy;2002 - $year, Blue Static</div>
87 </div>
88
89 </body>
90 Index: showreport_comment.tpl
91 ===================================================================
92 --- showreport_comment.tpl (.../1.0.1/templates) (revision 1087)
93 +++ showreport_comment.tpl (.../1.1.0-b1/templates) (revision 1087)
94 @@ -13,6 +13,7 @@
95 <if condition="$show['editcomment']">
96 <div class="box-foot">
97 <span style="float: right">
98 + <if condition="$show['delete']">[<a href="editcomment.php?do=delete&amp;commentid=$comment[commentid]">{@"Delete"}</a>]</if>
99 [<a href="editcomment.php?commentid=$comment[commentid]">{@"Edit Comment"}</a>]
100 </span>
101 <if condition="$comment['hidden']"><strong>{@"Hidden"}</strong><else />{@"Visible"}</if>
102 Index: std_message.tpl
103 ===================================================================
104 --- std_message.tpl (.../1.0.1/templates) (revision 1087)
105 +++ std_message.tpl (.../1.1.0-b1/templates) (revision 1087)
106 @@ -3,21 +3,41 @@
107 <head>
108 $headinclude
109 <link rel="stylesheet" href="templates/box.css" media="screen" />
110 - <title>{$bugsys->options['trackertitle']} - {@"Notice"}</title>
111 + <title>{$bugsys->options['trackertitle']} - <if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></title>
112 </head>
113
114 <body>
115
116 $header
117
118 +<if condition="$show['confirm']">
119 +<form name="confirm" action="$action" method="post">
120 +<input type="hidden" name="do" value="$do" />
121 +$extra
122 +</if>
123 +
124 <div align="center" style="margin-top: 10px">
125 <div class="box" style="width: $stylevar[alternate_width]">
126 - <div class="box-head">{@"Notice"}</div>
127 + <div class="box-head"><if condition="$show['confirm']">{@"Confirm"}<else />{@"Notice"}</if></div>
128
129 - <div class="box-mid + box-overpad">
130 + <div class="box-mid box-overpad">
131 {$this->process}
132 +
133 + <if condition="$show['confirm']">
134 + <br />
135 + <br />
136 +
137 + <div id="submitrow">
138 + <input type="submit" name="submit" value="$button" />
139 + <script type="text/javascript"> draw_cancel("$cancel"); </script>
140 + </div>
141 + </if>
142 </div>
143 </div>
144 </div>
145
146 +<if condition="$show['confirm']">
147 +</form>
148 +</if>
149 +
150 $footer
151 \ No newline at end of file
152 Index: std_error.tpl
153 ===================================================================
154 --- std_error.tpl (.../1.0.1/templates) (revision 1087)
155 +++ std_error.tpl (.../1.1.0-b1/templates) (revision 1087)
156 @@ -14,7 +14,7 @@
157 <div class="box" style="width: $stylevar[alternate_width]">
158 <div class="box-head">{@"Error"}</div>
159
160 - <div class="box-mid + box-overpad">
161 + <div class="box-mid box-overpad">
162 {$this->process}
163 </div>
164 </div>
165 Index: userctrl.tpl
166 ===================================================================
167 --- userctrl.tpl (.../1.0.1/templates) (revision 1087)
168 +++ userctrl.tpl (.../1.1.0-b1/templates) (revision 1087)
169 @@ -14,99 +14,207 @@
170 <form action="userctrl.php" name="options" method="post">
171 <input type="hidden" name="do" value="update" />
172
173 -<div align="center">
174 -<div style="width: $stylevar[alternate_width]">
175 - <if condition="$show['errors']">
176 - <div class="error">
177 - {@"The following errors occurred"}:
178 - {$message->process}
179 - </div>
180 - </if>
181 +<if condition="$show['errors']">
182 +<div class="error">
183 + {@"The following errors occurred"}:
184 + {$message->process}
185 +</div>
186 +</if>
187
188 - <div class="box">
189 - <div class="box-head">{@"User Options"}</div>
190 +<table style="width: 100%" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]" border="$stylevar[border]">
191 + <tr valign="top">
192 + <td width="50%">
193 + <div class="box">
194 + <!-- user options -->
195 + <div class="box-head">{@"User Options"}</div>
196 +
197 + <div class="box-mid">
198 + <fieldset>
199 + <legend>{@"Display Name"}</legend>
200 + <input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" />
201 + </fieldset>
202 +
203 + <fieldset>
204 + <legend>{@"Show Email Publicly"}</legend>
205 + <input type="radio" name="showemail" value="1"<if condition="$userinfo['showemail']"> checked="checked"</if> /> {@"Yes"}
206 + <input type="radio" name="showemail" value="0"<if condition="!$userinfo['showemail']"> checked="checked"</if> /> {@"No"}
207 + </fieldset>
208 +
209 + <fieldset>
210 + <legend>{@"Show Status Colours on Bug Listings"}</legend>
211 + <input type="radio" name="showcolours" value="1"<if condition="$userinfo['showcolours']"> checked="checked"</if> /> {@"Yes"}
212 + <input type="radio" name="showcolours" value="0"<if condition="!$userinfo['showcolours']"> checked="checked"</if> /> {@"No"}
213 + </fieldset>
214 +
215 + <fieldset>
216 + <legend>{@"Language"}</legend>
217 + <select name="languageid">$langselect</select>
218 + </fieldset>
219 +
220 + <fieldset>
221 + <legend>{@"Timezone"}</legend>
222 + <select name="timezone">$tzselect</select>
223 + </fieldset>
224 +
225 + <fieldset>
226 + <legend>{@"Observe Daylight Savings Time (DST)"}</legend>
227 + <input type="checkbox" name="usedst" value="1"<if condition="$userinfo['usedst']"> checked="checked"</if> /> {@"Yes, I'm currently observing DST"}
228 + </fieldset>
229 + </div>
230 + </div>
231 + </td>
232 + <!-- / user options -->
233
234 - <div class="box-mid">
235 - <fieldset>
236 - <legend>{@"Display Name"}</legend>
237 - <input type="text" name="displayname" value="{$userinfo['displayname']}" size="25" style="width: 100%" />
238 - </fieldset>
239 -
240 - <fieldset>
241 - <legend>{@"Show Email Publicly"}</legend>
242 - <input type="radio" name="showemail" value="1"<if condition="$userinfo['showemail']"> checked="checked"</if> /> Yes
243 - <input type="radio" name="showemail" value="0"<if condition="!$userinfo['showemail']"> checked="checked"</if> /> No
244 - </fieldset>
245 -
246 - <fieldset>
247 - <legend>{@"Show Status Colours on Bug Listings"}</legend>
248 - <input type="radio" name="showcolours" value="1"<if condition="$userinfo['showcolours']"> checked="checked"</if> /> Yes
249 - <input type="radio" name="showcolours" value="0"<if condition="!$userinfo['showcolours']"> checked="checked"</if> /> No
250 - </fieldset>
251 -
252 - <fieldset>
253 - <legend>{@"Language"}</legend>
254 - <select name="languageid">$langselect</select>
255 - </fieldset>
256 -
257 - <fieldset>
258 - <legend>{@"Timezone"}</legend>
259 - <select name="timezone">$tzselect</select>
260 - </fieldset>
261 - </div>
262 - </div>
263 + <br />
264 +
265 + <!-- password and email -->
266 + <td>
267 + <div class="box">
268 + <div class="box-head">
269 + {@"Please enter your password to change these fields"}:
270 + <br />
271 +
272 + <input type="password" name="validate" size="35" />
273 + </div>
274 +
275 + <div class="box-mid box-margmod-top">
276 + <fieldset>
277 + <legend>{@"Password"}</legend>
278 + <input type="password" name="password" size="25" style="width: 100%" />
279 + </fieldset>
280 +
281 + <fieldset>
282 + <legend>{@"Confirm Password"}</legend>
283 + <input type="password" name="password_confirm" size="25" style="width: 100%" />
284 + </fieldset>
285 + </div>
286 +
287 + <div class="box-mid box-margmod-top">
288 + <fieldset>
289 + <legend>{@"Email"}</legend>
290 + <input type="text" name="email" size="25" value="$email" style="width: 100%" />
291 + </fieldset>
292 +
293 + <fieldset>
294 + <legend>{@"Confirm Email"}</legend>
295 + <input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" />
296 + </fieldset>
297 + </div>
298 + </div>
299 + </td>
300 + <!-- / password and email -->
301 + </tr>
302
303 - <br />
304 -
305 - <div class="submitrow">
306 - <input name="submit" type="submit" value=" {@"Submit"} " accesskey="s" />
307 - <input name="reset" type="reset" value=" {@"Reset"} " accesskey="r" />
308 - </div>
309 -
310 - <br />
311 -
312 - <div class="box">
313 - <div class="box-head">
314 - {@"Please enter your password to change these fields"}:
315 - <br />
316 -
317 - <input type="password" name="validate" size="35" />
318 - </div>
319 + <tr valign="top">
320 + <!-- email options -->
321 + <td>
322 + <div class="box">
323 + <div class="box-head">{@"Email Options"}</div>
324 +
325 + <div class="box-mid">
326 + <table cellspacing="2" cellpadding="1" border="0" style="width: 100%">
327 + <tr style="text-align: center">
328 + <td>&nbsp;</td>
329 + <td style="background-color: $stylevar[alt_colour]"><strong>{@"Reporter"}</strong></td>
330 + <td><strong>{@"Assignee"}</strong></td>
331 + <td style="background-color: $stylevar[alt_colour]"><strong>{@"Favourite"}</strong></td>
332 + <td><strong>{@"Voter"}</strong></td>
333 + <td style="background-color: $stylevar[alt_colour]"><strong>{@"Commenter"}</strong></td>
334 + </tr>
335 +
336 + <tr style="text-align: center; background-color: $stylevar[alt_colour]">
337 + <td style="text-align: left">{@"New bug is added"}</td>
338 + <td colspan="5"><input type="checkbox" name="emailopts[0][2048]"{$checked[0][2048]} value="1" /></td>
339 + </tr>
340 +
341 + <tr style="text-align: center">
342 + <td style="text-align: left">{@"I am made the assignee"}</td>
343 + <td colspan="5"><input type="checkbox" name="emailopts[0][32]"{$checked[0][32]} value="1" /></td>
344 + </tr>
345 +
346 + <tr style="text-align: center; background-color: $stylevar[alt_colour]">
347 + <td style="text-align: left">{@"Status or resolution changes"}</td>
348 + <td><input type="checkbox" name="emailopts[1][64]"{$checked[1][64]} value="1" /></td>
349 + <td><input type="checkbox" name="emailopts[2][64]"{$checked[2][64]} value="1" /></td>
350 + <td><input type="checkbox" name="emailopts[4][64]"{$checked[4][64]} value="1" /></td>
351 + <td><input type="checkbox" name="emailopts[8][64]"{$checked[8][64]} value="1" /></td>
352 + <td><input type="checkbox" name="emailopts[16][64]"{$checked[16][64]} value="1" /></td>
353 + </tr>
354 +
355 + <tr style="text-align: center">
356 + <td style="text-align: left">{@"'Duplicates' field is changed"}</td>
357 + <td><input type="checkbox" name="emailopts[1][128]"{$checked[1][128]} value="1" /></td>
358 + <td><input type="checkbox" name="emailopts[2][128]"{$checked[2][128]} value="1" /></td>
359 + <td><input type="checkbox" name="emailopts[4][128]"{$checked[4][128]} value="1" /></td>
360 + <td><input type="checkbox" name="emailopts[8][128]"{$checked[8][128]} value="1" /></td>
361 + <td><input type="checkbox" name="emailopts[16][128]"{$checked[16][128]} value="1" /></td>
362 + </tr>
363 +
364 + <tr style="text-align: center; background-color: $stylevar[alt_colour]">
365 + <td style="text-align: left">{@"A new comment is added"}</td>
366 + <td><input type="checkbox" name="emailopts[1][256]"{$checked[1][256]} value="1" /></td>
367 + <td><input type="checkbox" name="emailopts[2][256]"{$checked[2][256]} value="1" /></td>
368 + <td><input type="checkbox" name="emailopts[4][256]"{$checked[4][256]} value="1" /></td>
369 + <td><input type="checkbox" name="emailopts[8][256]"{$checked[8][256]} value="1" /></td>
370 + <td><input type="checkbox" name="emailopts[16][256]"{$checked[16][256]} value="1" /></td>
371 + </tr>
372 +
373 + <tr style="text-align: center">
374 + <td style="text-align: left">{@"A new attachment is added"}</td>
375 + <td><input type="checkbox" name="emailopts[1][512]"{$checked[1][512]} value="1" /></td>
376 + <td><input type="checkbox" name="emailopts[2][512]"{$checked[2][512]} value="1" /></td>
377 + <td><input type="checkbox" name="emailopts[4][512]"{$checked[4][512]} value="1" /></td>
378 + <td><input type="checkbox" name="emailopts[8][512]"{$checked[8][512]} value="1" /></td>
379 + <td><input type="checkbox" name="emailopts[16][512]"{$checked[16][512]} value="1" /></td>
380 + </tr>
381 +
382 + <tr style="text-align: center; background-color: $stylevar[alt_colour]">
383 + <td style="text-align: left">{@"Any other field changes"}</td>
384 + <td><input type="checkbox" name="emailopts[1][1024]"{$checked[1][1024]} value="1" /></td>
385 + <td><input type="checkbox" name="emailopts[2][1024]"{$checked[2][1024]} value="1" /></td>
386 + <td><input type="checkbox" name="emailopts[4][1024]"{$checked[4][1024]} value="1" /></td>
387 + <td><input type="checkbox" name="emailopts[8][1024]"{$checked[8][1024]} value="1" /></td>
388 + <td><input type="checkbox" name="emailopts[16][1024]"{$checked[16][1024]} value="1" /></td>
389 + </tr>
390 + </table>
391 + </div>
392 + </div>
393 + </td>
394 + <!-- / email options -->
395
396 - <div class="box-mid + box-margmod-top">
397 - <fieldset>
398 - <legend>{@"Password"}</legend>
399 - <input type="password" name="password" size="25" style="width: 100%" />
400 - </fieldset>
401 -
402 - <fieldset>
403 - <legend>{@"Confirm Password"}</legend>
404 - <input type="password" name="password_confirm" size="25" style="width: 100%" />
405 - </fieldset>
406 - </div>
407 -
408 - <div class="box-mid + box-margmod-top">
409 - <fieldset>
410 - <legend>{@"Email"}</legend>
411 - <input type="text" name="email" size="25" value="$email" style="width: 100%" />
412 - </fieldset>
413 -
414 - <fieldset>
415 - <legend>{@"Confirm Email"}</legend>
416 - <input type="text" name="email_confirm" size="25" value="$email_confirm" style="width: 100%" />
417 - </fieldset>
418 - </div>
419 - </div>
420 + <!-- display options -->
421 + <td>
422 + <div class="box">
423 + <div class="box-head">{@"Bug List Display Options"}</div>
424 +
425 + <div class="box-mid">
426 + <fieldset>
427 + <legend>{@"Hidden Statuses on Bug Listing"}</legend>
428 + <select name="hidestatuses[]" multiple="multiple" size="$hidestatusesnum">$hidestatuses</select>
429 + </fieldset>
430 +
431 + <fieldset>
432 + <legend>{@"Default Sort Order Column"}</legend>
433 + <select name="defaultsortkey">$defaultsortkey</select>
434 + </fieldset>
435 +
436 + <fieldset>
437 + <legend>{@"Default Sort Order Direction"}</legend>
438 + <select name="defaultsortas">$defaultsortas</select>
439 + </fieldset>
440 + </div>
441 + </div>
442 + <!-- / display options -->
443 + </td>
444 + </tr>
445 +</table>
446
447 - <br />
448 +<br />
449
450 - <div id="submitrow">
451 - <input name="submit" type="submit" value=" {@"Submit"} " accesskey="s" />
452 - <input name="reset" type="reset" value=" {@"Reset"} " accesskey="r" />
453 - </div>
454 -
455 +<div class="submitrow">
456 + <input name="submit" type="submit" value=" {@"Submit"} " accesskey="s" />
457 + <input name="reset" type="reset" value=" {@"Reset"} " accesskey="r" />
458 </div>
459 -</div>
460
461 </form>
462
463 Index: headinclude.tpl
464 ===================================================================
465 --- headinclude.tpl (.../1.0.1/templates) (revision 1087)
466 +++ headinclude.tpl (.../1.1.0-b1/templates) (revision 1087)
467 @@ -1,5 +1,6 @@
468 <!-- CSS and JavaScript goes here -->
469 <meta http-equiv="Content-Type" content="text/html; charset=$stylevar[charset]" />
470 <link rel="stylesheet" href="templates/global.css" media="screen" />
471 + <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="syndicate.php" />
472 <script type="text/javascript"> var lang = { "Cancel" : "{@"Cancel"}" }; </script>
473 <script src="templates/global.js" type="text/javascript"></script>
474 \ No newline at end of file
475 Index: search.tpl
476 ===================================================================
477 --- search.tpl (.../1.0.1/templates) (revision 1087)
478 +++ search.tpl (.../1.1.0-b1/templates) (revision 1087)
479 @@ -51,14 +51,14 @@
480 <!-- status -->
481 <fieldset>
482 <legend>{@"Status"} $help[status]</legend>
483 - <div class="field"><select name="status">$select[status]</select></div>
484 + <div class="field"><select name="status[]" size="4" multiple="multiple">$select[status]</select></div>
485 </fieldset>
486 <!-- / status -->
487
488 <!-- priority -->
489 <fieldset>
490 <legend>{@"Priority"} $help[priority]</legend>
491 - <div class="field"><select name="priority">$select[priority]</select></div>
492 + <div class="field"><select name="priority[]" size="4" multiple="multiple">$select[priority]</select></div>
493 </fieldset>
494 <!-- / priority -->
495
496 @@ -122,21 +122,21 @@
497 <!-- assignment -->
498 <fieldset>
499 <legend>{@"Assignment"} $help[assignedto]</legend>
500 - <div class="field"><select name="assignedto">$select[dev]</select></div>
501 + <div class="field"><select name="assignedto[]" size="4" multiple="multiple">$select[dev]</select></div>
502 </fieldset>
503 <!-- / assignment -->
504
505 <!-- resolution -->
506 <fieldset>
507 <legend>{@"Resolution"} $help[resolution]</legend>
508 - <div class="field"><select name="resolution">$select[resolution]</select></div>
509 + <div class="field"><select name="resolution[]" size="4" multiple="multiple">$select[resolution]</select></div>
510 </fieldset>
511 <!-- / resolution -->
512
513 <!-- severity -->
514 <fieldset>
515 <legend>{@"Severity"} $help[severity]</legend>
516 - <div class="field"><select name="severity">$select[severity]</select></div>
517 + <div class="field"><select name="severity[]" size="4" multiple="multiple">$select[severity]</select></div>
518 </fieldset>
519 <!-- / severity -->
520
521 @@ -144,7 +144,13 @@
522 <!-- favourite -->
523 <fieldset>
524 <legend>{@"Favourite"}</legend>
525 - <div class="field"><input type="checkbox" name="favourite" value="1" /> {@"Yes, search for favourites only"}</div>
526 + <div class="field">
527 + <select name="favourite">
528 + <option value="-1">{@"Ignore favourite status"}</option>
529 + <option value="1">{@"Yes, search for favourites only"}</option>
530 + <option value="0">{@"No, exclude all favourites"}</option>
531 + </select>
532 + </div>
533 </fieldset>
534 <!-- / favourite -->
535 </if>
536 @@ -155,7 +161,7 @@
537 <!-- / RIGHT COLUMN -->
538 </div>
539
540 -<div id="clear-spill"></div>
541 +<div class="clearspill"></div>
542
543 <div id="submitrow">
544 <input type="submit" name="submit" value=" {@"Search Reports"} " accesskey="s" />
545 Index: images/arrow_asc.gif
546 ===================================================================
547 Cannot display: file marked as a binary type.
548 svn:mime-type = application/octet-stream
549
550 Property changes on: images/arrow_asc.gif
551 ___________________________________________________________________
552 Name: svn:mime-type
553 + application/octet-stream
554
555 Index: images/feed.gif
556 ===================================================================
557 Cannot display: file marked as a binary type.
558 svn:mime-type = application/octet-stream
559
560 Property changes on: images/feed.gif
561 ___________________________________________________________________
562 Name: svn:mime-type
563 + application/octet-stream
564
565 Index: images/arrow_desc.gif
566 ===================================================================
567 Cannot display: file marked as a binary type.
568 svn:mime-type = application/octet-stream
569
570 Property changes on: images/arrow_desc.gif
571 ___________________________________________________________________
572 Name: svn:mime-type
573 + application/octet-stream
574
575 Index: login.tpl
576 ===================================================================
577 --- login.tpl (.../1.0.1/templates) (revision 1087)
578 +++ login.tpl (.../1.1.0-b1/templates) (revision 1087)
579 @@ -26,7 +26,7 @@
580 <a href="register.php">{@"Click here if you do not have an account..."}</a>
581 </div>
582
583 - <div class="box-foot + box-center">
584 + <div class="box-foot box-center">
585 <input type="submit" name="submit" value=" {@"Login"} " accesskey="s" />
586 <input type="reset" name="reset" value=" {@"Reset"} " accesskey="r" />
587 </div>
588 Index: editcomment.tpl
589 ===================================================================
590 --- editcomment.tpl (.../1.0.1/templates) (revision 1087)
591 +++ editcomment.tpl (.../1.1.0-b1/templates) (revision 1087)
592 @@ -26,7 +26,7 @@
593 <lang 1="$comment[commentid]" 2="$bug[bugid]" 3="$bug[summary]">{@"Comment #%1$s in bug #%2$s <em>%3$s</em>"}</lang>
594 </div>
595
596 - <div class="box-foot + box-margmod-bottom"><lang 1="$comment[posttime]" 2="$comment[postby]">{@"Posted on %1$s by %2$s"}</lang></div>
597 + <div class="box-foot box-margmod-bottom"><lang 1="$comment[posttime]" 2="$comment[postby]">{@"Posted on %1$s by %2$s"}</lang></div>
598
599 <div class="box-mid">
600 <if condition="$show['hide']"><div><strong<if condition="$comment['hidden']"> style="color: red"</if>>{@"Hidden"}:</strong> <input type="checkbox" name="hidden" value="1"<if condition="$comment['hidden']"> checked="checked"</if> /></div></if>
601 Index: editattach.tpl
602 ===================================================================
603 --- editattach.tpl (.../1.0.1/templates) (revision 1087)
604 +++ editattach.tpl (.../1.1.0-b1/templates) (revision 1087)
605 @@ -20,7 +20,7 @@
606 <lang 1="$attachment[attachmentid]" 2="$bug[bugid]" 3="$bug[summary]">{@"Attachment #%1$s for Bug #%2$s %3$s"}</lang>
607 </div>
608
609 - <div class="box-mid + box-margmod-bottom">
610 + <div class="box-mid box-margmod-bottom">
611 <div><strong>{@"Attachment"}:</strong> <a href="viewattachment.php?attachmentid=$attachment[attachmentid]">{@"View"}</a> [$attachment[filename]]</div>
612 </div>
613
614 Index: showreport.tpl
615 ===================================================================
616 --- showreport.tpl (.../1.0.1/templates) (revision 1087)
617 +++ showreport.tpl (.../1.1.0-b1/templates) (revision 1087)
618 @@ -5,7 +5,7 @@
619 <link rel="stylesheet" href="templates/report.css" media="screen" />
620 <link rel="stylesheet" href="templates/fields.css" media="screen" />
621 <link rel="stylesheet" href="templates/box.css" media="screen" />
622 - <title><lang 1="$bug[bugid]">{@"Bug Report %1$s"}</lang> - $bug[summary]</title>
623 + <title><lang 1="$bug[bugid]">{@"Bug Report %1$s"}</lang> - $bug[summary_title]</title>
624 </head>
625
626 <body>
627 @@ -36,6 +36,7 @@
628
629 / [<a href="showhistory.php?bugid=$bug[bugid]">{@"Show Bug History"}</a>]
630 <if condition="$show['subscribe']">/ [<a href="favourite.php?do=handle&amp;bugid=$bug[bugid]">$favouritetext</a>]</if>
631 + <if condition="$show['delete']">/ [<a href="editreport.php?do=delete&amp;bugid=$bug[bugid]">{@"Delete"}</a>]</if>
632 </div>
633 </fieldset>
634 <!-- / bug id & hidden -->
635 @@ -52,9 +53,9 @@
636 <legend><a href="explain.php?do=products">{@"Product/Version"}</a> $help[product]</legend>
637 <div class="field">
638 <if condition="$show['edit']">
639 - $bug[product] / <if condition="$bug['componentid']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
640 + $bug[product] / <if condition="$bug['component']">$bug[component] / </if><select name="pcv_select">$pcv_select</select>
641 <else />
642 - $bug[product] <if condition="$bug['componentid']">/ $bug[component]</if> / $bug[version]
643 + $bug[product] <if condition="$bug['component']">/ $bug[component]</if> / $bug[version]
644 </if>
645 </div>
646 </fieldset>
647 @@ -185,7 +186,7 @@
648 <!-- / RIGHT COLUMN -->
649 </div>
650
651 -<div id="clear-spill"></div>
652 +<div class="clearspill"></div>
653
654 <br />
655
656 @@ -258,6 +259,8 @@
657 </div>
658 <!-- / attachments & voting -->
659
660 +<div class="clearspill"></div>
661 +
662 <br />
663
664 $comments
665 Index: newattach.tpl
666 ===================================================================
667 --- newattach.tpl (.../1.0.1/templates) (revision 1087)
668 +++ newattach.tpl (.../1.1.0-b1/templates) (revision 1087)
669 @@ -26,13 +26,13 @@
670 <div class="box">
671 <div class="box-head"><lang 1="$bug[bugid]" 2="$bug[summary]">{@"New Attachment for Bug #%1$s %2$s"}</lang></div>
672
673 - <div class="box-mid + box-margmod-bottom">
674 + <div class="box-mid box-margmod-bottom">
675 <div><input name="attachment" type="file" /></div>
676 <div><strong>{@"Description"}:</strong> <input name="description" type="text" size="35" value="{$bugsys->in['description']}" /></div>
677 </div>
678
679 <if condition="$show['obsoletes']">
680 - <div class="box-mid + box-margmod-bottom">
681 + <div class="box-mid box-margmod-bottom">
682 <div><strong>{@"Mark the Following Attachments Obsolete"}:</strong>
683 $obsoletes
684 </div>
685 Index: trackerhome_bits.tpl
686 ===================================================================
687 --- trackerhome_bits.tpl (.../1.0.1/templates) (revision 1087)
688 +++ trackerhome_bits.tpl (.../1.1.0-b1/templates) (revision 1087)
689 @@ -4,7 +4,7 @@
690 <td>$bug[bugid]</td>
691 <td>
692 <div><a href="showreport.php?bugid=$bug[bugid]$bug[urladd]">$bug[summary]</a></div>
693 - <if condition="$bug['firstreport']"><div>$bug[firstreport]</div></if>
694 + <if condition="$bug['username']"><div>$bug[username]</div></if>
695 </td>
696 <td>
697 <div>$bug[product]</div>
698 @@ -15,8 +15,8 @@
699 <div>$bug[resolution]</div>
700 </td>
701 <td>
702 + <div>$bug[priority]</div>
703 <div>$bug[severity]</div>
704 - <div>$bug[priority]</div>
705 </td>
706 <td>
707 <div>$bug[lastposttime]</div>
708 Index: search_results.tpl
709 ===================================================================
710 --- search_results.tpl (.../1.0.1/templates) (revision 1087)
711 +++ search_results.tpl (.../1.1.0-b1/templates) (revision 1087)
712 @@ -27,4 +27,12 @@
713 $bugs
714 </table>
715
716 +<if condition="$show['pagenav']">
717 +<!-- pagenav -->
718 +<div align="right">
719 +$pagenav
720 +</div>
721 +<!-- / pagenav -->
722 +</if>
723 +
724 $footer
725 \ No newline at end of file
726 Index: favourites.tpl
727 ===================================================================
728 --- favourites.tpl (.../1.0.1/templates) (revision 0)
729 +++ favourites.tpl (.../1.1.0-b1/templates) (revision 1087)
730 @@ -0,0 +1,32 @@
731 +$doctype
732 +<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]" dir="$stylevar[lang_dir]">
733 +<head>
734 +$headinclude
735 + <title>{$bugsys->options['trackertitle']} - {@"My Favourite Bugs"}</title>
736 +</head>
737 +
738 +<body>
739 +
740 +$header
741 +
742 +<table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
743 +<tr class="listinghead">
744 + <td>{@"ID"}</td>
745 + <td>{@"Summary/Reporter"}</td>
746 + <td>{@"Product/Version"}</td>
747 + <td>{@"Status/Resolution"}</td>
748 + <td>{@"Priority/Severity"}</td>
749 + <td>{@"Last Post"}</td>
750 +</tr>
751 +$bugs
752 +</table>
753 +
754 +<if condition="$show['pagenav']">
755 +<!-- pagenav -->
756 +<div align="right">
757 +$pagenav
758 +</div>
759 +<!-- / pagenav -->
760 +</if>
761 +
762 +$footer
763 \ No newline at end of file
764
765 Property changes on: favourites.tpl
766 ___________________________________________________________________
767 Name: svn:keywords
768 + LastChangedDate LastChangedRevision LastChangedBy HeadURL Id Date
769
770 Index: header.tpl
771 ===================================================================
772 --- header.tpl (.../1.0.1/templates) (revision 1087)
773 +++ header.tpl (.../1.1.0-b1/templates) (revision 1087)
774 @@ -5,7 +5,15 @@
775 <span id="time">$datetime</span>
776 </div>
777
778 +<if condition="!$bugsys->userinfo['userid']">
779 +<div class="alertbox">
780 + {@"Hello, guest. We have noticed that you are not registered at this bug tracker. Your experience will be grealy enhanced if you log in. To do so, you first must register by clicking on the <a href="register.php">Register</a> tab at the top. If you are already registered, you can login at the <a href="login.php">Login</a> tab."}
781 +</div>
782 +</if>
783 +
784 <div id="tabbar">
785 + <span style="float: right" class="smallfont"><a href="syndicate.php"><img src="templates/images/feed.gif" alt="@{"Syndicate"}" style="border: 0px" /> {@"Syndicate"}</a></span>
786 +
787 <a class="tab$focus[index]" href="index.php">{@"Listing"}</a>
788 <if condition="$show['newreport']">
789 <a class="tab$focus[newreport]" href="newreport.php">{@"New Bug"}</a>
790 @@ -14,6 +22,9 @@
791 <if condition="$show['search']">
792 <a class="tab$focus[search]" href="search.php">{@"Search"}</a>
793 </if>
794 + <if condition="$bugsys->userinfo['userid']">
795 + <a class="tab$focus[favourites]" href="favourite.php">{@"My Favourites"}</a>
796 + </if>
797 <a class="tab$focus[user]" href="<if condition="$bugsys->userinfo['userid']">userctrl.php">{@"My Controls"}<else />login.php">{@"Login/Register"}</if></a>
798 <if condition="$show['admin']">
799 <a class="tab" href="admin/index.php">{@"Administration"}</a>
800 Index: global.css
801 ===================================================================
802 --- global.css (.../1.0.1/templates) (revision 1087)
803 +++ global.css (.../1.1.0-b1/templates) (revision 1087)
804 @@ -1,12 +1,21 @@
805 /*=====================================================================*\
806 -|| ################################################################### ||
807 +|| ###################################################################
808 || # Bugdar
809 -|| # --------------------------------------------------------------- # ||
810 -|| # Copyright (c)2004-2008 by Iris Studios, Inc. All Rights Reserved. # ||
811 -|| # This file may not be reproduced in any way without permission. # ||
812 -|| # --------------------------------------------------------------- # ||
813 -|| # User License Agreement at http://www.iris-studios.com/license/ # ||
814 -|| ################################################################### ||
815 +|| # Copyright (c)2004-2008 Blue Static
816 +|| #
817 +|| # This program is free software; you can redistribute it and/or modify
818 +|| # it under the terms of the GNU General Public License as published by
819 +|| # the Free Software Foundation; version 2 of the License.
820 +|| #
821 +|| # This program is distributed in the hope that it will be useful, but
822 +|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
823 +|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
824 +|| # more details.
825 +|| #
826 +|| # You should have received a copy of the GNU General Public License along
827 +|| # with this program; if not, write to the Free Software Foundation, Inc.,
828 +|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
829 +|| ###################################################################
830 \*=====================================================================*/
831
832 body
833 @@ -14,7 +23,7 @@
834 margin: 0px;
835 padding: 0px;
836 font-family: Verdana, Tahoma, Geneva, "Lucida Grande", Arial, sans-serif;
837 - font-size: 11px;
838 + font-size: 12px;
839 background-color: rgb(102, 102, 102);
840 }
841
842 @@ -113,6 +122,22 @@
843 font-weight: bold;
844 }
845
846 +.listinghead a
847 +{
848 + color: rgb(255, 255, 255);
849 +}
850 +
851 +.listinghead a:hover
852 +{
853 + color: rgb(64, 102, 112);
854 +}
855 +
856 +.listinghead .select
857 +{
858 + color: rgb(187, 44, 0);
859 + font-style: italic;
860 +}
861 +
862 .form
863 {
864 display: inline;
865 @@ -132,6 +157,32 @@
866 text-align: center;
867 }
868
869 +.clearspill
870 +{
871 + clear: both;
872 +}
873 +
874 +.alertbox
875 +{
876 + background-color: rgb(255, 255, 255);
877 +
878 + color: rgb(236, 0, 0);
879 +
880 + border-color: rgb(202, 27, 0);
881 + border-style: solid;
882 + border-width: 2px;
883 +
884 + padding: 4px;
885 + margin: 4px;
886 +}
887 +
888 +.smallfont, .smallfont a
889 +{
890 + color: rgb(255, 255, 255);
891 + font-size: 10px;
892 + text-decoration: none;
893 +}
894 +
895 /*=====================================================================*\
896 || ###################################################################
897 || # $HeadURL$
898 Index: fields.css
899 ===================================================================
900 --- fields.css (.../1.0.1/templates) (revision 1087)
901 +++ fields.css (.../1.1.0-b1/templates) (revision 1087)
902 @@ -1,12 +1,21 @@
903 /*=====================================================================*\
904 -|| ################################################################### ||
905 +|| ###################################################################
906 || # Bugdar
907 -|| # --------------------------------------------------------------- # ||
908 -|| # Copyright (c)2004-2008 by Iris Studios, Inc. All Rights Reserved. # ||
909 -|| # This file may not be reproduced in any way without permission. # ||
910 -|| # --------------------------------------------------------------- # ||
911 -|| # User License Agreement at http://www.iris-studios.com/license/ # ||
912 -|| ################################################################### ||
913 +|| # Copyright (c)2004-2008 Blue Static
914 +|| #
915 +|| # This program is free software; you can redistribute it and/or modify
916 +|| # it under the terms of the GNU General Public License as published by
917 +|| # the Free Software Foundation; version 2 of the License.
918 +|| #
919 +|| # This program is distributed in the hope that it will be useful, but
920 +|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
921 +|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
922 +|| # more details.
923 +|| #
924 +|| # You should have received a copy of the GNU General Public License along
925 +|| # with this program; if not, write to the Free Software Foundation, Inc.,
926 +|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
927 +|| ###################################################################
928 \*=====================================================================*/
929
930 legend
931 Index: quicksearch.tpl
932 ===================================================================
933 --- quicksearch.tpl (.../1.0.1/templates) (revision 1087)
934 +++ quicksearch.tpl (.../1.1.0-b1/templates) (revision 1087)
935 @@ -14,7 +14,7 @@
936 <div class="box" style="width: $stylevar[alternate_width]">
937 <div class="box-head">{@"Quick Search"}</div>
938
939 - <div class="box-mid + box-overpad">
940 + <div class="box-mid box-overpad">
941 <if condition="$error">
942 <div class="error" style="margin-bottom: 5px">$error</div>
943 </if>
944 Index: report.css
945 ===================================================================
946 --- report.css (.../1.0.1/templates) (revision 1087)
947 +++ report.css (.../1.1.0-b1/templates) (revision 1087)
948 @@ -1,12 +1,21 @@
949 /*=====================================================================*\
950 -|| ################################################################### ||
951 +|| ###################################################################
952 || # Bugdar
953 -|| # --------------------------------------------------------------- # ||
954 -|| # Copyright (c)2004-2008 by Iris Studios, Inc. All Rights Reserved. # ||
955 -|| # This file may not be reproduced in any way without permission. # ||
956 -|| # --------------------------------------------------------------- # ||
957 -|| # User License Agreement at http://www.iris-studios.com/license/ # ||
958 -|| ################################################################### ||
959 +|| # Copyright (c)2004-2008 Blue Static
960 +|| #
961 +|| # This program is free software; you can redistribute it and/or modify
962 +|| # it under the terms of the GNU General Public License as published by
963 +|| # the Free Software Foundation; version 2 of the License.
964 +|| #
965 +|| # This program is distributed in the hope that it will be useful, but
966 +|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
967 +|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
968 +|| # more details.
969 +|| #
970 +|| # You should have received a copy of the GNU General Public License along
971 +|| # with this program; if not, write to the Free Software Foundation, Inc.,
972 +|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
973 +|| ###################################################################
974 \*=====================================================================*/
975
976 #fieldbody
977 @@ -27,12 +36,6 @@
978 margin-left: 50%;
979 }
980
981 -/* if we get overflow, this will block so we don't get spill */
982 -#clear-spill
983 -{
984 - clear: both;
985 -}
986 -
987 /* ################################################################### */
988
989 #votes, #yourvote, #votesfifty, #voteshundred
990 Index: trackerhome.tpl
991 ===================================================================
992 --- trackerhome.tpl (.../1.0.1/templates) (revision 1087)
993 +++ trackerhome.tpl (.../1.1.0-b1/templates) (revision 1087)
994 @@ -11,12 +11,12 @@
995
996 <table border="$stylevar[border]" cellspacing="$stylevar[spacing]" cellpadding="$stylevar[padding]px" width="$stylevar[normal_width]">
997 <tr class="listinghead">
998 - <td>{@"ID"}</td>
999 - <td>{@"Summary/Reporter"}</td>
1000 - <td>{@"Product/Version"}</td>
1001 - <td>{@"Status/Resolution"}</td>
1002 - <td>{@"Priority/Severity"}</td>
1003 - <td>{@"Last Post"}</td>
1004 + <td><a href="{$order['id']['href']}">{@"ID"}</a> {$order['id']['image']}</td>
1005 + <td><a href="{$order['summary']['href']}">{@"Summary"}</a> {$order['summary']['image']}/ <a href="{$order['reporter']['href']}">{@"Reporter"}</a> {$order['reporter']['image']}</td>
1006 + <td><a href="{$order['product']['href']}">{@"Product/Version"}</a> {$order['product']['image']}</td>
1007 + <td><a href="{$order['status']['href']}">{@"Status"}</a> {$order['status']['image']}/ <a href="{$order['resolution']['href']}">{@"Resolution"}</a> {$order['resolution']['image']}</td>
1008 + <td><a href="{$order['priority']['href']}">{@"Priority"}</a> {$order['priority']['image']}</a>/ <a href="{$order['severity']['href']}">{@"Severity"}</a> {$order['severity']['image']}</td>
1009 + <td><a href="{$order['lastpost']['href']}">{@"Last Post"}</a> {$order['lastpost']['image']}</td>
1010 </tr>
1011 $bugs
1012 </table>
1013 Index: std_redirect.tpl
1014 ===================================================================
1015 --- std_redirect.tpl (.../1.0.1/templates) (revision 1087)
1016 +++ std_redirect.tpl (.../1.1.0-b1/templates) (revision 1087)
1017 @@ -15,7 +15,7 @@
1018 <div class="box" style="width: $stylevar[alternate_width]">
1019 <div class="box-head">{@"Redirect..."}</div>
1020
1021 - <div class="box-mid + box-overpad">
1022 + <div class="box-mid box-overpad">
1023 {$this->process}
1024
1025 <br />
1026 Index: stylevars.txt
1027 ===================================================================
1028 --- stylevars.txt (.../1.0.1/templates) (revision 1087)
1029 +++ stylevars.txt (.../1.1.0-b1/templates) (revision 1087)
1030 @@ -1,12 +1,21 @@
1031 /*=====================================================================*\
1032 -|| ################################################################### ||
1033 -|| # BugTrack [#]version[#]
1034 -|| # --------------------------------------------------------------- # ||
1035 -|| # Copyright (c)2004-2008 by Iris Studios, Inc. All Rights Reserved. # ||
1036 -|| # This file may not be reproduced in any way without permission. # ||
1037 -|| # --------------------------------------------------------------- # ||
1038 -|| # User License Agreement at http://www.iris-studios.com/license/ # ||
1039 -|| ################################################################### ||
1040 +|| ###################################################################
1041 +|| # Bugdar
1042 +|| # Copyright (c)2004-2008 Blue Static
1043 +|| #
1044 +|| # This program is free software; you can redistribute it and/or modify
1045 +|| # it under the terms of the GNU General Public License as published by
1046 +|| # the Free Software Foundation; version 2 of the License.
1047 +|| #
1048 +|| # This program is distributed in the hope that it will be useful, but
1049 +|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1050 +|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
1051 +|| # more details.
1052 +|| #
1053 +|| # You should have received a copy of the GNU General Public License along
1054 +|| # with this program; if not, write to the Free Software Foundation, Inc.,
1055 +|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1056 +|| ###################################################################
1057 \*=====================================================================*/
1058
1059 /*
1060 Index: global.js
1061 ===================================================================
1062 --- global.js (.../1.0.1/templates) (revision 1087)
1063 +++ global.js (.../1.1.0-b1/templates) (revision 1087)
1064 @@ -1,12 +1,21 @@
1065 /*=====================================================================*\
1066 -|| ################################################################### ||
1067 +|| ###################################################################
1068 || # Bugdar
1069 -|| # --------------------------------------------------------------- # ||
1070 -|| # Copyright (c)2004-2008 by Iris Studios, Inc. All Rights Reserved. # ||
1071 -|| # This file may not be reproduced in any way without permission. # ||
1072 -|| # --------------------------------------------------------------- # ||
1073 -|| # User License Agreement at http://www.iris-studios.com/license/ # ||
1074 -|| ################################################################### ||
1075 +|| # Copyright (c)2004-2008 Blue Static
1076 +|| #
1077 +|| # This program is free software; you can redistribute it and/or modify
1078 +|| # it under the terms of the GNU General Public License as published by
1079 +|| # the Free Software Foundation; version 2 of the License.
1080 +|| #
1081 +|| # This program is distributed in the hope that it will be useful, but
1082 +|| # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
1083 +|| # or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
1084 +|| # more details.
1085 +|| #
1086 +|| # You should have received a copy of the GNU General Public License along
1087 +|| # with this program; if not, write to the Free Software Foundation, Inc.,
1088 +|| # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1089 +|| ###################################################################
1090 \*=====================================================================*/
1091
1092 function draw_cancel(location)
1093 Index: help_window.tpl
1094 ===================================================================
1095 --- help_window.tpl (.../1.0.1/templates) (revision 1087)
1096 +++ help_window.tpl (.../1.1.0-b1/templates) (revision 1087)
1097 @@ -12,7 +12,7 @@
1098 <div class="box" style="width: 90%">
1099 <div class="box-head">{@"Help"} : $topic[title]</div>
1100
1101 - <div class="box-mid + box-overpad">
1102 + <div class="box-mid box-overpad">
1103 $topic[body]
1104 </div>
1105 </div>