fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-24 05:39:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from luminous (r11590)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11632 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-10-08 10:09:47 +00:00
parent ca554aad56
commit 2bf71d6660
4 changed files with 34 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/communication/communication.admin.controller.php
View file

@ -19,7 +19,7 @@
**/
function procCommunicationAdminInsertConfig() {
// get the default information
$args = Context::gets('skin','colorset','editor_skin','editor_colorset', 'mskin','layout_srl');
$args = Context::gets('skin','colorset','editor_skin','editor_colorset', 'mskin', 'layout_srl', 'mlayout_srl');
if(!$args->skin) $args->skin = 'default';
if(!$args->colorset) $args->colorset = 'white';

7
modules/communication/communication.admin.view.php
View file

@ -35,6 +35,13 @@
// get a list of communication skins
Context::set('communication_mobile_skin_list', $oModuleModel->getSkins($this->module_path, 'm.skins') );
// Get a layout list
$layout_list = $oLayoutModel->getLayoutList();
Context::set('layout_list', $layout_list);
$mlayout_list = $oLayoutModel->getLayoutList(0, 'M');
Context::set('mlayout_list', $mlayout_list);
$security = new Security();
$security->encodeHTML('communication_config..');
$security->encodeHTML('layout_list..');

8
modules/communication/communication.mobile.php
View file

@ -11,6 +11,14 @@ class communicationMobile extends communicationView {
$tpl_path = sprintf('%sm.skins/%s', $this->module_path, $skin);
$this->setTemplatePath($tpl_path);
$oLayoutModel = &getModel('layout');
$layout_info = $oLayoutModel->getLayout($this->communication_config->mlayout_srl);
if($layout_info)
{
$this->module_info->mlayout_srl = $this->communication_config->mlayout_srl;
$this->setLayoutPath($layout_info->path);
}
}
function dispCommunicationMessages()

18
modules/communication/tpl/index.html
View file

@ -34,6 +34,15 @@
//]]></script>
</td>
</tr>
<tr>
<th scope="row">{$lang->layout}</th>
<td>
<select id="layout" name="layout_srl">
<option value="0">{$lang->notuse}</option>
<option loop="$layout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $communication_config->layout_srl">{$val->title} ({$val->layout})</option>
</select>
</td>
</tr>
<tr>
<th scope="row">{$lang->skin}</th>
<td>
@ -48,6 +57,15 @@
<th scope="row">{$lang->colorset}</th>
<td><div id="communication_colorset"></div></td>
</tr>
<tr>
<th>{$lang->mobile_layout}</th>
<td>
<select id="layout" name="mlayout_srl">
<option value="0">{$lang->notuse}</option>
<option loop="$mlayout_list => $key,$val" value="{$val->layout_srl}" selected="selected"|cond="$val->layout_srl == $communication_config->mlayout_srl">{$val->title} ({$val->layout})</option>
</select>
</td>
</tr>
<tr>
<th scope="row">{$lang->mobile_skin}</th>
<td>