diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 5e24410f..99f9b714 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -725,7 +725,8 @@ module ApplicationHelper div_class = 'toc' div_class << ' right' if $1 == '>' div_class << ' left' if $1 == '<' - out = "' + out << '' end end end diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml index 9f38bf06..b1af5785 100644 --- a/app/views/issues/_action_menu.rhtml +++ b/app/views/issues/_action_menu.rhtml @@ -1,11 +1,9 @@
+<%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %> <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'new', :issue_id => @issue}, :class => 'icon icon-time-add' %> <%= watcher_link(@issue, User.current, {:class => 'watcher_link', :replace => ['#watchers', '.watcher_link']}) %> <%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %> <%= link_to_if_authorized l(:button_copy), {:controller => 'issue_moves', :action => 'new', :id => @issue, :copy_options => {:copy => 't'}}, :class => 'icon icon-copy' %> <%= link_to_if_authorized l(:button_move), {:controller => 'issue_moves', :action => 'new', :id => @issue}, :class => 'icon icon-move' %> <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => (@issue.leaf? ? l(:text_are_you_sure) : l(:text_are_you_sure_with_children)), :method => :post, :class => 'icon icon-del' %> -
-<%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => '', :accesskey => accesskey(:edit)) %> -
diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml index 6de1c2d6..1bb4ee68 100644 --- a/app/views/issues/_sidebar.rhtml +++ b/app/views/issues/_sidebar.rhtml @@ -1,16 +1,6 @@

<%= l(:label_issue_plural) %>

-<%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %>
-<% if @project %> -<%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %>
-<% end %> <%= call_hook(:view_issues_sidebar_issues_bottom) %> -<% if User.current.allowed_to?(:view_calendar, @project, :global => true) %> - <%= link_to(l(:label_calendar), :controller => 'calendars', :action => 'show', :project_id => @project) %>
-<% end %> -<% if User.current.allowed_to?(:view_gantt, @project, :global => true) %> - <%= link_to(l(:label_gantt), :controller => 'gantts', :action => 'show', :project_id => @project) %>
-<% end %> <%= call_hook(:view_issues_sidebar_planning_bottom) %> <%= render_sidebar_queries %> diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml index a4974771..c7cb5156 100644 --- a/app/views/issues/index.rhtml +++ b/app/views/issues/index.rhtml @@ -1,7 +1,6 @@

<%= @query.new_record? ? l(:label_issue_plural) : h(@query.name) %>

-<% html_title(@query.new_record? ? l(:label_issue_plural) : h(@query.name)) %>
@@ -13,6 +12,8 @@ <%= render :partial => 'queries/new_issue_button' %>
+<% html_title(@query.new_record? ? l(:label_issue_plural) : h(@query.name)) %> + <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %> <%= hidden_field_tag('project_id', @project.to_param) if @project %>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 16f6b68a..caed97e3 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -13,6 +13,7 @@

<%= h(@issue.tracker.name) %> #<%= @issue.id %>

+

<%= authoring @issue.created_on, @issue.author %>. @@ -107,6 +108,7 @@

<%= render :partial => 'relations' %>
+
<% end %>
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index 06e88d45..653fc98d 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -32,12 +32,13 @@
- <% account_items = menu_items_for(:account_menu) %> - -
    - <%= content_tag('li', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}", :id => '') if User.current.logged? %> - <% account_items.each do |item| %> - <%= render_menu_node(item) %> + +
    +
@@ -61,17 +62,11 @@
  • @@ -82,7 +77,7 @@ <%= hidden_field_tag(controller.default_search_scope, 1, :id => nil) if controller.default_search_scope %> <%= text_field_tag 'q', @question, :size => 20, :class => 'small', :accesskey => accesskey(:quick_search) %> <% end %> -
    • + <%= render_menu_node(help_menu_item) %> <% unless User.current.logged? %>
  • <%= link_to l(:label_login), {:controller => 'account', :action => 'login'}, :class => 'login' %> @@ -104,6 +99,10 @@ <% end %>
    • +
    +
    <% main_menu = render_main_menu(@project) %> @@ -113,8 +112,6 @@ <% display_sidebar = false %> <% end %>
    "> - -

    <%= page_header_title %>

    <% if display_sidebar %>