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

issue 1629 select signaure editor skins.

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@10998 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-08-08 06:57:26 +00:00
parent 64dc273bc2
commit e67b2f450e
5 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/member/member.admin.controller.php
View file

@ -148,7 +148,8 @@
'colorset', 'colorset',
'profile_image', 'profile_image_max_width', 'profile_image_max_height', 'profile_image', 'profile_image_max_width', 'profile_image_max_height',
'image_name', 'image_name_max_width', 'image_name_max_height', 'image_name', 'image_name_max_width', 'image_name_max_height',
'image_mark', 'image_mark_max_width', 'image_mark_max_height' 'image_mark', 'image_mark_max_width', 'image_mark_max_height',
'signature_editor_skin', 'sel_editor_colorset'
); );
$list_order = Context::get('list_order'); $list_order = Context::get('list_order');

5
modules/member/member.model.php
View file

@ -48,7 +48,7 @@
if(!$config->profile_image_max_height) $config->profile_image_max_height = 80; if(!$config->profile_image_max_height) $config->profile_image_max_height = 80;
if(!$config->skin) $config->skin = 'default'; if(!$config->skin) $config->skin = 'default';
if(!$config->colorset) $config->colorset = 'white'; if(!$config->colorset) $config->colorset = 'white';
if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = "xpresseditor"; if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = 'xpresseditor';
if(!$config->group_image_mark) $config->group_image_mark = "N"; if(!$config->group_image_mark) $config->group_image_mark = "N";
if (!$config->identifier) $config->identifier = 'user_id'; if (!$config->identifier) $config->identifier = 'user_id';
@ -62,6 +62,9 @@
$config->layout_srl = $defaultModuleInfo->layout_srl; $config->layout_srl = $defaultModuleInfo->layout_srl;
} }
if (!$config->signature_editor_skin || $config->signature_editor_skin == 'default') $config->signature_editor_skin = 'xpresseditor';
if (!$config->sel_editor_colorset) $config->sel_editor_colorset = 'white';
return $config; return $config;
} }

4
modules/member/member.view.php
View file

@ -142,8 +142,8 @@
$option->resizable = false; $option->resizable = false;
$option->disable_html = true; $option->disable_html = true;
$option->height = 200; $option->height = 200;
$option->skin = $member_config->editor_skin; $option->skin = $member_config->signature_editor_skin;
$option->colorset = $member_config->editor_colorset; $option->colorset = $member_config->sel_editor_colorset;
$editor = $oEditorModel->getEditor($member_info->member_srl, $option); $editor = $oEditorModel->getEditor($member_info->member_srl, $option);
Context::set('editor', $editor); Context::set('editor', $editor);
} }

15
modules/member/tpl/js/member_admin_config.js
View file

@ -86,20 +86,7 @@ jQuery(function($){
}); });
}); });
suForm.find('._imageType') $('a.modalAnchor._extendFormEdit').bind('before-open.mw', function(event){
.find('input:checkbox:not(:checked)').closest('tr')
.find('._subItem').hide().end()
.end()
.end()
.find('input:checkbox')
.change(function(){
var $subItem = $(this).closest('tr').find('._subItem');
if($(this).is(':checked')) $subItem.show();
else $subItem.hide();
})
.end();
$('a.modalAnchor._extendFormEdit').bind('before-open.mw', function(event){
var memberFormSrl = $(event.target).parent().attr('id'); var memberFormSrl = $(event.target).parent().attr('id');
var checked = $(event.target).closest('tr').find('input:radio:checked').val(); var checked = $(event.target).closest('tr').find('input:radio:checked').val();

13
modules/member/tpl/member_config.html
View file

@ -1,4 +1,5 @@
<load target="js/member_admin_config.js" usecdn="true" /> <load target="js/member_admin_config.js" usecdn="true" />
<load target="../../editor/tpl/js/editor_module_config.js" usecdn="true" />
<script type="text/javascript"> <script type="text/javascript">
xe.lang.msg_delete_extend_form = '{$lang->msg_delete_extend_form}'; xe.lang.msg_delete_extend_form = '{$lang->msg_delete_extend_form}';
xe.lang.confirm_delete = '{$lang->confirm_delete}'; xe.lang.confirm_delete = '{$lang->confirm_delete}';
@ -183,6 +184,18 @@
/ /
<label for="{$item->name}_max_height">{$lang->cmd_image_max_height}</label><input type="text" name="{$item->name}_max_height" id="{$item->name}_max_height" value="{$item->max_height}" style="width:30px" /> px <label for="{$item->name}_max_height">{$lang->cmd_image_max_height}</label><input type="text" name="{$item->name}_max_height" id="{$item->name}_max_height" value="{$item->max_height}" style="width:30px" /> px
</div> </div>
<div cond="$item->name == 'signature'" style="padding-top:10px">
<select id="signature_editor" name="signature_editor_skin" onchange="getEditorSkinColorList(this.value)">
<!--@foreach($editor_skin_list as $editor_skin)-->
<option value="{$editor_skin}" selected="selected"|cond="$editor_skin==$config->signature_editor_skin">{$editor_skin}</option>
<!--@end-->
</select>
<select name="sel_editor_colorset" id="sel_editor_colorset" style="display:none">
</select>
<script type="text/javascript">//<![CDATA[
getEditorSkinColorList('{$config->signature_editor_skin}','{$config->sel_editor_colorset}');
//]]></script>
</div>
</td> </td>
<td><input type="checkbox" name="is_{$item->name}_public" value="Y" checked="checked"|cond="$item->isPublic == 'Y'" disabled="disabled"|cond="in_array($item->name, $fixed_public_list) || !$item->isUse" /></td> <td><input type="checkbox" name="is_{$item->name}_public" value="Y" checked="checked"|cond="$item->isPublic == 'Y'" disabled="disabled"|cond="in_array($item->name, $fixed_public_list) || !$item->isUse" /></td>
<td class="text">&nbsp;</td> <td class="text">&nbsp;</td>