diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 99735fba3..1c740305c 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -471,7 +471,7 @@ SELECT id, file, path, tn_ext
'image_file' => $element['file'],
'category' => $category
))
- .'" class="thumblnk"> ';
+ .'" class="thumblnk"> ';
}
}
diff --git a/admin/include/c13y_internal.class.php b/admin/include/c13y_internal.class.php
index 093b67b6d..8065cbbb2 100644
--- a/admin/include/c13y_internal.class.php
+++ b/admin/include/c13y_internal.class.php
@@ -54,7 +54,7 @@ class c13y_internal
null,
null,
l10n('c13y_version_correction')
- .' '.
+ .' '.
$c13y->get_htlm_links_more_info());
}
}
@@ -79,7 +79,7 @@ class c13y_internal
null,
null,
sprintf(l10n('c13y_exif_correction'), '$conf[\''.$value.'\']')
- .' '.
+ .' '.
$c13y->get_htlm_links_more_info());
}
}
diff --git a/admin/template/goto/cat_list.tpl b/admin/template/goto/cat_list.tpl
index e3abaacc2..d21eac5aa 100644
--- a/admin/template/goto/cat_list.tpl
+++ b/admin/template/goto/cat_list.tpl
@@ -28,11 +28,11 @@
@@ -40,8 +40,8 @@
{if count($categories) }
diff --git a/admin/template/goto/cat_modify.tpl b/admin/template/goto/cat_modify.tpl
index 418f87539..01d4e4c71 100644
--- a/admin/template/goto/cat_modify.tpl
+++ b/admin/template/goto/cat_modify.tpl
@@ -11,18 +11,18 @@
{if cat_admin_access($CAT_ID)}
-
+
{/if}
{if isset($U_MANAGE_ELEMENTS) }
-
-
+
+
{/if}
-
+
{if isset($U_MANAGE_PERMISSIONS) }
-
+
{/if}
{if isset($U_DELETE) }
-
+
{/if}
@@ -42,7 +42,7 @@
{'Name'|@translate}
-
+
@@ -99,12 +99,12 @@
{'Sort order'|@translate}
-
+
{'Use default sort order'|@translate}
-
-
+
+
{'Apply to subcategories'|@translate}
-
+
{foreach from=$image_orders item=order}
@@ -112,14 +112,14 @@
{html_options options=$image_order_direction_options selected=$order.DIRECTION }
-
+
{/foreach}
-
-
+
+
{if isset($representant) }
@@ -129,18 +129,18 @@
{if isset($representant.picture) }
-
+
{else}
-
+
{/if}
{if $representant.ALLOW_SET_RANDOM }
-
+
{/if}
{if isset($representant.ALLOW_DELETE) }
-
+
{/if}
@@ -173,8 +173,8 @@
-
-
+
+
@@ -194,8 +194,8 @@
-
-
+
+
@@ -223,8 +223,8 @@
-
-
+
+
diff --git a/admin/template/goto/cat_perm.tpl b/admin/template/goto/cat_perm.tpl
index 858ff3723..aa135385c 100644
--- a/admin/template/goto/cat_perm.tpl
+++ b/admin/template/goto/cat_perm.tpl
@@ -13,10 +13,10 @@
{'Permission granted'|@translate}
-
+
@@ -26,7 +26,7 @@
{$all_groups[$id]}
{/foreach}
-
+
{'Users'|@translate}
@@ -35,10 +35,10 @@
{'Permission granted'|@translate}
-
+
@@ -59,7 +59,7 @@
{$all_users[$id]}
{/foreach}
-
+
diff --git a/admin/template/goto/check_integrity.tpl b/admin/template/goto/check_integrity.tpl
index 3d1bfb5d1..d9019dbe7 100644
--- a/admin/template/goto/check_integrity.tpl
+++ b/admin/template/goto/check_integrity.tpl
@@ -16,7 +16,7 @@
{if $c13y.can_select}
-
+
{/if}
{$c13y.anomaly}
@@ -24,7 +24,7 @@
{if $c13y.show_ignore_msg}
{'c13y_ignore_msg1'|@translate}
-
+
{'c13y_ignore_msg2'|@translate}
{/if}
{if $c13y.show_correction_fct}
@@ -38,12 +38,12 @@
{/if}
{if !empty($c13y.correction_error_fct)}
{'c13y_Correction_applied_error'|@translate}
-
+
{$c13y.c13y.correction_error_fct}
{/if}
{if !empty($c13y.correction_msg)}
{if $c13y.show_correction_success_fct or !empty($c13y.correction_error_fct) or $c13y.show_correction_fct or $c13y.show_correction_bad_fct }
-
+
{/if}
{$c13y.correction_msg|@nl2br}
{/if}
@@ -70,12 +70,12 @@
{if $c13y_show_submit_automatic_correction}
-
+
{/if}
{if $c13y_show_submit_ignore}
-
+
{/if}
-
+
diff --git a/admin/template/goto/comments.tpl b/admin/template/goto/comments.tpl
index d27b21a7d..8684f1d9b 100644
--- a/admin/template/goto/comments.tpl
+++ b/admin/template/goto/comments.tpl
@@ -10,23 +10,23 @@
{foreach from=$comments item=comment}
{/foreach}
-
-
-
-
-
+
+
+
+
+
-{/if}
\ No newline at end of file
+{/if}
diff --git a/admin/template/goto/configuration.tpl b/admin/template/goto/configuration.tpl
index 0c851082d..4823c9953 100644
--- a/admin/template/goto/configuration.tpl
+++ b/admin/template/goto/configuration.tpl
@@ -10,72 +10,73 @@
{if isset($main)}
+
+
@@ -86,15 +87,15 @@
@@ -107,7 +108,7 @@
{'Comments for all'|@translate}
-
+
@@ -115,13 +116,13 @@
{'Number of comments per page'|@translate}
-
+
{'Validation'|@translate}
-
+
@@ -129,17 +130,16 @@
{'Email administrators when a valid comment is entered'|@translate}
-
+
{'Email administrators when a comment requires validation'|@translate}
-
+
-
{/if}
@@ -149,7 +149,7 @@
{'User access level to upload'|@translate}
@@ -158,7 +158,7 @@
{'Email administrators when a picture is uploaded'|@translate}
-
+
@@ -175,4 +175,4 @@
{/if}
-
\ No newline at end of file
+
diff --git a/admin/template/goto/double_select.tpl b/admin/template/goto/double_select.tpl
index 2be698b0d..b42ca8403 100644
--- a/admin/template/goto/double_select.tpl
+++ b/admin/template/goto/double_select.tpl
@@ -9,7 +9,7 @@
{html_options options=$category_option_true selected=$category_option_true_selected}
-
+
@@ -17,7 +17,7 @@
{html_options options=$category_option_false selected=$category_option_false_selected}
-
+
diff --git a/admin/template/goto/element_set_global.tpl b/admin/template/goto/element_set_global.tpl
index a9c5173f0..c34c33e06 100644
--- a/admin/template/goto/element_set_global.tpl
+++ b/admin/template/goto/element_set_global.tpl
@@ -53,9 +53,9 @@
+ class="thumbnail">
-
+
@@ -71,12 +71,12 @@
{'Note: Only deletes photos added with pLoader'|@translate}
{'target'|@translate}
- {'all'|@translate}
- {'selection'|@translate}
+ {'all'|@translate}
+ {'selection'|@translate}
- {'confirm'|@translate}
-
+ {'confirm'|@translate}
+
{/if}
@@ -122,29 +122,29 @@
{'Author'|@translate}
- {'leave'|@translate}
- {'unset'|@translate}
- {'set to'|@translate}
-
+ {'leave'|@translate}
+ {'unset'|@translate}
+ {'set to'|@translate}
+
{'title'|@translate}
- {'leave'|@translate}
- {'unset'|@translate}
- {'set to'|@translate}
-
+ {'leave'|@translate}
+ {'unset'|@translate}
+ {'set to'|@translate}
+
{'Creation date'|@translate}
- {'leave'|@translate}
- {'unset'|@translate}
- {'set to'|@translate}
+ {'leave'|@translate}
+ {'unset'|@translate}
+ {'set to'|@translate}
--
{section name=day start=1 loop=32}
@@ -159,16 +159,16 @@
type="text"
size="4"
maxlength="4"
- value="{$DATE_CREATION_YEAR}" />
-
+ value="{$DATE_CREATION_YEAR}">
+
{'Minimum privacy level'|@translate}
- {'leave'|@translate}
- {'set to'|@translate}
+ {'leave'|@translate}
+ {'set to'|@translate}
{html_options options=$level_options}
@@ -179,12 +179,12 @@
{'target'|@translate}
- {'all'|@translate}
- {'selection'|@translate}
+ {'all'|@translate}
+ {'selection'|@translate}
-
+
@@ -194,14 +194,14 @@
-
+
diff --git a/admin/template/goto/element_set_ranks.tpl b/admin/template/goto/element_set_ranks.tpl
index 31e614480..5f134190d 100644
--- a/admin/template/goto/element_set_ranks.tpl
+++ b/admin/template/goto/element_set_ranks.tpl
@@ -20,9 +20,9 @@
{$thumbnail.LEVEL}
{/if}
-
+
-
+
@@ -30,7 +30,7 @@
{/if}
-
+
diff --git a/admin/template/goto/element_set_unit.tpl b/admin/template/goto/element_set_unit.tpl
index cb374e9d9..0520e4e59 100644
--- a/admin/template/goto/element_set_unit.tpl
+++ b/admin/template/goto/element_set_unit.tpl
@@ -27,30 +27,30 @@
{if !empty($navbar) }{include file='navigation_bar.tpl'|@get_extent:'navbar'}{/if}
{if !empty($elements) }
-
+
{foreach from=$elements item=element}
{$element.LEGEND}
-
+
{'Name'|@translate}
-
+
{'Author'|@translate}
-
+
{'Creation date'|@translate}
- {'unset'|@translate}
- {'set to'|@translate}
+ {'unset'|@translate}
+ {'set to'|@translate}
--
@@ -66,8 +66,8 @@
type="text"
size="4"
maxlength="4"
- value="{$element.DATE_CREATION_YEAR}" />
-
+ value="{$element.DATE_CREATION_YEAR}">
+
@@ -90,8 +90,8 @@
{/foreach}
-
-
+
+
{/if}
@@ -107,4 +107,4 @@
});
});{/literal}
// ]]>
-
\ No newline at end of file
+
diff --git a/admin/template/goto/extend_for_templates.tpl b/admin/template/goto/extend_for_templates.tpl
index dae6903a5..9ed880b63 100644
--- a/admin/template/goto/extend_for_templates.tpl
+++ b/admin/template/goto/extend_for_templates.tpl
@@ -14,7 +14,7 @@
{foreach from=$extents item=tpl name=extent_loop}
-
+
{$tpl.replacer}
@@ -31,8 +31,8 @@
{if !is_adviser()}
-
+
{/if}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/admin/template/goto/group_list.tpl b/admin/template/goto/group_list.tpl
index b21c2ec86..cdd07eb85 100644
--- a/admin/template/goto/group_list.tpl
+++ b/admin/template/goto/group_list.tpl
@@ -10,10 +10,10 @@
{'Group name'|@translate}
-
+
-
+
@@ -31,11 +31,11 @@
{$group.MEMBERS}
-
+
-
+
-
+
{/foreach}
diff --git a/admin/template/goto/history.tpl b/admin/template/goto/history.tpl
index ea9583e6a..670b93694 100644
--- a/admin/template/goto/history.tpl
+++ b/admin/template/goto/history.tpl
@@ -29,7 +29,7 @@
{html_options options=$month_list selected=$START_MONTH_SELECTED}
-
+
@@ -81,7 +81,7 @@
-
+
diff --git a/admin/template/goto/install.tpl b/admin/template/goto/install.tpl
index d7f6bd82f..b9ddb1316 100644
--- a/admin/template/goto/install.tpl
+++ b/admin/template/goto/install.tpl
@@ -87,27 +87,27 @@ TD {
{'step1_host'|@translate}
-
+
{'step1_host_info'|@translate}
{'step1_user'|@translate}
-
+
{'step1_user_info'|@translate}
{'step1_pass'|@translate}
-
+
{'step1_pass_info'|@translate}
{'step1_database'|@translate}
-
+
{'step1_database_info'|@translate}
{'step1_prefix'|@translate}
-
+
{'step1_prefix_info'|@translate}
@@ -118,22 +118,22 @@ TD {
{'install_webmaster'|@translate}
-
+
{'install_webmaster_info'|@translate}
{'step2_pwd'|@translate}
-
+
{'step2_pwd_info'|@translate}
{'step2_pwd_conf'|@translate}
-
+
{'step2_pwd_conf_info'|@translate}
{'conf_mail_webmaster'|@translate}
-
+
{'conf_mail_webmaster_info'|@translate}
@@ -141,16 +141,16 @@ TD {
{else}
-
-
-
+
+
+
{/if}
{* content *}
diff --git a/admin/template/goto/intro.tpl b/admin/template/goto/intro.tpl
index 2bde582f3..d9cafde2a 100644
--- a/admin/template/goto/intro.tpl
+++ b/admin/template/goto/intro.tpl
@@ -50,16 +50,16 @@
\ No newline at end of file
+
diff --git a/admin/template/goto/menubar.tpl b/admin/template/goto/menubar.tpl
index 7ce3d29e7..b03575a85 100644
--- a/admin/template/goto/menubar.tpl
+++ b/admin/template/goto/menubar.tpl
@@ -24,7 +24,7 @@
{/foreach}
-
-
+
+
-
\ No newline at end of file
+
diff --git a/admin/template/goto/notification_by_mail.tpl b/admin/template/goto/notification_by_mail.tpl
index 375093d01..7309f4a94 100644
--- a/admin/template/goto/notification_by_mail.tpl
+++ b/admin/template/goto/notification_by_mail.tpl
@@ -10,7 +10,7 @@
{if isset($REPOST_SUBMIT_NAME)}
-
+
{/if}
@@ -22,22 +22,22 @@
{'nbm_send_html_mail'|@translate}
- {'Yes'|@translate}
- {'No'|@translate}
+ {'Yes'|@translate}
+ {'No'|@translate}
{'nbm_send_mail_as'|@translate}
- {'nbm_info_send_mail_as'|@translate}
+ {'nbm_info_send_mail_as'|@translate}
-
+
{'nbm_send_detailed_content'|@translate}
- {'Yes'|@translate}
- {'No'|@translate}
+ {'Yes'|@translate}
+ {'No'|@translate}
@@ -47,19 +47,19 @@
{'nbm_send_recent_post_dates'|@translate}
- {'nbm_info_send_recent_post_dates'|@translate}
+ {'nbm_info_send_recent_post_dates'|@translate}
- {'Yes'|@translate}
- {'No'|@translate}
+ {'Yes'|@translate}
+ {'No'|@translate}
-
-
+
+
{/if}{* isset $param*}
@@ -93,7 +93,7 @@
{$u.USERNAME}
{$u.EMAIL}
{$u.LAST_SEND}
-
+
{/foreach}
@@ -114,7 +114,7 @@
-
+
{/if}
{/if}{* isset $send*}
diff --git a/admin/template/goto/permalinks.tpl b/admin/template/goto/permalinks.tpl
index 3e04cc3d0..1f2164721 100644
--- a/admin/template/goto/permalinks.tpl
+++ b/admin/template/goto/permalinks.tpl
@@ -13,15 +13,15 @@
{'Permalink'|@translate}:
-
+
{'Save to permalink history'|@translate}:
-
+
-
+
diff --git a/admin/template/goto/picture_modify.tpl b/admin/template/goto/picture_modify.tpl
index 65bc8f407..f6c259a53 100644
--- a/admin/template/goto/picture_modify.tpl
+++ b/admin/template/goto/picture_modify.tpl
@@ -12,14 +12,14 @@
{'title_picmod'|@translate}
-
+
{if isset($U_JUMPTO) }
-
+
{/if}
{if !url_is_remote($path)}
-
+
{/if}
@@ -86,19 +86,19 @@
{'Name'|@translate}
-
+
{'Author'|@translate}
-
+
{'Creation date'|@translate}
- {'unset'|@translate}
- {'set to'|@translate}
+ {'unset'|@translate}
+ {'set to'|@translate}
--
{section name=day start=1 loop=32}
@@ -113,8 +113,8 @@
type="text"
size="4"
maxlength="4"
- value="{$DATE_CREATION_YEAR_VALUE}" />
-
+ value="{$DATE_CREATION_YEAR_VALUE}">
+
@@ -141,8 +141,8 @@
-
-
+
+
@@ -160,7 +160,7 @@
{html_options options=$associated_options}
-
+
@@ -168,7 +168,7 @@
{html_options options=$dissociated_options}
-
+
@@ -187,7 +187,7 @@
{html_options options=$elected_options}
-
+
@@ -195,7 +195,7 @@
{html_options options=$dismissed_options}
-
+
diff --git a/admin/template/goto/plugins_list.tpl b/admin/template/goto/plugins_list.tpl
index 96b1f2b1a..7f8ee5cef 100644
--- a/admin/template/goto/plugins_list.tpl
+++ b/admin/template/goto/plugins_list.tpl
@@ -30,42 +30,42 @@
{if $plugin.STATE == 'active'}
-
+
-
+
{/if}
{if $plugin.STATE == 'inactive'}
-
+
-
+
{/if}
{if $plugin.STATE == 'missing'}
-
+
-
+
{/if}
{if $plugin.STATE == 'uninstalled'}
-
+
-
+
@@ -75,7 +75,7 @@
{else}
-
+
{/if}
diff --git a/admin/template/goto/profile_content.tpl b/admin/template/goto/profile_content.tpl
index dc67d5032..e4191f099 100644
--- a/admin/template/goto/profile_content.tpl
+++ b/admin/template/goto/profile_content.tpl
@@ -3,7 +3,7 @@
{'Registration'|@translate}
-
+
@@ -59,7 +59,7 @@
{$rate.RATE}
{$rate.USER}
{$rate.DATE}
-
+
{/foreach} {*rates*}
{/foreach} {*images*}
diff --git a/admin/template/goto/site_manager.tpl b/admin/template/goto/site_manager.tpl
index 61c0157cf..c1e86cae6 100644
--- a/admin/template/goto/site_manager.tpl
+++ b/admin/template/goto/site_manager.tpl
@@ -19,15 +19,15 @@
{/if}
{if isset($local_listing.U_SYNCHRONIZE)}
{'site_synchronize'|@translate}
-
+
{/if}
{/if}
@@ -39,7 +39,7 @@
{foreach from=$sites item=site name=site}
- {$site.NAME} ({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})
+ {$site.NAME} ({$site.TYPE}, {$site.CATEGORIES} {'Categories'|@translate}, {$pwg->l10n_dec('%d element','%d elements',$site.IMAGES)})
[{'site_synchronize'|@translate} ]
{if isset($site.U_DELETE)}
@@ -47,7 +47,7 @@
title="{'site_delete_hint'|@translate}" {$TAG_INPUT_ENABLED}>{'site_delete'|@translate}]
{/if}
{if isset($site.remote)}
-
+
[{'remote_site_test'|@translate} ]
[{'remote_site_generate'|@translate} ]
[{'remote_site_clean'|@translate} ]
@@ -66,9 +66,9 @@
diff --git a/admin/template/goto/site_update.tpl b/admin/template/goto/site_update.tpl
index 861c154d9..7b48094b9 100644
--- a/admin/template/goto/site_update.tpl
+++ b/admin/template/goto/site_update.tpl
@@ -63,13 +63,13 @@
{'update_sync_files'|@translate}
-
-
+
+
{/if}{*isset $introduction*}
diff --git a/admin/template/goto/tags.tpl b/admin/template/goto/tags.tpl
index b2ce57341..1072ea6e2 100644
--- a/admin/template/goto/tags.tpl
+++ b/admin/template/goto/tags.tpl
@@ -8,7 +8,7 @@
{if isset($EDIT_TAGS_LIST)}
{'Edit tags'|@translate}
-
+
-
-
+
+
{/if}
@@ -34,10 +34,10 @@
{'New tag'|@translate}
-
+
-
+
@@ -46,8 +46,8 @@
{$TAG_SELECTION}
-
-
+
+
diff --git a/admin/template/goto/thumbnail.tpl b/admin/template/goto/thumbnail.tpl
index d753e0175..b38692d42 100644
--- a/admin/template/goto/thumbnail.tpl
+++ b/admin/template/goto/thumbnail.tpl
@@ -16,7 +16,7 @@
{foreach from=$results.elements item=elt}
{$elt.PATH}
-
+
{$elt.GEN_TIME}
{$elt.TN_FILESIZE_IMG}
{$elt.TN_WIDTH_IMG} x {$elt.TN_HEIGHT_IMG}
@@ -49,7 +49,7 @@
{$results.TN_AVERAGE}
-
+
{/if}
{if isset($params) }
@@ -62,10 +62,10 @@
{'tn_params_GD'|@translate}
- 2.x
+ 2.x
- 1.x
+ 1.x
@@ -73,27 +73,27 @@
{'maximum width'|@translate}
-
+
{'maximum height'|@translate}
-
+
{'Number of thumbnails to create'|@translate}
- 5
- 10
- 20
- {'tn_all'|@translate}
+ 5
+ 10
+ 20
+ {'tn_all'|@translate}
-
+
{/if} {*isset params*}
diff --git a/admin/template/goto/upgrade.tpl b/admin/template/goto/upgrade.tpl
index b23448223..00cc297cf 100644
--- a/admin/template/goto/upgrade.tpl
+++ b/admin/template/goto/upgrade.tpl
@@ -68,17 +68,17 @@ textarea { margin-left: 20px; }
{/if}
-
+
-
+
{* Please, do not remove this copyright. If you really want to,
contact us on http://piwigo.org to find a solution on how
to show the origin of the script...*}
diff --git a/template/yoga/mail/text/html/notification_by_mail.tpl b/template/yoga/mail/text/html/notification_by_mail.tpl
index 52627ebe4..225f11313 100644
--- a/template/yoga/mail/text/html/notification_by_mail.tpl
+++ b/template/yoga/mail/text/html/notification_by_mail.tpl
@@ -40,11 +40,11 @@
{'nbm_content_byebye'|@translate}
{$SEND_AS_NAME}
-
-{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}
{$UNSUBSCRIBE_LINK}
-{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}
{$SUBSCRIBE_LINK}
-{'nbm_content_problem_contact'|@translate}
{$CONTACT_EMAIL}
-
+
+{'nbm_content_unsubscribe_link'|@translate}{'nbm_content_click_on'|@translate}
{$UNSUBSCRIBE_LINK}
+{'nbm_content_subscribe_link'|@translate}{'nbm_content_click_on'|@translate}
{$SUBSCRIBE_LINK}
+{'nbm_content_problem_contact'|@translate}
{$CONTACT_EMAIL}
+
{if not empty($recent_posts)}
diff --git a/template/yoga/menubar_identification.tpl b/template/yoga/menubar_identification.tpl
index 32032077a..402847954 100644
--- a/template/yoga/menubar_identification.tpl
+++ b/template/yoga/menubar_identification.tpl
@@ -31,12 +31,12 @@
{'Quick connect'|@translate}
- {'Username'|@translate}
+ {'Username'|@translate}
{'Password'|@translate}
-
+
@@ -52,7 +52,7 @@
{if isset($U_REGISTER)}
-
+
{/if}
diff --git a/template/yoga/menubar_menu.tpl b/template/yoga/menubar_menu.tpl
index 2600a8979..e0ba44483 100644
--- a/template/yoga/menubar_menu.tpl
+++ b/template/yoga/menubar_menu.tpl
@@ -3,7 +3,7 @@
{if isset($block->data.qsearch) and $block->data.qsearch==true}
diff --git a/template/yoga/menubar_tags.tpl b/template/yoga/menubar_tags.tpl
index d7072d82d..272356564 100644
--- a/template/yoga/menubar_tags.tpl
+++ b/template/yoga/menubar_tags.tpl
@@ -7,7 +7,7 @@
-
+
{/if}
{$tag.name}
diff --git a/template/yoga/month_calendar.tpl b/template/yoga/month_calendar.tpl
index 8fd0eb25f..b936fd50d 100644
--- a/template/yoga/month_calendar.tpl
+++ b/template/yoga/month_calendar.tpl
@@ -29,7 +29,7 @@
{if !empty($chronology_calendar.calendar_bars) }
{foreach from=$chronology_calendar.calendar_bars item=bar}
-
{$bar.HEAD_LABEL} ({$bar.NB_IMAGES})
+
{$bar.HEAD_LABEL} ({$bar.NB_IMAGES})
{foreach from=$bar.items item=item}
{if isset($item.URL)}
@@ -69,7 +69,7 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
{$day.DAY}
{$day.DAY}
{else}
diff --git a/template/yoga/nbm.tpl b/template/yoga/nbm.tpl
index 7fa2845eb..3d85bf51a 100644
--- a/template/yoga/nbm.tpl
+++ b/template/yoga/nbm.tpl
@@ -3,7 +3,7 @@
-
+
{'nbm_item_notification'|@translate}
diff --git a/template/yoga/notification.tpl b/template/yoga/notification.tpl
index e7d443e77..507aa3da7 100644
--- a/template/yoga/notification.tpl
+++ b/template/yoga/notification.tpl
@@ -7,7 +7,7 @@
-
+
{'Notification'|@translate}
@@ -16,7 +16,7 @@
- {'Image only RSS feed'|@translate}
+ {'Image only RSS feed'|@translate}
{'Complete RSS feed'|@translate}
diff --git a/template/yoga/password.tpl b/template/yoga/password.tpl
index 8071b16d2..78d207f49 100644
--- a/template/yoga/password.tpl
+++ b/template/yoga/password.tpl
@@ -3,7 +3,7 @@
-
+
{'Password forgotten'|@translate}
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index b670a0388..3154bcbe7 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -47,7 +47,7 @@
{if isset($U_SLIDESHOW_STOP) }
{/if}
-
+
{if isset($current.U_DOWNLOAD) }
{/if}
@@ -186,9 +186,9 @@ y.callService(
{foreach from=$rating.marks item=mark name=rate_loop}
{if !$smarty.foreach.rate_loop.first} | {/if}
{if isset($rating.USER_RATE) && $mark==$rating.USER_RATE}
-
+
{else}
-
+
{/if}
{/foreach}
@@ -269,7 +269,7 @@ y.callService(
{'upload_author'|@translate}
{/if}
{'comment'|@translate}
-
+
diff --git a/template/yoga/profile.tpl b/template/yoga/profile.tpl
index 75ea61d48..ae9686b5a 100644
--- a/template/yoga/profile.tpl
+++ b/template/yoga/profile.tpl
@@ -13,7 +13,7 @@
-
+
{'Profile'|@translate}
diff --git a/template/yoga/profile_content.tpl b/template/yoga/profile_content.tpl
index 9cabf0a51..c9bb349ad 100644
--- a/template/yoga/profile_content.tpl
+++ b/template/yoga/profile_content.tpl
@@ -3,7 +3,7 @@
{'Registration'|@translate}
-
+
{'Username'|@translate}
diff --git a/template/yoga/register.tpl b/template/yoga/register.tpl
index 83bfd8c27..7433b55ea 100644
--- a/template/yoga/register.tpl
+++ b/template/yoga/register.tpl
@@ -5,7 +5,7 @@
-
+
{'Registration'|@translate}
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index 154954444..ad4c88b11 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -23,7 +23,7 @@
@@ -42,18 +42,18 @@
{'Filter'|@translate}
{'search_keywords'|@translate}
-
+
{'search_author'|@translate}
-
+
@@ -61,8 +61,8 @@
{'Search tags'|@translate}
{$TAG_SELECTION}
- {'All tags'|@translate}
- {'Any tag'|@translate}
+ {'All tags'|@translate}
+ {'Any tag'|@translate}
{/if}
@@ -71,10 +71,10 @@
{'today'|@translate}
@@ -109,7 +109,7 @@
{html_options options=$month_list selected=$END_MONTH_SELECTED}
-
+
{'today'|@translate}
@@ -127,16 +127,16 @@
-
-
+
+
diff --git a/template/yoga/tags.tpl b/template/yoga/tags.tpl
index e81fe7f75..4e7b44047 100644
--- a/template/yoga/tags.tpl
+++ b/template/yoga/tags.tpl
@@ -4,14 +4,14 @@
{if $display_mode == 'letters'}
-
+
{/if}
{if $display_mode == 'cloud'}
-
+
{/if}
-
+
{'Tags'|@translate}
@@ -52,4 +52,4 @@
{/if}
{/if}
-
\ No newline at end of file
+
diff --git a/template/yoga/thumbnails.tpl b/template/yoga/thumbnails.tpl
index 80f9d7472..01068dee8 100644
--- a/template/yoga/thumbnails.tpl
+++ b/template/yoga/thumbnails.tpl
@@ -7,7 +7,7 @@
-
+
@@ -15,14 +15,14 @@
{$thumbnail.ICON_TS}
{if isset($thumbnail.NB_COMMENTS)}
{/if}
{if isset($thumbnail.NB_HITS)}
-
+
{$pwg->l10n_dec('%d hit', '%d hits',$thumbnail.NB_HITS)}
{/if}
diff --git a/template/yoga/upload.tpl b/template/yoga/upload.tpl
index 4d2ac9d02..8c8d5fa6c 100644
--- a/template/yoga/upload.tpl
+++ b/template/yoga/upload.tpl
@@ -9,7 +9,7 @@
-
+
{'upload_title'|@translate}
@@ -41,7 +41,7 @@
-
+
{if isset($SHOW_FORM_FIELDS) and $SHOW_FORM_FIELDS}
@@ -56,35 +56,35 @@
{'Username'|@translate} *
-
+
{'mail_address'|@translate} *
-
+
{'upload_name'|@translate}
-
+
{'upload_author'|@translate}
-
+
{'Creation date'|@translate} (DD/MM/YYYY)
-
+
@@ -97,13 +97,13 @@
{/if}
-
+
{else}
- {'upload_successful'|@translate}
+ {'upload_successful'|@translate}
diff --git a/tools/metadata.php b/tools/metadata.php
index fa35c823f..2e9e8706a 100644
--- a/tools/metadata.php
+++ b/tools/metadata.php
@@ -22,7 +22,7 @@
// +-----------------------------------------------------------------------+
$filename = 'sample.jpg';
-echo 'Informations are read from '.$filename.' ';
+echo 'Informations are read from '.$filename.' ';
/**
* return a cleaned IPTC value
@@ -75,12 +75,12 @@ if (isset($imginfo['APP13']))
}
}
- echo 'IPTC Fields in '.$filename.' ';
+ echo 'IPTC Fields in '.$filename.' ';
$keys = array_keys($iptc_result);
sort($keys);
foreach ($keys as $key)
{
- echo ' '.$key.' = '.$iptc_result[$key];
+ echo ' '.$key.' = '.$iptc_result[$key];
}
}
else
@@ -88,8 +88,8 @@ else
echo 'no IPTC information';
}
-echo ' ';
-echo 'EXIF Fields in '.$filename.' ';
+echo ' ';
+echo 'EXIF Fields in '.$filename.' ';
$exif = read_exif_data($filename);
echo '';
print_r($exif);
diff --git a/upload.php b/upload.php
index 14380a736..3cbd1f8cd 100644
--- a/upload.php
+++ b/upload.php
@@ -57,7 +57,7 @@ function validate_upload( $temp_name, $my_max_file_size,
$result = array();
$result['error'] = array();
- //echo $_FILES['picture']['name']." ".$temp_name;
+ //echo $_FILES['picture']['name']." ".$temp_name;
$extension = get_extension( $_FILES['picture']['name'] );
if (!in_array($extension, $conf['picture_ext']))
{
diff --git a/ws.php b/ws.php
index 7867f8001..f1d8c31af 100644
--- a/ws.php
+++ b/ws.php
@@ -69,8 +69,8 @@ function ws_addDefaultMethods( $arr )
'f_with_thumbnail' => array( 'default'=> false ),
),
'Returns elements for the corresponding categories.
-cat_id can be empty if recursive is true. Can be sent as an array.
-order comma separated fields for sorting (file,id, average_rate,...)'
+cat_id can be empty if recursive is true. Can be sent as an array.
+order comma separated fields for sorting (file,id, average_rate,...)'
);
$service->addMethod('pwg.categories.getList', 'ws_categories_getList',
@@ -195,7 +195,7 @@ function ws_addDefaultMethods( $arr )
),
),
'POST method only.
-categories is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.'
+categories is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.'
);
$service->addMethod(
@@ -258,7 +258,7 @@ function ws_addDefaultMethods( $arr )
),
),
'POST method only. Admin only
-categories is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.'
+categories is a string list "category_id[,rank];category_id[,rank]" The rank is optional and is equivalent to "auto" if not given.'
);
}