Merge remote-tracking branch 'origin/szzh' into szzh

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/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/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/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/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: 邀请成功

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