--- a/ForgeTracker/forgetracker/templates/ticket.html
+++ b/ForgeTracker/forgetracker/templates/ticket.html
@@ -19,17 +19,15 @@
<body>
<form method="POST" action="${ticket.url()}update_ticket">
- <div class="span-12 append-1">
+ <div class="span-11 append-1">
<span class="editable viewing" style="padding: 0">
- <h1 class="title">
- <py:if test="not allow_edit">#$ticket.ticket_num $ticket.summary</py:if>
- <py:if test="allow_edit">
- <span class="viewer">#$ticket.ticket_num $ticket.summary</span>
- <span class="editor">
- <input name="summary" value="$ticket.summary" class="title wide"/>
- </span>
- </py:if>
- </h1>
+ <py:if test="not allow_edit"><h1 class="title">#$ticket.ticket_num $ticket.summary</h1></py:if>
+ <py:if test="allow_edit">
+ <span class="viewer"><h1 class="title">#$ticket.ticket_num $ticket.summary</h1></span>
+ <span class="editor">
+ <input name="summary" value="$ticket.summary" class="title wide"/>
+ </span>
+ </py:if>
</span>
<hr class="clear clearfix"/>
@@ -38,7 +36,7 @@
<span class="${allow_edit and 'viewer' or ''}">
${Markup(g.markdown.convert(ticket.description))}
</span>
- <span class="editor" py:if="allow_edit">
+ <span class="multiline editor" py:if="allow_edit">
${c.markdown_editor.display(name='description',value=ticket.description)}
</span>
</div>
@@ -51,36 +49,35 @@
${c.attachment_list.display(attachments=list(ticket.attachments), edit_mode=False)}
</div>
- <div id="sidebar-right" class="span-6 last">
+ <div id="sidebar-right" class="span-7 last">
<div class="span-3 tright"><b>Created by:</b></div>
- <div class="span-3 last gravatar sm">
+ <div class="span-4 last gravatar sm">
${gravatar(ticket.reported_by.preferences.email_address, size=16)}
<a href="${ticket.reported_by.url()}">${ticket.reported_by.display_name}</a>
</div>
<hr class="clear clearfix"/>
<div class="span-3 tright clear"><b>Created Time:</b></div>
- <div class="span-3 last">
+ <div class="span-4 last">
${h.ago(ticket.created_date)}
</div>
<hr class="clear clearfix"/>
<div class="span-3 tright clear"><b>Assigned to:</b></div>
- <div class="span-3 last">
+ <div class="span-4 last">
<div class="gravatar sm${allow_edit and ' editable viewing' or ''}">
<py:if test="ticket.assigned_to_id">
- ${gravatar(ticket.assigned_to.preferences.email_address, size=16)}
<a py:if="not allow_edit" href="${ticket.assigned_to.url()}">${ticket.assigned_to_name()}</a>
<py:if test="allow_edit">
<span class="ticket-assigned-to viewer">
- <a href="${ticket.assigned_to.url()}">${ticket.assigned_to_name()}</a>
+ ${gravatar(ticket.assigned_to.preferences.email_address, size=16)} <a href="${ticket.assigned_to.url()}">${ticket.assigned_to_name()}</a>
</span>
- <span class="editor">${c.user_select.display(name='assigned_to',value=ticket.assigned_to_id)}</span>
+ <span class="multiline overlap editor">${c.user_select.display(name='assigned_to',value=ticket.assigned_to_id)}</span>
</py:if>
</py:if>
<py:if test="not ticket.assigned_to_id">
<span class="ticket-assigned-to ${allow_edit and 'viewer' or ''}">${ticket.assigned_to_name()}</span>
- <span class="editor" py:if="allow_edit">${c.user_select.display(name='assigned_to',value=ticket.assigned_to_id)}</span>
+ <span class="multiline overlap editor" py:if="allow_edit">${c.user_select.display(name='assigned_to',value=ticket.assigned_to_id)}</span>
</py:if>
</div>
</div>
@@ -88,10 +85,10 @@
<div class="span-3 tright"><b>Status:</b></div>
- <div class="span-3 last">
+ <div class="span-4 last">
<span class="${allow_edit and ' editable viewing' or ''}">
<span class="${ticket.status}${allow_edit and ' viewer' or ''}">${ticket.status}</span>
- <span class="editor" py:if="allow_edit">
+ <span class="multiline overlap editor" py:if="allow_edit">
<select name="status">
<option py:for="option in globals.status_names.split()" value="$option"
selected="${'selected' if ticket.status==option else None}">$option</option>
@@ -101,10 +98,10 @@
</div>
<hr class="clear clearfix"/>
<div class="span-3 tright"><b>Milestone:</b></div>
- <div class="span-3 last">
+ <div class="span-4 last">
<span class="${allow_edit and ' editable viewing' or ''}">
<span class="${allow_edit and ' viewer' or ''}">${ticket.milestone or 'None'}</span>
- <span class="editor" py:if="allow_edit">
+ <span class="multiline overlap editor" py:if="allow_edit">
<select name="milestone">
<option value="">None</option>
<option py:for="option in globals.milestone_names.split()" value="$option"
@@ -116,10 +113,10 @@
<hr class="clear clearfix"/>
<py:for each="field in globals.custom_fields or []">
<div class="span-3 tright"><b>${field.label}:</b></div>
- <div class="span-3 last">
+ <div class="span-4 last">
<span class="${allow_edit and ' editable viewing' or ''}">
<span class="${allow_edit and ' viewer' or ''}">${ticket.custom_fields.get(field.name, '') or ' '}</span>
- <span class="editor" py:if="allow_edit">
+ <span class="multiline overlap editor" py:if="allow_edit">
<input py:if="field.type != 'select' and field.type != 'boolean'" name="custom_fields.${field.name}" type="text"
value="${ticket.custom_fields.get(field.name, '')}" class="title wide"/>
<input py:if="field.type == 'boolean' and ticket.custom_fields.get(field.name, '') == 'True'"
@@ -140,7 +137,7 @@
<hr class="clear clearfix"/>
</py:for>
<div class="span-3 tright"><b>Tags:</b></div>
- <div class="span-3 last">
+ <div class="span-4 last">
<span class="${allow_edit and ' editable viewing' or ''}">
<span class="${allow_edit and ' viewer' or ''}">
<span py:for="label in ticket.labels" class="ui-corner-all tag">
@@ -148,7 +145,7 @@
</span>
<py:if test="not len(ticket.labels)">None</py:if>
</span>
- <span class="editor" py:if="allow_edit">${c.label_edit.display(name='labels', value=ticket.labels)}</span>
+ <span class="multiline overlap editor" py:if="allow_edit">${c.label_edit.display(name='labels', value=ticket.labels)}</span>
</span>
</div>
<span class="actions clear">