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

app/api/mobile/apis/courses.rb

@@ -232,6 +232,7 @@ module Mobile
         params do
           requires :token, type: String
           requires :course_id,type: Integer,desc: '课程id'
+          optional :name,type:String,desc:'课件名称可能包含的字符'
         end
         get ":course_id/attachments" do
           cs = CoursesService.new
@@ -244,6 +245,7 @@ module Mobile
         params do
           requires :token,type:String
           requires :course_id,type:Integer,desc: '课程id'
+          optional :name,type:String,desc:'学生的姓名或者昵称或者学号可能包含的字符'
         end
         get ":course_id/members" do
           cs = CoursesService.new

app/controllers/homework_attach_controller.rb

@@ -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

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/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/controllers/welcome_controller.rb

@@ -58,12 +58,18 @@ class WelcomeController < ApplicationController
     else
       case @first_page.sort_type
         when 0
+          @my_projects = find_my_projects
+          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
           @projects = find_miracle_project(10, 3,"created_on desc")
           #@projects =  @projects_all.order("created_on desc")
         when 1
+          @my_projects = find_my_projects
+          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
           @projects = find_miracle_project(10, 3,"score desc")
           #@projects = @projects_all.order("grade desc")
         when 2
+          @my_projects = find_my_projects
+          @other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
           @projects = find_miracle_project(10, 3,"watchers_count desc")
           #@projects = @projects_all.order("watchers_count desc")
 

app/helpers/welcome_helper.rb

@@ -443,6 +443,10 @@ module WelcomeHelper
     resultSet.take(limit)
   end
 
+  def find_my_projects
+    my_projects = User.current.memberships.all(conditions: "projects.project_type = 0")
+  end
+
   def sort_project_by_hot_rails project_type=0, order_by='score DESC', limit=15
     # Project.find_by_sql("
 			# SELECT p.id, p.name, p.description, p.identifier, t.project_id

app/services/courses_service.rb

@@ -433,18 +433,48 @@ class CoursesService
      result = []
      @course = Course.find(params[:course_id])
      @attachments = @course.attachments.order("created_on desc")
+     if !params[:name].nil? && params[:name] != ""
        @attachments.each do |atta|
-       result << {:filename => atta.filename,:description => atta.description,:downloads => atta.downloads,:quotes => atta.quotes.nil? ? 0 :atta.quotes  }
+         result << {:filename => atta.filename,
+                    :description => atta.description,
+                    :downloads => atta.downloads,
+                    :quotes => atta.quotes.nil? ? 0 :atta.quotes  } if atta.filename.include?(params[:name])
+
+       end
+     else
+       @attachments.each do |atta|
+         result << {:filename => atta.filename,
+                    :description => atta.description,
+                    :downloads => atta.downloads,
+                    :quotes => atta.quotes.nil? ? 0 :atta.quotes  }
+
+       end
      end
      result
    end
 
   # 课程学生列表
   def course_members params
-    @all_members = student_homework_score(0,params[:course_id], 10,"desc")
+    @all_members = searchmember_by_name(student_homework_score(0,params[:course_id], 10,"desc"),params[:name])
   end
 
   private
+  def searchmember_by_name  members, name
+    #searchPeopleByRoles(project, StudentRoles)
+    mems = []
+    if name != ""
+      name = name.to_s.downcase
+      members.each do |m|
+        username = m.user[:lastname].to_s.downcase + m.user[:firstname].to_s.downcase
+        if(m.user[:login].to_s.downcase.include?(name) ||  m.user.user_extensions[:student_id].to_s.downcase.include?(name) || username.include?(name))
+          mems << m
+        end
+      end
+    else
+      mems = members
+    end
+    mems
+  end
   def show_homework_info course,bid,current_user,is_course_teacher
     author_real_name = bid.author.lastname + bid.author.firstname
     many_times = course.homeworks.index(bid) + 1

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/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>
 

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

@@ -26,7 +26,7 @@
                 <%= 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_star.html.erb

@@ -1,3 +1,4 @@
+<a style="float: right;padding-left: 10px;font-weight: normal;cursor: pointer;color: red;" onclick="ChoseStars(0)">零分</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/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_projects.html.erb

@@ -13,7 +13,7 @@
 		<%= javascript_heads %>
 		<%= heads_for_theme %>
          <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2' %>
-         <%= javascript_include_tag 'project', 'header','select_list_move' %>
+         <%= javascript_include_tag 'cookie','project', 'header','select_list_move' %>
 		<%= call_hook :view_layouts_base_html_head %>
 		<!-- page specific tags -->
 		<%= yield :header_tags -%>

app/views/messages/_form_project.html.erb

@@ -25,7 +25,7 @@
 </li>
 <li>
   <div id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
-  <label class="fl ml3" >&nbsp;<%= l(:field_description) %>&nbsp;&nbsp;：</label>
+  <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <%= text_area :quote,:quote,:style => 'display:none' %>
   <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
   <div class="cl"></div>

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

@@ -91,7 +91,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>
 

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','repos_git_more'); return false;" 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/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: 邀请成功
@@ -415,3 +415,4 @@ zh:
   #     
   field_sharing: 共享
   label_title_code_review: 代码评审
+  label_home_non_project: 您还没有创建项目，您可以查看系统的其它项目！

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

@@ -654,16 +654,6 @@ ActiveRecord::Schema.define(:version => 20150428021035) do
 
   add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id"
 
-  create_table "journal_details_copy", :force => true do |t|
-    t.integer "journal_id",               :default => 0,  :null => false
-    t.string  "property",   :limit => 30, :default => "", :null => false
-    t.string  "prop_key",   :limit => 30, :default => "", :null => false
-    t.text    "old_value"
-    t.text    "value"
-  end
-
-  add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id"
-
   create_table "journal_replies", :id => false, :force => true do |t|
     t.integer "journal_id"
     t.integer "user_id"

public/javascripts/cookie.js

@@ -0,0 +1,39 @@
+//保存cookie
+//n:cookie的名字
+//v:cookie的值
+//mins:时间（分钟）
+//dn:
+//path:保存路径
+function cookiesave(n, v, mins, dn, path)
+{
+    if(n)
+    {
+
+        if(!mins) mins = 365 * 24 * 60;
+        if(!path) path = "/";
+        var date = new Date();
+
+        date.setTime(date.getTime() + (mins * 60 * 1000));
+
+        var expires = "; expires=" + date.toGMTString();
+
+        if(dn) dn = "domain=" + dn + "; ";
+        document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path;
+
+    }
+}
+
+//获取cookie
+function cookieget(n)
+{
+    var name = n + "=";
+    var ca = document.cookie.split(';');
+    for(var i=0;i<ca.length;i++) {
+        var c = ca[i];
+        while (c.charAt(0)==' ') c = c.substring(1,c.length);
+        if (c.indexOf(name) == 0){
+            return c.substring(name.length,c.length);}
+
+    }
+    return false;
+}

public/javascripts/project.js

@@ -61,27 +61,49 @@ function show_more_msg() {
 
 
 //项目版本库git帮助文档显示
-function showhelpAndScrollTo(id, focus) {
+function showhelpAndScrollTo(id) {
+    $('#' + id).toggle();
+    if(cookieget("repositories_visiable") == "true")
+    {
+        cookiesave("repositories_visiable", false,'','','');
+    }
+    else
+    {
+        cookiesave("repositories_visiable", true,'','','');
+    }
     var information = $("#showgithelp");
     var val = information.attr("value");
-    if (val == "show_help") {
+    if(val=="show_help")
+    {
         $("#showgithelp").text("收起Git操作指南");
         information.attr("value", "hide_help");
-        $('#' + id).show();
-        if (focus !== null) {
-            $('#' + focus).focus();
-        }
-        $('html, body').animate({scrollTop: $('#' + id).offset().top}, 400);
     }
-    else {
+    else
-        $("#showgithelp").text("显示Git操作指南");
+    {
+        $("#showgithelp").text("展开Git操作指南");
         information.attr("value", "show_help");
-        $('#' + id).hide();
     }
 }
 
 
 
+$(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");
+    }
+});
+
+
+
 ///////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////项目讨论区
 function regexSubject() {

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; }
 

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;}

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;}