{'Send mail to users'|@translate} {$TABSHEET_TITLE}
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 4ea5899e4..ffcb265d5 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -1,44 +1,42 @@
-{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js' }
-
{if $upload_mode eq 'multiple'}
-
+{combine_script id='jquery.jgrowl' load='footer' require='jquery' path='themes/default/js/plugins/jquery.jgrowl_minimized.js' }
+{combine_script id='swfobject' load='footer' path='admin/include/uploadify/swfobject.js'}
{combine_script id='jquery.uploadify' load='footer' require='jquery' path='admin/include/uploadify/jquery.uploadify.v2.1.0.min.js' }
+{combine_css path="admin/themes/default/uploadify.jGrowl.css"}
+{combine_css path="admin/include/uploadify/uploadify.css"}
{/if}
-{html_head}
-
-{/html_head}
{footer_script}{literal}
jQuery(document).ready(function(){
function checkUploadStart() {
var nbErrors = 0;
- $("#formErrors").hide();
- $("#formErrors li").hide();
+ jQuery("#formErrors").hide();
+ jQuery("#formErrors li").hide();
- if ($("input[name=category_type]:checked").val() == "new" && $("input[name=category_name]").val() == "") {
- $("#formErrors #emptyCategoryName").show();
+ if (jQuery("input[name=category_type]:checked").val() == "new" && jQuery("input[name=category_name]").val() == "") {
+ jQuery("#formErrors #emptyCategoryName").show();
nbErrors++;
}
var nbFiles = 0;
- if ($("#uploadBoxes").size() == 1) {
- $("input[name^=image_upload]").each(function() {
- if ($(this).val() != "") {
+ if (jQuery("#uploadBoxes").size() == 1) {
+ jQuery("input[name^=image_upload]").each(function() {
+ if (jQuery(this).val() != "") {
nbFiles++;
}
});
}
else {
- nbFiles = $(".uploadifyQueueItem").size();
+ nbFiles = jQuery(".uploadifyQueueItem").size();
}
if (nbFiles == 0) {
- $("#formErrors #noPhoto").show();
+ jQuery("#formErrors #noPhoto").show();
nbErrors++;
}
if (nbErrors != 0) {
- $("#formErrors").show();
+ jQuery("#formErrors").show();
return false;
}
else {
@@ -67,19 +65,19 @@ jQuery(document).ready(function(){
return byteSize+suffix;
}
- if ($("select[name=category] option").length == 0) {
- $('input[name=category_type][value=existing]').attr('disabled', true);
- $('input[name=category_type]').attr('checked', false);
- $('input[name=category_type][value=new]').attr('checked', true);
+ if (jQuery("select[name=category] option").length == 0) {
+ jQuery('input[name=category_type][value=existing]').attr('disabled', true);
+ jQuery('input[name=category_type]').attr('checked', false);
+ jQuery('input[name=category_type][value=new]').attr('checked', true);
}
- $("input[name=category_type]").click(function () {
- $("[id^=category_type_]").hide();
- $("#category_type_"+$(this).attr("value")).show();
+ jQuery("input[name=category_type]").click(function () {
+ jQuery("[id^=category_type_]").hide();
+ jQuery("#category_type_"+jQuery(this).attr("value")).show();
});
- $("#hideErrors").click(function() {
- $("#formErrors").hide();
+ jQuery("#hideErrors").click(function() {
+ jQuery("#formErrors").hide();
return false;
});
@@ -88,16 +86,16 @@ jQuery(document).ready(function(){
{literal}
function addUploadBox() {
var uploadBox = '
';
- $(uploadBox).appendTo("#uploadBoxes");
+ jQuery(uploadBox).appendTo("#uploadBoxes");
}
addUploadBox();
- $("#addUploadBox A").click(function () {
+ jQuery("#addUploadBox A").click(function () {
addUploadBox();
});
- $("#uploadForm").submit(function() {
+ jQuery("#uploadForm").submit(function() {
return checkUploadStart();
});
{/literal}
@@ -133,7 +131,7 @@ var sizeLimit = {$upload_max_filesize};
return false;
}
else {
- $("input[name=submit_upload]").click();
+ jQuery("input[name=submit_upload]").click();
}
},
onError: function (event, queueID ,fileObj, errorObj) {
@@ -157,7 +155,7 @@ var sizeLimit = {$upload_max_filesize};
msg = errorObj.type+": "+errorObj.info;
}
- $.jGrowl(
+ jQuery.jGrowl(
'
'+msg,
{
theme: 'error',
@@ -166,17 +164,17 @@ var sizeLimit = {$upload_max_filesize};
}
);
- $("#fileUploadgrowl" + queueID).fadeOut(
+ jQuery("#fileUploadgrowl" + queueID).fadeOut(
250,
function() {
- $("#fileUploadgrowl" + queueID).remove()
+ jQuery("#fileUploadgrowl" + queueID).remove()
}
);
return false;
},
onCancel: function (a, b, c, d) {
var msg = "Cancelled uploading: "+c.name;
- $.jGrowl(
+ jQuery.jGrowl(
'
'+msg,
{
theme: 'warning',
@@ -188,7 +186,7 @@ var sizeLimit = {$upload_max_filesize};
},
onClearQueue: function (a, b) {
var msg = "Cleared "+b.fileCount+" files from queue";
- $.jGrowl(
+ jQuery.jGrowl(
'
'+msg,
{
theme: 'warning',
@@ -200,7 +198,7 @@ var sizeLimit = {$upload_max_filesize};
},
onComplete: function (a, b ,c, d, e) {
var size = Math.round(c.size/1024);
- $.jGrowl(
+ jQuery.jGrowl(
'
'+c.name+' - '+size+'KB',
{
theme: 'success',
@@ -212,12 +210,12 @@ var sizeLimit = {$upload_max_filesize};
}
});
- $("input[type=button]").click(function() {
+ jQuery("input[type=button]").click(function() {
if (!checkUploadStart()) {
return false;
}
- $("#uploadify").uploadifyUpload();
+ jQuery("#uploadify").uploadifyUpload();
});
{/literal}
diff --git a/admin/themes/default/template/photos_add_ploader.tpl b/admin/themes/default/template/photos_add_ploader.tpl
index 9412aa21d..8047baeca 100644
--- a/admin/themes/default/template/photos_add_ploader.tpl
+++ b/admin/themes/default/template/photos_add_ploader.tpl
@@ -1,20 +1,19 @@
-{html_head}
-{literal}
-
+{/literal}{/footer_script}
+{html_head}{literal}
-{/literal}
-{/html_head}
+{/literal}{/html_head}
{'Piwigo Uploader'|@translate}
diff --git a/admin/themes/default/template/photos_add_settings.tpl b/admin/themes/default/template/photos_add_settings.tpl
index fe9830e9e..c8cc19b84 100644
--- a/admin/themes/default/template/photos_add_settings.tpl
+++ b/admin/themes/default/template/photos_add_settings.tpl
@@ -1,38 +1,37 @@
-{literal}
-
-{/literal}
+{/literal}{/footer_script}
{'Upload Photos'|@translate}
diff --git a/admin/themes/default/template/plugins_new.tpl b/admin/themes/default/template/plugins_new.tpl
index b61b4c948..425c8338a 100644
--- a/admin/themes/default/template/plugins_new.tpl
+++ b/admin/themes/default/template/plugins_new.tpl
@@ -1,23 +1,20 @@
-{combine_script id='jquery.effects' load='async' path='themes/default/js/ui/minified/jquery.effects.core.min.js' }
-{combine_script id='jquery.effects.blind' load='async' require='jquery.effects' path='themes/default/js/ui/minified/jquery.effects.blind.min.js' }
-
-{footer_script require='jquery.effects.blind'}
-jQuery(document).ready(function(){ldelim}
- jQuery("td[id^='desc_']").click(function() {ldelim}
+{footer_script require='jquery.effects.blind'}{literal}
+jQuery(document).ready(function(){
+ jQuery("td[id^='desc_']").click(function() {
id = this.id.split('_');
nb_lines = jQuery("#bigdesc_"+id[1]).html().split('
').length;
jQuery("#smalldesc_"+id[1]).toggle('blind', 1);
- if (jQuery(this).hasClass('bigdesc')) {ldelim}
+ if (jQuery(this).hasClass('bigdesc')) {
jQuery("#bigdesc_"+id[1]).toggle('blind', 1);
- } else {ldelim}
+ } else {
jQuery("#bigdesc_"+id[1]).toggle('blind', 50 + (nb_lines * 30));
}
jQuery(this).toggleClass('bigdesc');
return false;
});
});
-{/footer_script}
+{/literal}{/footer_script}
diff --git a/admin/themes/default/template/plugins_update.tpl b/admin/themes/default/template/plugins_update.tpl
index 75030c311..50cca3505 100644
--- a/admin/themes/default/template/plugins_update.tpl
+++ b/admin/themes/default/template/plugins_update.tpl
@@ -1,16 +1,13 @@
-{combine_script id='jquery.effects' load='async' path='themes/default/js/ui/minified/jquery.effects.core.min.js' }
-{combine_script id='jquery.effects.blind' load='async' require='jquery.effects' path='themes/default/js/ui/minified/jquery.effects.blind.min.js' }
-
-{footer_script require='jquery.effects.blind'}
-jQuery(document).ready(function(){ldelim}
- jQuery("td[id^='desc_'], p[id^='revdesc_']").click(function() {ldelim}
+{footer_script require='jquery.effects.blind'}{literal}
+jQuery(document).ready(function(){
+ jQuery("td[id^='desc_'], p[id^='revdesc_']").click(function() {
id = this.id.split('_');
jQuery("#revdesc_"+id[1]).toggle('blind');
jQuery(".button_"+id[1]).toggle();
return false;
});
});
-{/footer_script}
+{/literal}{/footer_script}
{'Plugins'|@translate}
diff --git a/admin/themes/default/template/themes_update.tpl b/admin/themes/default/template/themes_update.tpl
index ad9d97469..caad66aa4 100644
--- a/admin/themes/default/template/themes_update.tpl
+++ b/admin/themes/default/template/themes_update.tpl
@@ -1,7 +1,4 @@
-{combine_script id='jquery.effects' load='async' path='themes/default/js/ui/minified/jquery.effects.core.min.js' }
-{combine_script id='jquery.effects.blind' load='async' require='jquery.effects' path='themes/default/js/ui/minified/jquery.effects.blind.min.js' }
-
-{footer_script require='jquery.effects.blind'}
+{footer_script require='jquery.effects.blind'}{literal}
jQuery(document).ready(function(){ldelim}
jQuery("td[id^='desc_'], p[id^='revdesc_']").click(function() {ldelim}
id = this.id.split('_');
@@ -10,7 +7,7 @@ jQuery(document).ready(function(){ldelim}
return false;
});
});
-{/footer_script}
+{/literal}{/footer_script}
{'Themes'|@translate}
diff --git a/include/template.class.php b/include/template.class.php
index de135ac8a..10dea455c 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -1139,7 +1139,7 @@ class ScriptLoader
private function load_known_required_script($id, $load_mode)
{
- if ( isset(self::$known_paths[$id]) or strncmp($id, 'jquery.ui.', 10)==0 or strncmp($id, 'jquery.effetcs.', 15)==0 )
+ if ( isset(self::$known_paths[$id]) or strncmp($id, 'jquery.ui.', 10)==0 or strncmp($id, 'jquery.effects.', 15)==0 )
{
$this->add($id, $load_mode, array(), null);
return true;