Menu
▾
▴
[phpBT-dev] CVS: phpbt/templates/default badgroup.html,1.4,1.5 bugattachmentform.html,1.7,1.8 bugdisplay-printable.html,1.11,1.12 bugdisplay.html,1.45,1.46 bugemail-newbug.txt,1.3,1.4 bugemail.txt,1.5,1.6 bugform.html,1.9,1.10 bughistory.html,1.5,1.6 buglist.html,1.8,1.9 bugvotes.html,1.4,1.5 changessaved.html,1.1,1.2 error.html,1.4,1.5 index.html,1.12,1.13 install-complete.html,1.6,1.7 install-dbfailure.html,1.1,1.2 install-dbsuccess.html,1.1,1.2 install.html,1.9,1.10 login.html,1.4,1.5 logout.html,1.1,1.2 newaccount-disabled.html,1.4,1.5 newaccount.html,1.7,1.8 newaccountsuccess.html,1.4,1.5 projectlist.html,1.3,1.4 queryform-simple.html,1.10,1.11 queryform.html,1.20,1.21 report.html,1.8,1.9 upgrade-finished.html,1.3,1.4 upgrade.html,1.10,1.11 user.html,1.10,1.11 wrap-popup.html,1.2,1.3 wrap.html,1.28,1.29
Update of /cvsroot/phpbt/phpbt/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28250/templates/default Modified Files: badgroup.html bugattachmentform.html bugdisplay-printable.html bugdisplay.html bugemail-newbug.txt bugemail.txt bugform.html bughistory.html buglist.html bugvotes.html changessaved.html error.html index.html install-complete.html install-dbfailure.html install-dbsuccess.html install.html login.html logout.html newaccount-disabled.html newaccount.html newaccountsuccess.html projectlist.html queryform-simple.html queryform.html report.html upgrade-finished.html upgrade.html user.html wrap-popup.html wrap.html Log Message: Merging in htmltemplates branch to HEAD Index: badgroup.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/badgroup.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- badgroup.html 24 May 2002 15:19:16 -0000 1.4 +++ badgroup.html 25 Oct 2004 12:07:03 -0000 1.5 @@ -2,7 +2,7 @@ <tr> <td align="center"> <br> - You must be a member of the {$group} group to use this page. + You must be a member of the <?php echo $group; ?> group to use this page. <br> <br> </td> Index: bugattachmentform.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugattachmentform.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bugattachmentform.html 18 May 2002 03:00:50 -0000 1.7 +++ bugattachmentform.html 25 Oct 2004 12:07:04 -0000 1.8 @@ -1,21 +1,21 @@ -<form enctype="multipart/form-data" action="{$smarty.server.PHP_SELF}" method="post"> -<input type="hidden" name="bugid" value="{$bugid}"> -<input type="hidden" name="use_js" value="{$smarty.request.use_js}"> +<form enctype="multipart/form-data" action="<?php echo $_SERVER['PHP_SELF']; ?>" method="post"> +<input type="hidden" name="bugid" value="<?php echo $bugid; ?>"> +<input type="hidden" name="use_js" value="<?php echo $_REQUEST['use_js']; ?>"> <table border="0" align="center"> <tr> <td colspan="2" align="center"> Please choose a file to upload and enter a one-line description. <br> - Maximum file size: {$max_size} bytes + Maximum file size: <?php echo $max_size; ?> bytes <br> <br> </td> </tr> - {if $error} + <?php if ($error) { ?> <tr> - <td colspan="2" class="error">{$error}</td> + <td colspan="2" class="error"><?php echo $error; ?></td> </tr> - {/if} + <?php } ?> <tr> <td> File: @@ -29,7 +29,7 @@ Description: </td> <td> - <input type="text" name="description" maxlength="255" value="{$description}"> + <input type="text" name="description" maxlength="255" value="<?php echo $description; ?>"> </td> </tr> <tr> Index: bugdisplay-printable.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay-printable.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bugdisplay-printable.html 28 Oct 2002 22:06:02 -0000 1.11 +++ bugdisplay-printable.html 25 Oct 2004 12:07:04 -0000 1.12 @@ -1,73 +1,87 @@ <table border='0' width="100%" cellspacing="0" cellpadding="0"> <tr> <td> - Bug <b>#{$bug_id}</b> + <?php echo translate("Bug"); ?> <b>#<?php echo $bug_id; ?></b> </td> <td> - Created: <b>{$created_date|date:DATE_FORMAT}</b> + <?php echo translate("Created"); ?>: <b><?php echo date(DATE_FORMAT, $created_date); ?></b> </td> </tr> <tr> <td> - Reporter: <b>{$reporter|maskemail}</b> + <?php echo translate("Reporter"); ?>: <b><?php echo maskemail($reporter); ?></b> </td> - <td>Assigned To: <b>{$owner|maskemail}</td> + <td><?php echo translate("Assigned to"); ?>: <b><?php echo maskemail($owner); ?></td> </tr> <tr> - <td>Status: <b>{$status_name}</b></td> - <td>Resolution: <b>{$resolution_name}</b></td> + <td><?php echo translate("Status"); ?>: <b><?php echo $status_name; ?></b></td> + <td><?php echo translate("Resolution"); ?>: <b><?php echo $resolution_name; ?></b></td> </tr> <tr> <td> - Project: {$project_name} + <?php echo translate("Project"); ?>: <?php echo $project_name; ?> </td> <td> - Component: {$component_name} + <?php echo translate("Component"); ?>: <?php echo $component_name; ?> </td> </tr> <tr> <td> - Version: {$version_name} + <?php echo translate("Version"); ?>: <?php echo $version_name; ?> </td> <td> - Severity: {$severity_name} + <?php echo translate("Severity"); ?>: <?php echo $severity_name; ?> </td> </tr> <tr> <td> - Priority: {$priority} + <?php echo translate("Priority"); ?>: <?php echo $priority; ?> </td> <td colspan="2"> - OS: {$os_name} + <?php echo translate("Operating System"); ?>: <?php echo $os_name; ?> </td> </tr> </table> <br> -Summary: {$title|stripslashes} +<?php echo translate("Summary"); ?>: <?php echo stripslashes($title); ?> <br> -URL: {$url} +<?php echo translate("URL"); ?>: <?php echo $url; ?> <br> -Bug Dependencies: {$bug_dependencies} +<?php echo translate("Depends on bugs"); ?>: +<?php for ($i = 0, $count = count($bug_dependencies); $i < $count; $i++) { + printf('<a href="bug.php?op=show&bugid=%d" class="%s">#%d</a>%s', + $bug_dependencies[$i]['bug_id'], + ($bug_dependencies[$i]['bug_open'] ? 'open_bug_number' : 'closed_bug_number'), + $bug_dependencies[$i]['bug_id'], + ($i < $count - 1 ? ', ' : '')); +} ?> +<br> +<?php echo translate("Blocks bugs"); ?>: +<?php for ($i = 0, $count = count($bug_blocks); $i < $count; $i++) { + printf('<a href="bug.php?op=show&bugid=%d" class="%s">#%d</a>%s', + $bug_blocks[$i]['bug_id'], + ($bug_blocks[$i]['bug_open'] ? 'open_bug_number' : 'closed_bug_number'), + $bug_blocks[$i]['bug_id'], + ($i < $count - 1 ? ', ' : '')); +} ?> <br> -{$STRING.BUGDISPLAY.blocks}: {$rev_bug_dependencies} <br> -<br> -Comments: +<?php echo translate("Comments"); ?>: <hr size="1"> -<i>----- Posted by {$reporter|maskemail} at {$created_date|date:TIME_FORMAT} on {$created_date|date:DATE_FORMAT} -----</i> +<i>----- <?php echo translate("Posted by").' '.maskemail($reporter).' ('.date(TIME_FORMAT.' '.DATE_FORMAT, $created_date).')' ?>-----</i> <br> -{$description|stripslashes|format_comments|nl2br} +<?php echo stripslashes(format_comments(nl2br($description))) ?> <br> <br> -{section name=comment loop=$comments} -<i>----- Posted by {$comments[comment].login|maskemail} at {$comments[comment].created_date|date:TIME_FORMAT} on {$comments[comment].created_date|date:DATE_FORMAT}-----</i> +<?php for ($i = 0, $ccount = count($comments); $i < $ccount; $i++) { ?> +<i>----- <?php echo translate("Posted by").' '.maskemail($comments[$i]['login']).' ('.date(TIME_FORMAT.' '.DATE_FORMAT, $comments[$i]['created_date']).')'; ?>-----</i> <br> -{$comments[comment].comment_text|stripslashes|format_comments|nl2br} +<?php echo stripslashes(format_comments(nl2br($comments[$i]['comment_text']))); ?> <br> <br> -{/section} +<?php } ?> <br> -<a class="bugdisplaylinks" href="{$smarty.server.PHP_SELF}?op=show&bugid={$bug_id}">Back to bug #{$bug_id}</a> +<a class="bugdisplaylinks" href="<?php echo $_SERVER['PHP_SELF']; ?>?op=show&bugid=<?php echo $bug_id; ?>"><?php echo translate("Back to bug"); ?></a> <br> <br> Index: bugdisplay.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugdisplay.html,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- bugdisplay.html 9 Apr 2003 21:52:32 -0000 1.45 +++ bugdisplay.html 25 Oct 2004 12:07:04 -0000 1.46 @@ -1,9 +1,7 @@ -{if not $smarty.session.uid}{assign var=disabled value='onClick="alertNoChange();"'} -{else}{assign var=disabled value=""} -{/if} +<?php $disabled = empty($_SESSION['uid']) ? 'onClick="alertNoChange();"' : ''; ?> <script type="text/JavaScript"> <!-- - warningString = '{$STRING.logintomodify}'; + warningString = '<?php echo translate("You must login to modify this bug"); ?>'; warnedAlready = false; versions = new Array(); @@ -12,9 +10,8 @@ versions['All'] = new Array(new Array('','All')); closedversions['All'] = new Array(new Array('','All')); components['All'] = new Array(new Array('','All')); - {project_js no_all=true} + <?php build_project_js(true); ?> - {literal} function updateMenus(f) { sel = f.project_id[f.project_id.selectedIndex].text; f.version_id.length = versions[sel].length; @@ -57,123 +54,141 @@ warnedAlready = true; } } - {/literal} //--> </script> <form action="bug.php" method="post"> <input type="hidden" name="op" value="update"> - <input type="hidden" name="bugid" value="{$bug_id}"> - <input type="hidden" name="projectid" value="{$project_id}"> - <input type="hidden" name="last_modified_date" value="{$last_modified_date}"> - <input type="hidden" name="pos" value="{$smarty.request.pos}"> + <input type="hidden" name="bugid" value="<?php echo $bug_id ?>"> + <input type="hidden" name="projectid" value="<?php echo $project_id ?>"> + <input type="hidden" name="last_modified_date" value="<?php echo $last_modified_date ?>"> + <input type="hidden" name="pos" value="<?php echo isset($_REQUEST['pos']) ? $_REQUEST['pos'] : ''; ?>"> <table border="0" width="100%"> <tr> - <td>Bug <b>#{$bug_id}</b> - {$title|stripslashes} - {$STRING.BUGDISPLAY.returnto} <a href="query.php">{$STRING.BUGDISPLAY.buglist}</a></td> + <td>Bug <b>#<?php echo $bug_id ?></b> - <?php echo stripslashes($title) ?> - <a href="query.php"><?php echo translate("Return to bug list"); ?></a></td> <td align="right"> -{if $prevbug} - <b><a href="bug.php?op=show&bugid={$prevbug}&pos={$prevpos}">{$STRING.previous_bug}</a></b> -{/if} -{if $prevbug and $nextbug} - | -{/if} -{if $nextbug} - <b><a href="bug.php?op=show&bugid={$nextbug}&pos={$nextpos}">{$STRING.next_bug}</a></b> -{/if} + <?php if (!empty($prevbug)) { ?> + <b><a href="bug.php?op=show&bugid=<?php echo $prevbug ?>&pos=<?php echo $prevpos ?>"><?php echo translate("Previous bug"); ?></a></b> + <?php } ?> + <?php if (!empty($prevbug) && !empty($nextbug)) echo ' | '; ?> + <?php if (!empty($nextbug)) { ?> + <b><a href="bug.php?op=show&bugid=<?php echo $nextbug ?>&pos=<?php echo $nextpos ?>"><?php echo translate("Next bug"); ?></a></b> + <?php } ?> </td> </tr> -{if $error.status} - <tr><td class="error">{$error.status}</td></tr> -{/if} + <?php if (!empty($error['status'])) echo "<tr><td class=\"error\">{$error['status']}</td></tr>"; ?> </table> + <?php if (!empty($error['add_dep'])) echo "<div class=\"error\">{$error['add_dep']}</div>"; ?> + <?php if (!empty($error['vote'])) echo "<div class=\"error\">{$error['vote']}</div>" ?> <table border="0" width="100%" cellspacing="0" cellpadding="2"> <tr> - <td>{$STRING.BUGDISPLAY.reporter}:</td> - <td><b>{$reporter|maskemail}</b></td> - <td>{$STRING.BUGDISPLAY.created}:</td> - <td><b>{$created_date|date:DATE_FORMAT}</b></td> - </tr><tr> - <td>{$STRING.BUGDISPLAY.project}:</td> - <td><select name="project_id" onChange="updateMenus(this.form)" {$disabled}>{build_select box=project selected=$project_id}</select></td> - <td>{$STRING.BUGDISPLAY.priority}:</td> - <td><select name="priority" {$disabled}>{build_select box=priority selected=$priority}</select></td> - </tr><tr> - <td>{$STRING.BUGDISPLAY.component}:</td> - <td><select name="component_id" {$disabled}>{build_select box=component selected=$component_id project=$project_id}</select></td> - <td>{$STRING.BUGDISPLAY.severity}:</td> - <td><select name="severity_id" {$disabled}>{build_select box=severity selected=$severity_id}</select></td> - </tr><tr> - <td>{$STRING.BUGDISPLAY.version}:</td> - <td><select name="version_id" {$disabled}>{build_select box=version selected=$version_id project=$project_id}</select></td> - <td>{$STRING.BUGDISPLAY.os}:</td> - <td><select name="os_id" {$disabled}>{build_select box=os selected=$os_id}</select></td> - </tr><tr> - <td>{$STRING.BUGDISPLAY.tobeclosedinversion}</td> - <td><select name="to_be_closed_in_version_id" {$disabled}> - <option value="0">{$STRING.BUGDISPLAY.chooseone}</option> - {build_select box=version selected=$to_be_closed_in_version_id project=$project_id} + <td><?php echo translate("Reporter"); ?>:</td> + <td><b><?php echo maskemail($reporter) ?></b></td> + <td><?php echo translate("Created"); ?>:</td> + <td><b><?php echo date(DATE_FORMAT, $created_date) ?></b></td> + </tr><tr> + <td><?php echo translate("Project"); ?>:</td> + <td><select name="project_id" onChange="updateMenus(this.form)" <?php echo $disabled ?>><?php build_select('project', $project_id) ?></select></td> + <td><?php echo translate("Priority"); ?>:</td> + <td><select name="priority" <?php echo $disabled ?>><?php build_select('priority', $priority) ?></select></td> + </tr><tr> + <td><?php echo translate("Component"); ?>:</td> + <td><select name="component_id" <?php echo $disabled ?>><?php build_select('component', $component_id, $project_id) ?></select></td> + <td><?php echo translate("Severity"); ?>:</td> + <td><select name="severity_id" <?php echo $disabled ?>><?php build_select('severity', $severity_id) ?></select></td> + </tr><tr> + <td><?php echo translate("Version"); ?>:</td> + <td><select name="version_id" <?php echo $disabled ?>><?php build_select('version', $version_id, $project_id) ?></select></td> + <td><?php echo translate("Operating System"); ?>:</td> + <td><select name="os_id" <?php echo $disabled ?>><?php build_select('os', $os_id) ?></select></td> + </tr><tr> + <td><?php echo translate("To be closed in version"); ?></td> + <td><select name="to_be_closed_in_version_id" <?php echo $disabled ?>> + <option value="0"><?php echo translate("Choose one"); ?></option> + <?php build_select('version', $to_be_closed_in_version_id, $project_id) ?> </select></td> - <td>{$STRING.BUGDISPLAY.database}:</td> - <td><select name="database_id" {$disabled}>{build_select box=database selected=$database_id}</select></td> + <td><?php echo translate("Database"); ?>:</td> + <td><select name="database_id" <?php echo $disabled ?>><?php build_select('database', $database_id) ?></select></td> </tr><tr> - <td>{$STRING.BUGDISPLAY.closedinversion}</td> - <td><select name="closed_in_version_id" {$disabled}> - <option value="0">{$STRING.BUGDISPLAY.chooseone}</option> - {build_select box=version selected=$closed_in_version_id project=$project_id} + <td><?php echo translate("Closed in version"); ?></td> + <td><select name="closed_in_version_id" <?php echo $disabled ?>> + <option value="0"><?php echo translate("Choose one"); ?></option> + <?php build_select('version', $closed_in_version_id, $project_id) ?> </select></td> - <td>{$STRING.BUGDISPLAY.site}</td> - <td><select name="site_id" {$disabled}>{build_select box=site selected=$site_id}</select></td> + <td><?php echo translate("Site"); ?></td> + <td><select name="site_id" <?php echo $disabled ?>><?php build_select('site', $site_id) ?></select></td> + </tr><tr> + <td><?php echo translate("Summary"); ?>:</td> + <td><input type="text" size="30" maxlength="100" name="title" value="<?php echo stripslashes(htmlspecialchars($title)) ?>" <?php echo $disabled ?>></td> + <td><?php echo translate("Status"); ?>:</td> + <td><select name="status_id" <?php echo $disabled ?>><?php build_select('status', $status_id) ?></select></td> + </tr><tr> + <td><?php if($url) echo "<a href=\"$url\">URL</a>"; else echo 'URL'; ?>:</td> + <td><input type="text" size="30" maxlength="255" name="url" value="<?php echo $url ?>" <?php echo $disabled ?>></td> + <td><?php echo translate("Resolution"); ?>:</td> + <td><select name="resolution_id" <?php echo $disabled ?>><option value="0"><?php echo translate("None"); ?></option><?php build_select('resolution', $resolution_id) ?></select></td> </tr><tr> - <td>{$STRING.BUGDISPLAY.summary}:</td> - <td><input type="text" size="30" maxlength="100" name="title" value="{$title|stripslashes|htmlspecialchars}" {$disabled}></td> - <td>{$STRING.BUGDISPLAY.status}:</td> - <td><select name="status_id" {$disabled}>{build_select box=status selected=$status_id}</select></td> - </tr><tr> - <td>{if $url}<a href="{$url}">URL</a>{else}URL{/if}:</td> - <td><input type="text" size="30" maxlength="255" name="url" value="{$url}" {$disabled}></td> - <td>{$STRING.BUGDISPLAY.resolution}:</td> - <td><select name="resolution_id" {$disabled}><option value="0">{$STRING.BUGDISPLAY.resolutionnone}</option>{build_select box=resolution selected=$resolution_id}</select></td> - </tr><tr> - <td>{$STRING.BUGDISPLAY.assignedto}:</td> - <td><select name="assigned_to" {$disabled}><option value="0">{$STRING.BUGDISPLAY.assignedtonobody}</option>{build_select box=owner selected=$assigned_to}</select></td> - <td>{$STRING.BUGDISPLAY.addcc}:</td> - <td><input type="text" name="add_cc" {$disabled}></td> + <td><?php echo translate("Assigned to"); ?>:</td> + <?php if (isset($perm) && $perm->have_perm('EditAssignment')) { ?> + <td><select name="assigned_to" <?php echo $disabled ?>><option value="0"><?php echo translate("None"); ?></option><?php build_select('owner', $assigned_to) ?></select></td> + <?php } else { ?> + <td> + <?php echo lookup('assigned_to', $assigned_to); ?> + <input type="hidden" name="assigned_to" value="<?php echo $assigned_to ?>"> + </td> + <?php } ?> + <td><?php echo translate("Add CC"); ?>:</td> + <td><input type="text" name="add_cc" <?php echo $disabled ?>></td> </tr><tr> <td colspan="2" valign="top"> -{if !empty($error.add_dep)}<div class="error">{$error.add_dep}</div>{/if} - {$STRING.BUGDISPLAY.bugdependency}: {$bug_dependencies}<br> - {$STRING.BUGDISPLAY.blocks}: {$rev_bug_dependencies}<br> - {$STRING.BUGDISPLAY.adddependency}: <input type="text" name="add_dependency" size="5" {$disabled}><br> - {$STRING.BUGDISPLAY.removedependency}: <input type="text" name="del_dependency" size="5" {$disabled}><br><br></td> + <?php if (!empty($error['add_dep'])) echo "<div class=\"error\">{$error['add_dep']}</div>"; ?> + <?php echo translate("Depends on bugs"); ?>: + <?php for ($i = 0, $count = count($bug_dependencies); $i < $count; $i++) { + printf('<a href="bug.php?op=show&bugid=%d" class="%s">#%d</a>%s', + $bug_dependencies[$i]['bug_id'], + ($bug_dependencies[$i]['bug_open'] ? 'open_bug_number' : 'closed_bug_number'), + $bug_dependencies[$i]['bug_id'], + ($i < $count - 1 ? ', ' : '')); + } ?> + <br> + <?php echo translate("Blocks bugs"); ?>: + <?php for ($i = 0, $count = count($bug_blocks); $i < $count; $i++) { + printf('<a href="bug.php?op=show&bugid=%d" class="%s">#%d</a>%s', + $bug_blocks[$i]['bug_id'], + ($bug_blocks[$i]['bug_open'] ? 'open_bug_number' : 'closed_bug_number'), + $bug_blocks[$i]['bug_id'], + ($i < $count - 1 ? ', ' : '')); + } ?> + <br> + <?php echo translate("Add dependency"); ?>: <input type="text" name="add_dependency" size="5" <?php echo $disabled ?>><br> + <?php echo translate("Remove dependency"); ?>: <input type="text" name="del_dependency" size="5" <?php echo $disabled ?>><br><br></td> <td colspan="2" valign="top"> - {$STRING.BUGDISPLAY.removeselectedcc}:<br> - <select name="remove_cc[]" size="5" style="width: 15em" multiple {$disabled}>{build_select box=bug_cc selected=$bug_id}</select></td> + <?php echo translate("Remove selected CCs"); ?>:<br> + <select name="remove_cc[]" size="5" style="width: 15em" multiple <?php echo $disabled ?>><?php build_select('bug_cc', $bug_id) ?></select></td> </tr> </table> <table border="0" cellpadding="2" cellspacing="0" width="100%"> - <tr> - <td valign="top">{$STRING.BUGDISPLAY.additionalcomments}:<br><br> - <textarea name="comments" rows="6" cols="55" wrap="virtual" {$disabled}>{$smarty.post.comments}</textarea> + <tr class="noprint"> + <td valign="top"><?php echo translate("Additional comments"); ?>:<br><br> + <textarea name="comments" rows="6" cols="55" wrap="virtual" <?php echo $disabled ?>><?php echo isset($_POST['comments']) ? $_POST['comments'] : ''; ?></textarea> <br><br> <div align="right"> -{if $smarty.session.uid} - {$STRING.BUGDISPLAY.suppressemail} <input type="checkbox" name="suppress_email" value="1"> + <?php if (!empty($_SESSION['uid'])) { ?> + <?php echo translate("Supress notification email"); ?> <input type="checkbox" name="suppress_email" value="1"> <input type="submit" value="Submit"> -{else} - {$STRING.logintomodify} -{/if} + <?php } else echo translate("You must login to modify this bug"); ?> </div></td> </tr><tr> <td><table border="0" cellpadding="0" width="100%"> <tr> - <td colspan="2">{$STRING.BUGDISPLAY.attachments}:</td> - <td colspan="3" align="right"><a href="attachment.php?bugid={$bug_id}" onClick="return popupAtt({$bug_id})">{$STRING.BUGDISPLAY.createattachment}</a></td> + <td colspan="2"><?php echo translate("Attachments"); ?>:</td> + <td colspan="3" align="right"><a href="attachment.php?bugid=<?php echo $bug_id; ?>" onClick="return popupAtt(<?php echo $bug_id; ?>)"><?php echo translate("Create new attachment"); ?></a></td> </tr><tr> <td colspan="5" height="2" bgcolor="#ffffff"><spacer type="block" height="2" width="2"></td> </tr><tr> - <td bgcolor="#cccccc" align="center"><b>{$STRING.BUGDISPLAY.name}</b></td> - <td width="60" bgcolor="#cccccc" align="center"><b>{$STRING.BUGDISPLAY.size}</b></a></td> - <td width="150" bgcolor="#cccccc" align="center"><b>{$STRING.BUGDISPLAY.type}</b></a></td> - <td width="80" bgcolor="#cccccc" align="center"><b>{$STRING.BUGDISPLAY.created}</b></a></td> + <td bgcolor="#cccccc" align="center"><b><?php echo translate("Name"); ?></b></td> + <td width="60" bgcolor="#cccccc" align="center"><b><?php echo translate("Size"); ?></b></a></td> + <td width="150" bgcolor="#cccccc" align="center"><b><?php echo translate("Type"); ?></b></a></td> + <td width="80" bgcolor="#cccccc" align="center"><b><?php echo translate("Created"); ?></b></a></td> <td width="80" bgcolor="#cccccc" align="center"> </a></td> </tr><tr> <td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td> @@ -182,30 +197,30 @@ <td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td> <td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td> </tr> -{section name=attachment loop=$attachments} - <tr title="{$attachments[attachment].description|stripslashes}"{if $smarty.section.attachment.iteration is even} class="alt" bgcolor="#dddddd"{/if}> - <td>{$attachments[attachment].file_name|stripslashes}</td> - <td align="right"> - {if $attachments[attachment].file_size > 1024} - {math equation="(round(x) / 1024 * 100) / 100" x=$attachments[attachment].file_size assign=file_size} - {$file_size|number_format}k - {else} - {$attachments[attachment].file_size|number_format}b - {/if} - </td> - <td align="center">{$attachments[attachment].mime_type}</td> - <td align="center">{$attachments[attachment].created_date|date:DATE_FORMAT}</td> - <td align="center"><a href='attachment.php?attachid={$attachments[attachment].attachment_id}'>View</a> - {if isset($perm) and $perm->have_perm('Administrator')} - | <a href='attachment.php?del={$attachments[attachment].attachment_id}' onClick="return confirm('{$STRING.BUGDISPLAY.suredeleteattachment}');">{$STRING.delete}</a> - {/if} - </td> - </tr> -{sectionelse} - <tr> - <td colspan="5" align="center">{$STRING.BUGDISPLAY.noattachments}</td> - </tr> -{/section} + <?php if ($attcount = count($attachments)) { ?> + <?php for ($i = 0; $i < $attcount; $i++) { ?> + <tr title="<?php echo stripslashes($attachments[$i]['description']); ?>"<?php if ($i % 2 != 0) echo ' class="alt" bgcolor="#dddddd"' ?>> + <td><?php echo stripslashes($attachments[$i]['file_name']); ?></td> + <td align="right"> + <?php echo $attachments[$i]['file_size'] > 1024 + ? number_format((round($attachments[$i]['file_size']) / 1024 * 100) / 100).'k' + : number_format($attachments[$i]['file_size']).'b'; + ?> + </td> + <td align="center"><?php echo $attachments[$i]['mime_type']; ?></td> + <td align="center"><?php echo date(DATE_FORMAT, $attachments[$i]['created_date']); ?></td> + <td align="center"><a href='attachment.php?attachid=<?php echo $attachments[$i]['attachment_id']; ?>'>View</a> + <?php if (isset($perm) and $perm->have_perm('Administrator')) { ?> + | <a href='attachment.php?del=<?php echo $attachments[$i]['attachment_id']; ?>' onClick="return confirm('<?php echo translate("Are you sure you want to delete this attachment?"); ?>');"><?php echo translate("Delete"); ?></a> + <?php } ?> + </td> + </tr> + <?php } ?> + <?php } else { ?> + <tr> + <td colspan="5" align="center"><?php echo translate("No attachments found for this bug"); ?></td> + </tr> + <?php } ?> <tr> <td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td> <td bgcolor="#000000" height="1"><spacer type="block" height="1" width="1"></td> @@ -220,28 +235,27 @@ </table> </form> <div align="center" class="bugdisplaylinks"> -{if !empty($error.vote)}<div class="error">{$error.vote}</div>{/if} - <b><a href="{$smarty.server.PHP_SELF}?op=vote&bugid={$bug_id}" onClick="if ({$already_voted}) {literal}{ alert ('{/literal}{$STRING.already_voted}{literal}'); return false; }{/literal}">{$STRING.BUGDISPLAY.voteforthisbug}</a></b> | - <b><a href="{$smarty.server.PHP_SELF}?op=viewvotes&bugid={$bug_id}">{$STRING.BUGDISPLAY.viewvotes} ({$num_votes}) {$STRING.BUGDISPLAY.forthisbug}</a></b> | - <b><a href="{$smarty.server.PHP_SELF}?op=history&bugid={$bug_id}">{$STRING.BUGDISPLAY.viewbugactivity}</a></b> | - <b><a href="{$smarty.server.PHP_SELF}?op=print&bugid={$bug_id}">{$STRING.BUGDISPLAY.printableview}</a></b> +<?php if (!empty($error['vote'])) echo "<div class=\"error\">{$error['vote']}</div>" ?> + <b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=vote&bugid=<?php echo $bug_id; ?>" onClick="if (<?php echo $already_voted; ?>) { alert ('<?php echo translate("You have already voted for this bug"); ?>'); return false; }"><?php echo translate("Vote for this bug"); ?></a></b> | + <b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=viewvotes&bugid=<?php echo $bug_id; ?>"><?php echo translate("View votes"); ?> (<?php echo $num_votes; ?>)</a></b> | + <b><a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=history&bugid=<?php echo $bug_id; ?>"><?php echo translate("View bug history"); ?></a></b> </div> <br><br> <table border="0" cellpadding="2" cellspacing="0" width="100%"> <tr> - <td>{$STRING.BUGDISPLAY.comments}:</td> + <td><?php echo translate("Comments"); ?>:</td> </tr><tr class="alt"> - <td>{$STRING.BUGDISPLAY.postedby}: {$reporter|maskemail} <br> - {$STRING.BUGDISPLAY.date}: {$created_date|date:TIME_FORMAT} {$STRING.BUGDISPLAY.dateon} {$created_date|date:DATE_FORMAT}</td> - </tr><tr> - <td>{$description|stripslashes|htmlspecialchars|format_comments|nl2br} <br><br></td> - </tr> - {section name=comment loop=$comments} - <tr class="alt"> - <td>{$STRING.BUGDISPLAY.postedby}: {$comments[comment].login|maskemail} <br> - {$STRING.BUGDISPLAY.date}: {$comments[comment].created_date|date:TIME_FORMAT} {$STRING.BUGDISPLAY.on} {$comments[comment].created_date|date:DATE_FORMAT}</td> + <td><?php echo translate("Posted by"); ?>: <?php echo maskemail($reporter); ?> <br> + <?php echo translate("Date"); ?>: <?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $created_date); ?></td> </tr><tr> - <td>{$comments[comment].comment_text|stripslashes|htmlspecialchars|format_comments|nl2br} <br><br></td> + <td><?php echo nl2br(stripslashes(format_comments(htmlspecialchars($description)))); ?> <br><br></td> </tr> - {/section} + <?php for ($i = 0, $ccount = count($comments); $i < $ccount; $i++) { ?> + <tr class="alt"> + <td><?php echo translate("Posted by"); ?>: <?php echo maskemail($comments[$i]['login']); ?> <br> + <?php echo translate("Date"); ?>: <?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $comments[$i]['created_date']); ?></td> + </tr><tr> + <td><?php echo nl2br(stripslashes(format_comments(htmlspecialchars($comments[$i]['comment_text'])))); ?> <br><br></td> + </tr> + <?php } ?> </table> Index: bugemail-newbug.txt =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugemail-newbug.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- bugemail-newbug.txt 17 Jun 2002 15:49:18 -0000 1.3 +++ bugemail-newbug.txt 25 Oct 2004 12:07:04 -0000 1.4 @@ -3,27 +3,27 @@ INSTEAD FOLLOW BUG'S URL BELOW IN ORDER TO DETAIL BUG: ============================================================================ - Bug #: {$bugid} ({$bugurl}) - Reported By: {$reporter} + Bug #: <?php echo $bugid; ?> (<?php echo $bugurl; ?>) + Reported By: <?php echo $reporter."\n"; ?> ---------------------------------------------------------------------------- - Summary: {$title} - URL: {$url} - Product: {$project_id} - Version: {$version_id} - Component: {$component_id} - Site: {$site_id} - Status: {$status_id} - Resolution: {$resolution_id} - Severity: {$severity_id} - OS/Version: {$os_id} - Database: {$database_id} - Priority: {$priority} - Assigned To: {$assignedto} + Summary: <?php echo $title."\n"; ?> + URL: <?php echo $url."\n"; ?> + Product: <?php echo $project_id."\n"; ?> + Version: <?php echo $version_id."\n"; ?> + Component: <?php echo $component_id."\n"; ?> + Site: <?php echo $site_id."\n"; ?> + Status: <?php echo $status_id."\n"; ?> + Resolution: <?php echo $resolution_id."\n"; ?> + Severity: <?php echo $severity_id."\n"; ?> + OS/Version: <?php echo $os_id."\n"; ?> + Database: <?php echo $database_id."\n"; ?> + Priority: <?php echo $priority."\n"; ?> + Assigned To: <?php echo $assignedto."\n"; ?> ============================================================================ -{if $showcomments} +<?php if ($showcomments) { ?> COMMENTS ------ Posted by {$oldpostedby} at {$oldpostedon} ----- -{$oldcomments} +----- Posted by <?php echo $oldpostedby; ?> at <?php echo $oldpostedon; ?> ----- +<?php echo $oldcomments."\n"; ?> -{/if} +<?php } ?> Index: bugemail.txt =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugemail.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bugemail.txt 14 Jun 2002 15:26:06 -0000 1.5 +++ bugemail.txt 25 Oct 2004 12:07:04 -0000 1.6 @@ -3,32 +3,32 @@ INSTEAD FOLLOW BUG'S URL BELOW IN ORDER TO DETAIL BUG: ============================================================================ - Bug #: {$bugid} ({$bugurl}) -{$reporter_stat} Reported By: {$reporter} + Bug #: <?php echo $bugid; ?> (<?php echo $bugurl; ?>) +<?php echo $reporter_stat; ?> Reported By: <?php echo $reporter."\n"; ?> ---------------------------------------------------------------------------- -{$title_stat} Summary: {$title} -{$url_stat} URL: {$url} -{$project_id_stat} Product: {$project_id} -{$version_id_stat} Version: {$version_id} -{$to_be_closed_in_version_id_stat} To be Closed in Version: {$to_be_closed_in_version_id} -{$closed_in_version_id_stat} Closed in Version: {$closed_in_version_id} -{$component_id_stat} Component: {$component_id} -{$site_id_stat} Site(s): {$site_id} -{$status_id_stat} Status: {$status_id} -{$resolution_id_stat} Resolution: {$resolution_id} -{$severity_id_stat} Severity: {$severity_id} -{$os_id_stat} OS/Version: {$os_id} -{$database_id_stat} Database: {$database_id} -{$priority_stat} Priority: {$priority} -{$assignedto_stat} Assigned To: {$assignedto} +<?php echo $title_stat; ?> Summary: <?php echo $title."\n"; ?> +<?php echo $url_stat; ?> URL: <?php echo $url."\n"; ?> +<?php echo $project_id_stat; ?> Product: <?php echo $project_id."\n"; ?> +<?php echo $version_id_stat; ?> Version: <?php echo $version_id."\n"; ?> +<?php echo $to_be_closed_in_version_id_stat; ?> To be Closed in Version: <?php echo $to_be_closed_in_version_id."\n"; ?> +<?php echo $closed_in_version_id_stat; ?> Closed in Version: <?php echo $closed_in_version_id."\n"; ?> +<?php echo $component_id_stat; ?> Component: <?php echo $component_id."\n"; ?> +<?php echo $site_id_stat; ?> Site(s): <?php echo $site_id."\n"; ?> +<?php echo $status_id_stat; ?> Status: <?php echo $status_id."\n"; ?> +<?php echo $resolution_id_stat; ?> Resolution: <?php echo $resolution_id."\n"; ?> +<?php echo $severity_id_stat; ?> Severity: <?php echo $severity_id."\n"; ?> +<?php echo $os_id_stat; ?> OS/Version: <?php echo $os_id."\n"; ?> +<?php echo $database_id_stat; ?> Database: <?php echo $database_id."\n"; ?> +<?php echo $priority_stat; ?> Priority: <?php echo $priority."\n"; ?> +<?php echo $assignedto_stat; ?> Assigned To: <?php echo $assignedto."\n"; ?> ============================================================================ -{if $showcomments} +<?php if ($showcomments) { ?> COMMENTS ------ Posted by {$oldpostedby} at {$oldpostedon} ----- -{$oldcomments} +----- Posted by <?php echo $oldpostedby; ?> at <?php echo $oldpostedon; ?> ----- +<?php echo $oldcomments."\n"; ?> ------ Posted by {$newpostedby} at {$newpostedon} ----- -{$newcomments} +----- Posted by <?php echo $newpostedby; ?> at <?php echo $newpostedon; ?> ----- +<?php echo $newcomments."\n"; ?> -{/if} +<?php } ?> Index: bugform.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugform.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- bugform.html 12 May 2003 22:26:27 -0000 1.9 +++ bugform.html 25 Oct 2004 12:07:04 -0000 1.10 @@ -1,88 +1,161 @@ -<form action="bug.php" method="post" enctype="multipart/form-data"> - <input type="hidden" name="bugid" value="0"> - <input type="hidden" name="project" value="{$project}"> - <input type="hidden" name="op" value="do"> - <table border="0"> -{if $error} - <tr> - <td colspan="2" class="error">{$error}</td> - </tr> -{/if} - <tr> - <td align="right" valign="top">{$STRING.BUGFORM.Project}:</td> - <td>{$projectname|stripslashes|htmlspecialchars}</td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.Version}:</td> - <td><select name="version">{build_select box=version selected=$version project=$project} - </select></td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.Summary}:</td> - <td><input type="text" size="50" maxlength="100" name="title" - value="{$title|stripslashes|htmlspecialchars}"></td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.Description}:</td> - <td><textarea name="description" cols="50" rows="8" - wrap=virtual>{$description|stripslashes|htmlspecialchars}</textarea></td> - </tr><tr> - <td align="right" valign="top">URL:</td> - <td><input type="text" size="30" maxlength="255" name="url" value="{$url}"></td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.Severity}:</td> - <td><select name="severity">{build_select box=severity selected=$severity} - </select></td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.Priority}:</td> - <td><select name="priority">{build_select box=priority selected=$priority} - </select></td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.Component}:</td> - <td><select name="component">{build_select box=component selected=$component project=$project} - </select></td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.Database}:</td> - <td><select name="database">{build_select box=database selected=$database} - </select></td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.Site}:</td> - <td><select name="site">{build_select box=site selected=$site} - </select></td> - </tr><tr> - <td align="right" valign="top">{$STRING.BUGFORM.OS}:</td> - <td><select name="os">{build_select box=os selected=$os} - </select></td> - </tr><tr> - <td align="right">Attachment:</td> - <td> -<table border="0" align="center"> - <tr> - <td colspan="2" align="center"> - Please choose a file to upload and enter a one-line description. - <br> - Maximum file size: {$max_size} bytes - <br> - <br> - </td> - </tr> - <tr> - <td> - File: - </td> - <td> - <input type="file" name="attachment"> - </td> - </tr> - <tr> - <td> - Description: - </td> - <td> - <input type="text" name="at_description" maxlength="255" value="{$description}"> - </td> - </tr> -</table> - - </td> - </tr> - </table> - <input type="submit" name="submit" value="{$STRING.BUGFORM.Submit}"> -</form> + <form action="bug.php" method="post" enctype="multipart/form-data"> + <table border="0"> + <?php if (!empty($error)) { ?> + <tr> + <td colspan="2" class="error"> + <?php echo $error ?> + </td> + </tr> + <?php } ?> + <tr> + <td align="right" valign="top"> + <?php echo translate("Project"); ?>: + </td> + <td> + <?php echo stripslashes($projectname) ?> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Reporter"); ?>: + </td> + <td> + <select name="reporter"> + <?php build_select('reporter', $reporter) ?> + </select> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Version"); ?>: + </td> + <td> + <select name="version"> + <?php build_select('version', $version, $project) ?> + </select> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Summary"); ?>: + </td> + <td> + <input type="text" size="50" maxlength="100" name="title" value="<?php echo htmlspecialchars(stripslashes($title)) ?>"> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Description"); ?>: + </td> + <td> + <textarea name="description" cols="50" rows="8" wrap="virtual"><?php echo htmlspecialchars(stripslashes($description)) ?></textarea> + </td> + </tr> + <tr> + <td align="right" valign="top"> + URL: + </td> + <td> + <input type="text" size="30" maxlength="255" name="url" value="<?php echo $url ?>"> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Severity"); ?>: + </td> + <td> + <select name="severity"> + <?php build_select('severity', $severity) ?> + </select> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Priority"); ?>: + </td> + <td> + <select name="priority"> + <?php build_select('priority', $priority) ?> + </select> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Component"); ?>: + </td> + <td> + <select name="component"> + <?php build_select('component', $component, $project) ?> + </select> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Database"); ?>: + </td> + <td> + <select name="database"> + <?php build_select('database', $database) ?> + </select> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Site"); ?>: + </td> + <td> + <select name="site"> + <?php build_select('site', $site) ?> + </select> + </td> + </tr> + <tr> + <td align="right" valign="top"> + <?php echo translate("Operating System"); ?>: + </td> + <td> + <select name="os"> + <?php build_select('os', $os) ?> + </select> + </td> + </tr> + <tr> + <td align="right"> + Attachment: + </td> + <td> + <table border="0" align="center"> + <tr> + <td colspan="2" align="center"> + Please choose a file to upload and enter a one-line description. + <br> + Maximum file size: <?php echo $max_size ?> bytes + <br> + <br> + </td> + </tr> + <tr> + <td> + File: + </td> + <td> + <input type="file" name="attachment"> + </td> + </tr> + <tr> + <td> + Description: + </td> + <td> + <input type="text" name="at_description" maxlength="255" value=""> + </td> + </tr> + </table> + </td> + </tr> + </table> + <input type="submit" name="submit" value="<?php echo translate("Submit"); ?>"> + <input type="hidden" name="bugid" value="0"> + <input type="hidden" name="project" value="<?php echo $project ?>"> + <input type="hidden" name="op" value="do"> + </form> Index: bughistory.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bughistory.html,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bughistory.html 14 Sep 2002 19:02:28 -0000 1.5 +++ bughistory.html 25 Oct 2004 12:07:04 -0000 1.6 @@ -1,26 +1,28 @@ <table border="0" cellspacing="2" cellpadding="2" width="100%"> <tr bgcolor="#eeeeee"> - <th>Who</th> - <th>What</th> - <th>Old Value</th> - <th>New Value</th> - <th>When</th> + <th><?php echo translate("Who"); ?></th> + <th><?php echo translate("What"); ?></th> + <th><?php echo translate("Old Value"); ?></th> + <th><?php echo translate("New Value"); ?></th> + <th><?php echo translate("When"); ?></th> </tr> - {section name=event loop=$history} - <tr{if $smarty.section.event.iteration is even} class="alt" bgcolor="#dddddd"{/if}> - <td>{$history[event].login|maskemail}</td> - <td>{$history[event].changed_field}</td> - <td> {$history[event].old_value}</td> - <td> {$history[event].new_value}</td> - <td align="center">{$history[event].created_date|date:DATE_FORMAT} {$history[event].created_date|date:TIME_FORMAT}</td> - </tr> - {sectionelse} + <?php if ($count = count($history)) { ?> + <?php for ($i = 0; $i < $count; $i++) { ?> + <tr<?php if ($i % 2) echo ' class="alt" bgcolor="#dddddd"' ?>> + <td><?php echo maskemail($history[$i]['login']); ?></td> + <td><?php echo $history[$i]['changed_field']; ?></td> + <td> <?php echo $history[$i]['old_value']; ?></td> + <td> <?php echo $history[$i]['new_value']; ?></td> + <td align="center"><?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $history[$i]['created_date']); ?></td> + </tr> + <?php } ?> + <?php } else { ?> <tr> - <td colspan="5" align="center">{$STRING.nobughistory}</td> + <td colspan="5" align="center"><?php echo translate("No history found for this bug"); ?></td> </tr> - {/section} + <?php } ?> </table> <br> -<a href="{$smarty.server.PHP_SELF}?op=show&bugid={$smarty.get.bugid}">Back to bug #{$smarty.get.bugid}</a> +<a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=show&bugid=<?php echo $_GET['bugid']; ?>"><?php echo translate("Back to bug"); ?></a> <br> <br> Index: buglist.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/buglist.html,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- buglist.html 29 Jul 2002 12:41:47 -0000 1.8 +++ buglist.html 25 Oct 2004 12:07:04 -0000 1.9 @@ -1,35 +1,28 @@ -<table cellpadding="2"> +<table class="bordertable" align="center" style="width: 100%"> <tr> - {section name=col loop=$db_fields} - <th class={$headers[col].class} bgcolor={$headers[col].color}><a href="{$headers[col].url}">{$field_titles[col]}</a></th> - {/section} + <?php for ($i = 0, $colcount = count($db_fields); $i < $colcount; $i++) { + echo "<th class='{$headers[$i]['class']}' bgcolor='{$headers[$i]['color']}'><a href='{$headers[$i]['url']}'>{$field_titles[$i]}</a></th>"; + } ?> </tr> - {section name=bug loop=$bugs} - <tr{if $smarty.section.bug.iteration is even} class="alt" bgcolor="#dddddd"{/if}> - {foreach key=key item=item from=$bugs[bug]} - {if $key eq "bug_link_id"} - {assign var=bug_id value=$item} - {elseif $key eq "severity_color"} - {assign var=bgcolor value=$item} - {else} - <td {if USE_SEVERITY_COLOR}bgcolor="{$bgcolor}"{/if}>{$item|modify_bug_col:$key:$bug_id:$smarty.section.bug.iteration}</td> - {/if} - {/foreach} - </tr> - {sectionelse} - <tr> - <td colspan="{$smarty.section.col.loop}" align="center"> - {$STRING.nobugs} - </td> - </tr> - {/section} - {if $smarty.section.bug.total} - <tr> - <td colspan="{$smarty.section.col.loop}" align="center"> - <br> - {$first} - {$last} of {$total}<br>[ {$pages} ]<!-- <a href="bugs.php?page=all">Show all</a>--> - <br> + <?php if (!$bugcount = count($bugs)) { ?> + <td colspan="<?php echo $colcount ?>" align="center"> + <?php echo translate("No bugs found"); ?> </td> - </tr> - {/if} + <?php } else { ?> + <?php for ($i = 0; $i < $bugcount; $i++) { ?> + <tr<?php if ($i % 2 != 0) echo ' class="alt" bgcolor="#dddddd"'; ?>> + <?php + foreach ($bugs[$i] as $var => $val) { + if ($var == 'bug_link_id') $bugid = $val; + elseif ($var == 'severity_color') $bgcolor = $val; + else echo '<td '.(USE_SEVERITY_COLOR ? "bgcolor='$bgcolor'" : '').'>'.format_bug_col($val, $var, $bugid, $i).'</td>'; + } + ?> + </tr> + <?php } ?> + <?php } ?> </table> +<?php include('admin/pagination.html'); ?> +<div align="center"> + <a href="query.php?xl=1"><?php echo translate("Download to spreadsheet"); ?></a> +</div> Index: bugvotes.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/bugvotes.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bugvotes.html 18 May 2002 03:00:50 -0000 1.4 +++ bugvotes.html 25 Oct 2004 12:07:04 -0000 1.5 @@ -1,20 +1,22 @@ <table border="0" cellspacing="2" cellpadding="2"> <tr bgcolor="#eeeeee"> - <th>Who</th> - <th>When</th> + <th><?php echo translate("Who"); ?></th> + <th><?php echo translate("When"); ?></th> </tr> - {section name=vote loop=$votes} - <tr{if $smarty.section.vote.iteration is even} class="alt" bgcolor="#dddddd"{/if}> - <td>{$votes[vote].login|maskemail}</td> - <td>{$votes[vote].created_date|date:DATE_FORMAT} {$votes[vote].created_date|date:TIME_FORMAT}</td> - </tr> - {sectionelse} + <?php if ($count = count($votes)) { ?> + <?php for ($i = 0; $i < $count; $i++) { ?> + <tr<?php if ($i % 2) echo ' class="alt" bgcolor="#dddddd"'; ?>> + <td><?php echo maskemail($votes[$i]['login']); ?></td> + <td><?php echo date(TIME_FORMAT.' '.DATE_FORMAT, $votes[$i]['created_date']); ?></td> + </tr> + <?php } ?> + <?php } else { ?> <tr> - <td colspan="2" align="center">{$STRING.no_votes}</td> + <td colspan="2" align="center"><?php echo translate("No votes found for this bug"); ?></td> </tr> - {/section} + <?php } ?> </table> <br> -<a href="{$smarty.server.PHP_SELF}?op=show&bugid={$smarty.get.bugid}">Back to bug #{$smarty.get.bugid}</a> +<a href="<?php echo $_SERVER['PHP_SELF']; ?>?op=show&bugid=<?php echo $_GET['bugid']; ?>"><?php echo translate("Back to bug"); ?></a> <br> <br> Index: changessaved.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/changessaved.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- changessaved.html 18 May 2002 03:01:22 -0000 1.1 +++ changessaved.html 25 Oct 2004 12:07:04 -0000 1.2 @@ -1,7 +1,7 @@ <div align="center"> <br> <br> - {$changetext} + <?php echo $changetext; ?> <br> <br> Return to the <a href="user.php">Personal Page</a> or <a href="index.php">phpBugTracker Home</a>. Index: error.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/error.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- error.html 24 May 2002 15:19:16 -0000 1.4 +++ error.html 25 Oct 2004 12:07:04 -0000 1.5 @@ -1,14 +1,13 @@ <table width="100%"> <tr> <td align="center"> - {if $iserror} - <div class="error">{$text}</div> - {else} - {$text} - {/if} + <?php + if ($iserror) echo "<div class=\"error\">$text</div>"; + else echo $text; + ?> <br> <br> - <a href="javascript:history.go(-1)">Back</a> + <a href="javascript:history.go(-1)"><?php echo translate("Back"); ?></a> </td> </tr> </table> Index: index.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/index.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- index.html 19 Jun 2002 13:45:36 -0000 1.12 +++ index.html 25 Oct 2004 12:07:04 -0000 1.13 @@ -1,66 +1,76 @@ <table border=0 width="100%"> - <tr> - <td valign="top" width="250"><b>{$STRING.INDEX.FiveRecentlySubmitted}</b> - <br> -{section name=bug loop=$recentbugs} - <a href="bug.php?op=show&bugid={$recentbugs[bug].bug_id}">{$recentbugs[bug].title|stripslashes}</a> (<i>{$recentbugs[bug].project_name|stripslashes}</i>)<br> -{sectionelse} - {$STRING.nobugs} -{/section} - <br><br> - <b>{$STRING.INDEX.FiveRecentlyClosed}</b> - <br> -{section name=bug loop=$closedbugs} - <a href="bug.php?op=show&bugid={$closedbugs[bug].bug_id}">{$closedbugs[bug].title|stripslashes}</a> (<i>{$closedbugs[bug].project_name|stripslashes}</i>)<br> -{sectionelse} - {$STRING.nobugs} -{/section} -{if count($queries)} - <br><br> - <b>{$STRING.INDEX.SavedQueries}</b> - <br> - {section name=query loop=$queries} - <a href="query.php?{$queries[query].saved_query_string}">{$queries[query].saved_query_name}</a><br> - {/section} -{/if} - </td> - <td valign="top"> -{if USE_JPGRAPH} - {$summary_image} -{else} - <b>{$STRING.INDEX.QuickStats}</b> - <br><br> - <table border="1" cellspacing="0" cellpadding="2"> - <tr> - <th>{$STRING.INDEX.Status}</th> - <th>{$STRING.INDEX.NumberOfBugs}</th> - </tr> - {foreach name=outer key=key item=item from=$stats} - <tr> - <td><a href="query.php?op=doquery&status[]={$key}">{$item.name}</a></td> - <td align="center">{$item.count|default:0}</td> - </tr> - {/foreach} - </table> -{/if} - </td> - </tr> + <tr> + <td valign="top" width="250"> + <b><?php echo translate("Five most recently submitted bugs") ?></b> + <br> + <?php + if ($count = count($recentbugs)) { + for ($i = 0; $i < $count; $i++) { + echo '<a href="bug.php?op=show&bugid='.$recentbugs[$i]['bug_id'].'">'.stripslashes($recentbugs[$i]['title']).'</a> (<i>'.stripslashes($recentbugs[$i]['project_name']).'</i>)<br>'; + } + } else { + echo translate("No bugs found"); + } + ?> + <br><br> + <b><?php echo translate("Five most recently closed bugs") ?></b> + <br> + <?php + if ($count = count($closedbugs)) { + for ($i = 0; $i < $count; $i++) { + echo '<a href="bug.php?op=show&bugid='.$closedbugs[$i]['bug_id'].'">'.stripslashes($closedbugs[$i]['title']).'</a> (<i>'.stripslashes($closedbugs[$i]['project_name']).'</i>)<br>'; + } + } else { + echo translate("No bugs found"); + } + ?> + <?php if (isset($queries) && count($queries)) { ?> + <br><br> + <b><?php echo translate("Saved Queries") ?></b> + <br> + <?php for ($i = 0, $count = count($queries); $i < $count; $i++) { + echo '<a href="query.php?'.$queries[$i]['saved_query_string'].'">'.$queries[$i]['saved_query_name'].'</a><br>'; + } + } ?> + </td> + <td valign="top"> + <?php if (USE_JPGRAPH) { + if (!is_writeable('jpgimages')) { + echo translate("The image path is not writeable"); + } else { + echo build_image($restricted_projects); + } + } else { ?> + <b><?php echo translate("Quick Stats"); ?></b> + <br><br> + <table border="1" cellspacing="0" cellpadding="2"> + <tr> + <th><?php echo translate("Status"); ?></th> + <th><?php echo translate('# bugs'); ?></th> + </tr> + <?php $stats = grab_data($restricted_projects); ?> + <?php foreach ($stats as $statid => $info) { ?> + <tr> + <td><a href="query.php?op=doquery&status[]=<?php echo $statid ?>"><?php echo $info['name'] ?></a></td> + <td align="center"><?php echo $info['count'] ? $info['count'] : 0 ?></td> + </tr> + <?php } ?> + </table> + <?php } ?> + </td> + </tr> </table> <br> <br> -{if SHOW_PROJECT_SUMMARIES} -<table border="0" cellpadding="4"> - <tr> - {section name=col loop=$resfields} - <th>{$resfields[col]}</th> - {/section} - </tr> - {section name=project loop=$projects} - <tr{if $smarty.section.project.iteration is even} class="alt"{/if}> - {foreach key=key item=item from=$projects[project]} - <td{if $key ne "Project"} align="center"{/if}>{$item|stripslashes}</td> - {/foreach} - </tr> - {/section} -</table> -{/if} +<?php if (SHOW_PROJECT_SUMMARIES) { ?> + <table class="bordertable" align="center"> + <tr> + <?php foreach ($resfields as $field) echo "<th>$field</th>"; ?> + </tr> + <?php for ($i = 0, $count = count($projects); $i < $count; $i++) { ?> + <tr<?php if ($i % 2 != 0) echo ' class="alt"'?>> + <?php foreach ($projects[$i] as $var => $val) echo '<td'.($var != 'Project' ? ' align="center"' : '').'>'.stripslashes($val).'</td>'; ?> + </tr> + <?php } ?> + </table> +<?php } ?> Index: install-complete.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/install-complete.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- install-complete.html 24 May 2002 15:19:16 -0000 1.6 +++ install-complete.html 25 Oct 2004 12:07:04 -0000 1.7 @@ -1,5 +1,5 @@ <html> - <title>phpBugTracker Installation</title> + <title><?php echo translate("phpBugTracker Installation"); ?></title> <link rel="StyleSheet" href="styles/default.css" type="text/css"> </head> <body bgcolor="#ffffff" link="#006699" vlink="#006699" alink="#006699"> @@ -7,7 +7,7 @@ <tr> <td width="200" valign="top"><br><img src="logo.jpg"></td> <td valign="top"> - <div class="banner">phpBugTracker Installation</div> + <div class="banner"><?php echo translate("phpBugTracker Installation"); ?></div> The database tables have been created and the config file has been written. Especially if you are on a shared server, you should change the permissions so that config.php isn't writeable by others @@ -28,10 +28,10 @@ <form action="index.php" method="post"> <table border="0" cellpadding="1" cellspacing="3" align="center"> <tr> - <td>Login:</td> - <td><input type="text" name="username" value="{$login}"></td> + <td><?php echo translate("Login"); ?>:</td> + <td><input type="text" name="username" value="<?php echo $login; ?>"></td> </tr> - <td>Password:</td> + <td><?php echo translate("Password"); ?>:</td> <td><input type="password" name="password"></td> </tr> <tr> Index: install-dbfailure.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/install-dbfailure.html,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- install-dbfailure.html 27 Sep 2002 19:24:39 -0000 1.1 +++ install-dbfailure.html 25 Oct 2004 12:07:04 -0000 1.2 @@ -1,22 +1,18 @@ <html> <head> - <title>DB Test Failure</title> + <title><?php echo translate("DB Test Failure"); ?></title> <link rel="StyleSheet" href="styles/default.css" type="text/css"> </head> <body> <br><br> <div align="center"> -... [truncated message content] |
