Merge branch 'luoquan' into yuanke
This commit is contained in:
commit
4fa25f68b6
|
|
@ -8,10 +8,10 @@
|
|||
<%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %>
|
||||
<span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>"><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %></span>
|
||||
</li>
|
||||
<li class="homepageNewsContent fl"><a href="javascript:void(0);" class="newsGrey">
|
||||
<li class="homepageNewsContent fl">
|
||||
<%= link_to ma.journals_for_message.notes.gsub("<p>","").gsub("</p>","").gsub("<br />","").html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
|
||||
:onmouseover =>"message_titile_show($(this),event)",
|
||||
:onmouseout => "message_titile_hide($(this))" %></a>
|
||||
:onmouseout => "message_titile_hide($(this))" %>
|
||||
</li>
|
||||
<div style="display: none" class="message_title_red system_message_style" >
|
||||
<% if ma.journals_for_message.reply_id == 0 %>
|
||||
|
|
|
|||
|
|
@ -929,13 +929,34 @@ function _mediaClass(type) {
|
|||
function _mediaAttrs(srcTag) {
|
||||
return _getAttrList(unescape(srcTag));
|
||||
}
|
||||
function _mediaEmbed(attrs) {
|
||||
var html = '<embed ';
|
||||
function _mediaEmbed(attrs,target) {
|
||||
if(target && target === "media"){
|
||||
var html = [[],"<img class=\"mediaIco\" src=\"../../images/video.png\" "],_ww = window.screen.width,_wh = window.screen.height;//_docHeight(window.document);
|
||||
_each(attrs, function(key, val) {
|
||||
if(key === "src"){
|
||||
html[0].push("<a class=\"mediaIcobox\" href=\"javascript:window.open('"+ val+"','newwindow','");
|
||||
}else{
|
||||
if(key === "width"){
|
||||
html[0].push("width="+val,",left="+(_ww-val)/2 + ",");
|
||||
}else if(key === "height"){
|
||||
html[0].push("height="+val,",top="+(_wh-val)/2);
|
||||
}else{
|
||||
html.push(key, "=\"" , val , "\" ");
|
||||
}
|
||||
}
|
||||
});
|
||||
html[0].push("')\">");
|
||||
html[0] = html[0].join("");
|
||||
html.push("/></a>");
|
||||
return html.join("");
|
||||
}else{
|
||||
var html = '<img ';
|
||||
_each(attrs, function(key, val) {
|
||||
html += key + '="' + val + '" ';
|
||||
});
|
||||
html += '/>';
|
||||
return html;
|
||||
}
|
||||
}
|
||||
function _mediaImg(blankPath, attrs) {
|
||||
var width = attrs.width,
|
||||
|
|
@ -6039,7 +6060,7 @@ _plugin('core', function(K) {
|
|||
}
|
||||
attrs.width = _undef(imgAttrs.width, width);
|
||||
attrs.height = _undef(imgAttrs.height, height);
|
||||
return _mediaEmbed(attrs);
|
||||
return _mediaEmbed(attrs,"media");
|
||||
})
|
||||
.replace(/<img[^>]*class="?ke-anchor"?[^>]*>/ig, function(full) {
|
||||
var imgAttrs = _getAttrList(full);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
.ke-content {
|
||||
font-size: 10pt;
|
||||
font-size: 12px;
|
||||
font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢ÈíÑźÚ, ËÎÌå;
|
||||
font-family:Tahoma;
|
||||
}
|
||||
.ke-content pre {
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@ KindEditor.plugin('lineheight', function(K) {
|
|||
});
|
||||
self.updateState();
|
||||
self.addBookmark();
|
||||
//curVal = key;
|
||||
//self.cmd.doc.body.style.lineHeight = key;
|
||||
self.hideMenu();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
|
|
@ -702,7 +702,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
|
|||
.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
|
||||
.homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
|
||||
.homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
|
||||
.homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;}
|
||||
.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: 微软雅黑, 宋体;}
|
||||
.table_maxWidth table {max-width: 642px;}
|
||||
.homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
|
||||
.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
|
||||
|
|
@ -1479,3 +1479,6 @@ a.choose-active {background-color:#269ac9; color:#ffffff;}
|
|||
.subject-list-type {width:50px; text-align:center;}
|
||||
.subject-list-count {width:60px; text-align:center;}
|
||||
.subject-list-from {width:105px; text-align:center;}
|
||||
|
||||
/*视频播放默认图标*/
|
||||
.mediaIco{margin: 30px 0 30px 20px;}
|
||||
|
|
|
|||
|
|
@ -1131,3 +1131,5 @@ a.resource-tab-active {color:#fff; background-color:#269ac9; border-bottom:1px s
|
|||
a.group-btn{ background: url(../images/course/hwork_icon.png) -2px -58px no-repeat !important; height:20px; display:block; padding-left:23px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
|
||||
a.program-btn{background: url(../images/homepage_icon.png) -86px -393px no-repeat; width:30px; height:20px; display:block; padding-left:23px; color:#888888;}
|
||||
|
||||
/*视频播放默认图标*/
|
||||
.mediaIco{margin: 30px 0 30px 20px;}
|
||||
|
|
|
|||
Loading…
Reference in New Issue