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

merge from branch 1.5.3.2 (~r11282)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-19 07:56:40 +00:00
commit 9f5e25a15e
136 changed files with 414 additions and 317 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/layout/layout.admin.view.php
View file

@ -443,7 +443,7 @@
}
if(count($style)) {
$script = '<script> var faceOffStyle = {'.implode(',',$style).'}; </script>';
$script = '<script type="text/javascript"> var faceOffStyle = {'.implode(',',$style).'}; </script>';
Context::addHtmlHeader($script);
}

2
modules/layout/tpl/after_delete_config_image.html
View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
<!--@if($msg)-->
alert('{$msg}');
<!--@else-->

2
modules/layout/tpl/after_upload_config_image.html
View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
<!--@if($msg)-->
alert('{$msg}');
<!--@else-->

2
modules/layout/tpl/copy_layout.html
View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
var addLang = '{$lang->cmd_insert}';
</script>
<load target="js/layout_admin.js" usecdn="true" />

2
modules/layout/tpl/header.html
View file

@ -1,4 +1,4 @@
<style>
<style type="text/css">
#faceoff_migration_info img { border: 1px solid #ccc; padding: 5px; }
</style>

2
modules/layout/tpl/include.multilang.textarea.html
View file

@ -1,5 +1,5 @@
<block cond="$use_multilang_textarea">
<style>
<style type="text/css">
#langEditTextarea textarea { width: 258px; }
</style>

2
modules/layout/tpl/layout_all_instance_list.html
View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
xe.lang.confirm_delete = '{$lang->confirm_delete}';
</script>
<include target="header.html" />

2
modules/layout/tpl/layout_edit.html
View file

@ -15,7 +15,7 @@
<li loop="$layout_image_list => $no, $file">
{@$ext=substr(strrchr($file,'.'),1)}
<div class="a uploaded_image">
<script cond="$ext == 'swf' || $ext == 'flv'">
<script cond="$ext == 'swf' || $ext == 'flv'" type="text/javascript">
//<![CDATA[
displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100px', '100px');
//]]>

2
modules/layout/tpl/layout_image_list.html
View file

@ -7,7 +7,7 @@
{@$ext=substr(strrchr($file,'.'),1)}
<div class="filebox_preview_{$val->module_filebox_srl}" style="width:100px;height:100px;float:left; position:relative;margin-right:10px; ">
<!--@if($ext=='swf'||$ext=='flv')-->
<script>//<![CDATA[
<script type="text/javascript">//<![CDATA[
displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100%', '100%');
//]]></script>
<!--@elseif(in_array($ext,array('gif','png','jpg','jpeg')))-->

2
modules/layout/tpl/layout_instance_list.html
View file

@ -1,6 +1,6 @@
<include target="header.html" />
<load target="js/adminList.js" usecdn="true" />
<script>
<script type="text/javascript">
xe.lang.confirm_delete = '{$lang->confirm_delete}';
</script>
<h2 class="h2">{$layout_info->title} ver {$layout_info->version} ({$layout_info->layout})</h2>

7
modules/layout/tpl/layout_modify.html
View file

@ -163,8 +163,11 @@
<div class="btnArea">
<span class="etc">
<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList')}">{$lang->instance_layout}&nbsp;{$lang->cmd_list}</a></span>
<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout)}">{$selected_layout->title} ver {$selected_layout->version}({$selected_layout->layout})&nbsp;{$lang->cmd_list}</a></span>
<!--@if($layout)-->
<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminInstanceList', 'layout', $selected_layout->layout)}">{$lang->cmd_list}</a></span>
<!--@else-->
<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminAllInstanceList')}">{$lang->cmd_list}</a></span>
<!--@end-->
</span>
<span class="btn medium">
<input type="submit" value="{$lang->cmd_insert}"|cond="$act == 'dispLayoutAdminInsert'" value="{$lang->cmd_save}"|cond="$act == 'dispLayoutAdminModify'" onclick="doSubmitConfig()"/>

2
modules/layout/tpl/top_refresh.html
View file

@ -1,4 +1,4 @@
<script>//<![CDATA[
<script type="text/javascript">//<![CDATA[
alert("{$lang->success_updated}");
top.location.href = top.location.href;
//]]></script>