diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-12 17:59:02 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-03-12 17:59:02 +0000 |
commit | 027bf93849e82ef3c60e4a3024db49d65f0fb3c9 (patch) | |
tree | c6bc438fcd50370944b94f605b3f34fe54b73248 /app/views/news | |
parent | 071f8e18d02f789149071abb8e052bae7ad01003 (diff) | |
download | redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.tar.gz redmine-027bf93849e82ef3c60e4a3024db49d65f0fb3c9.zip |
added svn:eol-style native property on /app files
git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/news')
-rw-r--r-- | app/views/news/_news.rhtml | 8 | ||||
-rw-r--r-- | app/views/news/show.rhtml | 62 |
2 files changed, 35 insertions, 35 deletions
diff --git a/app/views/news/_news.rhtml b/app/views/news/_news.rhtml index 75a80d634..e48e5041b 100644 --- a/app/views/news/_news.rhtml +++ b/app/views/news/_news.rhtml @@ -1,4 +1,4 @@ -<p><%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %><br />
-<% unless news.summary.empty? %><%=h news.summary %><br /><% end %>
-<em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br />
-<%= news.comments_count %> <%= lwr(:label_comment, news.comments_count).downcase %><br /></p>
+<p><%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %><br /> +<% unless news.summary.empty? %><%=h news.summary %><br /><% end %> +<em><%= news.author.name %>, <%= format_time(news.created_on) %></em><br /> +<%= news.comments_count %> <%= lwr(:label_comment, news.comments_count).downcase %><br /></p> diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml index cf283aae0..92e664452 100644 --- a/app/views/news/show.rhtml +++ b/app/views/news/show.rhtml @@ -1,33 +1,33 @@ -<div class="contextual">
-<%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'icon icon-edit' %>
-<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</div>
-
-<h2><%=h @news.title %></h2>
-
-<p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>
-<%= @news.author.display_name %>, <%= format_time(@news.created_on) %></em></p>
-<br />
+<div class="contextual"> +<%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'icon icon-edit' %> +<%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> +</div> + +<h2><%=h @news.title %></h2> + +<p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %> +<%= @news.author.display_name %>, <%= format_time(@news.created_on) %></em></p> +<br /> <%= textilizable auto_link @news.description %> -<br />
-
-<div id="comments" style="margin-bottom:16px;">
-<h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>
-<% @news.comments.each do |comment| %>
- <% next if comment.new_record? %>
- <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
- <div class="contextual">
- <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
- </div>
- <%= simple_format(auto_link(h comment.comment))%>
-<% end if @news.comments_count > 0 %>
-</div>
-
-<% if authorize_for 'news', 'add_comment' %>
-<% form_tag({:action => 'add_comment', :id => @news}) do %>
-<%= error_messages_for 'comment' %>
-<p><label for="comment_comment"><%= l(:label_comment_add) %></label><br />
-<%= text_area 'comment', 'comment', :cols => 60, :rows => 6 %></p>
-<%= submit_tag l(:button_add) %>
-<% end %>
+<br /> + +<div id="comments" style="margin-bottom:16px;"> +<h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3> +<% @news.comments.each do |comment| %> + <% next if comment.new_record? %> + <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4> + <div class="contextual"> + <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> + </div> + <%= simple_format(auto_link(h comment.comment))%> +<% end if @news.comments_count > 0 %> +</div> + +<% if authorize_for 'news', 'add_comment' %> +<% form_tag({:action => 'add_comment', :id => @news}) do %> +<%= error_messages_for 'comment' %> +<p><label for="comment_comment"><%= l(:label_comment_add) %></label><br /> +<%= text_area 'comment', 'comment', :cols => 60, :rows => 6 %></p> +<%= submit_tag l(:button_add) %> +<% end %> <% end %>
\ No newline at end of file |