fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-26 14:49:56 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/editor/tpl/admin_index.html
View file

@ -80,13 +80,13 @@
<p class="q">{$lang->guide_choose_text_formatting}</p>
<p class="a">
<!--@foreach($content_style_list as $key => $val)-->
<input type="radio" name="content_style" value="{$key}" id="style_{$key}" <!--@if($key==$editor_config->content_style||!$editor_config->content_style&&$key=='default')-->checked="checked"<!--@end-->><label for="style_{$key}">{$key}</label>
<input type="radio" name="content_style" value="{$key}" id="style_{$key}" checked="checked"|cond="$key==$editor_config->content_style||!$editor_config->content_style && $key=='default'"> <label for="style_{$key}">{$key}</label>
<!--@end-->
</p>
</li>
<li>
<p class="q">{$lang->guide_choose_font_body}</p>
<textarea rows="3" cols="42" class="fontPreview" title="Font Preview">{$lang->font_preview}</textarea>
<textarea rows="8" cols="42" class="fontPreview" title="Font Preview">{$lang->font_preview}</textarea>
<p class="answer fontSelector">
<input type="radio" name="content_font" id="font_noFont" value="" <!--@if(!$editor_config->content_font)-->checked="checked" <!--@end-->/> <label for="font_noFont" style="font-family:''">none(inherit)</label><br />
<!--@foreach($lang->edit->fontlist as $name => $detail)-->
@ -96,7 +96,7 @@
</li>
<li>
<p class="q"><label for="fontSize">{$lang->guide_choose_font_size_body}</label></p>
<textarea rows="3" cols="42" class="fontPreview" title="Font Preview">{$lang->font_preview}</textarea>
<textarea rows="8" cols="42" class="fontPreview" title="Font Preview">{$lang->font_preview}</textarea>
<p class="a"><input type="text" id="fontSize" name="content_font_size" value="<!--@if($editor_config->content_font_size)-->{str_replace('px','',$editor_config->content_font_size)}<!--@else-->{str_replace('px','',$editor_config_default['content_font_size'])}<!--@end-->" style="width:30px" /> px</p>
</li>
</ul>

82
modules/editor/tpl/css/editor.css
View file

@ -1,50 +1,42 @@
@charset "utf-8";
.xeEditor { }
.xeEditor .optionABC { clear:both; width:100%; border-bottom:1px solid #c2c2c2; overflow:hidden; background:#ffffff url(../images/bgBoardEditorOption.gif) no-repeat -3px bottom;}
.xeEditor .optionABC .selectGroup { white-space:nowrap; display:block; height:21px; margin:0 .5em 0 0; padding-left:1em; float:left;}
.xeEditor .optionABC .buttonGroup { white-space:nowrap; position:relative; display:block; margin:0 .5em 0 0; float:left; height:21px; overflow:hidden; padding-left:2px;}
.xeEditor .optionABC .buttonGroup img { float:left; display:block; margin-left:-1px; cursor:pointer;}
.xeEditor .optionABC{clear:both;width:100%;border-bottom:1px solid #c2c2c2;overflow:hidden;background:#ffffff url(../images/bgBoardEditorOption.gif) no-repeat -3px bottom}
.xeEditor .optionABC .selectGroup{white-space:nowrap;display:block;height:21px;margin:0 .5em 0 0;padding-left:1em;float:left}
.xeEditor .optionABC .buttonGroup{white-space:nowrap;position:relative;display:block;margin:0 .5em 0 0;float:left;height:21px;overflow:hidden;padding-left:2px}
.xeEditor .optionABC .buttonGroup img{float:left;display:block;margin-left:-1px;cursor:pointer}
.xeEditor .optionA,
.xeEditor .optionB,
.xeEditor .optionC { float:left; background:#ffffff url(../images/bgBoardEditorOption.gif) no-repeat left bottom; padding:.5em 0 .5em .7em; overflow:hidden;}
.xeEditor .optionC{float:left;background:#ffffff url(../images/bgBoardEditorOption.gif) no-repeat left bottom;padding:.5em 0 .5em .7em;overflow:hidden}
.xeEditor .optionA *,
.xeEditor .optionB *,
.xeEditor .optionC * { vertical-align:middle;}
.xeEditor .optionA { background-position:-3px bottom; padding-left:0;}
.xeEditor .optionA select option { font-size:.9em; }
.xeEditor .optionDE { width:100%; clear:both; overflow:hidden; background:#f8f8f8; border-bottom:1px solid #e1e1e1; height:29px;}
.xeEditor .optionDE .buttonGroup { white-space:nowrap; position:relative; display:block; float:left; height:21px; overflow:hidden; padding-left:2px;}
.xeEditor .optionDE img { float:left; display:block; margin-right:.5em; cursor:pointer;}
.xeEditor .optionD { padding:.5em 0 .5em .8em; overflow:hidden; float:left; border-right:1px solid #e0e0e0;}
.xeEditor .optionE { padding:4px 0 0 8px; overflow:hidden; border-left:1px solid #ffffff; float:left;}
.xeEditor .editorInfo { background:#fbfbfb; padding:.5em; border:1px solid #e1e1dd; color:#999999; position:relative; margin:5px 20px 0 20px;}
.xeEditor .close { cursor:pointer; position:absolute; top:3px; right:3px; _top:3px; _right:25px;}
.xeEditor .editor_iframe_box { background:#ffffff; clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:.5em; margin:0 20px 0 20px; }
.xeEditor .textAreaDragIndicator { text-align:center; background:url(../images/lineTextAreaDrag.gif) repeat-x left center; padding:5px 0 5px 0; }
.xeEditor .textAreaDragIndicatorBar { background:url(../images/buttonTextAreaDrag.gif) no-repeat center; cursor:move;height:14px;}
.xeEditor .editor_info { clear:both; padding:5px 20px 5px 20px; overflow:hidden;}
.xeEditor .editor_info .editor_option { float:left; color:#888888; }
.xeEditor .editor_info .editor_autosaved_message { color:#888888; float:right; }
.xeEditor .inputTypeTextArea { background:#fbfbfb; padding:1em; width:94%;}
.xeEditor #textAreaDrag {}
.xeEditor .fileAttach { padding:0 1em .5em 1em;}
.xeEditor .fileAttach .preview { padding:5px; width:110px; height:110px; border:1px solid #e1e1dd; background:#fbfbfb; float:left; margin-right:.5em;}
.xeEditor .fileAttach .preview img { width:110px; height:110px; float:left; display:block;}
.xeEditor .fileAttach .fileListArea { float:left; width:50%; margin-right:.7em; padding-bottom:.5em; margin-bottom:1em}
.xeEditor .fileAttach .fileListArea .fileList { overflow:auto; width:100%; height:auto; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; margin-bottom:.3em; font-size:11px;}
.xeEditor .fileAttach .fileListArea .fileList option { line-height:100%; padding-left:.5em;}
.xeEditor .fileAttach .fileListArea span.file_attach_info { color:#3f4040; font-size:11px; text-align:left;}
.xeEditor .fileAttach .fileListArea span.file_attach_info strong { color:#ff6600; font-size:11px; font-weight:bold; }
.xeEditor .fileAttach .fileUploadControl { margin-bottom:5px; }
.xeEditor .fileAttach .fileUploadControl .uploaderButton { display:block; cursor:pointer; background:url(../images/buttonTypeBCenter.gif) repeat-x left center; line-height:100%; overflow:visible; color:#3f4040; margin:0 1px; font-size:.9em; white-space:nowrap;}
.xeEditor .fileAttach .fileUploadControl .uploaderButton:hover { text-decoration:none;}
.xeEditor .fileAttach .fileUploadControl .uploaderButton img { vertical-align:middle;}
.xeEditor .fileAttach .fileUploadControl .uploaderButton .leftCap { width:2px; height:21px; background:url(../images/buttonTypeBLeft.gif) no-repeat; margin:0 .3em 0 0; position:relative; left:-1px;}
.xeEditor .fileAttach .fileUploadControl .uploaderButton .rightCap { width:2px; height:21px; background:url(../images/buttonTypeBRight.gif) no-repeat; margin:0 -1px 0 .4em;}
.xeEditor .fileAttach .fileUploadControl .uploaderButton .icon { margin:0 .2em;}
.xeEditor .optionC *{vertical-align:middle}
.xeEditor .optionA{background-position:-3px bottom;padding-left:0}
.xeEditor .optionA select option{font-size:.9em}
.xeEditor .optionDE{width:100%;clear:both;overflow:hidden;background:#f8f8f8;border-bottom:1px solid #e1e1e1;height:29px}
.xeEditor .optionDE .buttonGroup{white-space:nowrap;position:relative;display:block;float:left;height:21px;overflow:hidden;padding-left:2px}
.xeEditor .optionDE img{float:left;display:block;margin-right:.5em;cursor:pointer}
.xeEditor .optionD{padding:.5em 0 .5em .8em;overflow:hidden;float:left;border-right:1px solid #e0e0e0}
.xeEditor .optionE{padding:4px 0 0 8px;overflow:hidden;border-left:1px solid #ffffff;float:left}
.xeEditor .editorInfo{background:#fbfbfb;padding:.5em;border:1px solid #e1e1dd;color:#999999;position:relative;margin:5px 20px 0 20px}
.xeEditor .close{cursor:pointer;position:absolute;top:3px;right:3px;_top:3px;_right:25px}
.xeEditor .editor_iframe_box{background:#ffffff;clear:both;border:1px solid;border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;padding:.5em;margin:0 20px 0 20px}
.xeEditor .textAreaDragIndicator{text-align:center;background:url(../images/lineTextAreaDrag.gif) repeat-x left center;padding:5px 0 5px 0}
.xeEditor .textAreaDragIndicatorBar{background:url(../images/buttonTextAreaDrag.gif) no-repeat center;cursor:move;height:14px}
.xeEditor .editor_info{clear:both;padding:5px 20px 5px 20px;overflow:hidden}
.xeEditor .editor_info .editor_option{float:left;color:#888888}
.xeEditor .editor_info .editor_autosaved_message{color:#888888;float:right}
.xeEditor .iTextArea{background:#fbfbfb;padding:1em;width:94%}
.xeEditor .fileAttach{padding:0 1em .5em 1em}
.xeEditor .fileAttach .preview{padding:5px;width:110px;height:110px;border:1px solid #e1e1dd;background:#fbfbfb;float:left;margin-right:.5em}
.xeEditor .fileAttach .preview img{width:110px;height:110px;float:left;display:block}
.xeEditor .fileAttach .fileListArea{float:left;width:50%;margin-right:.7em;padding-bottom:.5em;margin-bottom:1em}
.xeEditor .fileAttach .fileListArea .fileList{overflow:auto;width:100%;height:auto;border:1px solid;border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6;margin-bottom:.3em;font-size:11px}
.xeEditor .fileAttach .fileListArea .fileList option{line-height:100%;padding-left:.5em}
.xeEditor .fileAttach .fileListArea span.file_attach_info{color:#3f4040;font-size:11px;text-align:left}
.xeEditor .fileAttach .fileListArea span.file_attach_info strong{color:#ff6600;font-size:11px;font-weight:bold}
.xeEditor .fileAttach .fileUploadControl{margin-bottom:5px}
.xeEditor .fileAttach .fileUploadControl .uploaderButton{display:block;cursor:pointer;background:url(../images/buttonTypeBCenter.gif) repeat-x left center;line-height:100%;overflow:visible;color:#3f4040;margin:0 1px;font-size:.9em;white-space:nowrap}
.xeEditor .fileAttach .fileUploadControl .uploaderButton:hover{text-decoration:none}
.xeEditor .fileAttach .fileUploadControl .uploaderButton img{vertical-align:middle}
.xeEditor .fileAttach .fileUploadControl .uploaderButton .leftCap{width:2px;height:21px;background:url(../images/buttonTypeBLeft.gif) no-repeat;margin:0 .3em 0 0; position:relative;left:-1px}
.xeEditor .fileAttach .fileUploadControl .uploaderButton .rightCap{width:2px;height:21px;background:url(../images/buttonTypeBRight.gif) no-repeat;margin:0 -1px 0 .4em}
.xeEditor .fileAttach .fileUploadControl .uploaderButton .icon{margin:0 .2em}

2
modules/editor/tpl/js/editor_common.js
View file

@ -253,7 +253,7 @@ function editorSearchComponent(evt) {
// editor_component를 찾지 못했을 경우에 이미지/텍스트/링크의 경우 기본 컴포넌트와 연결
if(!editor_component) {
// 이미지일 경우
if(obj.nodeName == "IMG") {
if(obj.nodeName == "IMG" && !obj.getAttribute("widget")) {
editor_component = "image_link";
editorPrevNode = obj;
}

23
modules/editor/tpl/js/editor_module_config.js
View file

@ -9,22 +9,25 @@ function getEditorSkinColorList(skin_name,selected_colorset,type,testid){
function resultGetEditorSkinColorList(ret_obj,response_tags, params) {
var selectbox = null;
jQuery(function($){
selectbox = jQuery("#"+params.testid).next('label').next('select');
if(params.testid){
selectbox = $("#"+params.testid).next('label').next('select');
}else{
selectbox = (params.type == 'document') ? $('select[name=sel_editor_colorset]') : $('select[name=sel_comment_editor_colorset]');
}
selectbox.html('');
if(params.type == 'document'){
$("select[name=sel_editor_colorset]").css('display','none');
$("select[name=sel_editor_colorset]").removeAttr('name');
$("select[name=sel_editor_colorset]").hide()
.removeAttr('name');
selectbox.attr('name','sel_editor_colorset');
}else{
$("select[name=sel_comment_editor_colorset]").css('display','none');
$("select[name=sel_comment_editor_colorset]").removeAttr('name');
$("select[name=sel_comment_editor_colorset]").hide()
.removeAttr('name');
selectbox.attr('name','sel_comment_editor_colorset');
}
if(ret_obj['error'] == 0 && ret_obj.colorset){
var it = new Array();
var items = ret_obj['colorset']['item'];
if(typeof(items[0]) == 'undefined'){
it[0] = items;
@ -35,10 +38,10 @@ function resultGetEditorSkinColorList(ret_obj,response_tags, params) {
for(var i=0;i<it.length;i++){
selectbox.append($('<option value="'+it[i].name+'" >'+it[i].title+'</option>'));
}
selectbox.css('display','');
selectbox.show();
}else{
selectbox.css('display','none');
selectbox.innerHTML="";
selectbox.hide();
selectbox.html('');
}
});
}

2
modules/editor/tpl/js/uploader.js
View file

@ -71,7 +71,7 @@ function start(cfg) {
// Button settings
button_window_mode : 'transparent',
button_placeholder : $span.get(0),
button_placeholder_id : $span.attr('id'),
button_text : null,
button_image_url : request_uri+'common/img/blank.gif',
button_width : width,