Merge branch 'szzh' into cxt_course

lib/rails_kindeditor/lib/rails_kindeditor/helper.rb

@@ -14,7 +14,7 @@ module RailsKindeditor
       output = ActiveSupport::SafeBuffer.new
       output << text_area_tag(name, content, input_html)
       output << javascript_tag(js_replace(id, options.merge(window_onload: 'true',
-                                                            :autoHeightMode=>true,
+                                                            :autoHeightMode=>false,
                                                             afterCreate: eval_str(at_id, at_type),
                                                             emotionsBasePath: 'http://' + Setting.host_name
                                                             )))
@@ -29,7 +29,7 @@ module RailsKindeditor
       output_buffer = ActiveSupport::SafeBuffer.new
       output_buffer << build_text_area_tag(name, method, self, options, input_html)
       output_buffer << javascript_tag(js_replace(input_html['id'],options.merge(window_onload: 'true',
-                                                                                 :autoHeightMode=>true,
+                                                                                 :autoHeightMode=>false,
                                                                                 afterCreate: eval_str(at_id, at_type),
                                                                                 emotionsBasePath: 'http://' + Setting.host_name
                                                                                 )))

public/assets/kindeditor/at/config.js

@@ -35,7 +35,7 @@ var enableAt = function(_editor) {
     var at_config = {
         at: "@",
         data: names,
-        insertTpl: '<span class="at" data-user-id="${userid}">@${name}(${login})</span>',
+        insertTpl: '<span class="at" data-user-id="${userid}"><a href="/users/${userid}">@${name}(${login})</a></span>',
         displayTpl: "<li>${name} <small>${login}</small></li>",
         searchKey: 'searchKey',
         limit: 200

public/assets/kindeditor/at/jquery.atwho.css

@@ -49,4 +49,5 @@
 }
 
 /* @功能 定义 */
-span.at {color:#269ac9;}
+span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}

public/assets/kindeditor/plugins/code/previewcode.css

@@ -45,4 +45,5 @@
 
 
 .ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;}
-span.at {color:#269ac9;}
+span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}

public/javascripts/application.js

@@ -1000,14 +1000,3 @@ function showNormalImage(id) {
     }
 
 }
-
-$(function(){
-  //at 加链接
-  $("span.at").hover(function(){
-    $(this).css('cursor', 'pointer');
-  });
-  $("span.at").live('click', function(){
-    var userId = $(this).attr('data-user-id');
-    $(window.location).attr('href', '/users/'+userId);
-  });
-});

public/stylesheets/new_user.css

@@ -1387,6 +1387,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;}
 
 /* @功能 定义 */
 span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}
 
 .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;}
 /*问题状态图片*/

public/stylesheets/public.css

@@ -934,6 +934,7 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r
 
 /* @功能 定义 */
 span.at {color:#269ac9;}
+span.at a{color:#269ac9;text-decoration: none;}
 
 /*20151217资源库Tim*/
 .preview {background:url(../images/hwork_icon.png) -75px -120px no-repeat; width:20px; height:20px; display:inline-block;}
@@ -956,4 +957,4 @@ span.at {color:#269ac9;}
 .sectionContent li:hover {background-color:#cccccc;}
 .sectionContent span {width:160px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap; display:inline-block; height:20px; vertical-align:top;}
 .orgDirection {width:392px; background-color:#f1f1f1; height:30px; vertical-align:middle; line-height:30px; color:#585858; padding-left:10px;}
-.orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;}
+.orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;}