Apply property svn:eol-style Value: LF

git-svn-id: http://piwigo.org/svn/trunk@1900 68402e56-0260-453c-a942-63ccdbb3a9ee

7 files changed, 157 insertions, 157 deletions

diff --git a/template/yoga/mail/text/html/admin/notification_by_mail.tpl b/template/yoga/mail/text/html/admin/notification_by_mail.tpl
index d2a81000c..77d40daea 100644
--- a/template/yoga/mail/text/html/admin/notification_by_mail.tpl
+++ b/template/yoga/mail/text/html/admin/notification_by_mail.tpl
@@ -1,53 +1,53 @@
-<div id="nbm_message">

-<h2>{lang:Notification}</h2>

-<p>{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}</p>

-

-<!-- BEGIN subscribe_by_admin -->

-<p>{lang:nbm_content_subscribe_by_admin}</p>

-<!-- END subscribe_by_admin -->

-<!-- BEGIN subscribe_by_himself -->

-<p>{lang:nbm_content_subscribe_by_himself}</p>

-<!-- END subscribe_by_himself -->

-<!-- BEGIN unsubscribe_by_admin -->

-<p>{lang:nbm_content_unsubscribe_by_admin}</p>

-<!-- END unsubscribe_by_admin -->

-<!-- BEGIN unsubscribe_by_himself -->

-<p>{lang:nbm_content_unsubscribe_by_himself}</p>

-<!-- END unsubscribe_by_himself -->

-<!-- BEGIN content_new_elements_single -->

-<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}</p>

-<!-- END content_new_elements_single -->

-<!-- BEGIN content_new_elements_between -->

-<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}</p>

-<!-- END content_new_elements_between -->

-<!-- BEGIN global_new_line -->

-<ul id="nbm_new_line">

-  <!-- BEGIN new_line -->

-  <li>{global_new_line.new_line.DATA}</li>

-  <!-- END new_line -->

-</ul>

-<!-- END global_new_line -->

-<!-- BEGIN custom -->

-<p>{custom.CUSTOMIZE_MAIL_CONTENT}</p>

-<!-- END custom -->

-<!-- BEGIN goto -->

-<p>{lang:nbm_content_goto_1}<a href="{goto.GALLERY_URL}">{goto.GALLERY_TITLE}</a>{lang:nbm_content_goto_2}</p>

-<!-- END goto -->

-<p>{lang:nbm_content_byebye}</p>

-<p ALIGN=center>{SEND_AS_NAME}</p>

-<p>

-<br/><hr>

-{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}<a href="{UNSUBSCRIBE_LINK}">{UNSUBSCRIBE_LINK}</a><br/>

-{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}<a href="{SUBSCRIBE_LINK}">{SUBSCRIBE_LINK}</a><br/>

-{lang:nbm_content_problem_contact}<a href="mailto:{CONTACT_EMAIL}?subject={lang:nbm_content_pb_contact_object}">{CONTACT_EMAIL}</a><br/>

-<hr><br/>

-</p>

-<!-- BEGIN recent_post -->

-</div>

-<div id="nbm_recent_post">

-  <!-- BEGIN recent_post_block -->

-  <h2>{recent_post.recent_post_block.TITLE}</h2>

-  {recent_post.recent_post_block.HTML_DATA}

-  <!-- END recent_post_block -->

-<!-- END recent_post -->

-</div>

+<div id="nbm_message">
+<h2>{lang:Notification}</h2>
+<p>{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}</p>
+
+<!-- BEGIN subscribe_by_admin -->
+<p>{lang:nbm_content_subscribe_by_admin}</p>
+<!-- END subscribe_by_admin -->
+<!-- BEGIN subscribe_by_himself -->
+<p>{lang:nbm_content_subscribe_by_himself}</p>
+<!-- END subscribe_by_himself -->
+<!-- BEGIN unsubscribe_by_admin -->
+<p>{lang:nbm_content_unsubscribe_by_admin}</p>
+<!-- END unsubscribe_by_admin -->
+<!-- BEGIN unsubscribe_by_himself -->
+<p>{lang:nbm_content_unsubscribe_by_himself}</p>
+<!-- END unsubscribe_by_himself -->
+<!-- BEGIN content_new_elements_single -->
+<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}</p>
+<!-- END content_new_elements_single -->
+<!-- BEGIN content_new_elements_between -->
+<p>{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}</p>
+<!-- END content_new_elements_between -->
+<!-- BEGIN global_new_line -->
+<ul id="nbm_new_line">
+  <!-- BEGIN new_line -->
+  <li>{global_new_line.new_line.DATA}</li>
+  <!-- END new_line -->
+</ul>
+<!-- END global_new_line -->
+<!-- BEGIN custom -->
+<p>{custom.CUSTOMIZE_MAIL_CONTENT}</p>
+<!-- END custom -->
+<!-- BEGIN goto -->
+<p>{lang:nbm_content_goto_1}<a href="{goto.GALLERY_URL}">{goto.GALLERY_TITLE}</a>{lang:nbm_content_goto_2}</p>
+<!-- END goto -->
+<p>{lang:nbm_content_byebye}</p>
+<p ALIGN=center>{SEND_AS_NAME}</p>
+<p>
+<br/><hr>
+{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}<a href="{UNSUBSCRIBE_LINK}">{UNSUBSCRIBE_LINK}</a><br/>
+{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}<a href="{SUBSCRIBE_LINK}">{SUBSCRIBE_LINK}</a><br/>
+{lang:nbm_content_problem_contact}<a href="mailto:{CONTACT_EMAIL}?subject={lang:nbm_content_pb_contact_object}">{CONTACT_EMAIL}</a><br/>
+<hr><br/>
+</p>
+<!-- BEGIN recent_post -->
+</div>
+<div id="nbm_recent_post">
+  <!-- BEGIN recent_post_block -->
+  <h2>{recent_post.recent_post_block.TITLE}</h2>
+  {recent_post.recent_post_block.HTML_DATA}
+  <!-- END recent_post_block -->
+<!-- END recent_post -->
+</div>
diff --git a/template/yoga/mail/text/html/footer.tpl b/template/yoga/mail/text/html/footer.tpl
index 1e85a6a5d..c0ee0d2e4 100644
--- a/template/yoga/mail/text/html/footer.tpl
+++ b/template/yoga/mail/text/html/footer.tpl
@@ -1,19 +1,19 @@
-</div> <!-- content -->

-<div id="copyright">

-<HR>

- <!-- Please, do not remove this copyright. If you really want to,

-      contact us on http://phpwebgallery.net to find a solution on how

-      to show the origin of the script...-->

-

-  {lang:powered_by} 

-  <a href="http://www.phpwebgallery.net" class="PWG">

-  <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a>

-  {VERSION}

-  - {lang:send_mail}

-  <a href="mailto:{MAIL}?subject={TITLE_MAIL}">{lang:Webmaster}</a>

-

-</div> <!-- copyright -->

-</div> <!-- the_page -->

-

-</body>

-</html>

+</div> <!-- content -->
+<div id="copyright">
+<HR>
+ <!-- Please, do not remove this copyright. If you really want to,
+      contact us on http://phpwebgallery.net to find a solution on how
+      to show the origin of the script...-->
+
+  {lang:powered_by} 
+  <a href="http://www.phpwebgallery.net" class="PWG">
+  <span class="P">Php</span><span class="W">Web</span><span class="G">Gallery</span></a>
+  {VERSION}
+  - {lang:send_mail}
+  <a href="mailto:{MAIL}?subject={TITLE_MAIL}">{lang:Webmaster}</a>
+
+</div> <!-- copyright -->
+</div> <!-- the_page -->
+
+</body>
+</html>
diff --git a/template/yoga/mail/text/html/global-mail-css.tpl b/template/yoga/mail/text/html/global-mail-css.tpl
index dd65efff3..c8e4b3c63 100644
--- a/template/yoga/mail/text/html/global-mail-css.tpl
+++ b/template/yoga/mail/text/html/global-mail-css.tpl
@@ -1,18 +1,18 @@
-/* $Id$ */

-/* Global mail css */

-/* Including like css style on HTML mail */

-

-body{background-color:#fff;font-family: Univers, Helvetica, Optima;font-size:12px; margin:0px;padding:0px; color:#369;}

-#the_page {background: #fff url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;

-margin:0px;padding:0px;text-align: left;}

-#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;

-margin:0px;padding:82px 0px 0px 62px; width:732px;}

-hr {width:632px;margin-left:0px;}

-#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;

-color: #69c;font-size:10px;margin:0px;padding:98px 0px 62px 62px;}

-.PWG {font-family: verdana, sans-serif !important; font-size: 0.9em; font-weight: normal; letter-spacing: 0px;}

-h2 { background-color:#ddd;padding: 7px 15px; width:617px;font-weight:bold;}

-img { margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }

-img:hover { padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }

-a { color: #005e89; background: transparent; }

-a:hover { color: #858460; text-decoration: none;}

+/* $Id$ */
+/* Global mail css */
+/* Including like css style on HTML mail */
+
+body{background-color:#fff;font-family: Univers, Helvetica, Optima;font-size:12px; margin:0px;padding:0px; color:#369;}
+#the_page {background: #fff url({pwg_root}template/{themeconf:template}/mail/text/html/images/mailbody-bg.png) repeat-y scroll left top;
+margin:0px;padding:0px;text-align: left;}
+#content {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;
+margin:0px;padding:82px 0px 0px 62px; width:732px;}
+hr {width:632px;margin-left:0px;}
+#copyright {background: transparent url({pwg_root}template/{themeconf:template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
+color: #69c;font-size:10px;margin:0px;padding:98px 0px 62px 62px;}
+.PWG {font-family: verdana, sans-serif !important; font-size: 0.9em; font-weight: normal; letter-spacing: 0px;}
+h2 { background-color:#ddd;padding: 7px 15px; width:617px;font-weight:bold;}
+img { margin: 16px; border: 16px solid #aaa; -moz-border-radius: 4px; border-radius: 4px 4px; }
+img:hover { padding: 15px; border: 1px solid yellow; -moz-border-radius: 4px; border-radius: 4px 4px; }
+a { color: #005e89; background: transparent; }
+a:hover { color: #858460; text-decoration: none;}
diff --git a/template/yoga/mail/text/html/header.tpl b/template/yoga/mail/text/html/header.tpl
index 8ac637793..37df3bad9 100644
--- a/template/yoga/mail/text/html/header.tpl
+++ b/template/yoga/mail/text/html/header.tpl
@@ -1,18 +1,18 @@
------={BOUNDARY_KEY}

-Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};

-Content-Transfer-Encoding: 8bit

-

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">

-<html lang="{LANG}" dir="{DIR}">

-<head>

-<title>PhpWebGallery Mail</title>

-<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">

-<style><!-- /* Mini style for mails */

-{GLOBAL_MAIL_CSS}

-{MAIL_CSS}

-{LOCAL_MAIL_CSS}

---></style>

-</head>

-<body>

-<div id="the_page">

-<div id="content">

+-----={BOUNDARY_KEY}
+Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
+Content-Transfer-Encoding: 8bit
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="{LANG}" dir="{DIR}">
+<head>
+<title>PhpWebGallery Mail</title>
+<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
+<style><!-- /* Mini style for mails */
+{GLOBAL_MAIL_CSS}
+{MAIL_CSS}
+{LOCAL_MAIL_CSS}
+--></style>
+</head>
+<body>
+<div id="the_page">
+<div id="content">
diff --git a/template/yoga/mail/text/plain/admin/notification_by_mail.tpl b/template/yoga/mail/text/plain/admin/notification_by_mail.tpl
index 0f2179300..edaced083 100644
--- a/template/yoga/mail/text/plain/admin/notification_by_mail.tpl
+++ b/template/yoga/mail/text/plain/admin/notification_by_mail.tpl
@@ -1,43 +1,43 @@
-{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}

-

-<!-- BEGIN subscribe_by_admin -->

-{lang:nbm_content_subscribe_by_admin}

-<!-- END subscribe_by_admin -->

-<!-- BEGIN subscribe_by_himself -->

-{lang:nbm_content_subscribe_by_himself}

-<!-- END subscribe_by_himself -->

-<!-- BEGIN unsubscribe_by_admin -->

-{lang:nbm_content_unsubscribe_by_admin}

-<!-- END unsubscribe_by_admin -->

-<!-- BEGIN unsubscribe_by_himself -->

-{lang:nbm_content_unsubscribe_by_himself}

-<!-- END unsubscribe_by_himself -->

-<!-- BEGIN content_new_elements_single -->

-{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}

-<!-- END content_new_elements_single -->

-<!-- BEGIN content_new_elements_between -->

-{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}

-<!-- END content_new_elements_between -->

-<!-- BEGIN global_new_line -->

-<!-- BEGIN new_line -->

-  o {global_new_line.new_line.DATA}

-<!-- END new_line -->

-<!-- END global_new_line -->

-<!-- BEGIN custom -->

-

-{custom.CUSTOMIZE_MAIL_CONTENT}

-<!-- END custom -->

-<!-- BEGIN goto -->

-

-{lang:nbm_content_goto_1}{goto.GALLERY_TITLE} {goto.GALLERY_URL} {lang:nbm_content_goto_2}

-<!-- END goto -->

-

-{lang:nbm_content_byebye}

-  {SEND_AS_NAME}

-

-______________________________________________________________________________

-

-{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}{UNSUBSCRIBE_LINK}

-{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}{SUBSCRIBE_LINK}

-{lang:nbm_content_problem_contact}{CONTACT_EMAIL}

-______________________________________________________________________________

+{lang:nbm_content_hello_1}{USERNAME}{lang:nbm_content_hello_2}
+
+<!-- BEGIN subscribe_by_admin -->
+{lang:nbm_content_subscribe_by_admin}
+<!-- END subscribe_by_admin -->
+<!-- BEGIN subscribe_by_himself -->
+{lang:nbm_content_subscribe_by_himself}
+<!-- END subscribe_by_himself -->
+<!-- BEGIN unsubscribe_by_admin -->
+{lang:nbm_content_unsubscribe_by_admin}
+<!-- END unsubscribe_by_admin -->
+<!-- BEGIN unsubscribe_by_himself -->
+{lang:nbm_content_unsubscribe_by_himself}
+<!-- END unsubscribe_by_himself -->
+<!-- BEGIN content_new_elements_single -->
+{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_single}{content_new_elements_single.DATE_SINGLE}{content_new_elements_single.END_PUNCT}
+<!-- END content_new_elements_single -->
+<!-- BEGIN content_new_elements_between -->
+{lang:nbm_content_new_elements}{lang:nbm_content_new_elements_between_1}{content_new_elements_between.DATE_BETWEEN_1}{lang:nbm_content_new_elements_between_2}{content_new_elements_between.DATE_BETWEEN_2}{content_new_elements_between.END_PUNCT}
+<!-- END content_new_elements_between -->
+<!-- BEGIN global_new_line -->
+<!-- BEGIN new_line -->
+  o {global_new_line.new_line.DATA}
+<!-- END new_line -->
+<!-- END global_new_line -->
+<!-- BEGIN custom -->
+
+{custom.CUSTOMIZE_MAIL_CONTENT}
+<!-- END custom -->
+<!-- BEGIN goto -->
+
+{lang:nbm_content_goto_1}{goto.GALLERY_TITLE} {goto.GALLERY_URL} {lang:nbm_content_goto_2}
+<!-- END goto -->
+
+{lang:nbm_content_byebye}
+  {SEND_AS_NAME}
+
+______________________________________________________________________________
+
+{lang:nbm_content_unsubscribe_link}{lang:nbm_content_click_on}{UNSUBSCRIBE_LINK}
+{lang:nbm_content_subscribe_link}{lang:nbm_content_click_on}{SUBSCRIBE_LINK}
+{lang:nbm_content_problem_contact}{CONTACT_EMAIL}
+______________________________________________________________________________
diff --git a/template/yoga/mail/text/plain/footer.tpl b/template/yoga/mail/text/plain/footer.tpl
index 7d97bba50..a43f1621a 100644
--- a/template/yoga/mail/text/plain/footer.tpl
+++ b/template/yoga/mail/text/plain/footer.tpl
@@ -1,3 +1,3 @@
-

-------------------------

-PhpWebGallery {VERSION}

+
+------------------------
+PhpWebGallery {VERSION}
diff --git a/template/yoga/mail/text/plain/header.tpl b/template/yoga/mail/text/plain/header.tpl
index 1aefc7d2d..ce7667106 100644
--- a/template/yoga/mail/text/plain/header.tpl
+++ b/template/yoga/mail/text/plain/header.tpl
@@ -1,3 +1,3 @@
------={BOUNDARY_KEY}

-Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};

-Content-Transfer-Encoding: 8bit

+-----={BOUNDARY_KEY}
+Content-Type: {CONTENT_TYPE}; charset={CONTENT_ENCODING};
+Content-Transfer-Encoding: 8bit