https://src.bluestatic.org / bugdar.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce01a0f)
r326: Finished showreport.php styling
authorRobert Sesek <rsesek@bluestatic.org>
Mon, 25 Jul 2005 19:28:14 +0000 (19:28 +0000)
committerRobert Sesek <rsesek@bluestatic.org>
Mon, 25 Jul 2005 19:28:14 +0000 (19:28 +0000)
showreport.php patch | blob | history
templates/showreport.tpl patch | blob | history
templates/showreport_attachment.tpl patch | blob | history
templates/style.css patch | blob | history
templates/stylevars.txt patch | blob | history

diff --git a/showreport.php b/showreport.php
index c4929e95a6aec8c3ff25eb56ab977db5a4954c62..e5b9321fab04b809b10232f34c79f23acd39ec08 100644 (file)
--- a/showreport.php
+++ b/showreport.php
@@ -238,6 +238,7 @@ foreach ($words AS $word)
 // attachments
 $show['getattachments'] = ((can_perform('cangetattach') OR can_perform('caneditattach')) ? true : false);
 $show['putattachments'] = ((can_perform('canputattach') OR can_perform('caneditattach')) ? true : false);
+$show['attachments'] = ($show['getattachments'] OR $show['putattachments']) ? true : false;
 
 if ($show['getattachments'] OR $show['putattachments'])
 {
diff --git a/templates/showreport.tpl b/templates/showreport.tpl
index e9903fadd8f77e936babe7bd2061d370c70921ff..b347a2ac2e1d09ba8e151df351667f724b3f3dab 100644 (file)
--- a/templates/showreport.tpl
+++ b/templates/showreport.tpl
@@ -1,8 +1,11 @@
 $doctype
+<html lang="$stylevar[lang]" xml:lang="$stylevar[lang]">
+<head>
 $headinclude
+       <title>Bug Report $bug[bugid] - $bug[summary]</title>
 $header
 
-<form name="bugreport" action="editreport.php" method="post">
+<form name="bugreport" action="editreport.php" method="post" class="form">
 <input type="hidden" name="do" value="update" />
 <input type="hidden" name="bugid" value="$bug[bugid]" />
 
@@ -160,6 +163,12 @@ $customfields
                <if condition="$show['newreply']">New Reply</if>
                
                <if condition="$show['edit']"><div<if condition="$show['newreply']"> style="margin-top: 15px"</if>>Automatic Action: <select name="autoaction">$select[autoaction]</select></div></if>
+               
+               <br />
+               <br />
+               
+               <div>[<a href="showhistory.php?bugid=$bug[bugid]">Show Bug History</a>]</div>
+               <if condition="$bugsys->userinfo['userid']"><div>[<a href="favourite.php?do=handle&amp;bugid=$bug[bugid]">$favouritetext</a>]</div></if>
        </td>
        <if condition="$show['newreply']"><td class="tdata" colspan="2"><textarea name="comment" cols="50" rows="10" style="width: 100%"></textarea></td></if>
 </tr>
@@ -176,67 +185,49 @@ $customfields
 <!-- / submit row -->
 </table>
 
-<div>[<a href="showhistory.php?bugid=$bug[bugid]">Show Bug History</a>]<if condition="$bugsys->userinfo['userid']"> [<a href="favourite.php?do=handle&amp;bugid=$bug[bugid]">$favouritetext</a>]</div>
+</form>
 
 <br />
 
-<if condition="$show['getattachments'] OR $show['putattachments']">
-<table border="1" cellspacing="2" cellpadding="4">
-<thead style="background-color: #EEEEEE">
-       <tr>
-               <td>Attachments</td>
-       </tr>
-</thead>
-<tbody>
+<!-- attachments & voting -->
+<table width="100%" cellspasing="$stylevar[spacing_border]" cellpadding="$stylevar[padding]" border="$stylevar[border]" class="tborder">
+<tr>
+       <if condition="$show['attachments']"><td class="thead" style="width: 50%">Attachments <if condition="$show['putattachments']">[<a href="attachment.php?do=add&amp;bugid=$bug[bugid]">New</a>]</if></td></if>
+       <td class="thead" colspan="2">Votes</td>
+</tr>
+<tr valign="top">
+       <!-- attachments -->
+       <td class="tmiddle">
+       <if condition="$show['attachments']">
 $attachments
-<if condition="$show['putattachments']">
-       <tr>
-               <td style="background-color: #999999">[<a href="attachment.php?do=add&amp;bugid=$bug[bugid]">Add New Attachment</a>]</td>
-       </tr>
-</if>
-</tbody>
-</table>
-
-<br />
-</if>
-
-<table border="1" cellspacing="2" cellpadding="4">
-<thead style="background-color: #EEEEEE">
-       <tr>
-               <td>Votes for this Bug</td>
-       </tr>
-</thead>
-<tbody>
-       <tr>
-               <td>
-                       <strong>Votes for this Bug:</strong> $vote[votefor] ($vote[forpercent]%)<br />
-                       <strong>Votes against this bug:</strong> $vote[voteagainst] ($vote[againstpercent]%)<br />
-                       <strong>Total Votes:</strong> $vote[total]
-               </td>
-       </tr>
+       </if>
+       </td>
+       <!-- / attachments -->
        
-<if condition="$show['vote']">
-       <tr>
-               <td>
-               <form name="vote" action="vote.php" method="post">
+       <!-- voting -->
+       <td class="tmiddle">
+               <strong>For:</strong> $vote[votefor] ($vote[forpercent]%)<br />
+               <strong>Against:</strong> $vote[voteagainst] ($vote[againstpercent]%)<br />
+               <strong>Total:</strong> $vote[total]
+       </td>
+       <td class="tmiddle">
+       <strong>Your Vote</strong><br />
+       <form name="vote" action="vote.php" method="post" class="form">
                <input type="hidden" name="do" value="vote" />
                <input type="hidden" name="bugid" value="$bug[bugid]" />
+               <input type="radio" name="vote" value="1" /> Vote For (+1)<br />
+               <input type="radio" name="vote" value="-1" /> Vote Against (-1)<br />
                
-                       <input type="radio" name="vote" value="1" /> Vote For (+1)<br />
-                       <input type="radio" name="vote" value="-1" /> Vote Against (-1)<br />
-                       <input type="submit" name="submit" value="Vote" />
-               
-               </form>
-               </td>
-       </tr>
-</if>
-</tbody>
+               <input type="submit" name="submit" value="Vote" accesskey="v" />
+       </form>
+       </td>
+       <!-- / voting -->
+</tr>
 </table>
+<!-- / attachments & voting -->
 
 <br />
 
 $comments
 
-<if condition="$show['newreply']"><div>[<a href="newcomment.php?bugid=$bug[bugid]">New Comment</a>]</div></if>
-
 $footer
\ No newline at end of file
diff --git a/templates/showreport_attachment.tpl b/templates/showreport_attachment.tpl
index ca46849a37226e35c8feb77c4f009b410b7b9aec..d7da2c5f2901936490570575481feffbac9071e2 100644 (file)
--- a/templates/showreport_attachment.tpl
+++ b/templates/showreport_attachment.tpl
@@ -1,9 +1,8 @@
-       <tr>
-               <td>
-                       <strong><a href="viewattachment.php?attachmentid=$attachment[attachmentid]" target="_blank"<if condition="$attachment['obsolete']"> style="text-decoration: line-through"</if>>$attachment[filename]</a></strong> posted by $attachment[user] ($attachment[date])
-                       <div style="font-size: 11px; font-color: grey">
+               <div>
+                       <strong><a href="viewattachment.php?attachmentid=$attachment[attachmentid]" target="_blank"<if condition="$attachment['obsolete']"> style="text-decoration: line-through"</if> title="Posted by $attachment[user]\\n($attachment[date])">$attachment[filename]</a></strong>
+                       <span style="font-size: 10px">
                                <if condition="$show['editattach']"><span style="float: right">[<a href="attachment.php?do=edit&amp;attachmentid=$attachment[attachmentid]">Edit</a>]</span></if>
                                $attachment[description]
-                       </div>
-               </td>
-       </tr>
\ No newline at end of file
+                       </span>
+               </div>
+
diff --git a/templates/style.css b/templates/style.css
index 60d65b2776e5a84e946b9635886b063c1cb66895..73a31d72a5231d3cbb4293a2d55350bce4b8bd9f 100644 (file)
--- a/templates/style.css
+++ b/templates/style.css
@@ -18,6 +18,17 @@ body
        background-color: rgb(102, 102, 102);
 }
 
+a
+{
+       color: rgb(0, 0, 0);
+       text-decoration: underline;
+}
+
+       a:hover, .tlabel a:hover
+       {
+               color: /*rgb(0, 51, 64)*/ rgb(64, 102, 112);
+       }
+
 .error
 {
        color: rgb(255, 0, 0);
@@ -68,7 +79,7 @@ body
        
                #tabbar .tab:hover
                {
-                       background-color: rgb(255, 255, 255);
+                       background-color: rgb(191, 204, 207);
                        text-decoration: underline;
                }
        
@@ -78,6 +89,7 @@ body
                border-bottom: none;
                padding-bottom: 5px;
                font-weight: bold;
+               color: rgb(0, 51, 64);
        }
 
 #content
@@ -114,6 +126,11 @@ body
        padding-left: 4px;
 }
 
+       .tlabel a
+       {
+               color: rgb(255, 255, 255);
+       }
+
 .tdata
 {
        width: 35%;
@@ -127,6 +144,35 @@ body
        font-weight: bold;
 }
 
+.thead
+{
+       font-weight: bold;
+       background-color: rgb(51, 51, 51);
+       color: rgb(255, 255, 255);
+       padding-left: 4px;
+}
+
+       .thead a
+       {
+               color: rgb(255, 255, 255);
+               text-decoration: none;
+       }
+       
+               .thead a:hover
+               {
+                       text-decoration: underline;
+               }
+
+.tmiddle
+{
+       background-color: rgb(255, 255, 255);
+}
+
+.form
+{
+       display: inline;
+}
+
 #copyright
 {
        text-align: center;
diff --git a/templates/stylevars.txt b/templates/stylevars.txt
index 36c1119959ec1329c75fa10c216adc3bc3cb0e92..8726e2e8f4e63baea93a6d027729d74bac0eb335 100644 (file)
--- a/templates/stylevars.txt
+++ b/templates/stylevars.txt
@@ -30,7 +30,7 @@ Comments are only valid in C++ style (the type of comment this is).
 
 border: 0;
 spacing: 2;
-padding: 3;
+padding: 2;
 
 /* page elements */
 
Open-source PHP-MySQL bug tracking system that has customizable CSS/XHTML templates, email notifications, Atom syndication, internationalization support, and a very simple setup.