fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-25 21:32:51 +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/document/document.controller.php
View file

@ -1330,7 +1330,7 @@ class documentController extends document {
if(!count($extra_keys)) return;
$js_code = array();
$js_code[] = '<script>//<![CDATA[';
$js_code[] = '<script type="text/javascript">//<![CDATA[';
$js_code[] = '(function($){';
$js_code[] = 'var validator = xe.getApp("validator")[0];';
$js_code[] = 'if(!validator) return false;';

2
modules/document/tpl/category_info.html
View file

@ -61,7 +61,7 @@
</table>
</div>
</div>
<script>
<script type="text/javascript">
jQuery(function(){
jQuery('input.color-indicator').xe_colorpicker();
});

4
modules/document/tpl/category_list.html
View file

@ -6,7 +6,7 @@
<load target="js/document_category.js" usecdn="true" />
<!--%load_js_plugin("ui.colorpicker")-->
<script>
<script type="text/javascript">
var category_title = "{$lang->category}";
</script>
@ -28,7 +28,7 @@
</ul>
</div>
<span style="float:right"><a href="#" onclick="doReloadTreeCategory('{$module_info->module_srl}');return false;" class="button black"><span>{$lang->cmd_remake_cache}</span></a></span>
<script>
<script type="text/javascript">
var simpleTreeCollection;
var max_menu_depth = 999;
var lang_confirm_delete = "{$lang->confirm_delete}";

2
modules/document/tpl/checked_list.html
View file

@ -51,7 +51,7 @@
<button type="button" onclick="doManageDocument('copy');">{$lang->cmd_copy}</button>
</div>
<script>
<script type="text/javascript">
jQuery(function() { doGetCategoryFromModule({$module_srl}); } );
</script>
<!--@end-->

2
modules/document/tpl/declared_list.html
View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</script>

2
modules/document/tpl/document_list.html
View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
</script>

2
modules/document/tpl/print_page.html
View file

@ -8,7 +8,7 @@
<!--@end-->
<!--@end-->
{$oDocument->getContent(false, false)}
<script>
<script type="text/javascript">
//<![CDATA[
jQuery(window).load(function() { window.print(); } );
//]]>