fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-08 03:22:29 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge sandbox to trunk for 1.4.3.1

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@7659 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
zero 2010-08-25 06:19:21 +00:00
parent 289973781a
commit 200d63636c
195 changed files with 8166 additions and 3576 deletions
Download patch file Download diff file Expand all files Collapse all files

7
modules/module/module.controller.php
View file

@ -695,5 +695,12 @@
$output = executeQuery('module.deleteLock', $args);
return $output;
}
function updateModuleInSites($site_srls, $args)
{
$args->site_srls = $site_srls;
$output = executeQuery('module.updateModuleInSites', $args);
return $output;
}
}
?>

6
modules/module/module.model.php
View file

@ -535,9 +535,11 @@
$list = FileHandler::readDir($skin_path);
if(!count($list)) return;
natcasesort($list);
foreach($list as $skin_name) {
unset($skin_info);
$skin_info = $this->loadSkinInfo($path, $skin_name);
$skin_info = $this->loadSkinInfo($path, $skin_name, $dir);
if(!$skin_info) $skin_info->title = $skin_name;
$skin_list[$skin_name] = $skin_info;
@ -1263,7 +1265,7 @@
function getModuleFileBox($module_filebox_srl){
$args->module_filebox_srl = $module_filebox_srl;
return executeQuery('getModuleFileBox', $args);
return executeQuery('module.getModuleFileBox', $args);
}
function getModuleFileBoxList(){

12
modules/module/queries/updateModuleInSites.xml Normal file
View file

@ -0,0 +1,12 @@
<query id="updateModuleInSites" action="update">
<tables>
<table name="modules" />
</tables>
<columns>
<column name="mlayout_srl" var="mlayout_srl" />
<column name="use_mobile" var="use_mobile" />
</columns>
<conditions>
<condition operation="in" column="site_srl" var="site_srls" filter="number" notnull="notnull" />
</conditions>
</query>

35
modules/module/tpl/css/mlang.css
View file

@ -1,12 +1,23 @@
/* Body */
.bd{position:relative;overflow:hidden;clear:both}
/* GNB */
.gn,.gn ul{margin:0;padding:0;list-style:none}
.gn li{margin:-1px 0;border:1px solid #999;border-left:0;border-right:0;vertical-align:top}
.gn li a{display:block;text-decoration:none;height:45px;line-height:45px;padding:0 10px;color:#000;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.gn li strong{display:block;text-decoration:none;height:45px;line-height:45px;padding:0 10px;color:#000;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
.gn li a em{font-weight:normal;color:#f60;font-size:12px}
.gn li a:visited{color:#666}
.gn li li a{padding:0 10px 0 20px}
.gn li li li a{padding:0 10px 0 30px}
.gn li li li li a{padding:0 10px 0 50px}
@charset "utf-8";
/* Mobile XE Language (/modules/module/tpl/lang.html) */
body{margin:0}
.bd{background:#f8f8f8;padding:1px 0}
/* Hx */
.hx{position:relative;border-bottom:1px solid #ccc8be;padding:8px 10px;margin:0}
.hx:after{content:"";margin:0 -10px;position:relative;top:10px;display:block;clear:both;height:1px;background:#fff}
.hx.h2{background:#e5e5e5;}
.hx h2{margin:0 10px 0 0;display:inline;font-size:16px;line-height:1.4}
/* Global Navigation */
.gn{margin:0;padding:0;list-style:none;background:#d3d1cc}
.gn li{background:#d3d1cc;border:1px solid #a3a09a;border-left:0;border-right:0;margin:0 0 -1px 0}
.gn li li{background:#f8f8f8;border:1px solid #c9c9c9;border-left:0;border-right:0}
.gn ul{margin:0 0 -1px 0;padding:0;list-style:none}
.gn a,.gn strong{position:relative;text-decoration:none;display:block;padding:10px;font-size:16px}
.gn li a{color:#333}
.gn li a:after{position:absolute;top:7px;right:10px;content:"›";color:#888;font-size:18px;font-weight:bold;font-family:Verdana, Geneva, sans-serif}
.gn li li a:before{content:"";display:inline-block;width:6px;height:6px;border:1px dotted #666;border-top:0;border-right:0;margin:0 4px 0 0;vertical-align:top}
.gn li li a{padding-left:15px}
.gn li li li a{padding-left:30px}
.gn li li li li a{padding-left:45px}
.gn li li li li li a{padding-left:60px}
.gn em{color:#f63;font-size:12px}

27
modules/module/tpl/lang.html
View file

@ -1,12 +1,15 @@
<!--%import("css/mlang.css")-->
<div class="bd">
<ul class="gn">
<!--@foreach($lang_supported as $key=>$val)-->
<!--@if($key != $lang_type)-->
<li><a href="{getUrl('act',$oldact,'l',$key)}">{$val}</a></li>
<!--@else-->
<li><strong>{$val}</strong></li>
<!--@end-->
<!--@end-->
</ul>
</div>
<!--%import("css/mlang.css")-->
<div class="bd">
<div class="hx h2">
<h2>Select Your Language</h2>
</div>
<ul class="gn">
<!--@foreach($lang_supported as $key=>$val)-->
<!--@if($key != $lang_type)-->
<li><a href="{getUrl('act',$oldact,'l',$key)}">{$val}</a></li>
<!--@else-->
<li><strong>{$val}</strong></li>
<!--@end-->
<!--@end-->
</ul>
</div>