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

@ -41,7 +41,7 @@
<div class="widgetBoxRemove"></div>
</div>
<script>
<script type="text/javascript">
var confirm_delete_msg = "{$lang->confirm_delete}";
xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
</script>

View file

@ -141,7 +141,7 @@
<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
</div>
</form>
<script>
<script type="text/javascript">
(function($){
$('.optionnalData').hide();
$('select[name=page_type]').change(function(){

View file

@ -44,7 +44,7 @@
<div class="widgetBoxRemove"></div>
</div>
<script>
<script type="text/javascript">
var confirm_delete_msg = "{$lang->confirm_delete}";
xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
</script>