컨텐츠 스타일을 지정하지 않았을 경우 글보기에서는 사용되지 않도록 수정

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6365 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2009-05-23 08:24:06 +00:00
parent 0be0094a35
commit db8733fd18
3 changed files with 12 additions and 9 deletions

View file

@ -158,14 +158,16 @@
$oEditorModel = &getModel('editor');
$editor_config = $oEditorModel->getEditorConfig($module_srl);
$content_style = $editor_config->content_style;
$path = _XE_PATH_.'modules/editor/styles/'.$content_style.'/';
if(is_dir($path) && file_exists($path.'style.ini')) {
$ini = file($path.'style.ini');
for($i=0,$c=count($ini);$i<$c;$i++) {
$file = trim($ini[$i]);
if(!$file) continue;
if(preg_match('/\.css$/i',$file)) Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
elseif(preg_match('/\.js/i',$file)) Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
if($content_style) {
$path = _XE_PATH_.'modules/editor/styles/'.$content_style.'/';
if(is_dir($path) && file_exists($path.'style.ini')) {
$ini = file($path.'style.ini');
for($i=0,$c=count($ini);$i<$c;$i++) {
$file = trim($ini[$i]);
if(!$file) continue;
if(preg_match('/\.css$/i',$file)) Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
elseif(preg_match('/\.js/i',$file)) Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
}
}
}
$content_font = $editor_config->content_font;

View file

@ -48,7 +48,7 @@
if(!$editor_config->editor_skin) $editor_config->editor_skin = 'xpresseditor';
if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'xpresseditor';
if(!$editor_config->content_style) $editor_config->content_style = 'xeStyle';
//if(!$editor_config->content_style) $editor_config->content_style = 'xeStyle';
return $editor_config;
}

View file

@ -50,6 +50,7 @@
<tr>
<td colspan="2">
<select name="content_style">
<option value=""></option>
<!--@foreach($content_style_list as $key => $val)-->
<option value="{$key}" <!--@if($key==$editor_config->content_style)-->selected="selected"<!--@end-->>{$val->title}</option>
<!--@end-->