diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-12 13:57:29 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-08-12 13:57:29 +0000 |
| commit | 6862b979090482785f336130952dcf5a7e97db8c (patch) | |
| tree | 7dccbda74cb1ab2935e6812c6887c3cff78589fc /app/views/issues | |
| parent | 64e91b2e13813f129db910efd976080e02fd0a45 (diff) | |
| download | redmine-6862b979090482785f336130952dcf5a7e97db8c.tar.gz redmine-6862b979090482785f336130952dcf5a7e97db8c.zip | |
Removed IssuesController#history, all changes are now displayed on issues/show (not only the last 15).
Added anchor links to issue notes, eg: /issues/show/1#note-3
git-svn-id: http://redmine.rubyforge.org/svn/trunk@613 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_history.rhtml | 10 | ||||
| -rw-r--r-- | app/views/issues/history.rhtml | 6 | ||||
| -rw-r--r-- | app/views/issues/show.rhtml | 8 |
3 files changed, 8 insertions, 16 deletions
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml index ad5141581..1ad0c235d 100644 --- a/app/views/issues/_history.rhtml +++ b/app/views/issues/_history.rhtml @@ -1,11 +1,13 @@ +<% note_id = journals.length %> <% for journal in journals %> - <h4><%= format_time(journal.created_on) %> - <%= journal.user.name %></h4> + <h4><div style="float:right;"><%= link_to "##{note_id}", :anchor => "note-#{note_id}" %></div> + <%= content_tag('a', '', :name => "note-#{note_id}")%> + <%= format_time(journal.created_on) %> - <%= journal.user.name %></h4> <ul> <% for detail in journal.details %> <li><%= show_detail(detail) %></li> <% end %> </ul> - <% if journal.notes? %> - <%= textilizable(journal.notes) %> - <% end %> + <%= textilizable(journal.notes) unless journal.notes.blank? %> + <% note_id -= 1 %> <% end %> diff --git a/app/views/issues/history.rhtml b/app/views/issues/history.rhtml deleted file mode 100644 index 830e1fc8e..000000000 --- a/app/views/issues/history.rhtml +++ /dev/null @@ -1,6 +0,0 @@ -<h3><%=l(:label_history)%></h3> -<div id="history"> -<%= render :partial => 'history', :locals => { :journals => @journals } %> -</div> -<br /> -<p><%= link_to l(:button_back), :action => 'show', :id => @issue %></p>
\ No newline at end of file diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml index 4e5bf7b43..078ecd1f5 100644 --- a/app/views/issues/show.rhtml +++ b/app/views/issues/show.rhtml @@ -81,14 +81,10 @@ end %> </div> <% end %> -<% if @journals_count > 0 %> +<% if @journals.any? %> <div id="history" class="box"> -<h3><%=l(:label_history)%> -<% if @journals_count > @journals.length %>(<%= l(:label_last_changes, @journals.length) %>)<% end %></h3> +<h3><%=l(:label_history)%></h3> <%= render :partial => 'history', :locals => { :journals => @journals } %> -<% if @journals_count > @journals.length %> - <p><center><small><%= link_to l(:label_change_view_all), :action => 'history', :id => @issue %></small></center></p> -<% end %> </div> <% end %> |