Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

2016-11-11 19:52:38 +08:00 · 2016-11-11 19:52:38 +08:00 · d0abc8d3ad
parent 369f6eb9f7 898cec5ef0
commit d0abc8d3ad
23 changed files with 66 additions and 43 deletions
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -1203,7 +1203,7 @@ class UsersController < ApplicationController


  #引入资源列表根据关键词过滤
-  def user_ref_resource_searc
+  def user_ref_resource_search
    @resource_id = params[:mul_id]
    @resource_type = params[:mul_type]
    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@ -2946,32 +2946,34 @@ module ApplicationHelper

  #根据传入作业确定显示为提交作品、补交作品、查看作品等
  def student_for_homework_common homework
-    if User.current.member_of_course?(homework.course)
+    if User.current.allowed_to?(:as_teacher, homework.course)
+      link_to "查看作品", student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green fr mt5', :title => "查看作品", :target => '_blank'
+    else User.current.member_of_course?(homework.course)
      work = cur_user_works_for_homework homework
      project = cur_user_projects_for_homework homework
      if work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
        if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
-          link_to "查看详情", homework_common_index_path(:course_id => homework.course_id), :class => 'hw_btn_green2 fr mt5',:title => '查看分组作业详情', :target => '_blank'
+          link_to "查看详情", homework_common_index_path(:course_id => homework.course_id), :class => 'hw_btn_green fr mt5',:title => '查看分组作业详情', :target => '_blank'
        else
-          link_to "提交作品", new_student_work_url_without_domain(homework.id),:class => 'hw_btn_green2 fr mt5', :target => '_blank'
+          link_to "提交作品", new_student_work_url_without_domain(homework.id),:class => 'hw_btn_green fr mt5', :target => '_blank'
        end
      elsif work.nil? && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d")
        if homework.homework_type ==3 && project.nil? && homework.homework_detail_group.base_on_project == 1
-          link_to "查看详情", homework_common_index_path(:course_id => homework.course_id), :class => 'hw_btn_green2 fr mt5',:title => '查看分组作业详情', :target => '_blank'
+          link_to "查看详情", homework_common_index_path(:course_id => homework.course_id), :class => 'hw_btn_green fr mt5',:title => '查看分组作业详情', :target => '_blank'
        else
          link_to "补交作品",  new_student_work_url_without_domain(homework.id),:class => 'btn_orange_big fr mt5', :target => '_blank'
        end
      else
        if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 2 #匿评作业，且作业状态不是在开启匿评之前
-          link_to "作品匿评", student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green2 fr mt5', :title => "开启匿评后不可修改作品", :target => '_blank'
+          link_to "作品匿评", student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green fr mt5', :title => "开启匿评后不可修改作品", :target => '_blank'
        elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
-          link_to "查看作品",student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green2 fr mt5', :title => "匿评已结束", :target => '_blank'
+          link_to "查看作品",student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green fr mt5', :title => "匿评已结束", :target => '_blank'
        elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
-          link_to "修改作品", new_student_work_url_without_domain(homework.id),:class => 'hw_btn_green2 fr mt5', :target => '_blank'
+          link_to "修改作品", new_student_work_url_without_domain(homework.id),:class => 'hw_btn_green fr mt5', :target => '_blank'
        elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") && work.user_id == User.current.id
-          link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'hw_btn_green2 fr mt5', :target => '_blank'
+          link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'hw_btn_green fr mt5', :target => '_blank'
        else
-          link_to "查看作品", student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green2 fr mt5', :title => "作业截止后不可修改作品", :target => '_blank'
+          link_to "查看作品", student_work_index_url_in_org(homework.id, 2), :class => 'hw_btn_green fr mt5', :title => "作业截止后不可修改作品", :target => '_blank'
        end
      end
    end
--- a/app/views/courses/_new_member_list.html.erb
+++ b/app/views/courses/_new_member_list.html.erb
@ -1,6 +1,6 @@
 <% is_teacher = User.current.allowed_to?(:as_teacher, @course) || User.current.admin? %>
 <% if members.any? %>
-<table class="sy_new_table clear sy_new_table_width"  cellpadding="0" cellspacing="0">
+<table class="sy_new_table clear sy_new_table_width"  cellpadding="0" cellspacing="0" id="student_list_table">
  <thead>
  <tr class="clear">
    <th class="sy_th6">序号</th>
@ -123,7 +123,7 @@
                  <%= form_tag({:controller => 'courses', :action => 'teacher_assign_group', :id => @course.id,:user_id => member.user_id, :group_id => @group && @group != -1 ? @group.id : -1},:remote=>'true', :method => 'post', :id=>"join_group_form_#{member.id}", :class => 'query_form') do %>
                      <div class="select-class-option">
                        <span class="hidden" style="display:inline-block; vertical-align:middle; max-width:70px;"><%=member.course_group_id == 0 ? "暂无" : member.course_group.name %></span>
-                        <a href="javascript:void(0)" class="sy_icons_edit pic_edit_icon" alt="编辑" style="background-position:0 5px;"></a>
+                        <a href="javascript:void(0)" class="sy_icons_edit pic_edit_icon fr mt9 options_show_or_hide" alt="编辑" style="background-position:0 5px;"></a>
                      </div>
                      <%= select( :name,:group_id, course_group_option(@course),
                                  { :include_blank => false,:selected => member.course_group_id},
@ -136,7 +136,7 @@
        </td>
        <% if is_teacher %>
        <td>
-          <a href="javascript:void(0)" onClick="delete_confirm_box('<%=delete_member_course_path(@course, :member_id => member.id) %>', '确认删除该成员吗？');" class="sy_icons_del fl"></a>
+          <a href="javascript:void(0)" onClick="delete_confirm_box('<%=delete_member_course_path(@course, :member_id => member.id) %>', '确认删除该成员吗？');" class="sy_icons_del fl options_show_or_hide"></a>
        </td>
        <% end %>
      </tr>
@ -159,6 +159,11 @@

 <script>
    $(document).ready(function(){
+//        $("#student_list_table").mouseover(function(){
+//            $(".options_show_or_hide").show();
+//        }).mouseout(function(){
+//            $(".options_show_or_hide").hide();
+//        });
        $(".pic_edit_icon").click(function(){
            $(this).parent().hide();
            $(this).parent().next().show();
--- a/app/views/courses/delete_member.js.erb
+++ b/app/views/courses/delete_member.js.erb
@ -2,3 +2,4 @@ hideModal();
 $("#member_li_<%=params[:member_id] %>").html("");
 $("#st_groups").html("<%=escape_javascript(render :partial => 'new_groups_name', :locals => {:course_groups => @course_groups}) %>");
 $("#group_children_list").html("<%= escape_javascript( render :partial => 'layouts/group_children_list', :locals => {:course => @course})%>");
+$("#student_number").html("<%= studentCount(@course) %>");
--- a/app/views/courses/updategroupname.js.erb
+++ b/app/views/courses/updategroupname.js.erb
@ -2,4 +2,5 @@
 * Created by Administrator on 2014/12/3.
 */
 $("#st_groups").html("<%= escape_javascript(  render :partial => 'new_groups_name', locals: {:course_groups => @course_groups})%>");
-$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");
+$("#member_content").html("<%= escape_javascript( render :partial => 'new_member_list', :locals => {:members => @members})%>");
+$("#group_children_list").html("<%= escape_javascript( render :partial => 'layouts/group_children_list', :locals => {:course => @course})%>");
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@ -61,7 +61,7 @@
        <li class="clear">
          <span class="pro_new_conbox_leftspan fl">指派给</span>
          <span class="pro_new_conbox_rightspan fl ml10">
-             <a href="<%=  @issue.assigned_to_id.nil? ? "javascript:void(0)" : user_path(@issue.assigned_to_id)  %>" class="c_blue" ><%= @issue.assigned_to ? @issue.assigned_to.show_name : "--" %></a></span>
+             <a href="<%=  @issue.assigned_to_id.nil? ? "javascript:void(0)" : user_path(@issue.assigned_to)  %>" class="c_blue" ><%= @issue.assigned_to ? @issue.assigned_to.show_name : "--" %></a></span>
        </li>
    <% end %>
    <% unless @issue.disabled_core_fields.include?('fixed_version_id') %>
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@ -68,11 +68,11 @@
          </li>
          <% if hidden_unproject_infos %>
              <li>
-                <%= link_to '我的课程',{:controller => "users", :action => "user_courselist", :id => User.current.id}, :class => "menuGrey" %>
+                <%= link_to '我的课程',{:controller => "users", :action => "user_courselist", :id => User.current}, :class => "menuGrey" %>
              </li>
          <% end %>
          <li>
-            <%= link_to "我的组织",  user_organizations_user_path(:id => User.current.id), :class => "menuGrey"%>
+            <%= link_to "我的组织",  user_organizations_user_path(:id => User.current), :class => "menuGrey"%>
          </li>
          <li>
            <%= link_to "新建组织", new_organization_path, :class => "menuGrey"%>
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@ -134,19 +134,19 @@
          </div>
          <ul class="user_atten clear">
            <li>
-              <a href="<%=user_blogs_path(:user_id => @user.id) %>">
+              <a href="<%=user_blogs_path(:user_id => @user) %>">
                <strong>博客</strong><br />
                <span class="sy_cgrey"><%=@user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count %></span>
              </a>
            </li>
            <li>
-              <a href="<%=user_watchlist_user_path(@user.id) %>">
+              <a href="<%=user_watchlist_user_path(@user) %>">
                <strong>关注</strong><br />
-                <span class="sy_cgrey"><%=User.watched_by(@user.id).count %></span>
+                <span class="sy_cgrey"><%=User.watched_by(@user).count %></span>
              </a>
            </li>
            <li>
-              <a href="<%=user_fanslist_user_path(@user.id) %>">
+              <a href="<%=user_fanslist_user_path(@user) %>">
                <strong>粉丝</strong><br />
                <span class="sy_cgrey"><%= @user.watcher_users.count %></span>
              </a>
--- a/app/views/poll/_other_poll.html.erb
+++ b/app/views/poll/_other_poll.html.erb
@ -17,8 +17,9 @@
            </li>
          <% end %>
        </div>
+        <p class="none c_red" style="margin-left: 33px;" id="error_show"></p>
        <div class="cl"></div>
-        <a href="javascript:void(0);" class="fr sy_btn_blue mr35" onclick="submit_quote();">导&nbsp;&nbsp;入</a>
+        <a href="javascript:void(0);" class="fr sy_btn_blue mr35" id="submit_quote" onclick="submit_quote();">导&nbsp;&nbsp;入</a>
        <a href="javascript:void(0);" class="fr sy_btn_grey mr5" onclick="hideModal();">取&nbsp;&nbsp;消</a>
      <% end -%>
  </div>
@ -38,6 +39,7 @@
            closeModal();
        }else{
            $('#error_show').html('您没有选择任何问卷');
+            $('#error_show').show();
        }
    }
 </script>
--- a/app/views/projects/settings/_new_versions_form.html.erb
+++ b/app/views/projects/settings/_new_versions_form.html.erb
@ -23,7 +23,8 @@
        </li>
        <div class="cl mb10"></div>
      </ul>
-      <a href="javascript:void(0);" class="fr sy_btn_grey " onclick="pro_st_show_ban1();">取消</a><a href="javascript:void(0);" onclick="project_version_commit();" class="fr sy_btn_blue mr5">保存</a>
+      <a href="javascript:void(0);" class="fr sy_btn_grey " onclick="pro_st_show_ban1();">取消</a>
+      <a href="javascript:void(0);" onclick="project_version_commit();" class="fr sy_btn_blue mr5">保存</a>
    </div>
 <% end %>
 <script>
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@ -1,11 +1,13 @@
 <!--新版项目头部结束-->
-<div class="pro_new_info mb10 break_word">
+<div class="pro_new_info mb10 break_word" style="padding-bottom: 5px" >
 <div id="project_invite_code"><%= render :partial => 'projects/invite_code' %></div>
+  <div id="project_description_code" >
  <% if @project.description.blank? %>
-      <p class="break_word"><%= @project.name %></p>
+      <p class="break_word"  style="padding-top:5px"><%= @project.name %></p>
  <% else %>
-      <p class="break_word"><%=h @project.description.html_safe %></p>
+      <p class="break_word" style="padding-top:5px"><%=h @project.description.html_safe %></p>
  <% end %>
+  </div>
 </div>

 <input type="hidden" value="<%= @type %>" name="type" id="user_activities_type">
@ -34,4 +36,7 @@
  </div>

  <%= render :partial => "project_activities", :locals => {:forge_acts => @events_pages, :page => 0, :type => @type} %>
-</div>
+</div>
+<script>
+ autoUrl('project_description_code');
+</script>
--- a/app/views/student_work/_evaluation_un_group.html.erb
+++ b/app/views/student_work/_evaluation_un_group.html.erb
@ -12,12 +12,12 @@

 <script>
  $(".icons_sy_close").live('click',function(){
-      $(this).parent().parent().next().next().show();
+      $(this).parent().parent().parent().next().show();
      $(this).removeClass("icons_sy_close");
      $(this).addClass("icons_sy_open");
  });
  $(".icons_sy_open").live('click',function(){
-      $(this).parent().parent().next().next().hide();
+      $(this).parent().parent().parent().next().hide();
      $(this).addClass("icons_sy_close");
      $(this).removeClass("icons_sy_open");
  });
--- a/app/views/student_work/_evaluation_un_group_work.html.erb
+++ b/app/views/student_work/_evaluation_un_group_work.html.erb
@ -1,4 +1,5 @@
 <div class="sy_courses_open f14 fontGrey3">
+  <div>
  <span class="icons_sy_open fl mr5" title="点击展开/收起详情" style="cursor: pointer;"></span>
  <span class="fl" style="width:280px;">
    <span class="hidden fl" style="max-width:220px;"><%= student_work.name %></span>
@ -39,6 +40,7 @@
          </div>
      </div>
  <% end %>
+  </div>
  <div class="cl"></div>
 </div>
 <div class="fl sy_p_grey">
--- a/app/views/student_work/_evaluation_work.html.erb
+++ b/app/views/student_work/_evaluation_work.html.erb
@ -55,14 +55,14 @@
          <td class="hworkStName float-none <%= @homework.homework_type == 2 ? 'w180' : 'w190' %>" title="姓名" onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;">
            匿名
          </td>
-          <td class="hworkStID <%= @homework.homework_type == 2 ? 'w180' : 'w190' %> float-none" title="学号">
+          <td class="hworkStID <%= @homework.homework_type == 2 ? 'w180' : 'w190' %> float-none" title="学号" onclick="show_student_work('<%= student_work_path(student_work)%>');">
            --
          </td>
      <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %>
-          <td class="hworkName pr10 w220 float-none student_work_<%= student_work.id%>">
+          <td class="hworkName pr10 w220 float-none student_work_<%= student_work.id%>" onclick="show_student_work('<%= student_work_path(student_work)%>');">
            <div style="text-align: left">匿名</div>
          </td>
-           <td class="hworkPrName float-none mr10 student_work_<%= student_work.id%>" title="">
+           <td class="hworkPrName float-none mr10 student_work_<%= student_work.id%>" title="" onclick="show_student_work('<%= student_work_path(student_work)%>');">
             匿名
           </td>
      <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 0 %>
--- a/app/views/syllabuses/new.html.erb
+++ b/app/views/syllabuses/new.html.erb
@ -11,7 +11,10 @@
          <span class="c_red ml80" id="new_syllabus_name_notice" style="display: none;">课程名称不能为空且至少有两个字符</span>
        </li>
        <div class="cl"></div>
-        <li class="ml125 fontGrey3"><span class="success-icon mr25">正确示例：软件工程</span><span class="error-icon">错误示例：2016软件工程</span></li>
+        <li class="ml125 fontGrey3"><span class="success-icon mr70">正确示例：</span><span class="error-icon">错误示例：</span></li>
+        <li class="ml125 mt5 fontGrey3"><span class="ml25 mr70">软件工程</span><span style="margin-left: 37px;">2016软件工程</span></li>
+        <li class="ml125 mt5 fontGrey3"><span class="ml25 mr70">统计学原理</span><span style="margin-left: 25px;">统计学原理计算机系</span></li>
+        <li class="ml125 mt5 fontGrey3"><span class="ml25 mr70">并行处理</span><span style="margin-left: 36px;">并行处理2016秋季A班</span></li>
        <li class="mt10 ml45">
          <label><span class="c_white">*</span>&nbsp;<%= l(:label_tags_course_eng_name)%>&nbsp;&nbsp;：</label>
          <input  type="text" name="eng_name" id="new_syllabus_eng_name" placeholder="例如：Software Engineering" class="name_input" maxlength="100">
@ -29,7 +32,7 @@
    <em style="top: 9px;"></em>
    <span style="top: 9px;"></span>
    <p>
-    课程是针对一个具体的学科方向开展的教学内容与进程安排。<br/>本质上，一门课程就是一个教学计划。
+    课程是针对一个具体的学科方向开展的教学内容与进程安排<br/>本质上，一门课程就是一个教学计划<br/><br/>班级是实行教学任务的群体，创建班级后才能开展在线教学
    </p>
  </div>
 </div><!--talknew end-->
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@ -1,8 +1,8 @@
 <div class="orig_user fl">
-<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user.id), :alt => "用户头像" %>
+<%= link_to image_tag(url_to_avatar(comment.creator_user), :width => "33", :height => "33"), user_path(comment.creator_user), :alt => "用户头像" %>
 </div>
 <div class="orig_right fl">
-  <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
+  <%= link_to comment.creator_user.show_name, user_path(comment.creator_user), :class => "content-username" %>
  <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
  <div class="orig_content ">
    <% if comment.class == Journal %>
--- a/app/views/users/_message_contents.html.erb
+++ b/app/views/users/_message_contents.html.erb
@ -1,5 +1,5 @@
 <div class="homepagePostReplyPublisher">
-  <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+  <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user), :class => "newsBlue mr10 f14" %>
  <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
 </div>
 <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
--- a/app/views/users/_message_replies.html.erb
+++ b/app/views/users/_message_replies.html.erb
@ -8,7 +8,7 @@
      </script>
      <li class="homepagePostReplyContainer" nhname="reply_rec">
        <div class="homepagePostReplyPortrait">
-          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
+          <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user) %>
        </div>
        <div class="homepagePostReplyDes" onmouseover="$('#delete_reply_<%=activity_id %>_<%=comment.id %>').show();" onmouseout="$('#delete_reply_<%=activity_id %>_<%=comment.id %>').hide();">
          <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@ -10,7 +10,7 @@
  <% end %>

  <div class="homepagePostReplyContainer borderBottomNone minHeight48">
-    <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author_id), :alt => "用户头像" %></div>
+    <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= user_activity_id%>"><%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(activity.author), :alt => "用户头像" %></div>
    <div class="homepagePostReplyInputContainer mb10">
      <% if User.current.logged? %>
          <div nhname='new_message_<%= user_activity_id %>' style="display:none;">
--- a/app/views/versions/show.html.erb
+++ b/app/views/versions/show.html.erb
@ -70,7 +70,7 @@
              <td>#<%= issue.id %></td>
              <td><a href="<%= issue_path(issue) %>" class="new_roadmap_info_title" title="<%= issue.subject %>" target="_blank"><%= issue.subject %></a> </td>
              <td> <%= issue.tracker %> </td>
-              <td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to_id) %>" class="new_roadmap_info_name" target="_blank">
+              <td><a href="<%= issue.assigned_to_id.nil? ? "" : user_path(issue.assigned_to) %>" class="new_roadmap_info_name" target="_blank">
                <%= User.find(issue.try(:assigned_to_id)).nil? ? "" : User.find(issue.try(:assigned_to_id)).show_name %></a>
              </td>
              <td><%= format_time issue.updated_on %></td>
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@ -110,7 +110,7 @@ function addFile(inputEl, file, eagerUpload,btnId) {
                'class': 'upload_filename readonly hidden',
                'name': 'attachments[' + attachmentId + '][filename]',
                'readonly': 'readonly',
-                'style': 'border:none; width:464px;'
+                'style': 'border:none; max-width:270px;'
            }).val(file.name),
 //            $('<input>', {
 //                'type': 'text',
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@ -195,6 +195,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .mt6{ margin-top:6px;}
 .mt7 {margin-top:7px;}
 .mt8{ margin-top:8px !important;}
+.mt9{ margin-top:9px !important;}
 .mt10{ margin-top:10px !important;}
 .mt12 { margin-top:12px !important;}
 .mt15 {margin-top:15px;}
--- a/public/stylesheets/css/project.css
+++ b/public/stylesheets/css/project.css
@ -887,7 +887,7 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
 /*项目简介*/
 .pro_new_info{ border:1px solid #ddd; background-color:#fff;  width: 998px;}
 .pro_new_info h2{ background: #fff; font-size: 14px; color: #333; height: 40px; line-height: 40px; padding-left: 15px; border-bottom:1px solid #e5e5e5;}
-.pro_new_info p{ padding-bottom:2px; padding-left: 5px; color: #666; padding-right: 5px}
+.pro_new_info p{ padding-bottom:2px; padding-left: 15px; color: #666; padding-right: 5px}
 .pro_new_info_weight{ font-size: 16px; font-weight: bold;}
 /* 新版项目配置*/
 .pro_new_setting_leftnav{ width: 162px; border:1px solid #ddd; background-color:#fff; padding:3px; padding-bottom: 0;}
@ -1030,4 +1030,4 @@ textarea.muban_textarea{ width: 98.5%;border:1px solid #ddd; background:#fff; co
 a.pro_new_users { max-width:80px; overflow:hidden;overflow:hidden;text-overflow:ellipsis;white-space:nowrap; word-break:break-all; display: inline-block;  font-weight: bold; color: #666;}
 a:hover.pro_new_users {color: #3b94d6}
 .pro_new_users img{ width:40px;height:40px; border: 3px solid #fff;-webkit-border-radius:50px;-moz-border-radius:50px;-o-border-radius:50px;border-radius:50px;}
-.pro_new_users img:hover{border: 3px solid #e6e6e6;}
+.pro_new_users img:hover{border: 3px solid #e6e6e6;}