jro_apps/redmine Commit - r14687:4e979d307366

1

1

2

<%= watcher_link(@news, User.current) %>

2

<%= watcher_link(@news, User.current) %>

3

<%= link_to(l(:button_edit),

3

<%= link_to(l(:button_edit),

4

edit_news_path(@news),

4

edit_news_path(@news),

5

:class => 'icon icon-edit',

5

:class => 'icon icon-edit',

6

:accesskey => accesskey(:edit),

6

:accesskey => accesskey(:edit),

7

:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>

7

:onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>

8

<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>

8

<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>

9

</div>

9

</div>

10

11

11

12

13

<% if authorize_for('news', 'edit') %>

13

<% if authorize_for('news', 'edit') %>

14

14

15

<%= labelled_form_for :news, @news, :url => news_path(@news),

15

<%= labelled_form_for :news, @news, :url => news_path(@news),

16

:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>

16

:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>

17

<%= render :partial => 'form', :locals => { :f => f } %>

17

<%= render :partial => 'form', :locals => { :f => f } %>

18

<%= submit_tag l(:button_save) %>

18

<%= submit_tag l(:button_save) %>

19

<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %> |

19

<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %> |

20

<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>

20

<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>

21

<% end %>

21

<% end %>

22

22

23

</div>

23

</div>

24

<% end %>

24

<% end %>

25

26

26

27

27

28

28

29

<%= textilizable(@news, :description) %>

29

<%= textilizable(@news, :description) %>

30

</div>

30

</div>

31

<%= link_to_attachments @news %>

31

<%= link_to_attachments @news %>

32

<br />

32

<br />

33

34

34

35

35

36

<% @comments.each do |comment| %>

36

<% @comments.each do |comment| %>

37

<% next if comment.new_record? %>

37

<% next if comment.new_record? %>

38

38

39

<%= link_to_if_authorized '', {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},

39

<%= link_to_if_authorized '', {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},

40

:data => {:confirm => l(:text_are_you_sure)}, :method => :delete,

40

:data => {:confirm => l(:text_are_you_sure)}, :method => :delete,

41

:title => l(:button_delete),

41

:title => l(:button_delete),

42

:class => 'icon-only icon-del' %>

42

:class => 'icon-only icon-del' %>

43

</div>

43

</div>

44

44

45

45

<%= textilizable(comment.comments) %>

46

<%= textilizable(comment.comments) %>

47

</div>

46

<% end if @comments.any? %>

48

<% end if @comments.any? %>

47

</div>

49

</div>

48

50

49

<% if @news.commentable? %>

51

<% if @news.commentable? %>

50

<p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>

52

<p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>

51

<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>

53

<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>

52

54

53

<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>

55

<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>

54

<%= wikitoolbar_for 'comment_comments' %>

56

<%= wikitoolbar_for 'comment_comments' %>

55

</div>

57

</div>

56

58

57

<% end %>

59

<% end %>

58

<% end %>

60

<% end %>

59

61

60

<% html_title @news.title -%>

62

<% html_title @news.title -%>

61

63

62

<% content_for :header_tags do %>

64

<% content_for :header_tags do %>

63

<%= stylesheet_link_tag 'scm' %>

65

<%= stylesheet_link_tag 'scm' %>

64

<% end %>

66

<% end %>

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             <div class="contextual">
             <%= watcher_link(@news, User.current) %>
             <%= link_to(l(:button_edit),
                   edit_news_path(@news),
                   :class => 'icon icon-edit',
                   :accesskey => accesskey(:edit),
                   :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
             <%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
             </div>
             <h2><%= avatar(@news.author, :size => "24") %><%=h @news.title %></h2>
             <% if authorize_for('news', 'edit') %>
             <div id="edit-news" style="display:none;">
             <%= labelled_form_for :news, @news, :url => news_path(@news),
                                                        :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
             <%= render :partial => 'form', :locals => { :f => f } %>
             <%= submit_tag l(:button_save) %>
             <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %> |
             <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
             <% end %>
             <div id="preview" class="wiki"></div>
             </div>
             <% end %>
             <p><% unless @news.summary.blank? %><em><%= @news.summary %></em><br /><% end %>
             <span class="author"><%= authoring @news.created_on, @news.author %></span></p>
             <div class="wiki">
             <%= textilizable(@news, :description) %>
             </div>
             <%= link_to_attachments @news %>
             <br />
             <div id="comments" style="margin-bottom:16px;">
             <h3 class="comments"><%= l(:label_comment_plural) %></h3>
             <% @comments.each do |comment| %>
                 <% next if comment.new_record? %>
                 <div class="contextual">
                 <%= link_to_if_authorized '', {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
                                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,
                                           :title => l(:button_delete),
                                           :class => 'icon-only icon-del' %>
                 </div>
                 <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
+                <div class="wiki">
                 <%= textilizable(comment.comments) %>
+                </div>
             <% end if @comments.any? %>
             </div>
             <% if @news.commentable? %>
             <p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
             <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
             <div class="box">
                 <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
                 <%= wikitoolbar_for 'comment_comments' %>
             </div>
             <p><%= submit_tag l(:button_add) %></p>
             <% end %>
             <% end %>
             <% html_title @news.title -%>
             <% content_for :header_tags do %>
               <%= stylesheet_link_tag 'scm' %>
             <% end %>