diff --git a/app/views/attachments/_form_project.html.erb b/app/views/attachments/_form_project.html.erb index da074f4d5..9778d3242 100644 --- a/app/views/attachments/_form_project.html.erb +++ b/app/views/attachments/_form_project.html.erb @@ -2,7 +2,7 @@ <% if defined?(container) && container && container.saved_attachments %> <% if isReply %> <% container.saved_attachments.each_with_index do |attachment, i| %> - + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") + link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %> @@ -26,7 +26,7 @@ <% end %> <% end %> <% end %> -
+ -
+
+

<%= h @board.name %>

+
+
<% if User.current.logged? %> -
-

<%= l(:label_message_new) %>

-
<%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> - <%= render :partial => 'messages/form', :locals => {:f => f} %> + <%= render :partial => 'messages/form_project', :locals => {:f => f} %>

- <%= l(:button_submit)%> - <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'ButtonColor m3p10' %> + <%= l(:button_submit)%> + <%= link_to l(:button_cancel), "#", :onclick => '$("#add-message").hide(); return false;', :class => 'grey_btn ml10 fl' %>

<% end %>
+

<% end %>
@@ -37,15 +38,12 @@ <% end %> -
-

<%= h @board.name %>

-
项目讨论区共有<%= @topic_count %>个帖子
<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %> <%= link_to l(:label_message_new), new_board_message_path(@board), - :class => 'problem_new_btn fl c_dorange', - :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> + :class => 'problem_new_btn fl c_dorange', + :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %> <% end %>
diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb index 92eddaab7..af8aeb3a5 100644 --- a/app/views/messages/_form_project.html.erb +++ b/app/views/messages/_form_project.html.erb @@ -1,7 +1,7 @@ <%= error_messages_for 'message' %> <% replying ||= false %> <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %> - +

<%= l(:label_message_new) %>

  • <% if replying %> @@ -41,4 +41,4 @@
  • -
    • + \ No newline at end of file diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index a157bb860..7df8fd389 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -7,7 +7,7 @@

    - <%= link_to @topic.subject, project_boards_path(@topic.project),title: @topic.subject.to_s %>

    + <%= @topic.subject %>


    由<%= link_to_user_header @topic.author,false,:class=> 'problem_name c_orange' %> 添加于<%= format_time(@topic.created_on) %>

    @@ -88,7 +88,7 @@ <% if !@topic.locked? && authorize_for('messages', 'reply') %>