diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 9c952bb8..1224b0fe 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -25,47 +25,33 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + <% if User.current.allowed_to?(:view_time_entries, @project) %> - - + + <% end %> - + + + <% if @issue.estimated_hours %> - - + <% end %> - - - <%= render_custom_fields_rows(@issue) %> - - <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> + + <%= render_custom_fields_rows(@issue) %> + <%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
<%=l(:field_status)%>:<%= h(@issue.status.name) %><%=l(:field_category)%>:<%=h(@issue.category ? @issue.category.name : "-") %><%=l(:field_start_date)%>:<%= format_date(@issue.start_date) %>
<%=l(:field_priority)%>:<%= h(@issue.priority.name) %><%=l(:field_fixed_version)%>:<%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %><%=l(:field_due_date)%>:<%= format_date(@issue.due_date) %>
<%=l(:field_assigned_to)%>:<%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %><%=l(:field_done_ratio)%>:<%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %>
<%=l(:field_status)%>:<%= h(@issue.status.name) %><%=l(:field_start_date)%>:<%= format_date(@issue.start_date) %>
<%=l(:field_priority)%>:<%= h(@issue.priority.name) %><%=l(:field_due_date)%>:<%= format_date(@issue.due_date) %>
<%=l(:field_assigned_to)%>:<%= avatar(@issue.assigned_to, :size => "14") %><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %><%=l(:field_done_ratio)%>:<%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %>
<%=l(:field_category)%>:<%=h(@issue.category ? @issue.category.name : "-") %><%=l(:label_spent_time)%>:<%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %><%=l(:label_spent_time)%>:<%= @issue.spent_hours > 0 ? (link_to l_hours(@issue.spent_hours), {:controller => 'timelog', :action => 'index', :project_id => @project, :issue_id => @issue}) : "-" %>
<%=l(:field_fixed_version)%>:<%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %><%=l(:field_estimated_hours)%>:<%= l_hours(@issue.estimated_hours) %><%=l(:field_estimated_hours)%>:<%= l_hours(@issue.estimated_hours) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c05fd089..8bbadcbd 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -266,6 +266,9 @@ div.issue div.subject h3 {margin: 0; margin-bottom: 0.1em;} #issue_tree table.issues { border: 0; } #issue_tree td.checkbox {display:none;} +#content fieldset#filters { + padding-bottom:10px; + } fieldset#filters legend { -moz-border-radius-bottomleft:0px; -moz-border-radius-bottomright:0px; @@ -1249,9 +1252,12 @@ input:-moz-placeholder { font-family:"Arial", Arial, sans-serif; font-style:normal; font-weight:normal; - margin:6px; - height:20px; - line-height:20px; + margin-top:3px; + margin-bottom:3px; + margin-left:6px; + margin-right:6px; + height:15px; + line-height:15px; } #breadcrumb { height:38px;