merge from branch 1.5.3.2 (~r11282)

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

View file

@ -1,9 +1,9 @@
<!--@if($error_message)-->
<script>
<script type="text/javascript">
alert("{$error_message}");
</script>
<!--@else-->
<script>
<script type="text/javascript">
top.completeMenuUploadButton("{$target}", "{$filename}");
</script>
<!--@end-->

View file

@ -105,7 +105,7 @@
<div class="btnArea">
<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
</div>
<script>
<script type="text/javascript">
(function($){
$("[name^=menu_name_]").bind("blur",function(e){
if($("[name=ck_"+$(this).attr("name")+"]:checked").size()>0){

View file

@ -8,7 +8,7 @@
<!--// tree javascript plugin load -->
<!--%load_js_plugin("ui.tree")-->
<script>
<script type="text/javascript">
var alertImageOnly = "{$lang->alert_image_only}";
</script>
@ -79,7 +79,7 @@
</div>
</div>
<script>//<![CDATA[
<script type="text/javascript">//<![CDATA[
//언어파일 로드용
var lang_cmd_insert = "{htmlspecialchars($lang->cmd_insert)}";
var lang_cmd_delete = "{htmlspecialchars($lang->cmd_delete)}";

View file

@ -1,4 +1,4 @@
<script>
<script type="text/javascript">
xe.lang.confirm_delete = "{$lang->confirm_delete}";
xe.current_layout = {$current_layout};
jQuery( function() { jQuery('.grant_default').change( function(event) { doShowMenuGrantZone(); } ); doShowMenuGrantZone() } );