--- a/ForgeTracker/forgetracker/templates/ticket.html
+++ b/ForgeTracker/forgetracker/templates/ticket.html
@@ -18,39 +18,36 @@
</head>
<body>
- <div id="sidebar-right">
- State: $ticket.status<br/>
- Assigned To: ${ticket.assigned_to_name()}<br/>
- <py:for each="field in globals.custom_fields or []">
- ${field.label}: ${ticket.custom_fields.get(field.name, '')}<br/>
- </py:for>
- </div>
- <div id="ticket_header">
- <div class="reported_by">
- ${gravatar(ticket.reported_by().preferences.email_address, size=50)}<br/>
- ${ticket.reported_by().username}
+ <div class="span-14">
+ <div class="span-2">
+ ${gravatar(ticket.reported_by().preferences.email_address, size=50)}
+ </div>
+ <div class="span-12 last">
+ <h2 class="ticket_title">#$ticket.ticket_num $ticket.summary</h2>
+ <a href="${ticket.reported_by().url()}">${ticket.reported_by().username}</a>, ${helpers.ago(ticket.created_date, round=True)}
+ <div py:content="Markup(g.markdown.convert(ticket.description))"/>
+ ${list_attachments(list(ticket.attachments), False)}
+ </div>
</div>
- <div class="information">
- <div style="overflow: auto">
- <h2 class="title">#$ticket.ticket_num $ticket.summary</h2>
- <div class="update_times">
- reported ${helpers.ago(ticket.created_date, round=True)}<br/>
- last updated ${helpers.ago(ticket.last_updated, round=True)}
- </div>
- <a class="feed" href="${ticket.url()}feed.rss"><img src="/images/rss.png" alt="subscribe" title="subscribe" width="25" height="25"/></a>
- </div>
- <div>
+ <div id="sidebar-right" class="span-5 last">
+ <a class="ticket_feed" href="${ticket.url()}feed.rss"><img src="/images/rss.png" alt="subscribe" title="subscribe" width="25" height="25"/></a>
+ Status: $ticket.status<br/>
<div class="tags" py:if="len(ticket.tags)">
Tags: <span py:for="tag in ticket.tags">$tag.tag ($tag.count) </span>
</div>
- </div>
+ Assigned To:
+ <py:if test="not ticket.assigned_to()">${ticket.assigned_to_name()}</py:if>
+ <a py:if="ticket.assigned_to()" href="${ticket.assigned_to().url()}">${ticket.assigned_to_name()}</a>
+ <br/>
+ <py:for each="field in globals.custom_fields or []">
+ ${field.label}: ${ticket.custom_fields.get(field.name, '')}<br/>
+ </py:for>
+ <br/>
+ <a href="#comment">Leave a Comment</a><br/>
+ <a href="edit">Edit this Ticket</a>
</div>
- </div>
-
- <div py:content="Markup(g.markdown.convert(ticket.description))"/>
- ${list_attachments(list(ticket.attachments), False)}
<hr/>
- <h2>Comments</h2>
+ <h2 id="comment">Comments</h2>
<div class="reply title-pane closed">
<h3 class="title">Make a comment</h3>
<div class="content">