Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/messages_controller.rb

@@ -165,7 +165,15 @@ class MessagesController < ApplicationController
       render_attachment_warning_if_needed(@message)
       flash[:notice] = l(:notice_successful_update)
       @message.reload
-      redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
+      if params[:is_board]
+        if @project
+          redirect_to project_boards_path(@project)
+        elsif @course
+          redirect_to course_boards_path(@course)
+        end
+      else
+       redirect_to board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id))
+      end
     elsif request.get?
       respond_to do |format|
         format.html {

app/views/boards/_course_show.html.erb

@@ -16,7 +16,7 @@
 <!-- 发布新帖部分 -->
 <div class="cl"></div>
 <div class=" talklist_box" >
-  <div class="talk_new ml15 mb10" id="about_newtalk" >
+  <div class="talk_new ml15 mb10" id="about_newtalk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;" >
     <ul>
       <%= render :partial => 'course_new' %>
     </ul>
@@ -29,18 +29,31 @@
       <hr/>
     </div>
 <% end %>
-
+  <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
   <% if @topics.any? %>
       <% @topics.each do |topic| %>
-          <div class="talkmain_box" style="border:none; margin-bottom:0;">
+          <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
             <div class="talkmain_txt fl mt5">
               <% author = topic.author.to_s + "：" %>
               <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
+
               <p  class="talkmain_tit fl fb">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
-              <% if topic.sticky? %>
+              <% if topic.editable_by?(User.current) %>
-                  <a href="javascript:void(0)" class="talk_up fr c_red"><%= l(:label_board_sticky)%></a>
+                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: left;
+                          margin-left: 20px;"><%= l(:button_edit) %></a>
               <% end %>
+              <% if topic.sticky? %>
+                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
+              <% 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) %>
 
 
               <br/>
@@ -59,6 +72,11 @@
 
             <div class="cl"></div>
           </div><!--讨论主类容 end-->
+          <div class="talk_new ml15 mb10" id="about_newtalk<%=topic.id%>" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;">
+            <ul>
+              <%= render :partial => 'edit',locals:  {:topic => topic} %>
+            </ul>
+          </div>
           <div class="talkWrapBox">
             <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
             <% if !topic.locked? && authorize_for('messages', 'reply') %>
@@ -141,8 +159,9 @@
                     <% end %>
                   </ul>
                 </div>
-                <div class="talkWrapMsg"><a class=" ml258"  id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%= topic.replies_count%>'); " class="c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a></div>
+                <%if replies_all.first %>
-
+                    <div class="talkWrapMsg"><a class=" ml258"  id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a></div>
+                <% end %>
             <% end %>
           </div>
       <% end %>

app/views/boards/_edit.html.erb

@@ -0,0 +1,42 @@
+
+    <% if topic.project %>
+    <%#= board_breadcrumb(@message) %>
+      <!--<h3><%#= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;word-wrap: break-word;"><%#=h @topic.subject %></span></h3>-->
+      <div class="talk_new ml15">
+        <ul>
+            <%= form_for topic, { :as => :message,
+                             :url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
+                             :html => {:multipart => true,
+                             :id => 'message-form' + topic.id.to_s,
+                             :method => :post}
+                           } do |f| %>
+            <%= render :partial => 'form_project',
+                     :locals => {:f => f, :replying => !topic.parent.nil?} %>
+            <a href="#" onclick="$('#message-form<%= topic.id%>').submit();"class="blue_btn fl c_white" ><%= l(:button_submit)%></a>
+          <%= 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"  %>
+        </ul>
+      </div>
+      <% end %>
+<% elsif topic.course %>
+    <%#= course_board_breadcrumb(@message) %>
+      <div class="talk_new ml15">
+        <ul>
+          <%= form_for topic, {
+                                       :as => :message,
+                                       :url => {:controller => 'messages',:action => 'edit', :is_board => 'true',:id => topic.id, :board_id => topic.board_id},
+                                       :html => {:multipart => true,
+                                                 :id => 'message-form' + topic.id.to_s,
+                                                 :method => :post}
+                               } do |f| %>
+              <%= render :partial => 'form_course',
+                         :locals => {:f => f, :replying => !topic.parent.nil?} %>
+              <a href="javascript:void(0)" onclick="$('#message-form<%= topic.id%>').submit();"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
+              <%= 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"  %>
+
+          <% end %>
+        </ul>
+      </div>
+<% end %>
+
+
+<div id="preview" class="wiki"></div>

app/views/boards/_project_show.html.erb

@@ -22,31 +22,46 @@
 <!-- 发布新帖部分 -->
 <div class="cl"></div>
 <div class=" talklist_box" >
-  <div class="talk_new ml15 mb10" id="about_newtalk" >
+  <div class="talk_new ml15 mb10" id="about_newtalk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;">
     <ul>
       <%= render :partial => 'project_new_topic' %>
     </ul>
   </div><!--talknew end-->
 
           <!-- 帖子内容显示      -->
-
+  <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
 <% if @topics.any? %>
       		<% @topics.each do |topic| %>
-          <div class="talkmain_box" style="border:none; margin-bottom:0;">
+          <div class="talkmain_box" style="border:none; margin-bottom:0; border-bottom: 1px dashed #d9d9d9;">
             <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
             <div class="talkmain_txt fl mt5">
                <% author = topic.author.to_s + "：" %>
               <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
-              <p  class="talkmain_tit fl fb">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
+
-                	<% if topic.sticky? %>
+              <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
-                		<a href="javascript:void(0)" class="talk_up fr c_red"><%= l(:label_board_sticky)%></a>
+              <% if topic.editable_by?(User.current) %>
-                	<% end %>
+                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: left;
+                          margin-left: 20px;"><%= l(:button_edit) %></a>
+              <% end %>
+              <% if topic.sticky? %>
+                  <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
+              <% 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) %>
+
 
               <div class="cl"></div>
 
-               <p  id="contentmessage<%=topic.id %>" class="project_board_content">
+               <p  id="contentmessage<%=topic.id %>" class="project_board_content break_word">
                  <%= topic.content %>
-               </p>     <p>
+               </p>
+              <p>
                 <label id="expend_more_information<%= topic.id%>"  onclick="show_more_reply('#contentmessage<%=topic.id %>','#expend_more_information<%= topic.id%>','#arrow<%=topic.id%>');"  value="show_more">[展开]</label>
                 <span class="g-arr-down">
                     <img id="arrow<%=topic.id%>" src="/images/jiantou.jpg" width="12" height="6" />
@@ -62,6 +77,12 @@
 
                 <div class="cl"></div>
              </div><!--讨论主类容 end-->
+
+            <div class="talk_new ml15 mb10" id="about_newtalk<%=topic.id%>" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;">
+              <ul>
+                <%= render :partial => 'edit',locals:  {:topic => topic} %>
+              </ul>
+            </div>
           <div class="talkWrapBox">
             <% reply = Message.new(:subject => "RE: #{@message.subject}")%>
             <% if !topic.locked? && authorize_for('messages', 'reply') %>
@@ -95,7 +116,7 @@
                           <div class="Msg_txt">
                             <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
                             <br/>
-                            <p class="fl"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+                            <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
 
                             <br/>
                             <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
@@ -124,7 +145,7 @@
                     <div class="Msg_txt">
                       <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
                     <br/>
-                      <p class="fl"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+                      <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
 
                     <br/>
                       <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
@@ -144,8 +165,9 @@
             <% end %>
                     </ul>
                 </div>
-                <div class="talkWrapMsg"><a class=" ml258"  id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a></div>
+               <%if replies_all.first %>
-
+                <div class="talkWrapMsg"><a class=" c_blue ml258"  id="showgithelp<%= topic.id%>" value="show_help" onclick ="showhelpAndScrollToMessage('talkWrapMsg<%= topic.id %>','#showgithelp<%= topic.id%>','<%=topic.replies_count%>'); " class="c_dblue lh23">展开回复(<%= topic.replies_count.to_s%>)</a></div>
+               <% end %>
            <% end %>
         </div>
        <% end %>

app/views/boards/show.html.erb

@@ -31,7 +31,10 @@ function show_newtalk()
     $("#about_newtalk").toggle();
 }
 
-
+function show_newtalk1(id)
+{
+    $(id).toggle();
+}
 </script>
 <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>

app/views/layouts/_base_development_group.html.erb

@@ -23,7 +23,7 @@
             <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
         <% end %>
         <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
+            <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
         <% end %>
       </div>
   <% end%>

app/views/layouts/_base_friend_group.html.erb

@@ -12,7 +12,7 @@
             <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
         <% end %>
         <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
+            <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
         <% end %>
       </div>
   <% end%>

app/views/layouts/_base_research_team.html.erb

@@ -23,7 +23,7 @@
             <a  class="subnav_num">(<%= @project.boards.first.topics.count %>)</a>
         <% end %>
         <% if User.current.member_of?(@project) %>
-            <%= link_to "+"+l(:project_module_boards_post), new_board_message_path(@project.boards.first), :layout => 'base_projects', :class => "subnav_green ml105" %>
+            <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
         <% end %>
       </div>
   <% end%>

app/views/layouts/base_courses.html.erb

@@ -133,7 +133,7 @@
         <div class="subNav">
           <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %>
           <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %>
-          <%= link_to( "+#{l(:label_message_new)}", new_board_message_path(@course.boards.first), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
+          <%= link_to( "+#{l(:label_message_new)}", course_boards_path(@course, :flag => true), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
         </div>
         <div class="subNav">
           <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %>

public/javascripts/course.js

@@ -527,3 +527,44 @@ function search_tag_attachment(url,tag_name,q,course_id,sort)
         }
     );
 }
+
+// 课程讨论区
+function showhelpAndScrollToMessage(id, id1, count) {
+    $('#' + id).toggle();
+    if(cookieget("repositories_visiable") == "true")
+    {
+        cookiesave("repositories_visiable", false,'','','');
+    }
+    else
+    {
+        cookiesave("repositories_visiable", true,'','','');
+    }
+    var information = $(id1);
+    var val = information.attr("value");
+    if(val=="show_help")
+    {
+        $(id1).text("收起回复(" + count + ")" );
+        information.attr("value", "hide_help");
+    }
+    else
+    {
+        $(id1).text("展开回复(" + count + ")");
+        information.attr("value", "show_help");
+    }
+}
+function show_more_reply(contentid, id2, id3) {
+    $(contentid).toggleClass("course_description_none");
+    var information = $(id2);
+    var arrow = $(id3);
+    var val = information.attr("value");
+    if (val == "show_more") {
+        $(id2).text("[收起]");
+        information.attr("value", "hide_more");
+        arrow.attr("src", "/images/jiantouup.jpg")
+    }
+    else {
+        $(id2).text("[展开]");
+        information.attr("value", "show_more");
+        arrow.attr("src", "/images/jiantou.jpg")
+    }
+}