diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index bde061f31..c83d9133f 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -27,6 +27,11 @@
}
}
+ function submitComment()
+ {
+ $("#add_comment_form").submit();
+ }
+
function regexDescription()
{
var name = $("#news_description").val();
@@ -54,104 +59,71 @@
}
-
- <%= 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) %>
-
-
-<%=h @news.title %>
<% if authorize_for('news', 'edit') %>
<%= 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) %>
- <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:onmouseover => 'this.focus()',:class => 'ButtonColor m3p10' %>
- <%#= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %>
- <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'ButtonColor m3p10'%>
+ <%= render :partial => 'project_form', :locals => { :f => f, :is_new => false } %>
<% end %>
<% end %>
-
+<% content_for :header_tags do %>
+ <%= stylesheet_link_tag 'scm' %>
+<% end %>
+<% html_title @news.title -%>
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index b07f1ac9f..5c88c6be3 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -337,4 +337,8 @@ a:hover.st_add{ color:#ff8e15;}
padding-left: 20px;
padding-top: 2px;
padding-bottom: 3px;
-}
\ No newline at end of file
+}
+/*新闻*/
+.msg_box{ width:670px; height:173px; border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box h4{ }
+.msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; }
\ No newline at end of file
- <%= link_to_attachments @news %> -
- - <% if @news.commentable? %> -
+
<%=h @news.title %>
+ <%#= watcher_link(@news, User.current) %> + <%= link_to(l(:button_edit), + edit_news_path(@news), + :class => 'talk_edit fr', + :accesskey => accesskey(:edit), + :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %> + <%= delete_link news_path(@news),:class => 'talk_edit fr' if User.current.allowed_to?(:manage_news, @project) %> + +<%= l(:label_create_time) %> : <%= format_time(@news.created_on) %>
- <%= submit_tag l(:button_add) %> -
+ <%= l(:label_comment_add) %> <% end %> <% end %> - - <% html_title @news.title -%> - - <% content_for :header_tags do %> - <%= stylesheet_link_tag 'scm' %> - <% end %> - - - -<%= l(:label_comment_plural) %>
- <% comments = @comments.reverse %> - <% comments.each do |comment| %> +<%= textAreailizable(comment.comments) %>
+