cvs: bugtracker /htdocs/elements screen.css /htdocs/index index.php /includes comment.php /includes/cache php_version.php status.php user.php
/template/generic/bug index.php /template/generic/report index.php
| From: | Barry Carlyon | Date: | Thu, 17 Jul 2008 09:48:05 +0000 |
| Subject: | cvs: bugtracker /htdocs/elements screen.css /htdocs/index index.php /includes comment.php /includes/cache php_version.php status.php user.php /template/generic/bug index.php /template/generic/report index.php |
||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-2130@lists.php.net to get a copy of this message | ||
bcarlyon Thu Jul 17 09:48:05 2008 UTC
Modified files:
/bugtracker/htdocs/elements screen.css
/bugtracker/htdocs/index index.php
/bugtracker/includes comment.php
/bugtracker/includes/cache php_version.php status.php user.php
/bugtracker/template/generic/bug index.php
/bugtracker/template/generic/report index.php
Log:
Recoded the layout of the bug display pages and made it prettier
http://cvs.php.net/viewvc.cgi/bugtracker/htdocs/elements/screen.css?r1=1.5&r2=1.6&diff_format=u Index: bugtracker/htdocs/elements/screen.css diff -u bugtracker/htdocs/elements/screen.css:1.5 bugtracker/htdocs/elements/screen.css:1.6 --- bugtracker/htdocs/elements/screen.css:1.5 Wed Jul 16 12:13:36 2008 +++ bugtracker/htdocs/elements/screen.css Thu Jul 17 09:48:05 2008 @@ -103,7 +103,7 @@ font-weight: 700; cursor: pointer; } -.slim, #bug { +.slim { width: 550px; } .form { @@ -137,6 +137,16 @@ border-right: 1px solid #000; padding: 0 5px 0 5px; } +#bug { + border-left: 1px solid #000; + border-top: 1px solid #000; + margin: 10px 0 0 10px; + border-right: 15px solid #EFEFEF; + border-bottom: 15px solid #EFEFEF; +} +#description { + border-top: 1px solid #000; +} .textAreaWithLines { font-family: courier; http://cvs.php.net/viewvc.cgi/bugtracker/htdocs/index/index.php?r1=1.7&r2=1.8&diff_format=u Index: bugtracker/htdocs/index/index.php diff -u bugtracker/htdocs/index/index.php:1.7 bugtracker/htdocs/index/index.php:1.8 --- bugtracker/htdocs/index/index.php:1.7 Wed Jul 16 12:13:36 2008 +++ bugtracker/htdocs/index/index.php Thu Jul 17 09:48:05 2008 @@ -66,6 +66,9 @@ } closedir($handle); } +//hack in a version of php +$php_version[0] = 'Irrelevant'; + $form_data = array();//array for holding the data in forms $template_data = array_merge($template_data, array( 'page_title' => 'PHP Bugs', @@ -204,7 +207,11 @@ echo ' tpl '; -print_r($template_data); +//print_r($template_data); +foreach ($template_data as $ref => $data) +{ + echo $ref . ' - ' . htmlentities($data) . "\n"; +} echo '</textarea>'; http://cvs.php.net/viewvc.cgi/bugtracker/includes/comment.php?r1=1.4&r2=1.5&diff_format=u Index: bugtracker/includes/comment.php diff -u bugtracker/includes/comment.php:1.4 bugtracker/includes/comment.php:1.5 --- bugtracker/includes/comment.php:1.4 Thu Jul 10 20:56:41 2008 +++ bugtracker/includes/comment.php Thu Jul 17 09:48:05 2008 @@ -37,8 +37,8 @@ //test logged in $content .= ' -<tr><td> Add Comment</td></tr> -<tr><td></td><td colspan="2">'; +<tr> <td style="text-align: center; border-top: 1px solid #000;"> Add Comment</td> <td colspan="3" style="border-top: 1px solid #000;"></td> </tr> +<tr> <td></td> <td colspan="3">'; if ($user->logged_in) { http://cvs.php.net/viewvc.cgi/bugtracker/includes/cache/php_version.php?r1=1.5&r2=1.6&diff_format=u Index: bugtracker/includes/cache/php_version.php diff -u bugtracker/includes/cache/php_version.php:1.5 bugtracker/includes/cache/php_version.php:1.6 --- bugtracker/includes/cache/php_version.php:1.5 Wed Jul 16 12:13:36 2008 +++ bugtracker/includes/cache/php_version.php Thu Jul 17 09:48:05 2008 @@ -1,5 +1,5 @@ <?php -$php_version[0] = 'Irrelevant'; + $php_version[1] = "5.2.6"; $php_version[2] = "4.4.8"; $php_version[3] = "4CVS-2008-06-27 (snap)"; @@ -14,4 +14,4 @@ define(strtoupper(str_replace(' ','_',$data)),$ref); } -?> +?> \ No newline at end of file http://cvs.php.net/viewvc.cgi/bugtracker/includes/cache/status.php?r1=1.5&r2=1.6&diff_format=u Index: bugtracker/includes/cache/status.php diff -u bugtracker/includes/cache/status.php:1.5 bugtracker/includes/cache/status.php:1.6 --- bugtracker/includes/cache/status.php:1.5 Wed Jul 16 04:19:20 2008 +++ bugtracker/includes/cache/status.php Thu Jul 17 09:48:05 2008 @@ -3,6 +3,7 @@ $status[0] = "Pending"; $status[1] = "Bogus"; $status[2] = "Is Bug"; + $status[3] = "Fixed"; foreach($status as $ref => $data) { http://cvs.php.net/viewvc.cgi/bugtracker/includes/cache/user.php?r1=1.4&r2=1.5&diff_format=u Index: bugtracker/includes/cache/user.php diff -u bugtracker/includes/cache/user.php:1.4 bugtracker/includes/cache/user.php:1.5 --- bugtracker/includes/cache/user.php:1.4 Wed Jul 16 04:19:20 2008 +++ bugtracker/includes/cache/user.php Thu Jul 17 09:48:05 2008 @@ -1,5 +1,5 @@ <?php - $users["Tbarry_barrycarlyon"]["handle"] = "Tbarry_barrycarlyon"; - $users["Tbarry_barrycarlyon"]["email"] = "barry@barrycarlyon.co.uk"; + $users["barrycarlyon"]["handle"] = "barrycarlyon"; + $users["barrycarlyon"]["email"] = "barry@barrycarlyon.co.uk"; http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/bug/index.php?r1=1.9&r2=1.10&diff_format=u Index: bugtracker/template/generic/bug/index.php diff -u bugtracker/template/generic/bug/index.php:1.9 bugtracker/template/generic/bug/index.php:1.10 --- bugtracker/template/generic/bug/index.php:1.9 Wed Jul 16 12:13:36 2008 +++ bugtracker/template/generic/bug/index.php Thu Jul 17 09:48:05 2008 @@ -58,66 +58,58 @@ $template_data['page_title'] .= ' - #' . $bug['bug_id'] . ' ' . $bug['summary']; $content .= '<h2>Bug Display</h2>'; - $content .= '<table id="bug">'; - - $content .= '<tr><td style="width: 100px;">Bug: #' . $bug['bug_id'] . '</td><td style="width: 200px;">' . $bug['summary'] . '</td><td>Reported By: <strong>' . $bug['reported_by'] . '</strong></td></tr>'; - $content .= '<tr><td>'; - - // $content .= '<img src="/images/bug_status/' . $status[$bug['status']] . '.png" alt="' . $status[$bug['status']] . '" />'; - $content .= '<h4>' . $status[$bug['status']] . '</h4>'; - $content .= '</td><td colspan="2">Opened: ' . date('d/m/Y h:i O',$bug['UNIX_TIMESTAMP(reported_on)']) . '<br />'; + + $content .= ' +<table id="bug"> +<tr> <td style="width: 100px;">Bug: #' . $bug['bug_id'] . '</td> <td colspan="2" style="width: 220px;">' . $bug['summary'] . '</td> <td style="width: 220px;">Reported By:<br /><strong>' . $bug['reported_by'] . '</strong></td> </tr> +<tr> <td><h4>' . $status[$bug['status']] . '</h4></td> <td style="width: 125px;">Opened:</td> <td colspan="2">' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(reported_on)']) . '</td> </tr>'; if ($bug['UNIX_TIMESTAMP(updated)'] != $bug['UNIX_TIMESTAMP(reported_on)']) { - $content .= 'Last Updated: ' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(updated)']) . '<br />';; + $content .= '<tr> <td></td> <td>Last Updated:</td> <td colspan="2">' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(updated)']) . '</td> </tr>'; } - if ($bug['status'] != 0) + if ($bug['assigned_to']) { - $content .= 'Assigned to: <strong>' . $bug['assigned_to'] . '</strong><br />'; - $content .= 'Assigned on: ' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(assigned_on)']); + $content .= '<tr> <td></td> <td>Assigned To:</td> <td colspan="2"><strong>' . $row['assigned_to'] . '</strong></td> </tr> +<tr> <td></td> <td>Assigned On:</td> <td colspan="2">' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(assigned_on)']) . '</td> </tr>'; } - $content .= '</td></tr>'; - - $content .= '<tr><td></td><td style="text-align: right;">Version:</td><td>' . $php_version[$bug['php_version']] . '</td></tr>'; - $content .= '<tr><td></td><td style="text-align: right;">Type:</td><td>' . $bug_type[$bug['bug_type']] . '</td></tr>'; - $content .= '<tr><td></td><td style="text-align: right;">OS:</td><td>' . $os_version[$bug['os_version']] . '</td></tr>'; - - $content .= '<tr><td></td><td colspan="2">'; - $content .= $bug['description']; - $content .= '<br /> '; - - $content .= '</td></tr>'; + $content .= ' +<tr> <td></td> <td colspan="2" style="text-align: right;">Version:</td> <td>' . $php_version[$row['php_version']] .'</td> </tr> +<tr> <td></td> <td colspan="2" style="text-align: right;">Type:</td> <td>' . $bug_type[$row['bug_type']] . '</td> </tr> +<tr> <td></td> <td colspan="2" style="text-align: right;">OS:</td> <td>' . $os_version[$row['os_version']] . '</td> </tr> +<tr id="description"> <td></td> <td colspan="3">' . $bug['description'] . '</td> </tr> +'; + //extra basic comments if (isset($bug['reproduce'])) { - $content .= "\n"; - //render a fancy line number box $jsscripts[] = '/elements/js/lineno.js'; - $content .= '<tr><td></td><td colspan="2" style="display: none;" id="reproduce_link"><a href="javascript:handleClick(\'reproduce_code\');handleClick(\'reproduce_link\');">Show Reproduce Code and Results</a></td></tr>'; - // $content .= '<tr><td></td><td colspan="2" style="display: block;" id="reproduce_code">'; - $content .= '<tr><td></td><td colspan="2" id="reproduce_code">'; - $content .= '<h5>Reproduce Code</h5>'; - $content .= '<a href="javascript:handleClick(\'reproduce_code\');handleClick(\'reproduce_link\');" class="lineno">Hide Code and Results</a>'; - $content .= '<a href="javascript:selectText(\'reproduce\');" title="Select Code" class="textselect">Select Code</a>'; - $content .= '<a href="/bug/download/' . $bug['bug_id'] . '/" title="Download Code" class="textselect">Download</a>'; - $content .= '<textarea id="reproduce" rows="7" cols="55">' . $bug['reproduce'] . '</textarea>'; - //given reporduce assume other, expected and actual - //need a swtich in the db for line numbers or dyn generate? - $content .= '<hr />'; - $content .= '<h5>Expected Result</h5>'; - $content .= '<textarea id="expected" rows="7" cols="55">' . $bug['expected'] . '</textarea>'; - $content .= '<hr />'; - $content .= '<a href="javascript:createTextAreaWithLines(\'expected\');" class="lineno">Add Line Numbers</a>'; - $content .= '<hr />'; - $content .= '<h5>Actual Result</h5>'; - $content .= '<textarea id="actual" rows="7" cols="55">' . $bug['actual'] . '</textarea>'; - $content .= '<hr />'; - $content .= '<a href="javascript:createTextAreaWithLines(\'actual\');" class="lineno">Add Line Numbers</a>'; - $content .= '</td></tr>'; - $content .= "\n"; + $content .= ' +<tr> <td></td> <td colspan="3" style="display: none;" id="reproduce_link"><br /><a href="javascript:handleClick(\'reproduce_code\');handleClick(\'reproduce_link\');">Show Reproduce Code and Results</a><br /> </td> </tr> +<tr> <td></td> <td colspan="3" id="reproduce_code"> + <br /><h5>Reproduce Code</h5> + <a href="javascript:handleClick(\'reproduce_code\');handleClick(\'reproduce_link\');" class="lineno">Hide Code and Results</a> + <a href="javascript:selectText(\'reproduce\');" title="Select Code" class="textselect">Select Code</a> + <a href="/bug/download/' . $bug['bug_id'] . '/" title="Download Code" class="textselect">Download</a> + <textarea id="reproduce" rows="7" cols="55">' . htmlentities($bug['reproduce']) . '</textarea> + <hr /> + <br /> + <h5>Expected Result</h5> + <textarea id="expected" rows="7" cols="55">' . $bug['expected'] . '</textarea> + <br /> + <a href="javascript:createTextAreaWithLines(\'expected\');handleClick(\'expected_add\');" id="expected_add" class="lineno">Add Line Numbers</a> + <hr /> + <h5>Actaul Result</h5> + <textarea id="actual" rows="7" cols="55">' . $bug['actual'] . '</textarea> + <br /><a href="javascript:createTextAreaWithLines(\'actual\');handleClick(\'actual_add\');" id="actual_add" class="lineno">Add Line Numbers</a> +</td></tr> +'; } - + //here be the comment controller $comment->spawn_form(); - + + $content .= ' +<tr> <td> </td> <td colspan="3"> </td> </tr> +'; $content .= '</table><br /><hr /><hr />'; if (isset($bug['reproduce'])) @@ -175,7 +167,7 @@ $db->get_data($query); $content .= '<h2>Bug Summary</h2>'; - $content .= 'There are Currenty ' . $db->total_rows . ' bugs in the system, of which ' . $pending . ' are pending review, the average review time is {AVERAGE_REVIEW}'; + $content .= 'There are Currenty ' . $db->total_rows . ' bugs in the system, of which ' . $pending . ' are pending review, the average review time is {AVERAGE_REVIEW}, the average close time is {AVERAGE_CLOSE}'; if ($db->total_rows) { http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/report/index.php?r1=1.4&r2=1.5&diff_format=u Index: bugtracker/template/generic/report/index.php diff -u bugtracker/template/generic/report/index.php:1.4 bugtracker/template/generic/report/index.php:1.5 --- bugtracker/template/generic/report/index.php:1.4 Wed Jul 16 14:13:36 2008 +++ bugtracker/template/generic/report/index.php Thu Jul 17 09:48:05 2008 @@ -1,5 +1,7 @@ <?php +unset($php_version[0]); + require_once($_SERVER['DOCUMENT_ROOT'] . '../includes/recaptchalib.php'); $form_data['email'] = isset($form_data['email']) ? $form_data['email'] : '';
http://cvs.php.net/viewvc.cgi/bugtracker/htdocs/elements/screen.css?r1=1.5&r2=1.6&diff_format=u Index: bugtracker/htdocs/elements/screen.css diff -u bugtracker/htdocs/elements/screen.css:1.5 bugtracker/htdocs/elements/screen.css:1.6 --- bugtracker/htdocs/elements/screen.css:1.5 Wed Jul 16 12:13:36 2008 +++ bugtracker/htdocs/elements/screen.css Thu Jul 17 09:48:05 2008 @@ -103,7 +103,7 @@ font-weight: 700; cursor: pointer; } -.slim, #bug { +.slim { width: 550px; } .form { @@ -137,6 +137,16 @@ border-right: 1px solid #000; padding: 0 5px 0 5px; } +#bug { + border-left: 1px solid #000; + border-top: 1px solid #000; + margin: 10px 0 0 10px; + border-right: 15px solid #EFEFEF; + border-bottom: 15px solid #EFEFEF; +} +#description { + border-top: 1px solid #000; +} .textAreaWithLines { font-family: courier; http://cvs.php.net/viewvc.cgi/bugtracker/htdocs/index/index.php?r1=1.7&r2=1.8&diff_format=u Index: bugtracker/htdocs/index/index.php diff -u bugtracker/htdocs/index/index.php:1.7 bugtracker/htdocs/index/index.php:1.8 --- bugtracker/htdocs/index/index.php:1.7 Wed Jul 16 12:13:36 2008 +++ bugtracker/htdocs/index/index.php Thu Jul 17 09:48:05 2008 @@ -66,6 +66,9 @@ } closedir($handle); } +//hack in a version of php +$php_version[0] = 'Irrelevant'; + $form_data = array();//array for holding the data in forms $template_data = array_merge($template_data, array( 'page_title' => 'PHP Bugs', @@ -204,7 +207,11 @@ echo ' tpl '; -print_r($template_data); +//print_r($template_data); +foreach ($template_data as $ref => $data) +{ + echo $ref . ' - ' . htmlentities($data) . "\n"; +} echo '</textarea>'; http://cvs.php.net/viewvc.cgi/bugtracker/includes/comment.php?r1=1.4&r2=1.5&diff_format=u Index: bugtracker/includes/comment.php diff -u bugtracker/includes/comment.php:1.4 bugtracker/includes/comment.php:1.5 --- bugtracker/includes/comment.php:1.4 Thu Jul 10 20:56:41 2008 +++ bugtracker/includes/comment.php Thu Jul 17 09:48:05 2008 @@ -37,8 +37,8 @@ //test logged in $content .= ' -<tr><td> Add Comment</td></tr> -<tr><td></td><td colspan="2">'; +<tr> <td style="text-align: center; border-top: 1px solid #000;"> Add Comment</td> <td colspan="3" style="border-top: 1px solid #000;"></td> </tr> +<tr> <td></td> <td colspan="3">'; if ($user->logged_in) { http://cvs.php.net/viewvc.cgi/bugtracker/includes/cache/php_version.php?r1=1.5&r2=1.6&diff_format=u Index: bugtracker/includes/cache/php_version.php diff -u bugtracker/includes/cache/php_version.php:1.5 bugtracker/includes/cache/php_version.php:1.6 --- bugtracker/includes/cache/php_version.php:1.5 Wed Jul 16 12:13:36 2008 +++ bugtracker/includes/cache/php_version.php Thu Jul 17 09:48:05 2008 @@ -1,5 +1,5 @@ <?php -$php_version[0] = 'Irrelevant'; + $php_version[1] = "5.2.6"; $php_version[2] = "4.4.8"; $php_version[3] = "4CVS-2008-06-27 (snap)"; @@ -14,4 +14,4 @@ define(strtoupper(str_replace(' ','_',$data)),$ref); } -?> +?> \ No newline at end of file http://cvs.php.net/viewvc.cgi/bugtracker/includes/cache/status.php?r1=1.5&r2=1.6&diff_format=u Index: bugtracker/includes/cache/status.php diff -u bugtracker/includes/cache/status.php:1.5 bugtracker/includes/cache/status.php:1.6 --- bugtracker/includes/cache/status.php:1.5 Wed Jul 16 04:19:20 2008 +++ bugtracker/includes/cache/status.php Thu Jul 17 09:48:05 2008 @@ -3,6 +3,7 @@ $status[0] = "Pending"; $status[1] = "Bogus"; $status[2] = "Is Bug"; + $status[3] = "Fixed"; foreach($status as $ref => $data) { http://cvs.php.net/viewvc.cgi/bugtracker/includes/cache/user.php?r1=1.4&r2=1.5&diff_format=u Index: bugtracker/includes/cache/user.php diff -u bugtracker/includes/cache/user.php:1.4 bugtracker/includes/cache/user.php:1.5 --- bugtracker/includes/cache/user.php:1.4 Wed Jul 16 04:19:20 2008 +++ bugtracker/includes/cache/user.php Thu Jul 17 09:48:05 2008 @@ -1,5 +1,5 @@ <?php - $users["Tbarry_barrycarlyon"]["handle"] = "Tbarry_barrycarlyon"; - $users["Tbarry_barrycarlyon"]["email"] = "barry@barrycarlyon.co.uk"; + $users["barrycarlyon"]["handle"] = "barrycarlyon"; + $users["barrycarlyon"]["email"] = "barry@barrycarlyon.co.uk"; http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/bug/index.php?r1=1.9&r2=1.10&diff_format=u Index: bugtracker/template/generic/bug/index.php diff -u bugtracker/template/generic/bug/index.php:1.9 bugtracker/template/generic/bug/index.php:1.10 --- bugtracker/template/generic/bug/index.php:1.9 Wed Jul 16 12:13:36 2008 +++ bugtracker/template/generic/bug/index.php Thu Jul 17 09:48:05 2008 @@ -58,66 +58,58 @@ $template_data['page_title'] .= ' - #' . $bug['bug_id'] . ' ' . $bug['summary']; $content .= '<h2>Bug Display</h2>'; - $content .= '<table id="bug">'; - - $content .= '<tr><td style="width: 100px;">Bug: #' . $bug['bug_id'] . '</td><td style="width: 200px;">' . $bug['summary'] . '</td><td>Reported By: <strong>' . $bug['reported_by'] . '</strong></td></tr>'; - $content .= '<tr><td>'; - - // $content .= '<img src="/images/bug_status/' . $status[$bug['status']] . '.png" alt="' . $status[$bug['status']] . '" />'; - $content .= '<h4>' . $status[$bug['status']] . '</h4>'; - $content .= '</td><td colspan="2">Opened: ' . date('d/m/Y h:i O',$bug['UNIX_TIMESTAMP(reported_on)']) . '<br />'; + + $content .= ' +<table id="bug"> +<tr> <td style="width: 100px;">Bug: #' . $bug['bug_id'] . '</td> <td colspan="2" style="width: 220px;">' . $bug['summary'] . '</td> <td style="width: 220px;">Reported By:<br /><strong>' . $bug['reported_by'] . '</strong></td> </tr> +<tr> <td><h4>' . $status[$bug['status']] . '</h4></td> <td style="width: 125px;">Opened:</td> <td colspan="2">' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(reported_on)']) . '</td> </tr>'; if ($bug['UNIX_TIMESTAMP(updated)'] != $bug['UNIX_TIMESTAMP(reported_on)']) { - $content .= 'Last Updated: ' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(updated)']) . '<br />';; + $content .= '<tr> <td></td> <td>Last Updated:</td> <td colspan="2">' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(updated)']) . '</td> </tr>'; } - if ($bug['status'] != 0) + if ($bug['assigned_to']) { - $content .= 'Assigned to: <strong>' . $bug['assigned_to'] . '</strong><br />'; - $content .= 'Assigned on: ' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(assigned_on)']); + $content .= '<tr> <td></td> <td>Assigned To:</td> <td colspan="2"><strong>' . $row['assigned_to'] . '</strong></td> </tr> +<tr> <td></td> <td>Assigned On:</td> <td colspan="2">' . date('d/m/Y H:i O',$bug['UNIX_TIMESTAMP(assigned_on)']) . '</td> </tr>'; } - $content .= '</td></tr>'; - - $content .= '<tr><td></td><td style="text-align: right;">Version:</td><td>' . $php_version[$bug['php_version']] . '</td></tr>'; - $content .= '<tr><td></td><td style="text-align: right;">Type:</td><td>' . $bug_type[$bug['bug_type']] . '</td></tr>'; - $content .= '<tr><td></td><td style="text-align: right;">OS:</td><td>' . $os_version[$bug['os_version']] . '</td></tr>'; - - $content .= '<tr><td></td><td colspan="2">'; - $content .= $bug['description']; - $content .= '<br /> '; - - $content .= '</td></tr>'; + $content .= ' +<tr> <td></td> <td colspan="2" style="text-align: right;">Version:</td> <td>' . $php_version[$row['php_version']] .'</td> </tr> +<tr> <td></td> <td colspan="2" style="text-align: right;">Type:</td> <td>' . $bug_type[$row['bug_type']] . '</td> </tr> +<tr> <td></td> <td colspan="2" style="text-align: right;">OS:</td> <td>' . $os_version[$row['os_version']] . '</td> </tr> +<tr id="description"> <td></td> <td colspan="3">' . $bug['description'] . '</td> </tr> +'; + //extra basic comments if (isset($bug['reproduce'])) { - $content .= "\n"; - //render a fancy line number box $jsscripts[] = '/elements/js/lineno.js'; - $content .= '<tr><td></td><td colspan="2" style="display: none;" id="reproduce_link"><a href="javascript:handleClick(\'reproduce_code\');handleClick(\'reproduce_link\');">Show Reproduce Code and Results</a></td></tr>'; - // $content .= '<tr><td></td><td colspan="2" style="display: block;" id="reproduce_code">'; - $content .= '<tr><td></td><td colspan="2" id="reproduce_code">'; - $content .= '<h5>Reproduce Code</h5>'; - $content .= '<a href="javascript:handleClick(\'reproduce_code\');handleClick(\'reproduce_link\');" class="lineno">Hide Code and Results</a>'; - $content .= '<a href="javascript:selectText(\'reproduce\');" title="Select Code" class="textselect">Select Code</a>'; - $content .= '<a href="/bug/download/' . $bug['bug_id'] . '/" title="Download Code" class="textselect">Download</a>'; - $content .= '<textarea id="reproduce" rows="7" cols="55">' . $bug['reproduce'] . '</textarea>'; - //given reporduce assume other, expected and actual - //need a swtich in the db for line numbers or dyn generate? - $content .= '<hr />'; - $content .= '<h5>Expected Result</h5>'; - $content .= '<textarea id="expected" rows="7" cols="55">' . $bug['expected'] . '</textarea>'; - $content .= '<hr />'; - $content .= '<a href="javascript:createTextAreaWithLines(\'expected\');" class="lineno">Add Line Numbers</a>'; - $content .= '<hr />'; - $content .= '<h5>Actual Result</h5>'; - $content .= '<textarea id="actual" rows="7" cols="55">' . $bug['actual'] . '</textarea>'; - $content .= '<hr />'; - $content .= '<a href="javascript:createTextAreaWithLines(\'actual\');" class="lineno">Add Line Numbers</a>'; - $content .= '</td></tr>'; - $content .= "\n"; + $content .= ' +<tr> <td></td> <td colspan="3" style="display: none;" id="reproduce_link"><br /><a href="javascript:handleClick(\'reproduce_code\');handleClick(\'reproduce_link\');">Show Reproduce Code and Results</a><br /> </td> </tr> +<tr> <td></td> <td colspan="3" id="reproduce_code"> + <br /><h5>Reproduce Code</h5> + <a href="javascript:handleClick(\'reproduce_code\');handleClick(\'reproduce_link\');" class="lineno">Hide Code and Results</a> + <a href="javascript:selectText(\'reproduce\');" title="Select Code" class="textselect">Select Code</a> + <a href="/bug/download/' . $bug['bug_id'] . '/" title="Download Code" class="textselect">Download</a> + <textarea id="reproduce" rows="7" cols="55">' . htmlentities($bug['reproduce']) . '</textarea> + <hr /> + <br /> + <h5>Expected Result</h5> + <textarea id="expected" rows="7" cols="55">' . $bug['expected'] . '</textarea> + <br /> + <a href="javascript:createTextAreaWithLines(\'expected\');handleClick(\'expected_add\');" id="expected_add" class="lineno">Add Line Numbers</a> + <hr /> + <h5>Actaul Result</h5> + <textarea id="actual" rows="7" cols="55">' . $bug['actual'] . '</textarea> + <br /><a href="javascript:createTextAreaWithLines(\'actual\');handleClick(\'actual_add\');" id="actual_add" class="lineno">Add Line Numbers</a> +</td></tr> +'; } - + //here be the comment controller $comment->spawn_form(); - + + $content .= ' +<tr> <td> </td> <td colspan="3"> </td> </tr> +'; $content .= '</table><br /><hr /><hr />'; if (isset($bug['reproduce'])) @@ -175,7 +167,7 @@ $db->get_data($query); $content .= '<h2>Bug Summary</h2>'; - $content .= 'There are Currenty ' . $db->total_rows . ' bugs in the system, of which ' . $pending . ' are pending review, the average review time is {AVERAGE_REVIEW}'; + $content .= 'There are Currenty ' . $db->total_rows . ' bugs in the system, of which ' . $pending . ' are pending review, the average review time is {AVERAGE_REVIEW}, the average close time is {AVERAGE_CLOSE}'; if ($db->total_rows) { http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/report/index.php?r1=1.4&r2=1.5&diff_format=u Index: bugtracker/template/generic/report/index.php diff -u bugtracker/template/generic/report/index.php:1.4 bugtracker/template/generic/report/index.php:1.5 --- bugtracker/template/generic/report/index.php:1.4 Wed Jul 16 14:13:36 2008 +++ bugtracker/template/generic/report/index.php Thu Jul 17 09:48:05 2008 @@ -1,5 +1,7 @@ <?php +unset($php_version[0]); + require_once($_SERVER['DOCUMENT_ROOT'] . '../includes/recaptchalib.php'); $form_data['email'] = isset($form_data['email']) ? $form_data['email'] : '';