merge

app/controllers/account_controller.rb

@@ -315,7 +315,7 @@ class AccountController < ApplicationController
     #根据home_url生产正则表达式
     eval("code = " + "/^" + home_url.gsub(/\//,"\\\/") + "\\\/*(welcome)?\\\/*(\\\/index\\\/*.*)?\$/")
     if (code=~params[:back_url] || params[:back_url].to_s.include?('lost_password')) && last_login_on != ''
-      redirect_to user_activities_path(user)
+      redirect_to user_activities_path(user,host: Setting.user_domain)
     else
       if last_login_on == ''
         redirect_to my_account_url

app/controllers/bids_controller.rb

@@ -490,7 +490,7 @@ class BidsController < ApplicationController
               (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
               (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
               FROM homework_attaches WHERE bid_id = #{@bid.id} ORDER BY s_score DESC,created_at ASC) AS table1
-              WHERE table1.t_score IS NULL OR table1.t_score = 0")
+              WHERE table1.t_score IS NULL")
           @not_batch_homework = true
           @cur_type = 1
         else

app/controllers/discuss_demos_controller.rb

@@ -0,0 +1,42 @@
+class DiscussDemosController < ApplicationController
+  def index
+
+    @discuss_demo_list = DiscussDemo.where("body is not null").order("created_at desc").page(params[:page] || 1).per(10)
+  end
+
+  def new
+    @discuss_demo = DiscussDemo.create
+    @discuss_demo.save!
+    @discuss_demo
+  end
+
+  def create
+
+  end
+
+  def update
+    @discuss_demo = DiscussDemo.find(params[:id])
+    @discuss_demo.update_attributes(:title =>  params[:discuss_demo][:title],:body =>  params[:discuss_demo][:body])
+    redirect_to :controller=> 'discuss_demos',:action => 'show',:id => params[:id]
+  end
+
+  def delete
+
+  end
+
+  def destroy
+    asset = Kindeditor::Asset.find_by_owner_id(params[:id])
+    if !asset.nil?
+      filepath = File.join(Rails.root,"public","files","uploads",
+                           asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s,
+                           asset[:asset].to_s)
+      File.delete(filepath) if File.exist?filepath
+    end
+    DiscussDemo.destroy(params[:id])
+    redirect_to :controller=> 'discuss_demos',:action => 'index'
+  end
+
+  def show
+    @discuss_demo = DiscussDemo.find(params[:id])
+  end
+end

app/controllers/homework_attach_controller.rb

@@ -51,7 +51,7 @@ class HomeworkAttachController < ApplicationController
       order_by = "created_at #{direction}"
     end
     all_homework_list = HomeworkAttach.eager_load(:attachments,:user,:rate_averages).find_by_sql("SELECT * FROM (SELECT homework_attaches.*,
-            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL AND stars > 0 ORDER BY updated_at DESC limit 0,1) AS t_score,
+            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
             FROM homework_attaches WHERE bid_id = #{@bid.id}
             ORDER BY #{order_by}) AS table1
@@ -445,7 +445,8 @@ class HomeworkAttachController < ApplicationController
     is_teacher = @is_teacher ? 1 : 0
     #保存评分@homework.rate(@m_score.to_i,User.current.id,:quality, (@is_teacher ? 1 : 0))
     @is_comprehensive_evaluation = @is_teacher ? 1 : (@is_anonymous_comments ? 2 : 3) #判断当前评论是老师评论？匿评？留言
-    if @m_score && (@is_teacher || @is_anonymous_comments)
+    if @is_teacher || @is_anonymous_comments
+      @m_score ||= 0
       rate = @homework.rates(:quality).where(:rater_id => User.current.id, :is_teacher_score => is_teacher).first
       if rate
         rate.stars = @m_score
@@ -502,7 +503,7 @@ class HomeworkAttachController < ApplicationController
       get_not_batch_homework_list params[:cur_sort] || "s_socre",params[:cur_direction] || "desc",@homework.bid_id
     elsif @cur_type == "2" #老师已批列表
       @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
-            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL AND stars > 0 ORDER BY updated_at DESC limit 0,1) AS t_score,
+            (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,
             (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
             FROM homework_attaches WHERE id = #{@homework.id}").first
     elsif @cur_type == "3" #全部作业列表
@@ -629,7 +630,7 @@ class HomeworkAttachController < ApplicationController
         (SELECT AVG(stars) FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 0) AS s_score
         FROM homework_attaches WHERE bid_id = #{bid_id}
         ORDER BY #{order_by}) AS table1
-        WHERE table1.t_score IS NULL OR table1.t_score = 0 ")
+        WHERE table1.t_score IS NULL ")
     @all_homework_list = search_homework_member(@all_homework_list,@search_name.to_s.downcase) if @search_name
     # @homework_list = paginateHelper @all_homework_list,10
     @homework_list = @all_homework_list

app/controllers/issues_controller.rb

@@ -75,7 +75,11 @@ class IssuesController < ApplicationController
       else
         @limit = 10#per_page_option
       end
-
+      @assign_to_id = params[:assigned_to_id]
+      @author_id = params[:author_id]
+      @priority_id = params[:priority_id]
+      @status_id = params[:status_id]
+      @subject = params[:subject]
       @issue_count = @query.issue_count
       @issue_pages = Paginator.new @issue_count, @limit, params['page']
       @offset ||= @issue_pages.offset

app/controllers/messages_controller.rb

@@ -93,7 +93,15 @@ class MessagesController < ApplicationController
         end
         call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
         render_attachment_warning_if_needed(@message)
-        redirect_to board_message_url(@board, @message)
+        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(@board, @message)
+        end
       else
         layout_file = @project ? 'base_projects' : 'base_courses'
         render :action => 'new', :layout => layout_file
@@ -131,9 +139,16 @@ class MessagesController < ApplicationController
       render_attachment_warning_if_needed(@reply)
      else
       #render file: 'messages#show', layout: 'base_courses'
+     end
+    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(@board, @topic, :r => @reply)
     end
-    redirect_to board_message_url(@board, @topic, :r => @reply)
-
   end
 
   # Edit a message
@@ -150,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 {
@@ -172,16 +195,20 @@ class MessagesController < ApplicationController
     @message.destroy
     # modify by nwb
     if @project
-      if @message.parent
+      if params[:is_board]
-        redirect_to board_message_url(@board, @message.parent, :r => r)
-      else
         redirect_to project_boards_url(@project)
+      else
+        redirect_to board_message_url(@board, @topic, :r => @reply)
       end
     elsif @course
-      if @message.parent
+      if params[:is_board]
-        redirect_to board_message_url(@board, @message.parent, :r => r)
+        redirect_to course_boards_url(@course)
       else
-        redirect_to course_board_url(@course, @board)
+        if @message.parent
+          redirect_to board_message_url(@board, @message.parent, :r => r)
+        else
+          redirect_to course_board_url(@course, @board)
+        end
       end
     end
   end

app/controllers/trackers_controller.rb

@@ -38,12 +38,13 @@ class TrackersController < ApplicationController
     @tracker ||= Tracker.new(params[:tracker])
     @trackers = Tracker.sorted.all
     @projects = Project.where("project_type = #{Project::ProjectType_project}").all
-    @courses = Course.all
+    # 去掉原因，这块代码已经没有用到
-    @course_activity_count=Hash.new
+    # @courses = Course.all
-    @courses.each do |course|
+    # @course_activity_count=Hash.new
-      @course_activity_count[course.id]=0
+    # @courses.each do |course|
-    end
+    #   @course_activity_count[course.id]=0
-    @course_activity_count=get_course_activity @courses,@course_activity_count
+    # end
+    # @course_activity_count=get_course_activity @courses,@course_activity_count
   end
 
   def create

app/helpers/courses_helper.rb

@@ -797,4 +797,17 @@ module CoursesHelper
     end
     result
   end
+
+  def zh_course_role role
+    if role == "TeachingAsistant"
+      result = l(:label_TA)
+    elsif role == "Teacher"
+      result = l(:label_teacher)
+    elsif role == "Student"
+      result = l(:label_student)
+    elsif role == "Manager"
+      result = l(:field_admin)
+    end
+    result
+  end
 end

app/helpers/queries_helper.rb

@@ -243,15 +243,15 @@ module QueriesHelper
 
   # Retrieve query from session or build a new query
   def retrieve_query
-    if !params[:query_id].blank?
+    # if !params[:query_id].blank?
-      cond = "project_id IS NULL"
+    #   cond = "project_id IS NULL"
-      cond << " OR project_id = #{@project.id}" if @project
+    #   cond << " OR project_id = #{@project.id}" if @project
-      @query = IssueQuery.find(params[:query_id], :conditions => cond)
+    #   @query = IssueQuery.find(params[:query_id], :conditions => cond)
-      raise ::Unauthorized unless @query.visible?
+    #   raise ::Unauthorized unless @query.visible?
-      @query.project = @project
+    #   @query.project = @project
-      session[:query] = {:id => @query.id, :project_id => @query.project_id}
+    #   session[:query] = {:id => @query.id, :project_id => @query.project_id}
-      sort_clear
+    #   sort_clear
-    elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
+    # elsif api_request? || params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
       # Give it a name, required to be valid
       @query = IssueQuery.new(:name => "_")
       @query.project = @project
@@ -268,12 +268,12 @@ module QueriesHelper
                     'assigned_to_id' => [params[:assigned_to_id]]} unless params[:status_id].nil?
       @query.build_from_params(params)
       #session[:query] = {:project_id => @query.project_id, :filters => @query.filters, :group_by => @query.group_by, :column_names => @query.column_names}
-    else
+    # else
-      # retrieve from session
+    #   # retrieve from session
-      @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id]
+    #   @query = IssueQuery.find_by_id(session[:query][:id]) if session[:query][:id]
-      @query ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
+    #   @query ||= IssueQuery.new(:name => "_", :filters => session[:query][:filters], :group_by => session[:query][:group_by], :column_names => session[:query][:column_names])
-      @query.project = @project
+    #   @query.project = @project
-    end
+    # end
   end
 
   def retrieve_query_from_session

app/services/courses_service.rb

@@ -86,7 +86,7 @@ class CoursesService
       gender = m.user.user_extensions.gender.nil? ? 0 : m.user.user_extensions.gender
       work_unit = get_user_work_unit m.user
       location = get_user_location m.user
-      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender, :work_unit => work_unit, :mail => m.user.mail, :location => location, :brief_introduction => m.user.user_extensions.brief_introduction}
+      users << {:id => m.user.id, :img_url => img_url, :nickname => m.user.login, :gender => gender, :work_unit => work_unit, :mail => m.user.mail, :location => location, :brief_introduction => m.user.user_extensions.brief_introduction,:realname=>m.user.realname}
     end
     users
   end

app/views/bids/_homework.html.erb

@@ -59,6 +59,55 @@
                 }
             );
         }
+
+//        $(window).scroll(function(){
+//            //获取窗口的滚动条的垂直位置
+//            var s = $(window).scrollTop();
+//            //当窗口的滚动条的垂直位置大于页面的最小高度时，让返回顶部元素渐现，否则渐隐
+//            if( s > 600){
+//                $("#gotoTop").fadeIn(100);
+//            }else{
+//                $("#gotoTop").fadeOut(200);
+//            };
+//        });
+        $(function(){goTopEx();});
+
+        var Sys = {};
+        var ua = navigator.userAgent.toLowerCase();
+        var s;
+        (s = ua.match(/msie ([\d.]+)/)) ? Sys.ie = s[1] :
+                (s = ua.match(/firefox\/([\d.]+)/)) ? Sys.firefox = s[1] :
+                        (s = ua.match(/chrome\/([\d.]+)/)) ? Sys.chrome = s[1] :
+                                (s = ua.match(/opera.([\d.]+)/)) ? Sys.opera = s[1] :
+                                        (s = ua.match(/version\/([\d.]+).*safari/)) ? Sys.safari = s[1] : 0;
+
+        function goTopEx() {
+            var obj = document.getElementById("goTopBtn");
+            var scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop || 0;
+            function getScrollTop() {
+                var xsun = document.documentElement.scrollTop;
+                if (Sys.chrome) {
+                    xsun=document.body.scrollTop;
+                }
+                return xsun;
+            }
+            function setScrollTop(value) {
+                if (Sys.chrome) {
+                    document.body.scrollTop = value;
+                }
+                else {
+                    document.documentElement.scrollTop = value;
+                }
+            }
+            window.onscroll = function () { getScrollTop() > 0 ? obj.style.display = "" : obj.style.display = "none"; };
+            obj.onclick = function () {
+                var goTop = setInterval(scrollMove, 10);
+                function scrollMove() {
+                    setScrollTop(getScrollTop() / 1.1);
+                    if (getScrollTop() < 1) clearInterval(goTop);
+                }
+            }
+        }
 	</script>
 </div>
 <div id='bidding_project_list'>

app/views/bids/_new_homework_form.html.erb

@@ -35,7 +35,7 @@
     </li>
     <li class="ml9" id="bid_evaluation_num_li"  style="display: <%= bid.open_anonymous_evaluation == 1 ? 'block' : 'none'%>;">
       <label><span class="c_red">*</span>&nbsp;<%= l(:field_evaluation_num)%>&nbsp;&nbsp;：</label>
-      <input  type="text" name="bid[evaluation_num]" id="bid_evaluation_num"  class="hwork_input02" onkeyup="regex_evaluation_num();" value="<%= bid.evaluation_num%>">
+      <input  type="text" name="bid[evaluation_num]" id="bid_evaluation_num"  class="hwork_input02" onkeyup="regex_evaluation_num();" value="<%= bid.evaluation_num%>" maxlength="3">
       <span><%= l(:label_evaluation_description)%></span>
       <p id="bid_evaluation_num_span" class="c_red" style="padding-left: 90px;"></p>
     </li>

app/views/boards/_course_new.html.erb

@@ -0,0 +1,9 @@
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+
+    <%= render :partial => 'form_course', :locals => {:f => f} %>
+    <li>
+      <%= link_to l(:button_cancel), course_boards_path(@course), :class => 'grey_btn fr ml10' %>
+      <a href="#" onclick="$('#message-form').submit();" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <div class="cl"></div>
+    </li>
+<% end %>

app/views/boards/_course_show.html.erb

@@ -10,7 +10,7 @@
       <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => false, :id => 'message-form'} do |f| %>
           <%= render :partial => 'messages/form_course', :locals => {:f => f} %>
           <p>
-           <a href="javascript:void(0)" onclick="submitCoursesBoard();"class="ButtonColor m3p10"><%= l(:button_submit)%></a>
+            <a href="javascript:void(0)" onclick="submitCoursesBoard();"class="ButtonColor m3p10"><%= l(:button_submit)%></a>
             <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => '$("#add-message").hide(); return false;' ,:class => 'ButtonColor m3p10'  %>
           </p>
       <% end %>
@@ -42,14 +42,14 @@
               :class => 'problem_new_btn fl c_dorange' if User.current.logged? %>
   <div class="cl"></div>
 </div>
-  <% if @topics.any? %>
+<% if @topics.any? %>
-      <% @topics.each do |topic| %>
+    <% @topics.each do |topic| %>
         <div class="problem_main">
           <%= link_to image_tag(url_to_avatar(topic.author), :width=>"32",:height=>"32"), user_path(topic.author),:class => 'problem_pic talk_pic fl' %>
           <div class="talk_txt fl">
-            <%= link_to h(topic.subject.truncate(40,ommision:'...')), board_message_path(@board, topic),title: topic.subject.to_s,:class => "problem_tit fl fb c_dblue" %>
+            <%= link_to h(topic.subject), board_message_path(@board, topic),title: topic.subject.to_s,:class => "problem_tit fl fb c_dblue" %>
             <% if topic.sticky? %>
-              <a href="javascript:void(0)" class="talk_up fr c_red">置顶</a>
+                <a href="javascript:void(0)" class="talk_up fr c_red">置顶</a>
             <% end %>
             <br/>
             <p>由<%= link_to topic.author,user_path(topic.author),:class => "problem_name" %>添加于<%= format_time(topic.created_on) %></p>
@@ -58,17 +58,17 @@
 
           <div class="cl"></div>
         </div><!--讨论主类容 end-->
-      <% end %>
+    <% end %>
-  <% else %>
+<% else %>
-      <p class="nodata">
+    <p class="nodata">
-        <%= l(:label_no_data) %>
+      <%= l(:label_no_data) %>
-      </p>
+    </p>
-  <% end %>
+<% end %>
 <ul class="wlist">
   <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
 </ul>
 <%# other_formats_links do |f| %>
-    <%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
+<%#= f.link_to 'Atom', :url => {:key => User.current.rss_key} %>
 <%# end %>
 
 <% html_title @board.name %>

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/_form_course.html.erb

@@ -0,0 +1,60 @@
+<%= error_messages_for 'message' %>
+<% replying ||= false %>
+<% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
+<% if replying %>
+    <li style="display: none">
+      <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
+
+      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %>
+
+
+      <p id="subject_span" class="ml55"></p>
+    </li>
+<% else %>
+    <li>
+      <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
+
+
+      <%= f.text_field :subject, { size: 60, id: "message_subject", onkeyup: "regexSubject();",:class=>"talk_input w585" }.merge(extra_option) %>
+
+      <p id="subject_span" class="ml55"></p>
+    </li>
+<% end %>
+<li class="ml60 mb5">
+  <% unless replying %>
+      <% if @message.safe_attribute? 'sticky' %>
+          <%= f.check_box :sticky %>
+          <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+      <% end %>
+      <% if @message.safe_attribute? 'locked' %>
+          <%= f.check_box :locked %>
+          <%= label_tag 'message_locked', l(:label_board_locked) %>
+      <% end %>
+  <% end %>
+  <div class="cl"></div>
+</li>
+<li>
+  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <% unless replying %>
+      <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
+  <% end %>
+  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <% if replying%>
+      <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)", :style=>"width: 575px;" %>
+  <% else %>
+      <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
+  <% end %>
+  <div class="cl"></div>
+  <p id="message_content_span"  class="ml55"></p>
+</li>
+<div class="cl"></div>
+<li>
+  <% unless replying %>
+      <div  class="fl ml3" style="padding-left: 52px;">
+        <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
+      </div>
+  <% end %>
+</li>
+<li >
+  <div class="cl"></div>
+</li>

app/views/boards/_form_project.html.erb

@@ -0,0 +1,60 @@
+<%= error_messages_for 'message' %>
+<% replying ||= false %>
+<% extra_option = replying ? { readonly: true} : { maxlength: 200 } %>
+<% if replying %>
+<li style="display: none">
+  <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
+
+      <%= f.text_field :subject, { size: 60, id: "message_subject",:class=>"talk_input w585" }.merge(extra_option) %>
+
+
+  <p id="subject_span" class="ml55"></p>
+</li>
+<% else %>
+    <li>
+      <label><span class="c_red">*</span>&nbsp;<%= l(:field_subject) %>&nbsp;&nbsp;：</label>
+
+
+      <%= f.text_field :subject, { size: 60, id: "message_subject", onkeyup: "regexSubject();",:class=>"talk_input w585" }.merge(extra_option) %>
+
+      <p id="subject_span" class="ml55"></p>
+    </li>
+<% end %>
+<li class="ml60 mb5">
+  <% unless replying %>
+      <% if @message.safe_attribute? 'sticky' %>
+          <%= f.check_box :sticky %>
+          <%= label_tag 'message_sticky', l(:label_board_sticky) %>
+      <% end %>
+      <% if @message.safe_attribute? 'locked' %>
+          <%= f.check_box :locked %>
+          <%= label_tag 'message_locked', l(:label_board_locked) %>
+      <% end %>
+  <% end %>
+  <div class="cl"></div>
+</li>
+<li>
+  <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <% unless replying %>
+    <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
+  <% end %>
+  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <% if replying%>
+    <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)", :style=>"width: 575px;" %>
+  <% else %>
+      <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
+  <% end %>
+  <div class="cl"></div>
+  <p id="message_content_span"  class="ml55"></p>
+</li>
+<div class="cl"></div>
+<li>
+<% unless replying %>
+  <div  class="fl ml3" style="padding-left: 52px;">
+    <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
+  </div>
+ <% end %>
+</li>
+<li >
+  <div class="cl"></div>
+</li>

app/views/boards/_project_new_topic.html.erb

@@ -0,0 +1,9 @@
+<%= form_for @message, :url =>{:controller=>'messages',:action => 'new',  :board_id => @board.id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+
+    <%= render :partial => 'form_project', :locals => {:f => f} %>
+    <li>
+      <%= link_to l(:button_cancel), project_boards_path(@project), :class => 'grey_btn fr ml10' %>
+      <a href="#" onclick="$('#message-form').submit();" class="blue_btn fr " style="margin-left: 55px"><%= l(:button_submit)%></a>
+      <div class="cl"></div>
+    </li>
+<% end %>

app/views/boards/_project_show.html.erb

@@ -1,11 +1,14 @@
-<div class="project_r_h">
+<div class="project_r_h" xmlns="http://www.w3.org/1999/html">
-  <h2 class="project_h2">
+  <h2 class="project_h2 fl">
     <% if User.current.language == "zh"%>
         <%= h @board.name %>
     <% else %>
         <%= l(:project_module_boards) %>
     <% end %>
+
   </h2>
+  <a href="javascript:void(0)" class="green_btn fr newtalk " onclick="show_newtalk();"><%= l(:label_message_new) %></a>
+  <div class="cl"></div>
 </div>
 
 <!--display the board-->
@@ -16,34 +19,158 @@
     </div>
 <% end %>
 
-<!-- 内容显示部分 -->
+<!-- 发布新帖部分 -->
-<div class="talk_top">
+<div class="cl"></div>
-        	<div class="fl"><span><%= l(:label_project_board_count , :count => @topic_count)%></span></div>
+<div class=" talklist_box" >
-<% if @project.enabled_modules.where("name = 'boards'").count > 0 && User.current.member_of?(@project) %>
+  <div class="talk_new ml15 mb10" id="about_newtalk" style="display:<%= !@flag.nil? && @flag=='true' ? 'block' : 'none' %>;">
-        		<span><%= link_to l(:project_module_boards_post), new_board_message_path(@board),
+    <ul>
-                    		         :class => 'problem_new_btn fl c_dorange',
+      <%= render :partial => 'project_new_topic' %>
-                    		         :onclick => 'showAndScrollTo("add-message", "message_subject"); return false;' if User.current.logged? %></span>
+    </ul>
-  				<% end %>
+  </div><!--talknew end-->
-            <div class="cl"></div>
+
-            </div>
           <!-- 帖子内容显示      -->
+  <p class="c_dark mb5">讨论区共有<span class="c_orange"><%= @topic_count %></span>个帖子</p>
 <% if @topics.any? %>
       		<% @topics.each do |topic| %>
-          <div class="problem_main">
+          <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=>"32",:height=>"32"), user_path(topic.author),:class => 'problem_pic talk_pic fl' %>
+            <%= link_to image_tag(url_to_avatar(topic.author), :width=>"42",:height=>"42"), user_path(topic.author),:class =>'talkmain_pic fl' %>
-      		<div class="talk_txt fl">
+            <div class="talkmain_txt fl mt5">
-      			<%= link_to h(topic.subject), board_message_path(@board, topic), title:topic.subject.to_s, :class =>"problem_tit fl" %>
+               <% author = topic.author.to_s + "：" %>
-                	<% if topic.sticky? %>
+              <%= link_to author, user_path(topic.author), :class =>"talkmain_name fl " %>
-                		<a href="javascript:void(0)" class="talk_up fr c_red"><%= l(:label_board_sticky)%></a>
+
-                	<% end %>
+              <p  class="talkmain_tit fl fb break_word">&nbsp;&nbsp;<%=  h(topic.subject) %></p>
-                <br/>
+              <% if topic.editable_by?(User.current) %>
-                <%= l(:label_post_by)%><%= link_to topic.author, user_path(topic.author), :class =>"problem_name" %>
+                  <a href="javascript:void(0)"  onclick="show_newtalk1('#about_newtalk<%= topic.id%>');" style="color: #426e9a;float: left;
-                	&nbsp;<%= l(:label_post_by_time)%><%= format_time topic.created_on %>
+                          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 break_word">
+                 <%= topic.content %>
+               </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" />
+                </span>
+
+              </p>
+
+
+
+              <%= l(:label_activity_time)%>：&nbsp;&nbsp;<%= format_time topic.created_on %>
             </div>
-                	<%= link_to (l(:label_short_reply) + " "+topic.replies_count.to_s), board_message_path(@board, topic), :class => "talk_btn fr c_white" %>
+            <%= toggle_link l(:button_reply), "reply" + topic.id.to_s, :focus => 'message_content',:class => ' c_dblue fr' %>
+
                 <div class="cl"></div>
              </div><!--讨论主类容 end-->
-             <% 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') %>
+                <em class="talkWrapArrow"></em>
+                <div class="cl"></div>
+                <div class="talkConIpt ml15 mb10" style="display: none" id="reply<%= topic.id %>">
+                  <%= form_for reply, :as => :reply, :url => {:controller=>'messages',:action => 'reply', :id => topic.id, :board_id => topic.board_id, :is_board => 'true'}, :html => {:multipart => true, :id => 'message_form' + topic.id.to_s} do |f| %>
+
+                      <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
+                      <a href="#" onclick="$('#message_form<%= topic.id%>').submit();" class="talk_btn fr c_white" style=""><%= l(:label_memo_create)%></a>
+                  <% end %>
+                  <div class="cl"></div>
+                </div>
+            <% 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 %>
+                <div class="talkWrapMsg">
+                  <ul>
+                    <% replies_show.each do |message| %>
+
+                        <li>
+                          <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
+                          <div class="Msg_txt">
+                            <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
+                            <br/>
+                            <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+
+                            <br/>
+                            <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
+                            <%= 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) %>
+                          </div>
+                          <div class="cl"></div>
+
+                        </li><!---留言内容-->
+                    <% end %>
+                  </ul>
+                </div>
+                <div class="talkWrapMsg" id="talkWrapMsg<%= topic.id %>" style="display: none">
+                  <ul>
+            <% replies_all.each do |message| %>
+
+                      <li>
+                        <%= link_to image_tag(url_to_avatar(message.author), :width => '34',:height => '34'), user_path(message.author), :class =>'Msg_pic' %>
+                    <div class="Msg_txt">
+                      <%= link_to_user_header message.author,false,:class => 'fl c_orange ' %>
+                    <br/>
+                      <p class="fl break_word"><%= textAreailizable message,:content,:attachments => message.attachments %></p>
+
+                    <br/>
+                      <span class=" c_grey fl"><%= format_time(message.created_on) %></span>
+                      <%= 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) %>
+                    </div>
+                    <div class="cl"></div>
+
+                </li><!---留言内容-->
+            <% end %>
+                    </ul>
+                </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 %>
   <% else %>
       <p class="nodata"><%= l(:label_no_data) %></p>
   <% end %>
@@ -61,3 +188,33 @@
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@project}: #{@board}") %>
 <% end %>
+  </div>
+<script type="text/javascript">
+    //    var flag = false;
+    //    jQuery(document).ready(function($) {
+    //        transpotUrl('#content');
+    //    });
+    function submit_message_replay()
+    {
+        if(flag)
+        {
+            $("#message_form").submit();
+        }
+    }
+    function regexContent()
+    {
+        var content = $.trim($("#message_content").val());
+        if(content.length ==0)
+        {
+            $("#message_content_span").text("<%= l(:label_reply_empty) %>");
+            $("#message_content_span").css('color','#ff0000');
+            flag =  false;
+        }
+        else
+        {
+            $("#message_content_span").text("<%= l(:label_field_correct) %>");
+            $("#message_content_span").css('color','#008000');
+            flag = true;
+        }
+    }
+</script>

app/views/boards/show.html.erb

@@ -1,4 +1,41 @@
+<script type="text/javascript">
+    //头部导航
+    var menuids=["TopUserNav"] //Enter id(s) of SuckerTree UL menus, separated by commas
+    function buildsubmenus(){
+        for (var i=0; i<menuids.length; i++){
+            var ultags=document.getElementById(menuids[i]).getElementsByTagName("ul")
+            for (var t=0; t<ultags.length; t++){
+                ultags[t].parentNode.getElementsByTagName("a")[0].className="subfolderstyle"
+                ultags[t].parentNode.onmouseover=function(){
+                    this.getElementsByTagName("ul")[0].style.display="block"
+                }
+                ultags[t].parentNode.onmouseout=function(){
+                    this.getElementsByTagName("ul")[0].style.display="none"
+                }
+            }
+        }
+    }
 
+    if (window.addEventListener)
+        window.addEventListener("load", buildsubmenus, false)
+    else if (window.attachEvent)
+        window.attachEvent("onload", buildsubmenus)
+</script>
+
+<script type="text/javascript">//侧导航
+
+
+
+function show_newtalk()
+{
+    $("#about_newtalk").toggle();
+}
+
+function show_newtalk1(id)
+{
+    $(id).toggle();
+}
+</script>
 <% if @project %>
     <%= render :partial => 'project_show', locals: {project: @project} %>
 <% elsif @course %>

app/views/courses/_course_members.html.erb

@@ -21,7 +21,7 @@
   <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@course), :remote => true, :method => :post}) do |f| %>
       <div class="member_search">
         <input hidden="hidden" value="true" name="flag">
-        <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
+        <input id="principal_search" class="member_search_input fl" type="text" placeholder="<%= l(:label_invite_trustie_user_tips)%>">
         <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@course, :format => 'js',:flag => true) }')" %>
         <div class="cl"></div>
 
@@ -37,7 +37,7 @@
           <% @roles.each do |role| %>
               <li>
                 <%= radio_button_tag 'membership[role_ids][]', role.id, role.name == "学生" || role.name == "Student" %>
-                <label ><%= h role %></label>
+                <label ><%= zh_course_role(h role) %></label>
               </li>
           <% end %>
         </ul>

app/views/courses/_course_teacher.html.erb

@@ -1,6 +1,7 @@
 <div class="st_list">
   <div class="st_box">
     <a href="javascript:void(0)" class="fr fb  mb5" >加入时间</a>
+    <a href="javascript:void(0)" class="fr fb  mb5 mr70" >角色</a>
     <div class="cl"></div><!--st_box_top end-->
 
     <% members.each do |member| %>
@@ -9,8 +10,9 @@
             <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 32, :height => 32))  %>
           </a>
           <span class="fl ml10 c_grey"><%= l(:label_username)%></span>
-          <%= link_to(member.user.name, user_path(member.user),:class => "ml10 c_blue02") %>
+          <%= link_to(member.user.show_name, user_path(member.user),:class => "ml10 c_blue02") %>
           <span class="fr c_grey"><%= format_date(member.created_on)%></span>
+          <span class="fr c_grey mr30 w45"><%= zh_course_role(h member.roles.sort.collect(&:to_s).first)%></span>
         </div>
         <div class="cl"></div>
     <% end%>

app/views/courses/_courses_jours.html.erb

@@ -15,7 +15,7 @@
             <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
             <%= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;",
                  :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%>
-            <a href="javascript:void(0)" class="grey_btn fr ml10 mt10">取&nbsp;&nbsp;消</a>
+            <a href="javascript:void(0)" class="grey_btn fr ml10 mt10" onclick="KindEditor.instances[0].html('');">取&nbsp;&nbsp;消</a>
             <a href="javascript:void(0)"  onclick='leave_message_editor.sync();$("#leave_message_form").submit();' class="blue_btn fr mt10">
               <%= l(:button_leave_meassge)%>
             </a>

app/views/courses/_member.html.erb

@@ -2,21 +2,21 @@
     <li >
       <%= link_to_user_header member.principal,true,:class => "w150 c_orange fl" %>
       <span class="w150 fl">
-        <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+        <%= zh_course_role(h member.roles.sort.collect(&:to_s).join(', ')) %>
         <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                               :method => :put,
                               :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
             ) do |f| %>
             <% @roles.each do |role| %>
-                <ul style="text-align: left;" class="ml20">
+                <ul style="text-align: left;" class="ml45">
                   <%= radio_button_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                          :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
-                  <label ><%= h role %></label>
+                  <label ><%= zh_course_role(h role) %></label>
                 </ul>
                 <!--<br/>-->
             <% end %>
             <%= hidden_field_tag 'membership[role_ids][]', '' %>
-            <div class="ml20">
+            <div class="ml45">
               <a href="javascript:void(0)" class="member_btn" onclick="$('#member-<%= member.id%>-roles-form').submit();" style="margin-right: 10px;">
                 <%= l(:button_change)%>
               </a>

app/views/files/_project_file_list.html.erb

@@ -24,9 +24,9 @@
                 <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
 
                 <% if manage_allowed && file.container_id == project.id && file.container_type == "Project"  %>
-                <span id="is_public_<%= file.id %>">
+                    <span id="is_public_<%= file.id %>">
-                  <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
+                        <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
-                </span>
+                    </span>
                 <% else %>
                       <!--  <#%= link_to (file.is_public? ? "公开":"私有"),"javascript:void(0)",:class=>"f_l re_open" %> -->
                 <% end %>

app/views/homework_attach/_addjour.html.erb

@@ -21,7 +21,9 @@
 
     function submit_jours(is_teacher)
     {
-        if(!is_teacher&&$("#stars_value").val() == "0"){alert("您还没有打分");return;}
+//        if(("#stars_value").val() == "0"){
+//            if(confirm('是否确定评分为0分?')){}else{return;}
+//        }
         if(!is_teacher&&$("#new_form_user_message").val() == ""){alert("您还没有填写评语");return;}
         $('#new_form_user_message').parent().submit();
     }

app/views/homework_attach/_homework.html.erb

@@ -32,7 +32,7 @@
   <% unless is_student_batch_homework %>
       <%= l(:label_teacher_score)%>:
       <span class="c_red">
-        <%= (homework.t_score.nil? || (homework.t_score && homework.t_score.to_i == 0)) ? l(:label_without_score) : format("%.2f",homework.t_score)%>
+        <%= (homework.t_score.nil?) ? l(:label_without_score) : format("%.2f",homework.t_score)%>
       </span>
       &nbsp;&nbsp;
   <% end %>

app/views/homework_attach/_homeworks_list.html.erb

@@ -34,7 +34,11 @@
       </span>
     </div>
 <% end %>
+<div class="cl"></div>
 
+<div class="to_top" id="goTopBtn" style="display: none;">
+    返<br/>回<br/>顶<br/>部
+</div>
 <div class="cl"></div>
 
 <% unless homeworks.nil? %>

app/views/homework_attach/_review.html.erb

@@ -22,11 +22,11 @@
                   </span>
                 <% end %>
               </span>
-              <span style="color:#a6a6a6; margin-right:30px; margin-left:10px;">
+              <span style="color:#a6a6a6; margin-right:20px; margin-left:10px;">
                 <%= format_time(review.created_at) %>
               </span>
               <span style="font-weight:bold; color:#a6a6a6; float: right;">
-                <% if review.stars && review.stars.to_i > 0%>
+                <% if review.stars%>
                     <span style="float:left">
                       <%= l(:label_work_rating) %>：
                     </span>

app/views/homework_attach/_show.html.erb

@@ -11,6 +11,14 @@
         for (var i = num; i >= 0; i--) {$("#star0" + i).css("background-position","-24px 0px");}
         $("#stars_value").val(num);
     }
+
+    function ChoseZero()
+    {
+        if(confirm('是否确定评分为0分?'))
+        {
+            ChoseStars(0);
+        }
+    }
   </script>
 <div id="popbox">
   <div class="ping_con">

app/views/homework_attach/_show_star.html.erb

@@ -1,3 +1,4 @@
+<a style="float: right;padding-left: 10px;font-weight: normal;cursor: pointer;color: red;" onclick="ChoseZero();">零分</a>
 <span><a href="javascript:" id="star05" onclick="ChoseStars(5)" style="background-position:<%= start_score>=5 ? '-24px 0px;':'-2px 0'%>"></a></span>
 <span><a href="javascript:" id="star04" onclick="ChoseStars(4)" style="background-position:<%= start_score>=4 ? '-24px 0px;':'-2px 0'%>"></a></span>
 <span><a href="javascript:" id="star03" onclick="ChoseStars(3)" style="background-position:<%= start_score>=3 ? '-24px 0px;':'-2px 0'%>"></a></span>

app/views/homework_attach/show.js.erb

@@ -3,7 +3,7 @@ showModal('ajax-modal', '513px');
 $('#ajax-modal').css('height','569px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
-    "<a href='#' onclick='hidden_homework_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    "<a href='javascript:void(0)' onclick='hidden_homework_atert_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
 $('#ajax-modal').parent().removeClass("alert_praise");
 $('#ajax-modal').parent().css("top","").css("left","");
 $('#ajax-modal').parent().addClass("alert_box");

app/views/issues/_list.html.erb

@@ -12,7 +12,7 @@
                 <%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %>
                 <span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)：</span>
               <div class="problem_tit_div fl">
-                <%=link_to "#{column_content[4]}<span class = '#{get_issue_type(column_content[1])}'>#{get_issue_typevalue(column_content[1])}</span>".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word" %>
+                <%=link_to "#{column_content[4]}<span class = '#{get_issue_type(column_content[1])}'>#{get_issue_typevalue(column_content[1])}</span>".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word",:target => "_blank" %>
               </div>
               <div class="cl"></div>
                 <p>

app/views/issues/index.html.erb

@@ -34,31 +34,31 @@
       <%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %>
           <%= hidden_field_tag 'set_filter', '1' %>
           <div class="problem_search" >
-            <input class="problem_search_input fl" id="v_subject" type="text" name="v[subject]" value="" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
+            <input class="problem_search_input fl" id="v_subject" type="text" name="v[subject]" value="<%= @subject ? @subject : ""%>" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
             <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
           </div><!--problem_search end-->
 
           <div id="filter_form" class="fr" >
             <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["指派给",0]),
-                        { :include_blank => false,:selected=>0
+                        { :include_blank => false,:selected=>@assign_to_id ? @assign_to_id : 0
                         },
                         {:onchange=>"remote_function();",:id=>"assigned_to_id",:name=>"v[assigned_to_id]",:class=>"w90"}
                 )
             %>
             <%= select( :issue,:prior, [["低",1],["正常",2],["高",3],["紧急",4],["立刻",5]].unshift(["优先级",0]),
-                        { :include_blank => false,:selected=>0
+                        { :include_blank => false,:selected=>@priority_id ?  @priority_id : 0
                         },
                         {:onchange=>"remote_function();",:id=>"priority_id",:name=>"v[priority_id]",:class=>"w90"}
                 )
             %>
             <%= select( :issue,:status, [["新增",1],["正在解决",2],["已解决",3],["反馈",4],["关闭",5],["拒绝",6]].unshift(["状态",0]),
-                        { :include_blank => false,:selected=>0
+                        { :include_blank => false,:selected=>@status_id ? @status_id : 0
                         },
                         {:onchange=>"remote_function();",:id=>"status_id",:name=>"v[status_id]",:class=>"w90"}
                 )
             %>
             <%= select( :issue,:user_id, @project.members.order("lower(users.login)").map{|c| [c.name, c.user_id]}.unshift(["作者",0]),
-                        { :include_blank => false,:selected=>0
+                        { :include_blank => false,:selected=>@author_id ? @author_id : 0
                         },
                         {:onchange=>"remote_function();",:id=>"author_id",:name=>"v[author_id]",:class=>"w90"}
                 )

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%>
@@ -46,7 +46,7 @@
       <% end %><!--meny end -->
 
   <!-- more -->
-  <div class="subNav subNav_jiantou" onclick="expand_tools_expand();" id="expand_tools_expand"><%= l(:label_project_more) %></div>
+  <div class="subNav subNav_jiantou" onclick="$('#navContent').toggle(500);" id="expand_tools_expand"><%= l(:label_project_more) %></div>
-  <ul class="navContent">
+  <ul class="navContent" id="navContent">
     <%= render 'projects/tools_expand' %>
   </ul>

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" %>

app/views/layouts/base_projects.html.erb

@@ -157,8 +157,8 @@
                   <!--邀请加入-->
                   <div class="subNavBox">
                     <% if User.current.member_of?(@project) %>
-                        <div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" onclick="expand_tools_expand('invit');"><%= l(:label_invite)%></div>
+                        <div class="subNav currentDd currentDt subNav_jiantou" id="expand_tools_expand_invit" onclick="$('#navContent_invit').toggle(500);"><%= l(:label_invite)%></div>
-                        <ul class="navContent " style="display:block">
+                        <ul class="navContent " style="display:block" id="navContent_invit">
                           <li><%=  link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %></li>
                           <% if User.current.allowed_to?(:manage_members, @project) %>
                             <li><%=  link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %></li>

app/views/my/account.html.erb

@@ -117,7 +117,7 @@
 
     <div>
     <!-- 昵称 -->
-    <p style="width:630px;padding-left: 40px;">
+    <p style="width:730px;padding-left: 40px;">
       <%= f.text_field :login, :required => true, :size => 25, :name => "login", :style =>  'border:1px solid #d3d3d3;'%>
       <span class='font_lighter'><%= l(:label_max_number) %></span>
       <br/>

app/views/news/_course_show.html.erb

@@ -1,9 +1,3 @@
-<script>
-    function clearMessage()
-    {
-        $("#news_comment").html("<%= escape_javascript(hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none') %><%= escape_javascript(kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字")%>");
-    }
-</script>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
 <div class="project_r_h">
   <h2 class="project_h2"><%= l(:label_course_news) %></h2>
@@ -39,7 +33,7 @@
             <%= kindeditor_tag :comment, '',:height=>'100',:editor_id =>'comment_editor', :placeholder=>"最多250个字"%>
           </div>
           <p class="mt10">
-            <a href="javascript:void(0)" class="grey_btn fr ml10" onclick="clearMessage();">
+            <a href="javascript:void(0)" class="grey_btn fr ml10" onclick="KindEditor.instances[0].html('');">
               <%= l(:label_cancel_with_space) %>
             </a>
             <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">

app/views/projects/_project_members.html.erb

@@ -20,7 +20,7 @@
   <%= form_for(@member, {:as => :membership, :url => course_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
       <div class="member_search">
         <input hidden="hidden" value="true" name="flag">
-        <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
+        <input id="principal_search" class="member_search_input fl" type="text" placeholder="<%= l(:label_invite_trustie_user_tips)%>">
         <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_course_memberships_path(@project, :format => 'js',:flag => true) }')" %>
         <div class="cl"></div>
 

app/views/projects/invite_members.html.erb

@@ -33,8 +33,18 @@
                   </li>
                   <% roles.each do |role| %>
                   <li class="fl mr5">
-                     <%= check_box_tag 'membership[role_ids][]', role.id %>
+                    <%= check_box_tag 'membership[role_ids][]', role.id %>
-                     <%= h role %>
+                    <% if User.current.language == "zh" %>
+                        <% if role.id == 3 %>
+                            <label >管理人员</label>
+                        <% elsif role.id == 4 %>
+                            <label >开发人员</label>
+                        <% else %>
+                            <label >报告人员</label>
+                        <% end %>
+                    <% else %>
+                        <label ><%= h role %></label>
+                    <% end %>
                   </li>
                   <% end %>
                 </ul>

app/views/projects/settings/_new_members.html.erb

@@ -2,7 +2,12 @@
 <%
    roles = Role.givable.all
    if @project.project_type == Project::ProjectType_course
-     roles = roles[3..5]
+     if User.current.language == "zh"
+       roles = ["管理人员","开发者","报告人员"]
+     else
+       roles = ["管理人员","开发者","报告人员"]
+       # roles = roles[3..5]
+     end
    else
      roles = roles[0..2]
    end
@@ -18,7 +23,23 @@
             <li >
               <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %>
               <span class="w180_h fl">
-              <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+              <!--区分中英文角色显示的不同-->
+              <% if User.current.language == "zh" %>
+                <% zh_roles = [] %>
+                <% member.roles.each do |role| %>
+                    <% if role.id == 3
+                       zh_roles << "管理人员"
+                    elsif role.id == 4
+                       zh_roles << "开发人员"
+                    else
+                       zh_roles << "报告人员"
+                    end
+                 %>
+                <% end %>
+                    <%= h zh_roles.sort.reverse.collect(&:to_s).join(', ') %>
+              <% else %>
+                <%= h member.roles.sort.collect(&:to_s).join(', ') %>
+              <% end %>
               <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member),
                                 :method => :put,
                                 :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}}
@@ -27,7 +48,18 @@
                 <ul style="text-align: left;" >
                   <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role),
                                     :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %>
-                  <label ><%= h role %></label>
+                 <!--编辑时候显示成员，中英文切换后面需从数据库的角度优化-->
+                  <% if User.current.language == "zh" %>
+                      <% if role.id == 3 %>
+                          <label >管理人员</label>
+                      <% elsif role.id == 4 %>
+                          <label >开发人员</label>
+                      <% else %>
+                          <label >报告人员</label>
+                      <% end %>
+                  <% else %>
+                      <label ><%= h role %></label>
+                  <% end %>
                 </ul>
                 <!--<br/>-->
               <% end %>
@@ -91,7 +123,7 @@
       <p class="c_blue fb mt10 mb5"><%= l(:label_member_new) %></p>
       <%= form_for(@member, {:as => :membership, :url => project_memberships_path(@project), :remote => true, :method => :post}) do |f| %>
           <div class="member_search">
-            <input id="principal_search" class="member_search_input fl" type="text" placeholder="请输入用户名称来搜索好友">
+            <input id="principal_search" class="member_search_input fl" type="text" placeholder="<%= l(:label_invite_trustie_user_tips)%>">
             <%= javascript_tag "observeSearchfield('principal_search', null, '#{ escape_javascript autocomplete_project_memberships_path(@project, :format => 'js') }')" %>
             <div class="cl"></div>
 
@@ -107,7 +139,17 @@
               <% roles.each do |role| %>
                   <li>
                     <%= check_box_tag 'membership[role_ids][]', role.id %>
-                    <label ><%= h role %></label>
+                    <% if User.current.language == "zh" %>
+                        <% if role.id == 3 %>
+                            <label >管理人员</label>
+                        <% elsif role.id == 4 %>
+                            <label >开发人员</label>
+                        <% else %>
+                            <label >报告人员</label>
+                        <% end %>
+                    <% else %>
+                        <label ><%= h role %></label>
+                    <% end %>
                   </li>
               <% end %>
             </ul>

app/views/repositories/show.html.erb

@@ -30,7 +30,7 @@
     </p>
   </div>
 </div>
-<div class="repos_more"><a id="showgithelp" value="hide_help" onclick ="showhelpAndScrollTo('repos_git_more'); " class="c_dblue lh23">收起Git操作指南</a></div>
+<div class="repos_more"><a id="showgithelp" value="show_help" onclick ="showhelpAndScrollTo('repos_git_more'); " class="c_dblue lh23">展开Git操作指南</a></div>
 <div id="repos_git_more">
   <br>
   <div class=" c_dark f14">

app/views/welcome/_course_list.html.erb

@@ -27,7 +27,7 @@
         (<%= course.members.count %>人)
         <% files_count = course.attachments.count %>
         <% if files_count > 0%>
-            (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>资料)
+            (<%= link_to "#{files_count.to_s}份", course_files_path(course) %>公开资料)
         <% end %>
       </div>
     </li>

config/locales/account/zh.yml

@@ -11,7 +11,7 @@ zh:
   #
   #  公共变量
   #
-  label_max_number: "登录名是在网站中显示的您的公开标识，只能为英文和数字。"
+  label_max_number: "登录名是在网站中显示的您的公开标识，只能为下划线、@、.以及英文和数字。"
   field_login: 登录名
   
   field_password: 密码

config/locales/commons/zh.yml

@@ -351,7 +351,7 @@ zh:
   #  意见反馈
   # 
   label_feedback: 意见反馈
-  label_feedback_tips: "有什么想说的，尽管来咆哮吧~~"
+  label_feedback_tips: "欢迎反馈网站问题，课程中遇到的问题请反馈给相关老师!"
   label_technical_support: "技术支持："
   label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！"
   label_feedback_value: "该帖来自用户反馈:)"

config/locales/navigatiors/zh.yml

@@ -15,8 +15,8 @@ zh:
   label_forum_all: 公共贴吧 
   label_school_all: 中国高校 
   label_contest_innovate: 创新竞赛  
-  #label_software_user: 软件创客
+  label_software_user: 软件创客
-  #label_requirement_enterprise: 软件众包
+  label_requirement_enterprise: 软件众包
   label_stores_index: 资源搜索  
   label_login: 登录
 

config/locales/projects/zh.yml

@@ -338,7 +338,7 @@ zh:
   label_input_email: 请输入邮箱地址
   
   label_invite_trustie_user: "邀请Trustie注册用户" 
-  label_invite_trustie_user_tips: "请输入用户名称来搜索好友"
+  label_invite_trustie_user_tips: "输入姓名、邮箱、昵称"
   label_user_role_null: 用户和角色不能留空！
   label_invite_project: 邀请您加入项目
   label_invite_success: 邀请成功

db/migrate/20150505025003_add_index_to_homeworkforcourse_course_id.rb

@@ -1,4 +1,4 @@
-class AddIndexToHomeworkattachCourseId < ActiveRecord::Migration
+class AddIndexToHomeworkforcourseCourseId < ActiveRecord::Migration
   def change
     add_index(:homework_for_courses,:course_id)
   end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20150428021035) do
+ActiveRecord::Schema.define(:version => 20150505025537) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -438,13 +438,6 @@ ActiveRecord::Schema.define(:version => 20150428021035) do
 
   add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
 
-  create_table "discuss_demos", :force => true do |t|
-    t.string   "title"
-    t.text     "body"
-    t.datetime "created_at", :null => false
-    t.datetime "updated_at", :null => false
-  end
-
   create_table "documents", :force => true do |t|
     t.integer  "project_id",                :default => 0,  :null => false
     t.integer  "category_id",               :default => 0,  :null => false
@@ -541,6 +534,8 @@ ActiveRecord::Schema.define(:version => 20150428021035) do
     t.integer  "is_teacher_score", :default => 0
   end
 
+  add_index "homework_attaches", ["bid_id"], :name => "index_homework_attaches_on_bid_id"
+
   create_table "homework_evaluations", :force => true do |t|
     t.string   "user_id"
     t.string   "homework_attach_id"
@@ -553,6 +548,9 @@ ActiveRecord::Schema.define(:version => 20150428021035) do
     t.integer "bid_id"
   end
 
+  add_index "homework_for_courses", ["bid_id"], :name => "index_homework_for_courses_on_bid_id"
+  add_index "homework_for_courses", ["course_id"], :name => "index_homework_for_courses_on_course_id"
+
   create_table "homework_users", :force => true do |t|
     t.string   "homework_attach_id"
     t.string   "user_id"
@@ -1159,6 +1157,9 @@ ActiveRecord::Schema.define(:version => 20150428021035) do
     t.datetime "updated_at", :null => false
   end
 
+  add_index "students_for_courses", ["course_id"], :name => "index_students_for_courses_on_course_id"
+  add_index "students_for_courses", ["student_id"], :name => "index_students_for_courses_on_student_id"
+
   create_table "taggings", :force => true do |t|
     t.integer  "tag_id"
     t.integer  "taggable_id"

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")
+    }
+}

public/javascripts/project.js

@@ -33,9 +33,10 @@ function expand_tools_expand(content) {
         $("#expand_tools_expand_invit").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
     }
     else {
-        $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
+//        $("#expand_tools_expand").toggleClass("currentDd").siblings(".subNav").removeClass("currentDd");
-        $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
+//        $("#expand_tools_expand").toggleClass("currentDt").siblings(".subNav").removeClass("currentDt");
-        $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+//        $("#expand_tools_expand").next(".navContent").slideToggle(500).siblings(".navContent").slideUp(500);
+        $("#navContent").toggle(500);
     }
 
     // 修改数字控制速度， slideUp(500)控制卷起速度
@@ -58,7 +59,22 @@ function show_more_msg() {
         arrow.attr("src", "/images/jiantou.jpg")
     }
 }
-
+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")
+    }
+}
 
 //项目版本库git帮助文档显示
 function showhelpAndScrollTo(id) {
@@ -71,13 +87,57 @@ function showhelpAndScrollTo(id) {
     {
         cookiesave("repositories_visiable", true,'','','');
     }
+    var information = $("#showgithelp");
+    var val = information.attr("value");
+    if(val=="show_help")
+    {
+        $("#showgithelp").text("收起Git操作指南");
+        information.attr("value", "hide_help");
+    }
+    else
+    {
+        $("#showgithelp").text("展开Git操作指南");
+        information.attr("value", "show_help");
+    }
+}
+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(){
+    var information = $("#showgithelp");
+    var val = information.attr("value");
     if(cookieget("repositories_visiable") == "true")
     {
         $('#repos_git_more').hide();
     }
+    else
+    {
+        $('#repos_git_more').show();
+        $("#showgithelp").text("收起Git操作指南");
+        information.attr("value", "hide_help");
+    }
 });
 
 

public/stylesheets/courses.css

@@ -174,7 +174,7 @@ a:hover.work_edit{color: #fff; background: #64bdd9;}
 .wzan a{ display: block;}
 a.wzan_img{background:url(images/pic_zan.png) 0 -59px no-repeat; display:block; height:31px; width:30px; color:#fff;}
 a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
-.msg_box{ width:670px; height:205px; border-bottom:1px dashed #CCC; padding-top:10px;}
+.msg_box{ width:670px; height:225px; 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; }
 
@@ -530,6 +530,41 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px
 a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px; }
 a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;}
 
+/* 20150505讨论区*/
+.w664{ width:664px;}
+.w140{ width:140px;}
+.talklist_box{  }
+.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9;  margin-bottom:20px; margin-top: 10px;}
+.talkmain_pic{}
+a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
+a:hover.talkmain_pic{border:1px solid #64bdd9;}
+.talkmain_txt{ width:610px; margin-left:10px; color:#333;}
+a.talkmain_name{ color:#ff5722;}
+a:hover.talkmain_name{ color:#d33503;}
+.talkmain_tit{ color:#0781b4; width:450px; display:block; }
+.talklist_main{   }
+.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}
+.talkConIpt{ background:#f2f2f2; }
+.talkWrapBox{ width:610px; margin-left:60px; }
+.inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px;  margin-bottom:5px;color:#666;}
+.inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px;  margin:5px 0 5px 50px; color:#666;}
+.inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px;  margin:5px 0 5px 0px; color:#666;}
+.talkWrapMsg{ background:#f2f2f2; padding:10px;}
+a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid #e3e3e3; float:left;}
+a:hover.Msg_pic{border:1px solid #64bdd9;}
+a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;}
+a:hover.Reply_pic{border:1px solid #64bdd9;}
+.Msg_txt{ float:left; width:540px; margin-left:10px;}
+.Msg_txt p{ }
+.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
+.talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
+.Replybox{ float:left; width:495px; margin-left:5px;}
+.talk_nextpage{ border:none; width:410px; margin:0 auto;}
+.newtalk { margin-top:8px; margin-right:8px;}
+.talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}
+#about_newtalk{ display:none;}
+
+
 
 
 

public/stylesheets/css.css

@@ -86,7 +86,7 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;}
 .ping_con h2{ font-size:14px; color:#444443; margin-bottom:10px; }
 .ping_con p{ color:#777777; font-size:12px; border-bottom:1px dashed #CCC; padding-bottom:5px;}
 .ping_con p span a{ color:#777777;}
-.ping_star{ width:165px; color:#333; font-weight:bold; margin-bottom:5px;}
+.ping_star{ width:185px; color:#333; font-weight:bold; margin-bottom:5px;}
 .ping_star span a{ float:right; width:20px; height:20px; background:url(images/star.png);background-repeat: no-repeat; margin-right:3px;}
 .ping_con textarea{ height:76px; border:1px solid #15bccf; margin-bottom:5px; color:#666; font-size:12px;}
 a.ping_sub{ float:right; height:22px; width:60px; margin-right:20px;  background:#15bccf; color:#fff; text-align:center;}
@@ -175,6 +175,7 @@ a.member_search {width: 43px;height: 22px;background: #15bccf;color: #fff;text-a
 /*上传图片处理*/
 .upload_img img{max-width: 100%;}
 
+.to_top{width: 19px;height: 74px;position: fixed;top: 50px;right: 1px;color: white;background: #15bccf; line-height: 1.2; padding-top: 10px;padding-left: 5px;font-size: 14px;cursor: pointer;}
 
 
 

public/stylesheets/pleft.css

@@ -49,6 +49,7 @@ a:hover.subnav_green{ background:#14ad5a;}
 /*简介*/
 .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;}
 .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;}
+.project_board_content{overflow: hidden;max-height: 50px;word-break: break-all;word-wrap: break-word;}
 .course_description_none{max-height: none;}
 .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;}
 .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}

public/stylesheets/project.css

@@ -76,7 +76,7 @@ a.problem_name{ color:#ff5722; }
 a:hover.problem_name{ color:#d33503;}
 a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
 a.problem_tit02{ color:#0781b4;  font-weight:bold;max-width:400px;}
-.problem_tit_div{ color:#0781b4;  font-weight:bold;width:400px; }
+.problem_tit_div{ color:#0781b4;  font-weight:bold;max-width:400px; }
 a.problem_tit_a{ color:#0781b4;   }
 .problem_tit_a:hover{ color:#09658c;   }
 a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; }
@@ -180,6 +180,7 @@ a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; col
 /* 版本库展示Git操作文档 */
 .repos_more{height:23px; width:100%; border:1px solid #CCC; background:#F6F6F6; text-align:center; font-size:12px; padding-top:2px;}
 .lh23{line-height: 23px;}
+.repos_git_more{display: none;}
 
 /* 弹框 新样式还没设计出来，暂时用的课程那边的样式 */
 .alert .close{width:26px;height:26px;overflow:hidden;position:absolute;top:-10px;right:-502px;background:url(images/close.png) no-repeat;cursor:pointer;}
@@ -691,3 +692,38 @@ tr.open span.expander {background-image: url(../images/bullet_toggle_minus.png);
 .icon-file.application-pdf { background-image: url(../images/files/pdf.png); }
 .icon-file.application-zip { background-image: url(../images/files/zip.png); }
 .icon-file.application-x-gzip { background-image: url(../images/files/zip.png); }
+
+/* 20150505讨论区*/
+.w664{ width:664px;}
+.w140{ width:140px;}
+.talklist_box{  }
+.talkmain_box{ width:670px; border-bottom:1px dashed #d9d9d9;  margin-bottom:20px; margin-top: 10px;}
+.talkmain_pic{}
+a.talkmain_pic{ display:block; width:42px; height:42px; padding:2px; border:1px solid #e3e3e3;}
+a:hover.talkmain_pic{border:1px solid #64bdd9;}
+.talkmain_txt{ width:610px; margin-left:10px; color:#333;}
+a.talkmain_name{ color:#ff5722;}
+a:hover.talkmain_name{ color:#d33503;}
+.talkmain_tit{ color:#0781b4; width:450px; display:block; }
+.talklist_main{   }
+.talkWrapArrow{ display:block; float:right; margin-right:10px;background:url(../images/arrow.png) 0 0 no-repeat; height:7px; width:13px;}
+.talkConIpt{ background:#f2f2f2; }
+.talkWrapBox{ width:610px; margin-left:60px; }
+.inputFeint{ border:1px solid #d9d9d9; background:#fff; width:583px; height:50px; margin:10px;  margin-bottom:5px;color:#666;}
+.inputFeint02{ border:1px solid #d9d9d9; background:#fff; width:535px; height:30px;  margin:5px 0 5px 50px; color:#666;}
+.inputFeint03{ border:1px solid #d9d9d9; background:#fff; width:490px; height:30px;  margin:5px 0 5px 0px; color:#666;}
+.talkWrapMsg{ background:#f2f2f2; padding:10px;}
+a.Msg_pic{ display:block; width:34px; height:34px; padding:2px; border:1px solid #e3e3e3; float:left;}
+a:hover.Msg_pic{border:1px solid #64bdd9;}
+a.Reply_pic{ display:block; width:30px; height:30px; padding:2px; border:1px solid #e3e3e3; float:left;}
+a:hover.Reply_pic{border:1px solid #64bdd9;}
+.Msg_txt{ float:left; width:540px; margin-left:10px;}
+.Msg_txt p{ }
+.talkWrapMsg ul li{border-bottom:1px dashed #d9d9d9; padding-bottom:10px; margin-bottom:10px;}
+.talkReply{ width:540px; margin-left:50px; border-top:1px dashed #d9d9d9; padding-top:10px; }
+.Replybox{ float:left; width:495px; margin-left:5px;}
+.talk_nextpage{ border:none; width:410px; margin:0 auto;}
+.newtalk { margin-top:8px; margin-right:8px;}
+.talk_new{ border-bottom:1px dashed #d9d9d9; padding-bottom:10px;}
+#about_newtalk{ display:none;}
+

public/stylesheets/public.css

@@ -56,7 +56,6 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml10{ margin-left:10px;}
 .ml15{ margin-left:15px;}
 .ml20{ margin-left:20px;}
-.ml25{ margin-left:25px;}
 .ml40{ margin-left:40px;}
 .ml45{ margin-left:45px;}
 .ml55{ margin-left:55px;}
@@ -64,23 +63,28 @@ h4{ font-size:14px; color:#3b3b3b;}
 .ml60{ margin-left:60px;}
 .ml80{ margin-left:80px;}
 .ml90{ margin-left:90px;}
+.ml100{ margin-left:100px;}
 .ml110{ margin-left:110px;}
 .mr5{ margin-right:5px;}
 .mr10{ margin-right:10px;}
 .mr20{ margin-right:20px;}
 .mr30{ margin-right:30px;}
 .mr40{ margin-right:40px;}
+.mr50{margin-right: 50px;}
+.mr55{margin-right: 55px;}
+.mr70{margin-right: 70px;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px;}
-.mt13{ margin-top:13px;}
-.mt43{ margin-top:43px;}
-.mt40{ margin-top:40px;}
 .mb5{ margin-bottom:5px;}
 .mb10{ margin-bottom:10px;}
-.mb13{ margin-bottom:13px;}
+.mb20{ margin-bottom:20px;}
 .pl15{ padding-left:15px;}
+.w20{ width:20px;}
+.w45{ width: 45px;}
+.w60{ width:60px;}
+.w70{ width:70px;}
 .w90{ width:90px;}
 .w210{ width:210px;}
 .w150{ width:150px;}
@@ -93,8 +97,10 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w350{ width:350px;}
 .w610{ width:610px;}
 .w600{ width:600px;}
+.h22{ height:22px;}
 .h26{ height:26px;}
 .h50{ height:50px;}
+.h70{ height:70px;}
 .h150{ height:150px;}
 
 /* Font & background Color */