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

@ -124,7 +124,7 @@
if(!$input_name) return new Object(-1, 'msg_not_permitted');
$addscript = sprintf('<script>//<![CDATA[
$addscript = sprintf('<script type="text/javascript">//<![CDATA[
var selected_filebox_input_name = "%s";
//]]></script>',$input_name);
Context::addHtmlHeader($addscript);

View file

@ -32,7 +32,7 @@
<button>Go</button>
</span>
</div>
<script>
<script type="text/javascript">
jQuery('.pagination').xePagination();
jQuery('a.tgAnchor').xeContentToggler();
</script>

View file

@ -1,6 +1,6 @@
<load target="js/module_admin.js" usecdn="true" />
<script>
<script type="text/javascript">
xe.lang.favorite_on = '{$lang->favorite}({$lang->on})';
xe.lang.favorite_off = '{$lang->favorite}({$lang->off})';
</script>

View file

@ -1,5 +1,5 @@
<load target="js/module_admin.js" usecdn="true" />
<script>
<script type="text/javascript">
jQuery( function() { jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); doShowGrantZone() } );
</script>

View file

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

View file

@ -1,5 +1,5 @@
<load target="js/module_admin.js" usecdn="true" />
<script>
<script type="text/javascript">
jQuery( function() { jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); doShowGrantZone() } );
</script>
<h1 class="h1">{$lang->bundle_grant_setup}</h1>

View file

@ -1,7 +1,7 @@
<!--%import("filter/insert_grant.xml")-->
<load target="js/module_admin.js" usecdn="true" />
<script>
<script type="text/javascript">
jQuery( function() { jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); doShowGrantZone() } );
</script>

View file

@ -1,3 +1,3 @@
<script>
<script type="text/javascript">
top.location.href = "{$url}";
</script>

View file

@ -1,4 +1,4 @@
<script>//<![CDATA[
<script type="text/javascript">//<![CDATA[
top.location.href = top.location.href;
//]]>
</script>