<%= render_flash_messages %>
<%= yield %>
<%= call_hook :view_layouts_base_content %>
- <%=render :partial => 'layouts/base_footer'%>
+ <%=render :partial => 'layouts/new_footer'%>
-
+-
- <%= render :partial => 'course_new' %>
-
+
<% if !User.current.logged?%>
-
+ <%= render :partial => 'course_new' %>
+
@@ -29,166 +29,166 @@
<% end %>
- 讨论区共有<%= @topic_count %>个帖子
- <% if @topics.any? %> - <% @topics.each do |topic| %> -
- <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
-
+
\ No newline at end of file
diff --git a/app/views/boards/_edit.html.erb b/app/views/boards/_edit.html.erb
index 0bb15b167..562319e56 100644
--- a/app/views/boards/_edit.html.erb
+++ b/app/views/boards/_edit.html.erb
@@ -6,14 +6,14 @@
- <% author = topic.author.to_s + "：" %>
- <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
-
-
+ <% end %>
+<% else %>
+ <%= h(topic.subject) %>
- <% if topic.course_editable_by?(User.current) %> - <%= l(:button_edit) %> - <% end %> +讨论区共有<%= @topic_count %>个帖子
+<% if @topics.any? %> + <% @topics.each do |topic| %> +
+ <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
+
-
-
+ <% author = topic.author.to_s + "：" %>
+ <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
+
+
+ <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => 'message_content',:class => ' c_dblue fr' %>
-
+
- <%= h(topic.subject) %>
+ <% if topic.course_editable_by?(User.current) %> + <%= l(:button_edit) %> + <% end %> - <%= link_to( - l(:button_delete), - {:controller =>'messages',:action => 'destroy', :id => topic.id, :board_id => topic.board_id, :is_board=>'true'}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :class => 'talk_edit fr', - :style => ' margin-right: 10px;' - ) if topic.destroyable_by?(User.current) %> - - <% if topic.sticky? %> - <%= l(:label_board_sticky)%> - <% end %> - + <%= link_to( + l(:button_delete), + {:controller =>'messages',:action => 'destroy', :id => topic.id, :board_id => topic.board_id, :is_board=>'true'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :class => 'talk_edit fr', + :style => ' margin-right: 10px;' + ) if topic.destroyable_by?(User.current) %> + + <% if topic.sticky? %> + <%= l(:label_board_sticky)%> + <% end %> + - -
-
- <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => 'message_content',:class => ' c_dblue fr' %>
+
- <%= topic.content.html_safe %>
-
+
+
+
-
- <%= link_to_attachments_course topic, :author => false %>
+
+ <%= link_to_attachments_course topic, :author => false %>
- <%= l(:label_activity_time)%>： <%= format_time topic.created_on %>
+ <%= l(:label_activity_time)%>： <%= format_time topic.created_on %>
-
+ <%= topic.content.html_safe %>
+
- <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
- <% if !topic.locked? && authorize_for('messages', 'reply') %>
-
-
-
+
+
+ <% end %>
+ <% replies_all = topic.children.
+ includes(:author, :attachments, {:board => :project}).
+ reorder("#{Message.table_name}.created_on DESC").offset(2).
+ all %>
+ <% replies_show = topic.children.
+ includes(:author, :attachments, {:board => :project}).
+ reorder("#{Message.table_name}.created_on DESC").limit(2).
+ all %>
+ <% unless replies_show.empty? %>
+ <% reply_count = 0 %>
+
+ <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
+ <% if !topic.locked? && authorize_for('messages', 'reply') %>
+
+
+
- <% end %>
- <% replies_all = topic.children.
- includes(:author, :attachments, {:board => :project}).
- reorder("#{Message.table_name}.created_on DESC").offset(2).
- all %>
- <% replies_show = topic.children.
- includes(:author, :attachments, {:board => :project}).
- reorder("#{Message.table_name}.created_on DESC").limit(2).
- all %>
- <% unless replies_show.empty? %>
- <% reply_count = 0 %>
-
- <% end %>
- <% else %>
-
-
-
- <%if replies_all.first %>
-
+ <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+ <%= toggle_link l(:button_cancel), "reply" + topic.id.to_s, :focus => 'message_content',:class => 'grey_btn fr ml10' %>
+ <%= l(:label_memo_create)%>
<% end %>
- <% end %>
- -
- <% replies_show.each do |message| %>
-
-
-
- <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
- - <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %> -- - -
-<%= textAreailizable message,:content,:attachments => message.attachments %>
- -
- <%= format_time(message.created_on) %> - <%= link_to( - - l(:button_delete), - {:controller => 'messages', :action => 'destroy', :id => message.id, :board_id => message.board_id, :is_board => 'true'}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete), - :class => ' c_dblue fr' - ) if message.course_destroyable_by?(User.current) %> -
- <% end %>
-
<%= l(:label_no_data) %>
- <% end %> + +
+
+
+ <%if replies_all.first %>
+
+ <% end %>
+ <% end %>
+ -
+ <% replies_show.each do |message| %>
+
+
-
+ <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
+ + <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %> ++ + +
+<%= textAreailizable message,:content,:attachments => message.attachments %>
+ +
+ <%= format_time(message.created_on) %> + <%= link_to( + + l(:button_delete), + {:controller => 'messages', :action => 'destroy', :id => message.id, :board_id => message.board_id, :is_board => 'true'}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete), + :class => ' c_dblue fr' + ) if message.course_destroyable_by?(User.current) %> +
+ <% end %>
+
<%= l(:label_no_data) %>
+<% end %>-
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-
<%= form_for topic, { :as => :message,
:url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
- :html => {:multipart => true,
+ :html => {:multipart => true, :name=>'message-form',
:id => 'message-form' + topic.id.to_s,
- :method => :post}
+ :method => :post,:nhname=>'form'}
} do |f| %>
<%= render :partial => 'form_project',
:locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
- <%= l(:button_submit)%>
- <%= l(:button_cancel) %>
+ <%= l(:button_cancel) %>
+ <%= l(:button_submit)%>
<%#= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white" %>