[#263] Removed and tweaks the design based on feedback

pull/351/head
Eric Davis 13 years ago
parent a2514ecc54
commit 5620488727
  1. 5
      app/views/context_menus/issues.html.erb
  2. 4
      app/views/issues/_list.rhtml
  3. 3
      app/views/issues/_relations.rhtml
  4. 9
      app/views/issues/show.rhtml
  5. 6
      app/views/projects/index.rhtml
  6. 5
      app/views/versions/index.html.erb
  7. BIN
      public/images/pencil.png.oxygen
  8. 13
      public/javascripts/DD_belatedPNG.min.js
  9. 2
      public/stylesheets/application.css

@ -1,7 +1,3 @@
<%# Added: classes to the li %>
<%# Added: classes to the a %>
<%# Added: div for submenu icons %>
<%# Removed: icon-* on links %>
<ul class="menu">
<%= call_hook(:view_issues_context_menu_start, {:issues => @issues, :can => @can, :back => @back }) %>
@ -126,7 +122,6 @@
<li class="move"><%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)},
:class => 'context_item', :disabled => !@can[:move] %></li>
<%# All users can copy because the copy acton will check their permissions on the target project %>
<li class="copy"><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'bulk_copy', :project_id => @project, :ids => @issues.collect(&:id)},
:class => 'context_item' %></li>
<li class="delete"><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},

@ -2,7 +2,7 @@
<%= hidden_field_tag 'back_url', url_for(params) %>
<div class="autoscroll">
<table class="list issues">
<thead><tr id="issue-header">
<thead><tr>
<th class="checkbox hide-when-print"><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
:title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
</th>
@ -12,7 +12,7 @@
<% end %>
</tr></thead>
<% previous_group = false %>
<tbody id="issue-list-body">
<tbody>
<% issue_list(issues) do |issue, level| -%>
<% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %>
<% reset_cycle %>

@ -1,6 +1,3 @@
<div class="contextual">
</div>
<p>
<strong><%=l(:label_related_issues)%></strong>
<% if authorize_for('issue_relations', 'new') %>

@ -93,10 +93,11 @@
<% if !@issue.leaf? || User.current.allowed_to?(:manage_subtasks, @project) %>
<hr />
<div id="issue_tree">
<div class="contextual">
<%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %>
</div>
<p><strong><%=l(:label_subtask_plural)%></strong></p>
<p>
<strong><%=l(:label_subtask_plural)%></strong>
(<%= link_to(l(:button_add), {:controller => 'issues', :action => 'new', :project_id => @project, :issue => {:parent_issue_id => @issue}}) if User.current.allowed_to?(:manage_subtasks, @project) %>)
</p>
<%= render_descendants_tree(@issue) unless @issue.leaf? %>
</div>
<% end %>

@ -2,7 +2,7 @@
<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %>
<% end %>
<div id="project-links"class="contextual">
<div id="project-links" class="contextual">
<%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') + ' |' if User.current.allowed_to?(:add_project, nil, :global => true) %>
<%= link_to(l(:label_issue_view_all), { :controller => 'issues' }) + ' |' if User.current.allowed_to?(:view_issues, nil, :global => true) %>
<%= link_to(l(:label_overall_spent_time), { :controller => 'time_entries' }) + ' |' if User.current.allowed_to?(:view_time_entries, nil, :global => true) %>
@ -11,7 +11,9 @@
<h2><%=l(:label_project_plural)%></h2>
<%= textilizable Setting.welcome_text %>
<div class="wiki">
<%= textilizable Setting.welcome_text %>
</div>
<%= render_project_hierarchy(@projects)%>

@ -43,6 +43,11 @@
<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
<% end %>
<h3><%= l(:label_version_plural) %></h3>
<% @versions.each do |version| %>
<%= link_to format_version_name(version), "##{version.name}" %><br />
<% end %>
<% end %>
<% html_title(l(:label_roadmap)) %>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 613 B

File diff suppressed because one or more lines are too long

@ -19,7 +19,7 @@ h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
padding: 0px 0px 0px 0px;
white-space:nowrap;
}
#top-menu a {color: #444;; margin-right: 0px; font-weight: bold;}
#top-menu a {color: #444; margin-right: 0px; font-weight: bold;}
#top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
#account {float:none;}

Loading…
Cancel
Save