fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-12 07:11:42 +09:00
Code Issues Projects Releases Packages Wiki Activity

Editor component UI cleaning. Editor default height fixed. 400px -> 300px.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@12009 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ChanMyeong 2012-10-31 08:48:37 +00:00
parent 3f84c6be34
commit a5fd743ac9
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/editor/editor.admin.view.php
View file

@ -28,7 +28,7 @@
$editor_config = $oModuleModel->getModuleConfig('editor'); $editor_config = $oModuleModel->getModuleConfig('editor');
//editor_config init //editor_config init
if(!$editor_config->editor_height) $editor_config->editor_height = 400; if(!$editor_config->editor_height) $editor_config->editor_height = 300;
if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100; if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
if(!$editor_config->editor_skin) $editor_config->editor_skin = 'xpresseditor'; 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->comment_editor_skin) $editor_config->comment_editor_skin = 'xpresseditor';
@ -62,7 +62,7 @@
foreach($component_list as $component_name => $xml_info) { foreach($component_list as $component_name => $xml_info) {
if($packages[$xml_info->package_srl]) $xml_info->need_update = $packages[$xml_info->package_srl]->need_update; if($packages[$xml_info->package_srl]) $xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
} }
$editor_config_default = array( "editor_height" => "400", "comment_editor_height" => "100","content_font_size"=>"12"); $editor_config_default = array( "editor_height" => "300", "comment_editor_height" => "100","content_font_size"=>"12");
//editor preview //editor preview
$config = $oEditorModel->getEditorConfig(); $config = $oEditorModel->getEditorConfig();

4
modules/editor/editor.model.php
View file

@ -46,7 +46,7 @@
if($editor_config->enable_autosave!='N') $editor_config->enable_autosave = "Y"; if($editor_config->enable_autosave!='N') $editor_config->enable_autosave = "Y";
if(!$editor_config->editor_height) if($editor_default_config->editor_height? $editor_config->editor_height = $editor_default_config->editor_height : $editor_config->editor_height = 400); if(!$editor_config->editor_height) if($editor_default_config->editor_height? $editor_config->editor_height = $editor_default_config->editor_height : $editor_config->editor_height = 300);
if(!$editor_config->comment_editor_height) if($editor_default_config->comment_editor_height? $editor_config->comment_editor_height = $editor_default_config->comment_editor_height : $editor_config->comment_editor_height = 100); if(!$editor_config->comment_editor_height) if($editor_default_config->comment_editor_height? $editor_config->comment_editor_height = $editor_default_config->comment_editor_height : $editor_config->comment_editor_height = 100);
if(!$editor_config->editor_skin) if($editor_default_config->editor_skin? $editor_config->editor_skin = $editor_default_config->editor_skin : $editor_config->editor_skin = 'xpresseditor'); if(!$editor_config->editor_skin) if($editor_default_config->editor_skin? $editor_config->editor_skin = $editor_default_config->editor_skin : $editor_config->editor_skin = 'xpresseditor');
if(!$editor_config->comment_editor_skin) if($editor_default_config->comment_editor_skin? $editor_config->comment_editor_skin = $editor_default_config->comment_editor_skin : $editor_config->comment_editor_skin = 'xpresseditor'); if(!$editor_config->comment_editor_skin) if($editor_default_config->comment_editor_skin? $editor_config->comment_editor_skin = $editor_default_config->comment_editor_skin : $editor_config->comment_editor_skin = 'xpresseditor');
@ -222,7 +222,7 @@
if($option->disable_html) $html_mode = false; if($option->disable_html) $html_mode = false;
else $html_mode = true; else $html_mode = true;
// Set Height // Set Height
if(!$option->height) $editor_height = 400; if(!$option->height) $editor_height = 300;
else $editor_height = $option->height; else $editor_height = $option->height;
// Skin Setting // Skin Setting
$skin = $option->skin; $skin = $option->skin;

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

@ -15,11 +15,11 @@
</ul> </ul>
<div class="x_tab-content x_thumbnail"> <div class="x_tab-content x_thumbnail">
<div class="x_tab-pane x_active" id="pre_document"> <div class="x_tab-pane x_active" id="pre_document">
<iframe src="{getUrl('','act', 'dispEditorConfigPreview','mode','main')}" id="pre_document_frame" style="border:0;width:100%;height:500px"></iframe> <iframe src="{getUrl('','act', 'dispEditorConfigPreview','mode','main')}" id="pre_document_frame" style="border:0;width:100%;height:450px"></iframe>
<p class="x_modal-footer center"><a href="{getUrl('','act', 'dispEditorConfigPreview','mode','main')}" target="pre_document_frame" class="x_btn">{$lang->reload}</a></p> <p class="x_modal-footer center"><a href="{getUrl('','act', 'dispEditorConfigPreview','mode','main')}" target="pre_document_frame" class="x_btn">{$lang->reload}</a></p>
</div> </div>
<div class="x_tab-pane" id="pre_comment"> <div class="x_tab-pane" id="pre_comment">
<iframe src="{getUrl('','act', 'dispEditorConfigPreview','mode','comment')}" id="pre_comment_frame" style="border:0;width:100%;height:500px"></iframe> <iframe src="{getUrl('','act', 'dispEditorConfigPreview','mode','comment')}" id="pre_comment_frame" style="border:0;width:100%;height:450px"></iframe>
<p class="x_modal-footer center"><a href="{getUrl('','act', 'dispEditorConfigPreview','mode','comment')}" target="pre_comment_frame" class="x_btn">{$lang->reload}</a></p> <p class="x_modal-footer center"><a href="{getUrl('','act', 'dispEditorConfigPreview','mode','comment')}" target="pre_comment_frame" class="x_btn">{$lang->reload}</a></p>
</div> </div>
</div> </div>