diff .svn/pristine/43/435d200d5b8e7f06b0e465d23cb053a76fc8f49e.svn-base @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/43/435d200d5b8e7f06b0e465d23cb053a76fc8f49e.svn-base	Fri Jun 14 09:28:30 2013 +0100
@@ -0,0 +1,62 @@
+<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><%=h @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 image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
+                                                       :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
+    </div>
+    <h4><%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %></h4>
+    <%= textilizable(comment.comments) %>
+<% 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 %>