natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #8 Misleading label in issue form (minor)

Browse Source
This commit is contained in:
Simon Holywell 2012-04-13 13:05:58 +01:00
parent a9630cea0d
commit cf2f9d419e
3 changed files with 95 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/IDF/templates/idf/issues/create.html
View File

@ -67,18 +67,22 @@
<td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if} <td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}
{$form.f.due_dtime|unsafe} {$form.f.due_dtime|unsafe}
<div id="due_dtime_wrapper"> <div id="due_dtime_wrapper">
<a href="#" rel="{$date_today} {$default_time}" class="due_dtime_shortcut" id="due_dtime_today">Today</a> <a href="#" id="due_dtime_shortcut_link">Date shortcuts&hellip; ▾</a>
<div id="due_dtime_more_shortcuts" style="display: none"> <dl id="due_dtime_more_shortcuts" style="display: none">
<a href="#" rel="{$date_today} {$default_time}" class="due_dtime_shortcut" id="due_dtime_today_more">Today</a> - <dt>Soon</dt>
<a href="#" rel="{$date_tomorrow} {$default_time}" class="due_dtime_shortcut" id="due_dtime_tomorrow">Tomorrow</a> - <dd><a href="#" rel="{$date_today}" class="due_dtime_shortcut" id="due_dtime_today_more">Today</a></dd>
<a href="#" rel="{$date_eow} {$default_time}" class="due_dtime_shortcut" id="due_dtime_eow">End of the Week</a> - <dd><a href="#" rel="{$date_tomorrow}" class="due_dtime_shortcut" id="due_dtime_tomorrow">Tomorrow</a></dd>
<a href="#" rel="{$date_eom} {$default_time}" class="due_dtime_shortcut" id="due_dtime_eom">End of the Month</a><br /> <dd><a href="#" rel="{$date_2_days}" class="due_dtime_shortcut" id="due_dtime_2_days">2 Days</a></dd>
<a href="#" rel="{$date_2_hours}" class="due_dtime_shortcut" id="due_dtime_2_hours">2 Hours</a> -
<a href="#" rel="{$date_2_days} {$default_time}" class="due_dtime_shortcut" id="due_dtime_2_days">2 Days</a> - <dt>Midterm</dt>
<a href="#" rel="{$date_1_week} {$default_time}" class="due_dtime_shortcut" id="due_dtime_1_week">1 Week</a> - <dd><a href="#" rel="{$date_eow}" class="due_dtime_shortcut" id="due_dtime_eow">End of the Week</a></dd>
<a href="#" rel="{$date_two_weeks} {$default_time}" class="due_dtime_shortcut" id="due_dtime_two_weeks">A Fortnight</a> - <dd><a href="#" rel="{$date_1_week}" class="due_dtime_shortcut" id="due_dtime_1_week">1 Week</a></dd>
<a href="#" rel="{$date_one_month} {$default_time}" class="due_dtime_shortcut" id="due_dtime_one_month">1 Month</a> <dd><a href="#" rel="{$date_two_weeks}" class="due_dtime_shortcut" id="due_dtime_two_weeks">A Fortnight</a></dd>
</div>
<dt>Longterm</dt>
<dd><a href="#" rel="{$date_eom}" class="due_dtime_shortcut" id="due_dtime_eom">End of the Month</a></dd>
<dd><a href="#" rel="{$date_one_month}" class="due_dtime_shortcut" id="due_dtime_one_month">1 Month</a></dd>
</dl>
</div> </div>
</td> </td>
<tr> <tr>

28
src/IDF/templates/idf/issues/view.html
View File

@ -132,18 +132,22 @@
<td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if} <td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}
{$form.f.due_dtime|unsafe} {$form.f.due_dtime|unsafe}
<div id="due_dtime_wrapper"> <div id="due_dtime_wrapper">
<a href="#" rel="{$date_today} {$default_time}" class="due_dtime_shortcut" id="due_dtime_today">Today</a> <a href="#" id="due_dtime_shortcut_link">Date shortcuts&hellip; ▾</a>
<div id="due_dtime_more_shortcuts" style="display: none"> <dl id="due_dtime_more_shortcuts" style="display: none">
<a href="#" rel="{$date_today} {$default_time}" class="due_dtime_shortcut" id="due_dtime_today_more">Today</a> - <dt>Soon</dt>
<a href="#" rel="{$date_tomorrow} {$default_time}" class="due_dtime_shortcut" id="due_dtime_tomorrow">Tomorrow</a> - <dd><a href="#" rel="{$date_today}" class="due_dtime_shortcut" id="due_dtime_today_more">Today</a></dd>
<a href="#" rel="{$date_eow} {$default_time}" class="due_dtime_shortcut" id="due_dtime_eow">End of the Week</a> - <dd><a href="#" rel="{$date_tomorrow}" class="due_dtime_shortcut" id="due_dtime_tomorrow">Tomorrow</a></dd>
<a href="#" rel="{$date_eom} {$default_time}" class="due_dtime_shortcut" id="due_dtime_eom">End of the Month</a><br /> <dd><a href="#" rel="{$date_2_days}" class="due_dtime_shortcut" id="due_dtime_2_days">2 Days</a></dd>
<a href="#" rel="{$date_2_hours}" class="due_dtime_shortcut" id="due_dtime_2_hours">2 Hours</a> -
<a href="#" rel="{$date_2_days} {$default_time}" class="due_dtime_shortcut" id="due_dtime_2_days">2 Days</a> - <dt>Midterm</dt>
<a href="#" rel="{$date_1_week} {$default_time}" class="due_dtime_shortcut" id="due_dtime_1_week">1 Week</a> - <dd><a href="#" rel="{$date_eow}" class="due_dtime_shortcut" id="due_dtime_eow">End of the Week</a></dd>
<a href="#" rel="{$date_two_weeks} {$default_time}" class="due_dtime_shortcut" id="due_dtime_two_weeks">A Fortnight</a> - <dd><a href="#" rel="{$date_1_week}" class="due_dtime_shortcut" id="due_dtime_1_week">1 Week</a></dd>
<a href="#" rel="{$date_one_month} {$default_time}" class="due_dtime_shortcut" id="due_dtime_one_month">1 Month</a> <dd><a href="#" rel="{$date_two_weeks}" class="due_dtime_shortcut" id="due_dtime_two_weeks">A Fortnight</a></dd>
</div>
<dt>Longterm</dt>
<dd><a href="#" rel="{$date_eom}" class="due_dtime_shortcut" id="due_dtime_eom">End of the Month</a></dd>
<dd><a href="#" rel="{$date_one_month}" class="due_dtime_shortcut" id="due_dtime_one_month">1 Month</a></dd>
</dl>
</div> </div>
</td> </td>
<tr> <tr>

63
www/media/idf/css/style.css
View File

@ -326,31 +326,72 @@ div.issue-submit-info h2 {
} }
#due_dtime_wrapper { #due_dtime_wrapper {
position: relative;
float: right; float: right;
width: 350px; width: 350px;
position: relative;
padding-left: 0 !important;
}
#due_dtime_shortcut_link {
text-decoration: none;
color: #000;
}
#due_dtime_wrapper > a {
padding-left: 5px;
padding-right: 5px;
margin-top: -3px;
padding-top: 3px;
} }
#due_dtime_more_shortcuts { #due_dtime_more_shortcuts {
display: none; display: none;
width: 345px; width: 345px;
background: #A5E26A;
border-top: 0;
position: absolute; position: absolute;
top: -3px; margin: 1px 0 0;
left: -6px; z-index: 1000;
background: white; top: 1.1em;
padding: 2px 5px; -moz-border-radius: 0 0 3px 3px;
border: 1px solid black; border-radius: 0 0 3px 3px;
-moz-box-shadow: 0 10px 20px #333;
-webkit-box-shadow: 0 10px 20px #333;
box-shadow: 0 10px 20px #333;
max-height: 400px;
min-width: 100%;
overflow-x: hidden;
overflow-y: auto;
padding: 0 5px 5px;
} }
#due_dtime_wrapper a { #due_dtime_more_shortcuts dt {
font-weight: bold;
margin-top: 2px;
}
#due_dtime_more_shortcuts dd {
margin-left: 6px;
}
#due_dtime_more_shortcuts a {
text-decoration: none; text-decoration: none;
color: black;
padding: 0 2px; padding: 0 2px;
} }
#due_dtime_wrapper a:hover { #due_dtime_more_shortcuts a:hover {
background-color: #4E9A06; background: #fff;
color: white; }
#due_dtime_wrapper:hover > a {
background: #A5E26A;
text-decoration: none;
}
#due_dtime_wrapper:hover a {
color: #2E3436;
} }
span.label { span.label {