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

app/views/users/_course_homework.html.erb

@@ -19,7 +19,7 @@
         <div class="homepagePostSubmit">
           <%= link_to "提交("+activity.student_works.count.to_s+")", student_work_index_path(:homework => activity.id), :class=> "c_blue" %>
         </div>
-        <div class="homepagePostDeadline">截止时间：<%= format_date(activity.end_time) %></div>
+        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %></div>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">
         作业描述：<%= activity.description.html_safe %>

app/views/users/_course_message.html.erb

@@ -21,7 +21,7 @@
         <% end %>
       </div>
       <div class="homepagePostDate">
-        发帖时间：<%= format_date(activity.created_on) %>
+        发帖时间：<%= format_time(activity.created_on) %>
       </div>
 
 
@@ -61,7 +61,7 @@
       <%if count > 2 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              点击展开更多回复(<%= count.to_s%>)
+              展开更多
             </a>
           </div>
       <% end %>
@@ -100,7 +100,7 @@
                       <% else %>
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_date(reply.created_on) %>
+                      <%= format_time(reply.created_on) %>
                     </div>
                     <div class="homepagePostReplyContent break_word">
                       <%= reply.content.html_safe %>

app/views/users/_course_news.html.erb

@@ -16,7 +16,7 @@
         <%= link_to activity.title.to_s, news_path(activity), :class => "postGrey" %>
       </div>
       <div class="homepagePostDate">
-        发布时间：<%= format_date(activity.created_on) %>
+        发布时间：<%= format_time(activity.created_on) %>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">
         通知描述：
@@ -35,7 +35,7 @@
       <%if count>2 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >
-              点击展开更多回复(<%= count.to_s%>)
+              展开更多
             </a>
           </div>
       <% end %>
@@ -72,7 +72,7 @@
                       <% else %>
                           <%= link_to comment.try(:author).try(:realname), user_path(comment.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_date(comment.created_on) %>
+                      <%= format_time(comment.created_on) %>
                     </div>
                     <div class="homepagePostReplyContent break_word"><%= comment.comments.html_safe %></div>
                   </div>

app/views/users/_course_poll.html.erb

@@ -26,7 +26,7 @@
         <% end %>
       </div>
       <div class="homepagePostDate">
-        发布时间：<%= format_date(activity.published_at) %>
+        发布时间：<%= format_time(activity.published_at) %>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">问卷描述：<%=activity.polls_description.html_safe.to_s%></div>
       <div class="homepagePostSetting" id="act-<%= user_activity_id %>" style="visibility: hidden">

app/views/users/_project_issue.html.erb

@@ -30,7 +30,7 @@
         </div>
         <div class="homepagePostDeadline">
           时间：
-          <%=format_date(activity.created_on) %>
+          <%=format_time(activity.created_on) %>
         </div>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">缺陷描述：
@@ -72,7 +72,7 @@
       <% if count > 2 %>
           <div class="homepagePostReplyBannerMore">
             <a id="reply_btn_<%= user_activity_id %>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help">
-              点击展开更多回复(<%= count.to_s %>)
+              展开更多
             </a>
           </div>
       <% end %>
@@ -109,7 +109,7 @@
                       <% else %>
                           <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_date(reply.created_on) %>
+                      <%= format_time(reply.created_on) %>
                     </div>
                     <% if reply.details.any? %>
                         <% details_to_strings(reply.details).each do |string| %>

app/views/users/_project_message.html.erb

@@ -24,7 +24,7 @@
         <% end %>
       </div>
       <div class="homepagePostDate">
-        时间：<%= format_date(activity.created_on) %>
+        时间：<%= format_time(activity.created_on) %>
       </div>
       <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id%>">帖子描述：
         <% if activity.parent_id.nil? %>
@@ -49,7 +49,7 @@
         )</div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count>2 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >点击展开更多回复(<%= count.to_s%>)</a></div>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >展开更多</a></div>
       <% end %>
     </div>
 
@@ -86,7 +86,7 @@
                       <% else %>
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %>
                       <% end %>
-                      <%= format_date(reply.created_on) %>
+                      <%= format_time(reply.created_on) %>
                     </div>
                     <div class="homepagePostReplyContent break_word"><%= reply.content.html_safe %></div>
                   </div>

public/assets/kindeditor/kindeditor.js

@@ -3536,8 +3536,8 @@ function _getInitHtml(themesPath, bodyClass, cssPath, cssData) {
 		(_direction === '' ? '<html>' : '<html dir="' + _direction + '">'),
 		'<head><meta charset="utf-8" /><title></title>',
 		'<style>',
-		'html {margin:2px;padding:2px;}',
+		'html {margin:3px 5px;padding:0px;}',
-		'body {margin:2px;padding:5px;}',
+		'body {margin:0px;padding:0px;}',
 		'body, td {font:14px/1.5 "sans serif",tahoma,verdana,helvetica;}',
 		'body, p, div {word-wrap: break-word;}',
 		'p {margin:0 0;}',

public/javascripts/init_KindEditor.js

@@ -1,6 +1,6 @@
 function init_editor(params){
     var editor = params.kindutil.create(params.textarea, {
-        resizeType : 1,minWidth:"1px",width:"100%",height:"80px",
+        resizeType : 0,minWidth:"1px",width:"100%",minHeight:"40px",
         items:['emoticons'],
         afterChange:function(){//按键事件
             nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});