diff options
author | Zach Prezkuta <fermion@gmx.com> | 2013-01-11 10:00:26 -0700 |
---|---|---|
committer | Zach Prezkuta <fermion@gmx.com> | 2013-01-11 10:00:26 -0700 |
commit | 690e278d956579a5d6b1b5b94e48c5b09b3134ba (patch) | |
tree | b9908b646a1bad8622fef9a4dce8a9c333f7a956 | |
parent | 34dc11d68ee474cf7dbb1f2e86befe4bae3caf42 (diff) | |
download | volse-hubzilla-690e278d956579a5d6b1b5b94e48c5b09b3134ba.tar.gz volse-hubzilla-690e278d956579a5d6b1b5b94e48c5b09b3134ba.tar.bz2 volse-hubzilla-690e278d956579a5d6b1b5b94e48c5b09b3134ba.zip |
add newline at end of header
335 files changed, 549 insertions, 215 deletions
diff --git a/mods/friendica-to-smarty-tpl.py b/mods/friendica-to-smarty-tpl.py index 9e4e52671..3e0add771 100755 --- a/mods/friendica-to-smarty-tpl.py +++ b/mods/friendica-to-smarty-tpl.py @@ -94,7 +94,7 @@ def fix_element(element): def convert(filename, tofilename, php_tpl): - header = ldelim + "*\n *\tAUTOMATICALLY GENERATED TEMPLATE\n *\tDO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN\n *\n *" + rdelim + header = ldelim + "*\n *\tAUTOMATICALLY GENERATED TEMPLATE\n *\tDO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN\n *\n *" + rdelim + "\n" tofilename.write(header) for line in filename: diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl index 780d5ccd1..c398c5231 100644 --- a/view/ca/smarty3/cmnt_received_eml.tpl +++ b/view/ca/smarty3/cmnt_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$username}}, '{{$from}}' ha comentat un element/conversació que està s seguint. diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl index 79d3af79a..b90804741 100644 --- a/view/ca/smarty3/follow_notify_eml.tpl +++ b/view/ca/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$myname}}, Tens un nou seguidor en {{$sitename}} - '{{$requestor}}'. diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl index 030d23182..b26152d81 100644 --- a/view/ca/smarty3/friend_complete_eml.tpl +++ b/view/ca/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$username}}, Grans noticies... '{{$fn}}' a '{{$dfrn_url}}' ha acceptat la teva sol·licitud de connexió en '{{$sitename}}'. diff --git a/view/ca/smarty3/intro_complete_eml.tpl b/view/ca/smarty3/intro_complete_eml.tpl index bcfa46e8d..2149c477a 100644 --- a/view/ca/smarty3/intro_complete_eml.tpl +++ b/view/ca/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$username}}, '{{$fn}}' en '{{$dfrn_url}}' ha acceptat la teva petició diff --git a/view/ca/smarty3/lostpass_eml.tpl b/view/ca/smarty3/lostpass_eml.tpl index 717bd567b..55a14e1d5 100644 --- a/view/ca/smarty3/lostpass_eml.tpl +++ b/view/ca/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$username}}, S'ha rebut una sol·licitud en {{$sitename}} recentment per restablir diff --git a/view/ca/smarty3/mail_received_html_body_eml.tpl b/view/ca/smarty3/mail_received_html_body_eml.tpl index e86b864f2..e61d861a2 100644 --- a/view/ca/smarty3/mail_received_html_body_eml.tpl +++ b/view/ca/smarty3/mail_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Mensaje de Friendica</title> diff --git a/view/ca/smarty3/mail_received_text_body_eml.tpl b/view/ca/smarty3/mail_received_text_body_eml.tpl index eb7d6048b..3bd4a186f 100644 --- a/view/ca/smarty3/mail_received_text_body_eml.tpl +++ b/view/ca/smarty3/mail_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}. + *}} +Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}. {{$title}} diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl index 73f508341..eddf2ed85 100644 --- a/view/ca/smarty3/passchanged_eml.tpl +++ b/view/ca/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$username}}, La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl index 6871ab015..b4e90991b 100644 --- a/view/ca/smarty3/register_open_eml.tpl +++ b/view/ca/smarty3/register_open_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$username}}, Grà cies per registrar-te en {{$sitename}}. El teu compte ha estat creat. diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl index 3dc207dd6..d9cc94c1a 100644 --- a/view/ca/smarty3/register_verify_eml.tpl +++ b/view/ca/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + S'ha rebut la sol·licitud de registre d'un nou usuari en {{$sitename}} que requereix la teva aprovació. diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl index 8d0435859..3e94e1a59 100644 --- a/view/ca/smarty3/request_notify_eml.tpl +++ b/view/ca/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$myname}}, Acabes de rebre una sol·licitud de connexió de '{{$requestor}}' en {{$sitename}}. diff --git a/view/ca/smarty3/wall_received_eml.tpl b/view/ca/smarty3/wall_received_eml.tpl index 3c6e919a0..faaaf1b19 100644 --- a/view/ca/smarty3/wall_received_eml.tpl +++ b/view/ca/smarty3/wall_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Apreciat/da {{$username}}, '{{$from}}' ha escrit quelcom en el mur del teu perfil. diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl index f69152b6c..2bf7cc18c 100644 --- a/view/cs/smarty3/cmnt_received_eml.tpl +++ b/view/cs/smarty3/cmnt_received_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Milý/Milá {{$username}}, + *}} +Milý/Milá {{$username}}, '{{$from}}' okommentoval položku/konverzaci, kterou následujete. diff --git a/view/cs/smarty3/cmnt_received_html_body_eml.tpl b/view/cs/smarty3/cmnt_received_html_body_eml.tpl index 5873070c9..306c7266f 100644 --- a/view/cs/smarty3/cmnt_received_html_body_eml.tpl +++ b/view/cs/smarty3/cmnt_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Friendika zpráva</title> diff --git a/view/cs/smarty3/cmnt_received_text_body_eml.tpl b/view/cs/smarty3/cmnt_received_text_body_eml.tpl index f69152b6c..2bf7cc18c 100644 --- a/view/cs/smarty3/cmnt_received_text_body_eml.tpl +++ b/view/cs/smarty3/cmnt_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Milý/Milá {{$username}}, + *}} +Milý/Milá {{$username}}, '{{$from}}' okommentoval položku/konverzaci, kterou následujete. diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl index e83d60f2e..f2bd3175b 100644 --- a/view/cs/smarty3/follow_notify_eml.tpl +++ b/view/cs/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Milý/Milá {{$username}}, Máte nového následovatele na {{$sitename}} - '{{$requestor}}'. diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl index f069c095a..138036d63 100644 --- a/view/cs/smarty3/friend_complete_eml.tpl +++ b/view/cs/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Milý/Milá {{$username}}, SkvÄ›lé zprávy... '{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojenà na '{{$sitename}}'. diff --git a/view/cs/smarty3/intro_complete_eml.tpl b/view/cs/smarty3/intro_complete_eml.tpl index 073e8bcc5..2666d4679 100644 --- a/view/cs/smarty3/intro_complete_eml.tpl +++ b/view/cs/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Milý/Milá {{$username}}, diff --git a/view/cs/smarty3/lostpass_eml.tpl b/view/cs/smarty3/lostpass_eml.tpl index 37950e22c..697908076 100644 --- a/view/cs/smarty3/lostpass_eml.tpl +++ b/view/cs/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Milý/Milá {{$username}}, Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavenà hesla k VaÅ¡emu úÄtu. Pro potvrzenà této žádosti prosÃm kliknÄ›te na potvrzovacà odkaz nÞe, nebo si tento odkaz zkopÃrujte do adresnÃho řádku prohlÞeÄe. Pokud jste o znovunastavenà hesla NEŽÃDALI, prosÃm NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte. diff --git a/view/cs/smarty3/mail_received_html_body_eml.tpl b/view/cs/smarty3/mail_received_html_body_eml.tpl index f4d25cb2c..304e94bc0 100644 --- a/view/cs/smarty3/mail_received_html_body_eml.tpl +++ b/view/cs/smarty3/mail_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Friendika Zpráva</title> diff --git a/view/cs/smarty3/mail_received_text_body_eml.tpl b/view/cs/smarty3/mail_received_text_body_eml.tpl index a2348c524..de9a84a76 100644 --- a/view/cs/smarty3/mail_received_text_body_eml.tpl +++ b/view/cs/smarty3/mail_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}. + *}} +{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}. {{$title}} diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl index fc7fb8de7..41eb2b403 100644 --- a/view/cs/smarty3/passchanged_eml.tpl +++ b/view/cs/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Milý/Milá {{$username}}, VaÅ¡e heslo bylo na VaÅ¡i žádost zmÄ›nÄ›no. ProsÃm zaznamenejte si tuto informaci (nebo si VaÅ¡e heslo změňte na nÄ›jaké, které si budete pamatovat). diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl index 5f9fff7be..7278baf7c 100644 --- a/view/cs/smarty3/register_open_eml.tpl +++ b/view/cs/smarty3/register_open_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Milý/milá {{$username}}, + *}} +Milý/milá {{$username}}, DÃky za registraci na {{$sitename}}. Váš úÄet byl vytvoÅ™en. VaÅ¡e pÅ™ihlaÅ¡ovacà údaje jsou tato: diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl index 256172f9f..785a18267 100644 --- a/view/cs/smarty3/register_verify_eml.tpl +++ b/view/cs/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Na webu {{$sitename}} byla vytvoÅ™ena nová uživatelská registrace, která vyžaduje VaÅ¡e schválenÃ. PÅ™ihlaÅ¡ovacà údaje jsou tato: diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl index e087c0f07..537cea01c 100644 --- a/view/cs/smarty3/request_notify_eml.tpl +++ b/view/cs/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Milý/Milá {{$username}}, PrávÄ› jste obdržel/obdržela požadavek na spojenà na webu {{$sitename}} diff --git a/view/cs/smarty3/wall_received_eml.tpl b/view/cs/smarty3/wall_received_eml.tpl index 6f78f2a65..a7c8bd136 100644 --- a/view/cs/smarty3/wall_received_eml.tpl +++ b/view/cs/smarty3/wall_received_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Milý/Milá {{$username}}, + *}} +Milý/Milá {{$username}}, '{{$from}}' obohatil VaÅ¡i profilovou zeÄ. diff --git a/view/cs/smarty3/wall_received_html_body_eml.tpl b/view/cs/smarty3/wall_received_html_body_eml.tpl index fa5eb55d9..9b53c6f97 100644 --- a/view/cs/smarty3/wall_received_html_body_eml.tpl +++ b/view/cs/smarty3/wall_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Friendika zpráva</title> diff --git a/view/cs/smarty3/wall_received_text_body_eml.tpl b/view/cs/smarty3/wall_received_text_body_eml.tpl index ee0eebdb9..eddf6d330 100644 --- a/view/cs/smarty3/wall_received_text_body_eml.tpl +++ b/view/cs/smarty3/wall_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Milý/Milá {{$username}}, + *}} +Milý/Milá {{$username}}, '{{$from}}' obohatil VaÅ¡i profilovou zeÄ. diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl index 5fca2043e..9b5c3d842 100644 --- a/view/de/smarty3/cmnt_received_eml.tpl +++ b/view/de/smarty3/cmnt_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$username}}, '{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst. diff --git a/view/de/smarty3/cmnt_received_html_body_eml.tpl b/view/de/smarty3/cmnt_received_html_body_eml.tpl index e91ac3b88..c219fcb18 100644 --- a/view/de/smarty3/cmnt_received_html_body_eml.tpl +++ b/view/de/smarty3/cmnt_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Friendica Nachricht</title> diff --git a/view/de/smarty3/cmnt_received_text_body_eml.tpl b/view/de/smarty3/cmnt_received_text_body_eml.tpl index 9908ee997..d100040c0 100644 --- a/view/de/smarty3/cmnt_received_text_body_eml.tpl +++ b/view/de/smarty3/cmnt_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Hallo {{$username}}, + *}} +Hallo {{$username}}, '{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst. diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl index 490ad26dd..7bec4d32d 100644 --- a/view/de/smarty3/follow_notify_eml.tpl +++ b/view/de/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$myname}}, Du hast einen neuen Anhänger auf {{$sitename}} - '{{$requestor}}'. diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl index 78e1b718a..592bf7dd8 100644 --- a/view/de/smarty3/friend_complete_eml.tpl +++ b/view/de/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$username}}, Großartige Neuigkeiten... '{{$fn}}' auf '{{$dfrn_url}}' hat diff --git a/view/de/smarty3/intro_complete_eml.tpl b/view/de/smarty3/intro_complete_eml.tpl index c0a6928c0..45912d746 100644 --- a/view/de/smarty3/intro_complete_eml.tpl +++ b/view/de/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$username}}, '{{$fn}}' auf '{{$dfrn_url}}' hat deine Verbindungsanfrage diff --git a/view/de/smarty3/lostpass_eml.tpl b/view/de/smarty3/lostpass_eml.tpl index 46f93ea13..4cc5203ed 100644 --- a/view/de/smarty3/lostpass_eml.tpl +++ b/view/de/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$username}}, Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines Passworts empfangen. Um diese zu bestätigen folge bitte dem Link diff --git a/view/de/smarty3/mail_received_html_body_eml.tpl b/view/de/smarty3/mail_received_html_body_eml.tpl index 3f76fb0e3..b4de64bdb 100644 --- a/view/de/smarty3/mail_received_html_body_eml.tpl +++ b/view/de/smarty3/mail_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Friendica Nachricht</title> diff --git a/view/de/smarty3/mail_received_text_body_eml.tpl b/view/de/smarty3/mail_received_text_body_eml.tpl index 5d41f2af0..2004cc3b0 100644 --- a/view/de/smarty3/mail_received_text_body_eml.tpl +++ b/view/de/smarty3/mail_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten. + *}} +Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten. {{$title}} diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl index 3b2c8dc90..4fd97881f 100644 --- a/view/de/smarty3/passchanged_eml.tpl +++ b/view/de/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$username}}, Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl index ad676eaf7..9e474ce9e 100644 --- a/view/de/smarty3/register_open_eml.tpl +++ b/view/de/smarty3/register_open_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$username}}, Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. Hier die Login Details: diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl index 237d4bf55..c7acbd9b6 100644 --- a/view/de/smarty3/register_verify_eml.tpl +++ b/view/de/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Eine Neuanmeldung auf {{$sitename}} benötigt deine Aufmerksamkeit. diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl index cc5bb3f87..ed8ebc951 100644 --- a/view/de/smarty3/request_notify_eml.tpl +++ b/view/de/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$myname}}, du hast eine Kontaktanfrage von '{{$requestor}}' auf {{$sitename}} diff --git a/view/de/smarty3/update_fail_eml.tpl b/view/de/smarty3/update_fail_eml.tpl index 8d20b599b..4329d0e42 100644 --- a/view/de/smarty3/update_fail_eml.tpl +++ b/view/de/smarty3/update_fail_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Hi,
+ *}} +Hi,
ich bin {{$sitename}}.
Die friendica Entwickler haben jüngst Update {{$update}} veröffentlicht,
aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen.
diff --git a/view/de/smarty3/wall_received_eml.tpl b/view/de/smarty3/wall_received_eml.tpl index 633a6f9b7..2ace0d5f4 100644 --- a/view/de/smarty3/wall_received_eml.tpl +++ b/view/de/smarty3/wall_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$username}}, '{{$from}}' hat etwas auf deiner Profilwand gepostet. diff --git a/view/de/smarty3/wall_received_html_body_eml.tpl b/view/de/smarty3/wall_received_html_body_eml.tpl index 3a182aa17..c58ee7500 100644 --- a/view/de/smarty3/wall_received_html_body_eml.tpl +++ b/view/de/smarty3/wall_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Friendica Nachricht</title> diff --git a/view/de/smarty3/wall_received_text_body_eml.tpl b/view/de/smarty3/wall_received_text_body_eml.tpl index f1f794a40..eb310177d 100644 --- a/view/de/smarty3/wall_received_text_body_eml.tpl +++ b/view/de/smarty3/wall_received_text_body_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Hallo {{$username}}, '{{$from}}' hat etwas auf deiner Pinnwand gepostet. diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl index 85f989fad..e944aad1a 100644 --- a/view/en/smarty3/follow_notify_eml.tpl +++ b/view/en/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Dear {{$myname}}, You have a new follower at {{$sitename}} - '{{$requestor}}'. diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl index 81cb74e14..8f72027e1 100644 --- a/view/en/smarty3/friend_complete_eml.tpl +++ b/view/en/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Dear {{$username}}, Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl index 8b4f79272..3af80374f 100644 --- a/view/en/smarty3/htconfig.tpl +++ b/view/en/smarty3/htconfig.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?php + *}} +<?php // Set the following for your MySQL installation // Copy or rename this file to .htconfig.php diff --git a/view/en/smarty3/intro_complete_eml.tpl b/view/en/smarty3/intro_complete_eml.tpl index 1aee435b4..7cf2dd562 100644 --- a/view/en/smarty3/intro_complete_eml.tpl +++ b/view/en/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Dear {{$username}}, '{{$fn}}' at '{{$dfrn_url}}' has accepted diff --git a/view/en/smarty3/lostpass_eml.tpl b/view/en/smarty3/lostpass_eml.tpl index e66bbe8ff..f739d5252 100644 --- a/view/en/smarty3/lostpass_eml.tpl +++ b/view/en/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Dear {{$username}}, A request was recently received at {{$sitename}} to reset your account password. In order to confirm this request, please select the verification link diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl index 07abb5255..c17860df6 100644 --- a/view/en/smarty3/passchanged_eml.tpl +++ b/view/en/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Dear {{$username}}, Your password has been changed as requested. Please retain this information for your records (or change your password immediately to diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl index cf549fe40..377fa8436 100644 --- a/view/en/smarty3/register_open_eml.tpl +++ b/view/en/smarty3/register_open_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + An account has been created at {{$sitename}} for this email address. The login details are as follows: diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl index 5f8fd1c9b..43257e78a 100644 --- a/view/en/smarty3/register_verify_eml.tpl +++ b/view/en/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + A new user registration request was received at {{$sitename}} which requires your approval. diff --git a/view/en/smarty3/request_notify_eml.tpl b/view/en/smarty3/request_notify_eml.tpl index 2177fe5e4..26a17b4bc 100644 --- a/view/en/smarty3/request_notify_eml.tpl +++ b/view/en/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Dear {{$myname}}, You have just received a connection request at {{$sitename}} diff --git a/view/en/smarty3/update_fail_eml.tpl b/view/en/smarty3/update_fail_eml.tpl index 9d6e7b6a3..931d9e455 100644 --- a/view/en/smarty3/update_fail_eml.tpl +++ b/view/en/smarty3/update_fail_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Hey,
+ *}} +Hey,
I'm {{$sitename}};
The friendica developers released update {{$update}} recently,
but when I tried to install it, something went terribly wrong.
diff --git a/view/eo/smarty3/follow_notify_eml.tpl b/view/eo/smarty3/follow_notify_eml.tpl index 4b00fa852..7edac031b 100644 --- a/view/eo/smarty3/follow_notify_eml.tpl +++ b/view/eo/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kara {{$myname}}, Vi havas novan abonanton ĉe {{$sitename}} - '{{$requestor}}'. diff --git a/view/eo/smarty3/friend_complete_eml.tpl b/view/eo/smarty3/friend_complete_eml.tpl index 45bb9b1cb..dc4cdd61a 100644 --- a/view/eo/smarty3/friend_complete_eml.tpl +++ b/view/eo/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kara {{$username}}, Boegaj novaĵoj.... '{{$fn}}' ĉe '{{$dfrn_url}}' aprobis diff --git a/view/eo/smarty3/intro_complete_eml.tpl b/view/eo/smarty3/intro_complete_eml.tpl index 63940af85..678c57b36 100644 --- a/view/eo/smarty3/intro_complete_eml.tpl +++ b/view/eo/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kara {{$username}}, '{{$fn}}' ĉe '{{$dfrn_url}}' akceptis diff --git a/view/eo/smarty3/lostpass_eml.tpl b/view/eo/smarty3/lostpass_eml.tpl index 87fe2c443..6fcf8f9ad 100644 --- a/view/eo/smarty3/lostpass_eml.tpl +++ b/view/eo/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kara {{$username}}, {{$sitename}} ricevis peton por rekomencigi vian pasvorton. Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon diff --git a/view/eo/smarty3/passchanged_eml.tpl b/view/eo/smarty3/passchanged_eml.tpl index 50d5c57f3..3252a6e7c 100644 --- a/view/eo/smarty3/passchanged_eml.tpl +++ b/view/eo/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kara {{$username}}, Via pasvorto estas ÅanÄita laÅ via peto. Bonvolu konservi ĉi tiun informon (aÅ tuj ÅanÄu vian pasvorton al diff --git a/view/eo/smarty3/register_open_eml.tpl b/view/eo/smarty3/register_open_eml.tpl index 89b0ef704..29bcbb52d 100644 --- a/view/eo/smarty3/register_open_eml.tpl +++ b/view/eo/smarty3/register_open_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kara {{$username}}, Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. Jen viaj legitimaĵoj: diff --git a/view/eo/smarty3/register_verify_eml.tpl b/view/eo/smarty3/register_verify_eml.tpl index 9439ca707..cc02c01f8 100644 --- a/view/eo/smarty3/register_verify_eml.tpl +++ b/view/eo/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Nova peto por registrado atendas ĉe {{$sitename}} kaj bezonas vian aprobon. diff --git a/view/eo/smarty3/request_notify_eml.tpl b/view/eo/smarty3/request_notify_eml.tpl index eb4d53b62..9bba49fd0 100644 --- a/view/eo/smarty3/request_notify_eml.tpl +++ b/view/eo/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kara {{$myname}}, Vi ĵus ricevis kontaktpeton ĉe {{$sitename}} diff --git a/view/eo/smarty3/update_fail_eml.tpl b/view/eo/smarty3/update_fail_eml.tpl index 306920d2b..728713227 100644 --- a/view/eo/smarty3/update_fail_eml.tpl +++ b/view/eo/smarty3/update_fail_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Saluton!
+ *}} +Saluton!
Mi estas {{$sitename}}.
La programistoj de Frienda eldonis Äisdatigon {{$update}} antaÅ ne longe,
sed kiam mi provis instali Äin, io terure malsukcesis.
diff --git a/view/es/smarty3/cmnt_received_eml.tpl b/view/es/smarty3/cmnt_received_eml.tpl index 12c5af7c0..ee5db7122 100644 --- a/view/es/smarty3/cmnt_received_eml.tpl +++ b/view/es/smarty3/cmnt_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$username}}, '{{$from}}' ha comentado un elemento/conversación que estás siguiendo. diff --git a/view/es/smarty3/follow_notify_eml.tpl b/view/es/smarty3/follow_notify_eml.tpl index d36bcfa74..bed92f59c 100644 --- a/view/es/smarty3/follow_notify_eml.tpl +++ b/view/es/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$myname}}, Tienes un nuevo seguidor en {{$sitename}} - '{{$requestor}}'. diff --git a/view/es/smarty3/friend_complete_eml.tpl b/view/es/smarty3/friend_complete_eml.tpl index 3277c9fe7..7ed514068 100644 --- a/view/es/smarty3/friend_complete_eml.tpl +++ b/view/es/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$username}}, Grandes noticias... '{{$fn}}' a '{{$dfrn_url}}' ha aceptado tu solicitud de conexión en '{{$sitename}}'. diff --git a/view/es/smarty3/intro_complete_eml.tpl b/view/es/smarty3/intro_complete_eml.tpl index 09775f109..e77fce2cd 100644 --- a/view/es/smarty3/intro_complete_eml.tpl +++ b/view/es/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$username}}, '{{$fn}}' en '{{$dfrn_url}}' ha aceptado tu petición diff --git a/view/es/smarty3/lostpass_eml.tpl b/view/es/smarty3/lostpass_eml.tpl index 52a91060e..7a78067ae 100644 --- a/view/es/smarty3/lostpass_eml.tpl +++ b/view/es/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$username}}, Se ha recibido una solicitud en {{$sitename}} recientemente para restablecer diff --git a/view/es/smarty3/mail_received_html_body_eml.tpl b/view/es/smarty3/mail_received_html_body_eml.tpl index 7125f9c13..49d53eb22 100644 --- a/view/es/smarty3/mail_received_html_body_eml.tpl +++ b/view/es/smarty3/mail_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Mensaje de Friendika</title> diff --git a/view/es/smarty3/mail_received_text_body_eml.tpl b/view/es/smarty3/mail_received_text_body_eml.tpl index 0823f312f..7ff093b91 100644 --- a/view/es/smarty3/mail_received_text_body_eml.tpl +++ b/view/es/smarty3/mail_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}. + *}} +Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}. {{$title}} diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl index a48ef26ef..e17776eaa 100644 --- a/view/es/smarty3/passchanged_eml.tpl +++ b/view/es/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$username}}, Tu contraseña ha sido modificada como has solicitado. Anota esta información diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl index ad254471e..5d5630461 100644 --- a/view/es/smarty3/register_open_eml.tpl +++ b/view/es/smarty3/register_open_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$username}}, Gracias por registrarte en {{$sitename}}. Tu cuenta ha sido creada. diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl index a2db15659..a67aedd10 100644 --- a/view/es/smarty3/register_verify_eml.tpl +++ b/view/es/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Se ha recibido la solicitud de registro de un nuevo usuario en {{$sitename}} que requiere tu aprobación. diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl index a2f79b353..f7bdf3294 100644 --- a/view/es/smarty3/request_notify_eml.tpl +++ b/view/es/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$myname}}, Acabas de recibir una solicitud de conexión de '{{$requestor}}' en {{$sitename}}. diff --git a/view/es/smarty3/wall_received_eml.tpl b/view/es/smarty3/wall_received_eml.tpl index 1de443ad2..a69c421c2 100644 --- a/view/es/smarty3/wall_received_eml.tpl +++ b/view/es/smarty3/wall_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Estimado/a {{$username}}, '{{$from}}' ha escrito algo en el muro de tu perfil. diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl index ae7252ca3..a2c1407f5 100644 --- a/view/fr/smarty3/cmnt_received_eml.tpl +++ b/view/fr/smarty3/cmnt_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$username}}, « {{$from}} » a commenté un élément ou une conversation que vous suivez. diff --git a/view/fr/smarty3/cmnt_received_html_body_eml.tpl b/view/fr/smarty3/cmnt_received_html_body_eml.tpl index 1c57f9f8c..265a11fc1 100644 --- a/view/fr/smarty3/cmnt_received_html_body_eml.tpl +++ b/view/fr/smarty3/cmnt_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Message de Friendica</title> diff --git a/view/fr/smarty3/cmnt_received_text_body_eml.tpl b/view/fr/smarty3/cmnt_received_text_body_eml.tpl index a00c6c860..b0360655b 100644 --- a/view/fr/smarty3/cmnt_received_text_body_eml.tpl +++ b/view/fr/smarty3/cmnt_received_text_body_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$username}}, « {{$from}} » a commenté un éléŽment ou une conversation que vous suivez. diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl index 6d6cddda4..7f7da5ec3 100644 --- a/view/fr/smarty3/follow_notify_eml.tpl +++ b/view/fr/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$myname}}, Une nouvelle personne - {{$requestor}} - vous suit désormais sur {{$sitename}}. diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl index dea9c5af9..2f68255a2 100644 --- a/view/fr/smarty3/friend_complete_eml.tpl +++ b/view/fr/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$username}}, Grande nouvelle… « {{$fn}} » (de « {{$dfrn_url}} ») a accepté votre diff --git a/view/fr/smarty3/intro_complete_eml.tpl b/view/fr/smarty3/intro_complete_eml.tpl index 32d29673d..4e1f8a5d5 100644 --- a/view/fr/smarty3/intro_complete_eml.tpl +++ b/view/fr/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$username}}, « {{$fn}} » du site « {{$dfrn_url}} » a accepté votre diff --git a/view/fr/smarty3/lostpass_eml.tpl b/view/fr/smarty3/lostpass_eml.tpl index dc76cb688..13801872d 100644 --- a/view/fr/smarty3/lostpass_eml.tpl +++ b/view/fr/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$username}}, Nous avons récemment reçu, chez {{$sitename}}, une demande de remise diff --git a/view/fr/smarty3/mail_received_html_body_eml.tpl b/view/fr/smarty3/mail_received_html_body_eml.tpl index ca5816e64..2eb35f881 100644 --- a/view/fr/smarty3/mail_received_html_body_eml.tpl +++ b/view/fr/smarty3/mail_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Message de Friendica</title> diff --git a/view/fr/smarty3/mail_received_text_body_eml.tpl b/view/fr/smarty3/mail_received_text_body_eml.tpl index 6c8013449..d1f03fb6e 100644 --- a/view/fr/smarty3/mail_received_text_body_eml.tpl +++ b/view/fr/smarty3/mail_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$from}} vous a envoyé un message à {{$siteName}}. + *}} +{{$from}} vous a envoyé un message à {{$siteName}}. {{$title}} diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl index 3d0a84b4c..47b10d3f5 100644 --- a/view/fr/smarty3/passchanged_eml.tpl +++ b/view/fr/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$username}}, Votre mot de passe a été modifié comme demandé. Merci de conserver diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl index ac5473ebe..320a58016 100644 --- a/view/fr/smarty3/register_open_eml.tpl +++ b/view/fr/smarty3/register_open_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$username}}, Merci de votre inscription à {{$sitename}}. Votre compte a été créé. diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl index 99294f9ad..8127010dd 100644 --- a/view/fr/smarty3/register_verify_eml.tpl +++ b/view/fr/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle nécessite votre approbation. diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl index 22193d758..cf2fe0cf0 100644 --- a/view/fr/smarty3/request_notify_eml.tpl +++ b/view/fr/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$myname}}, Vous venez de recevoir une demande de mise en relation sur {{$sitename}} diff --git a/view/fr/smarty3/wall_received_eml.tpl b/view/fr/smarty3/wall_received_eml.tpl index 31d080be9..2f91457fd 100644 --- a/view/fr/smarty3/wall_received_eml.tpl +++ b/view/fr/smarty3/wall_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Cher(e) {{$username}}, « {{$from}} » a posté quelque chose sur le mur de votre profil. diff --git a/view/it/smarty3/cmnt_received_eml.tpl b/view/it/smarty3/cmnt_received_eml.tpl index 4bb556765..479c566de 100644 --- a/view/it/smarty3/cmnt_received_eml.tpl +++ b/view/it/smarty3/cmnt_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Caro/a {{$username}}, '{{$from}}' ha commentato un elemeto/conversazione che stai seguendo. diff --git a/view/it/smarty3/cmnt_received_html_body_eml.tpl b/view/it/smarty3/cmnt_received_html_body_eml.tpl index a789a63d0..c290739a0 100644 --- a/view/it/smarty3/cmnt_received_html_body_eml.tpl +++ b/view/it/smarty3/cmnt_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Friendika Messaggio</title> diff --git a/view/it/smarty3/cmnt_received_text_body_eml.tpl b/view/it/smarty3/cmnt_received_text_body_eml.tpl index 4bb556765..479c566de 100644 --- a/view/it/smarty3/cmnt_received_text_body_eml.tpl +++ b/view/it/smarty3/cmnt_received_text_body_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Caro/a {{$username}}, '{{$from}}' ha commentato un elemeto/conversazione che stai seguendo. diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl index 049b62903..925d5b2d0 100644 --- a/view/it/smarty3/follow_notify_eml.tpl +++ b/view/it/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Ciao {{$myname}}, Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'. diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl index c3c8bfecb..667a1f445 100644 --- a/view/it/smarty3/friend_complete_eml.tpl +++ b/view/it/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Ciao {{$username}}, Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl index ce321d3f1..5c831f0d3 100644 --- a/view/it/smarty3/intro_complete_eml.tpl +++ b/view/it/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Ciao {{$username}}, '{{$fn}}' di '{{$dfrn_url}}' ha accettato diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl index a4d67b342..04a6a0716 100644 --- a/view/it/smarty3/lostpass_eml.tpl +++ b/view/it/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Ciao {{$username}}, Su {{$sitename}} è stata ricevuta una richiesta di azzeramento di password per un account. Per confermare la richiesta, clicca sul link di verifica diff --git a/view/it/smarty3/mail_received_html_body_eml.tpl b/view/it/smarty3/mail_received_html_body_eml.tpl index 9d908d6d9..dd897b927 100644 --- a/view/it/smarty3/mail_received_html_body_eml.tpl +++ b/view/it/smarty3/mail_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Friendika Messsaggio</title> diff --git a/view/it/smarty3/mail_received_text_body_eml.tpl b/view/it/smarty3/mail_received_text_body_eml.tpl index 75a73a1c2..3cb7b82d4 100644 --- a/view/it/smarty3/mail_received_text_body_eml.tpl +++ b/view/it/smarty3/mail_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'. + *}} +Hai ricevuto un nuovo messsaggio privato su {{$siteName}} da '{{$from}}'. {{$title}} diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl index 0669dd6a4..32970c9cb 100644 --- a/view/it/smarty3/passchanged_eml.tpl +++ b/view/it/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Ciao {{$username}}, La tua password è cambiata come hai richiesto. Conserva queste informazioni (oppure cambia immediatamente la password con diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl index 277b4cbd8..e5f909af5 100644 --- a/view/it/smarty3/register_open_eml.tpl +++ b/view/it/smarty3/register_open_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Ciao {{$username}}, Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. I dettagli di accesso sono i seguenti diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl index 2e28eedb8..9ce1f8f00 100644 --- a/view/it/smarty3/register_verify_eml.tpl +++ b/view/it/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede la tua approvazione. diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl index a93cc0c87..47240c5a3 100644 --- a/view/it/smarty3/request_notify_eml.tpl +++ b/view/it/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Ciao {{$myname}}, Hai appena ricevuto una richiesta di connessione da {{$sitename}} diff --git a/view/it/smarty3/wall_received_eml.tpl b/view/it/smarty3/wall_received_eml.tpl index 9b0b7d603..30b53d11e 100644 --- a/view/it/smarty3/wall_received_eml.tpl +++ b/view/it/smarty3/wall_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Caro/a {{$username}}, '{{$from}}' ha scritto qualcosa sulla bachecha del tuo profilo. diff --git a/view/it/smarty3/wall_received_html_body_eml.tpl b/view/it/smarty3/wall_received_html_body_eml.tpl index ab4c55ea0..6b9e44919 100644 --- a/view/it/smarty3/wall_received_html_body_eml.tpl +++ b/view/it/smarty3/wall_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Messaggio da Friendika</title> diff --git a/view/it/smarty3/wall_received_text_body_eml.tpl b/view/it/smarty3/wall_received_text_body_eml.tpl index c88144f79..2031744a6 100644 --- a/view/it/smarty3/wall_received_text_body_eml.tpl +++ b/view/it/smarty3/wall_received_text_body_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Caro {{$username}}, '{{$from}}' ha scritto sulla tua bacheca. diff --git a/view/nb-no/smarty3/follow_notify_eml.tpl b/view/nb-no/smarty3/follow_notify_eml.tpl index f7473176c..eedeef85d 100644 --- a/view/nb-no/smarty3/follow_notify_eml.tpl +++ b/view/nb-no/smarty3/follow_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kjære {{$myname}}, Du har en ny følgesvenn pÃ¥ {{$sitename}} - '{{$requestor}}'. diff --git a/view/nb-no/smarty3/friend_complete_eml.tpl b/view/nb-no/smarty3/friend_complete_eml.tpl index 424243c9a..f8348c51d 100644 --- a/view/nb-no/smarty3/friend_complete_eml.tpl +++ b/view/nb-no/smarty3/friend_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kjære {{$username}}, Gode nyheter... '{{$fn}}' ved '{{$dfrn_url}}' har godtatt diff --git a/view/nb-no/smarty3/intro_complete_eml.tpl b/view/nb-no/smarty3/intro_complete_eml.tpl index 4aacdd028..e00d99f8b 100644 --- a/view/nb-no/smarty3/intro_complete_eml.tpl +++ b/view/nb-no/smarty3/intro_complete_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kjære {{$username}}, '{{$fn}}' ved '{{$dfrn_url}}' har godtatt diff --git a/view/nb-no/smarty3/lostpass_eml.tpl b/view/nb-no/smarty3/lostpass_eml.tpl index 7c750a3e9..11ef4aab7 100644 --- a/view/nb-no/smarty3/lostpass_eml.tpl +++ b/view/nb-no/smarty3/lostpass_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kjære {{$username}}, En forespørsel ble nylig mottatt hos {{$sitename}} om Ã¥ tilbakestille din kontos passord. For Ã¥ godkjenne denne forespørselen, vennligst velg bekreftelseslenken diff --git a/view/nb-no/smarty3/passchanged_eml.tpl b/view/nb-no/smarty3/passchanged_eml.tpl index d4e45a05d..d5137fc47 100644 --- a/view/nb-no/smarty3/passchanged_eml.tpl +++ b/view/nb-no/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kjære {{$username}}, Ditt passord har blitt endret som forespurt. Vennligst ta vare pÃ¥ denne meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til diff --git a/view/nb-no/smarty3/register_open_eml.tpl b/view/nb-no/smarty3/register_open_eml.tpl index 2b7fe30ed..43b150da8 100644 --- a/view/nb-no/smarty3/register_open_eml.tpl +++ b/view/nb-no/smarty3/register_open_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kjære {{$username}}, Takk for at du registrerte deg hos {{$sitename}}. Kontoen din er opprettet. Innloggingsdetaljene er som følger: diff --git a/view/nb-no/smarty3/register_verify_eml.tpl b/view/nb-no/smarty3/register_verify_eml.tpl index 3ef38b35e..4b765885e 100644 --- a/view/nb-no/smarty3/register_verify_eml.tpl +++ b/view/nb-no/smarty3/register_verify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + En ny forespørsel om brukerregistering ble mottatt hos {{$sitename}} og krever din godkjenning. diff --git a/view/nb-no/smarty3/request_notify_eml.tpl b/view/nb-no/smarty3/request_notify_eml.tpl index 5f55154f1..9851b4f17 100644 --- a/view/nb-no/smarty3/request_notify_eml.tpl +++ b/view/nb-no/smarty3/request_notify_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + Kjære {{$myname}}, Du har akkurat mottatt en kontaktforespørsel hos {{$sitename}} diff --git a/view/nb-no/smarty3/update_fail_eml.tpl b/view/nb-no/smarty3/update_fail_eml.tpl index 19940de1b..771d4b97f 100644 --- a/view/nb-no/smarty3/update_fail_eml.tpl +++ b/view/nb-no/smarty3/update_fail_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}Hei,
+ *}} +Hei,
jeg er {{$sitename}}.
Friendica-utviklerne slapp nylig oppdateringen {{$update}},
men da jeg prøvde å installere den, gikk noe forferdelig galt.
diff --git a/view/sv/smarty3/cmnt_received_eml.tpl b/view/sv/smarty3/cmnt_received_eml.tpl index 92b597f2f..b001b8e49 100644 --- a/view/sv/smarty3/cmnt_received_eml.tpl +++ b/view/sv/smarty3/cmnt_received_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + {{$username}}, '{{$from}}' har kommenterat nÃ¥got som du följer. diff --git a/view/sv/smarty3/follow_notify_eml.tpl b/view/sv/smarty3/follow_notify_eml.tpl index dc3996ba6..8517fee3a 100644 --- a/view/sv/smarty3/follow_notify_eml.tpl +++ b/view/sv/smarty3/follow_notify_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$myname}}, + *}} +{{$myname}}, '{{$requestor}}' pÃ¥ {{$sitename}} vill följa dina uppdateringar här pÃ¥ Friendika. diff --git a/view/sv/smarty3/friend_complete_eml.tpl b/view/sv/smarty3/friend_complete_eml.tpl index 0b91fdaa2..18b063c15 100644 --- a/view/sv/smarty3/friend_complete_eml.tpl +++ b/view/sv/smarty3/friend_complete_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$username}}, + *}} +{{$username}}, Goda nyheter... '{{$fn}}' pÃ¥ '{{$dfrn_url}}' har accepterat din kontaktförfrÃ¥gan pÃ¥ '{{$sitename}}'. diff --git a/view/sv/smarty3/intro_complete_eml.tpl b/view/sv/smarty3/intro_complete_eml.tpl index fd69c4cbb..49b18846b 100644 --- a/view/sv/smarty3/intro_complete_eml.tpl +++ b/view/sv/smarty3/intro_complete_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$username}}, + *}} +{{$username}}, '{{$fn}}' pÃ¥ '{{$dfrn_url}}' har accepterat din kontaktförfrÃ¥gan pÃ¥ '{{$sitename}}'. diff --git a/view/sv/smarty3/lostpass_eml.tpl b/view/sv/smarty3/lostpass_eml.tpl index 3f0426c0d..1941b4479 100644 --- a/view/sv/smarty3/lostpass_eml.tpl +++ b/view/sv/smarty3/lostpass_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$username}}, + *}} +{{$username}}, En begäran om Ã¥terställning av lösenord pÃ¥ {{$sitename}} har mottagits. GÃ¥ till adressen nedan för att bekräfta denna begäran. Du kan ocksÃ¥ diff --git a/view/sv/smarty3/mail_received_html_body_eml.tpl b/view/sv/smarty3/mail_received_html_body_eml.tpl index c4da5ccd4..7826919da 100644 --- a/view/sv/smarty3/mail_received_html_body_eml.tpl +++ b/view/sv/smarty3/mail_received_html_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>Meddelande på Friendika</title> diff --git a/view/sv/smarty3/mail_received_text_body_eml.tpl b/view/sv/smarty3/mail_received_text_body_eml.tpl index 0a333e98a..ce3340785 100644 --- a/view/sv/smarty3/mail_received_text_body_eml.tpl +++ b/view/sv/smarty3/mail_received_text_body_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$from}} har skickat ett personligt meddelande till dig pÃ¥ {{$siteName}}. + *}} +{{$from}} har skickat ett personligt meddelande till dig pÃ¥ {{$siteName}}. {{$title}} diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl index b91d321c7..49afb735f 100644 --- a/view/sv/smarty3/passchanged_eml.tpl +++ b/view/sv/smarty3/passchanged_eml.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + {{$username}}, Lösenordet har ändrats enligt din begäran. BehÃ¥ll den här diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl index 28190c55b..55bd64e3d 100644 --- a/view/sv/smarty3/register_open_eml.tpl +++ b/view/sv/smarty3/register_open_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$username}}, + *}} +{{$username}}, Tack för att du registrerat dig pÃ¥ {{$sitename}}. Kontot har skapats. Här är dina inloggningsuppgifter: diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl index 6039c4726..50c94f94a 100644 --- a/view/sv/smarty3/register_verify_eml.tpl +++ b/view/sv/smarty3/register_verify_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}En registreringsförfrÃ¥gan som kräver svar har mottagits + *}} +En registreringsförfrÃ¥gan som kräver svar har mottagits pÃ¥ {{$sitename}} diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl index 36df90d1c..22cfb46de 100644 --- a/view/sv/smarty3/request_notify_eml.tpl +++ b/view/sv/smarty3/request_notify_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$myname}}, + *}} +{{$myname}}, Du har just fÃ¥tt en kontaktförfrÃ¥gan pÃ¥ {{$sitename}} frÃ¥n '{{$requestor}}' diff --git a/view/sv/smarty3/wall_received_eml.tpl b/view/sv/smarty3/wall_received_eml.tpl index 68e86ddd1..cd286ecf2 100644 --- a/view/sv/smarty3/wall_received_eml.tpl +++ b/view/sv/smarty3/wall_received_eml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$username}}, + *}} +{{$username}}, '{{$from}}' har skrivit pÃ¥ din profilsida. diff --git a/view/theme/fancyred/tpl/smarty3/conv_item.tpl b/view/theme/fancyred/tpl/smarty3/conv_item.tpl index c26a05b7f..7b719fb60 100644 --- a/view/theme/fancyred/tpl/smarty3/conv_item.tpl +++ b/view/theme/fancyred/tpl/smarty3/conv_item.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{if $item.comment_firstcollapsed}} + *}} +{{if $item.comment_firstcollapsed}} <div class="hide-comments-outer"> <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span> </div> diff --git a/view/theme/fancyred/tpl/smarty3/theme_settings.tpl b/view/theme/fancyred/tpl/smarty3/theme_settings.tpl index 82e161618..3401f318b 100644 --- a/view/theme/fancyred/tpl/smarty3/theme_settings.tpl +++ b/view/theme/fancyred/tpl/smarty3/theme_settings.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{include file="field_select.tpl" field=$font_size}} + *}} +{{include file="field_select.tpl" field=$font_size}} {{include file="field_select.tpl" field=$line_height}} diff --git a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl b/view/theme/redbasic/tpl/smarty3/theme_settings.tpl index bc7c2136a..f91f24de6 100644 --- a/view/theme/redbasic/tpl/smarty3/theme_settings.tpl +++ b/view/theme/redbasic/tpl/smarty3/theme_settings.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{include file="field_select.tpl" field=$font_size}} + *}} +{{include file="field_select.tpl" field=$font_size}} {{include file="field_select.tpl" field=$line_height}} diff --git a/view/tpl/smarty3/404.tpl b/view/tpl/smarty3/404.tpl index 7ee5324ac..2d581ab8d 100644 --- a/view/tpl/smarty3/404.tpl +++ b/view/tpl/smarty3/404.tpl @@ -2,4 +2,5 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$message}}</h1> + *}} +<h1>{{$message}}</h1> diff --git a/view/tpl/smarty3/abook_edit.tpl b/view/tpl/smarty3/abook_edit.tpl index 686e50b37..1289f90fc 100644 --- a/view/tpl/smarty3/abook_edit.tpl +++ b/view/tpl/smarty3/abook_edit.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h2>{{$header}}</h2> <h3>{{$addr}}</h3> diff --git a/view/tpl/smarty3/acl_selector.tpl b/view/tpl/smarty3/acl_selector.tpl index 37f297cb9..aebef71ee 100644 --- a/view/tpl/smarty3/acl_selector.tpl +++ b/view/tpl/smarty3/acl_selector.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="acl-wrapper"> + *}} +<div id="acl-wrapper"> <input id="acl-search"> <a href="#" id="acl-showall">{{$showall}}</a> <div id="acl-list"> diff --git a/view/tpl/smarty3/admin_aside.tpl b/view/tpl/smarty3/admin_aside.tpl index d8f37a399..69445d3b1 100644 --- a/view/tpl/smarty3/admin_aside.tpl +++ b/view/tpl/smarty3/admin_aside.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<script> + *}} +<script> // update pending count // $(function(){ diff --git a/view/tpl/smarty3/admin_logs.tpl b/view/tpl/smarty3/admin_logs.tpl index ec101a0ff..6a2259500 100644 --- a/view/tpl/smarty3/admin_logs.tpl +++ b/view/tpl/smarty3/admin_logs.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id='adminpage'> + *}} +<div id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <form action="{{$baseurl}}/admin/logs" method="post"> diff --git a/view/tpl/smarty3/admin_plugins.tpl b/view/tpl/smarty3/admin_plugins.tpl index 10f04dbf8..307814e87 100644 --- a/view/tpl/smarty3/admin_plugins.tpl +++ b/view/tpl/smarty3/admin_plugins.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id='adminpage'> + *}} +<div id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <ul id='pluginslist'> diff --git a/view/tpl/smarty3/admin_plugins_details.tpl b/view/tpl/smarty3/admin_plugins_details.tpl index a2d17c897..e81701732 100644 --- a/view/tpl/smarty3/admin_plugins_details.tpl +++ b/view/tpl/smarty3/admin_plugins_details.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id='adminpage'> + *}} +<div id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <p><span class='toggleplugin icon {{$status}}'></span> {{$info.name}} - {{$info.version}} : <a href="{{$baseurl}}/admin/{{$function}}/{{$plugin}}/?a=t&t={{$form_security_token}}">{{$action}}</a></p> diff --git a/view/tpl/smarty3/admin_remoteupdate.tpl b/view/tpl/smarty3/admin_remoteupdate.tpl index e14a679d8..cee0ef9b8 100644 --- a/view/tpl/smarty3/admin_remoteupdate.tpl +++ b/view/tpl/smarty3/admin_remoteupdate.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<script src="js/jquery.htmlstream.js"></script> + *}} +<script src="js/jquery.htmlstream.js"></script> <script> /* ajax updater */ function updateEnd(data){ diff --git a/view/tpl/smarty3/admin_site.tpl b/view/tpl/smarty3/admin_site.tpl index e34cb10fc..75a386f7d 100644 --- a/view/tpl/smarty3/admin_site.tpl +++ b/view/tpl/smarty3/admin_site.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<script> + *}} +<script> $(function(){ $("#cnftheme").fancybox({ diff --git a/view/tpl/smarty3/admin_summary.tpl b/view/tpl/smarty3/admin_summary.tpl index 042cb2d70..b3b42a139 100644 --- a/view/tpl/smarty3/admin_summary.tpl +++ b/view/tpl/smarty3/admin_summary.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id='adminpage'> + *}} +<div id='adminpage'> <h1>{{$title}} - {{$page}}</h1> <dl> diff --git a/view/tpl/smarty3/admin_users.tpl b/view/tpl/smarty3/admin_users.tpl index 5c72de47e..5448a08c4 100644 --- a/view/tpl/smarty3/admin_users.tpl +++ b/view/tpl/smarty3/admin_users.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<script> + *}} +<script> function confirm_delete(uname){ return confirm( "{{$confirm_delete}}".format(uname)); } diff --git a/view/tpl/smarty3/album_edit.tpl b/view/tpl/smarty3/album_edit.tpl index 23857d05a..36c07a9f0 100644 --- a/view/tpl/smarty3/album_edit.tpl +++ b/view/tpl/smarty3/album_edit.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="photo-album-edit-wrapper"> + *}} +<div id="photo-album-edit-wrapper"> <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" > diff --git a/view/tpl/smarty3/api_config_xml.tpl b/view/tpl/smarty3/api_config_xml.tpl index 445ba7f65..09aa00ac4 100644 --- a/view/tpl/smarty3/api_config_xml.tpl +++ b/view/tpl/smarty3/api_config_xml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<config> + *}} +<config> <site> <name>{{$config.site.name}}</name> <server>{{$config.site.server}}</server> diff --git a/view/tpl/smarty3/api_friends_xml.tpl b/view/tpl/smarty3/api_friends_xml.tpl index ba4f2f406..e9c40293b 100644 --- a/view/tpl/smarty3/api_friends_xml.tpl +++ b/view/tpl/smarty3/api_friends_xml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<users type="array"> + *}} +<users type="array"> {{foreach $users as $user}} {{include file="api_user_xml.tpl"}} {{/foreach}} diff --git a/view/tpl/smarty3/api_ratelimit_xml.tpl b/view/tpl/smarty3/api_ratelimit_xml.tpl index c1a6f7bf8..a34eb6723 100644 --- a/view/tpl/smarty3/api_ratelimit_xml.tpl +++ b/view/tpl/smarty3/api_ratelimit_xml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<hash> + *}} +<hash> <remaining-hits type="integer">{{$hash.remaining_hits}}</remaining-hits> <hourly-limit type="integer">{{$hash.hourly_limit}}</hourly-limit> <reset-time type="datetime">{{$hash.reset_time}}</reset-time> diff --git a/view/tpl/smarty3/api_status_xml.tpl b/view/tpl/smarty3/api_status_xml.tpl index b6b6a5e66..e3e80d2b1 100644 --- a/view/tpl/smarty3/api_status_xml.tpl +++ b/view/tpl/smarty3/api_status_xml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<status>{{if $status}} + *}} +<status>{{if $status}} <created_at>{{$status.created_at}}</created_at> <id>{{$status.id}}</id> <text>{{$status.text}}</text> diff --git a/view/tpl/smarty3/api_test_xml.tpl b/view/tpl/smarty3/api_test_xml.tpl index 6ce7696d1..df5009af5 100644 --- a/view/tpl/smarty3/api_test_xml.tpl +++ b/view/tpl/smarty3/api_test_xml.tpl @@ -2,4 +2,5 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<ok>{{$ok}}</ok> + *}} +<ok>{{$ok}}</ok> diff --git a/view/tpl/smarty3/api_timeline_atom.tpl b/view/tpl/smarty3/api_timeline_atom.tpl index 1a6cc9ddf..00a28e390 100644 --- a/view/tpl/smarty3/api_timeline_atom.tpl +++ b/view/tpl/smarty3/api_timeline_atom.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/"> + *}} +<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:georss="http://www.georss.org/georss" xmlns:activity="http://activitystrea.ms/spec/1.0/" xmlns:media="http://purl.org/syndication/atommedia" xmlns:poco="http://portablecontacts.net/spec/1.0" xmlns:ostatus="http://ostatus.org/schema/1.0" xmlns:statusnet="http://status.net/schema/api/1/"> <generator uri="http://status.net" version="0.9.7">StatusNet</generator> <id>{{$rss.self}}</id> <title>Friendika</title> diff --git a/view/tpl/smarty3/api_timeline_rss.tpl b/view/tpl/smarty3/api_timeline_rss.tpl index 8abd7316a..afad50aab 100644 --- a/view/tpl/smarty3/api_timeline_rss.tpl +++ b/view/tpl/smarty3/api_timeline_rss.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com"> + *}} +<rss xmlns:atom="http://www.w3.org/2005/Atom" version="2.0" xmlns:georss="http://www.georss.org/georss" xmlns:twitter="http://api.twitter.com"> <channel> <title>Friendika</title> <link>{{$rss.alternate}}</link> diff --git a/view/tpl/smarty3/api_timeline_xml.tpl b/view/tpl/smarty3/api_timeline_xml.tpl index 9b4239e2b..84148d17f 100644 --- a/view/tpl/smarty3/api_timeline_xml.tpl +++ b/view/tpl/smarty3/api_timeline_xml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/"> + *}} +<statuses type="array" xmlns:statusnet="http://status.net/schema/api/1/"> {{foreach $statuses as $status}} <status> <text>{{$status.text}}</text> <truncated>{{$status.truncated}}</truncated> diff --git a/view/tpl/smarty3/api_user_xml.tpl b/view/tpl/smarty3/api_user_xml.tpl index ed6c65511..d7efcf3fb 100644 --- a/view/tpl/smarty3/api_user_xml.tpl +++ b/view/tpl/smarty3/api_user_xml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} <user> + *}} + <user> <id>{{$user.id}}</id> <name>{{$user.name}}</name> <screen_name>{{$user.screen_name}}</screen_name> diff --git a/view/tpl/smarty3/apps.tpl b/view/tpl/smarty3/apps.tpl index 09c3d0c70..01d9bb8c8 100644 --- a/view/tpl/smarty3/apps.tpl +++ b/view/tpl/smarty3/apps.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$title}}</h3> + *}} +<h3>{{$title}}</h3> <ul> {{foreach $apps as $ap}} diff --git a/view/tpl/smarty3/atom_feed.tpl b/view/tpl/smarty3/atom_feed.tpl index 6a174eb36..db553d99f 100644 --- a/view/tpl/smarty3/atom_feed.tpl +++ b/view/tpl/smarty3/atom_feed.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version="1.0" encoding="utf-8" ?> + *}} +<?xml version="1.0" encoding="utf-8" ?> <feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:at="http://purl.org/atompub/tombstones/1.0" diff --git a/view/tpl/smarty3/atom_feed_dfrn.tpl b/view/tpl/smarty3/atom_feed_dfrn.tpl index 8c363114c..87d78a518 100644 --- a/view/tpl/smarty3/atom_feed_dfrn.tpl +++ b/view/tpl/smarty3/atom_feed_dfrn.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version="1.0" encoding="utf-8" ?> + *}} +<?xml version="1.0" encoding="utf-8" ?> <feed xmlns="http://www.w3.org/2005/Atom" xmlns:thr="http://purl.org/syndication/thread/1.0" xmlns:at="http://purl.org/atompub/tombstones/1.0" diff --git a/view/tpl/smarty3/atom_mail.tpl b/view/tpl/smarty3/atom_mail.tpl index e3c6bec8c..adf75a3e7 100644 --- a/view/tpl/smarty3/atom_mail.tpl +++ b/view/tpl/smarty3/atom_mail.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <dfrn:mail> <dfrn:sender> diff --git a/view/tpl/smarty3/atom_suggest.tpl b/view/tpl/smarty3/atom_suggest.tpl index 52b0caf6e..c0d1a1b3c 100644 --- a/view/tpl/smarty3/atom_suggest.tpl +++ b/view/tpl/smarty3/atom_suggest.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <dfrn:suggest> <dfrn:url>{{$url}}</dfrn:url> diff --git a/view/tpl/smarty3/auto_request.tpl b/view/tpl/smarty3/auto_request.tpl index 046dc7b28..662ca2447 100644 --- a/view/tpl/smarty3/auto_request.tpl +++ b/view/tpl/smarty3/auto_request.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h1>{{$header}}</h1> <p id="dfrn-request-intro"> diff --git a/view/tpl/smarty3/birthdays_reminder.tpl b/view/tpl/smarty3/birthdays_reminder.tpl index 164b44d6f..56749cd12 100644 --- a/view/tpl/smarty3/birthdays_reminder.tpl +++ b/view/tpl/smarty3/birthdays_reminder.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{if $count}} + *}} +{{if $count}} <div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div> <div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div> <div id="birthday-title-end"></div> diff --git a/view/tpl/smarty3/build_query.tpl b/view/tpl/smarty3/build_query.tpl index 21578d8a5..5520fb5b9 100644 --- a/view/tpl/smarty3/build_query.tpl +++ b/view/tpl/smarty3/build_query.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<script> + *}} +<script> var bParam_cmd = "{{$baseurl}}/update_{{$pgtype}}"; diff --git a/view/tpl/smarty3/categories_widget.tpl b/view/tpl/smarty3/categories_widget.tpl index b6b17daa1..75da9fc43 100644 --- a/view/tpl/smarty3/categories_widget.tpl +++ b/view/tpl/smarty3/categories_widget.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="categories-sidebar" class="widget"> + *}} +<div id="categories-sidebar" class="widget"> <h3>{{$title}}</h3> <div id="categories-sidebar-desc">{{$desc}}</div> diff --git a/view/tpl/smarty3/channel.tpl b/view/tpl/smarty3/channel.tpl index 15a1c0d5b..b49cf19cc 100644 --- a/view/tpl/smarty3/channel.tpl +++ b/view/tpl/smarty3/channel.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="channel-selection"> + *}} +<div class="channel-selection"> {{if $channel.default_links}} {{if $channel.default}} <div class="channel-selection-default default">{{$msg_default}}</div> diff --git a/view/tpl/smarty3/channels.tpl b/view/tpl/smarty3/channels.tpl index ab15c0001..cfb66401b 100644 --- a/view/tpl/smarty3/channels.tpl +++ b/view/tpl/smarty3/channels.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$header}}</h3> + *}} +<h3>{{$header}}</h3> {{if $links}} diff --git a/view/tpl/smarty3/chanview.tpl b/view/tpl/smarty3/chanview.tpl index 639d863b4..a0376c40d 100644 --- a/view/tpl/smarty3/chanview.tpl +++ b/view/tpl/smarty3/chanview.tpl @@ -2,4 +2,5 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe> + *}} +<iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe> diff --git a/view/tpl/smarty3/comment_item.tpl b/view/tpl/smarty3/comment_item.tpl index 578a14898..cde6466f0 100644 --- a/view/tpl/smarty3/comment_item.tpl +++ b/view/tpl/smarty3/comment_item.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} {{if $threaded}} + *}} + {{if $threaded}} <div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;"> {{else}} <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> diff --git a/view/tpl/smarty3/common_friends.tpl b/view/tpl/smarty3/common_friends.tpl index 603ee01f1..499cfe626 100644 --- a/view/tpl/smarty3/common_friends.tpl +++ b/view/tpl/smarty3/common_friends.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="profile-match-wrapper"> + *}} +<div class="profile-match-wrapper"> <div class="profile-match-photo"> <a href="{{$url}}"> <img src="{{$photo}}" alt="{{$name}}" width="80" height="80" title="{{$name}} [{{$url}}]" /> diff --git a/view/tpl/smarty3/common_tabs.tpl b/view/tpl/smarty3/common_tabs.tpl index a3ff2b08f..07c501499 100644 --- a/view/tpl/smarty3/common_tabs.tpl +++ b/view/tpl/smarty3/common_tabs.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<ul class="tabs"> + *}} +<ul class="tabs"> {{foreach $tabs as $tab}} <li {{if $tab.id}}id="{{$tab.id}}"{{/if}}><a href="{{$tab.url}}" class="tab button {{$tab.sel}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li> {{/foreach}} diff --git a/view/tpl/smarty3/contact_block.tpl b/view/tpl/smarty3/contact_block.tpl index 18f606428..0610b3c3f 100644 --- a/view/tpl/smarty3/contact_block.tpl +++ b/view/tpl/smarty3/contact_block.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="contact-block"> + *}} +<div id="contact-block"> <div id="contact-block-numcontacts">{{$contacts}}</div> {{if $micropro}} <a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a> diff --git a/view/tpl/smarty3/contact_edit.tpl b/view/tpl/smarty3/contact_edit.tpl index a44ae2640..28d067af1 100644 --- a/view/tpl/smarty3/contact_edit.tpl +++ b/view/tpl/smarty3/contact_edit.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h2>{{$header}}</h2> <div id="contact-edit-wrapper" > diff --git a/view/tpl/smarty3/contact_head.tpl b/view/tpl/smarty3/contact_head.tpl index 0245d3d37..27bc286b1 100644 --- a/view/tpl/smarty3/contact_head.tpl +++ b/view/tpl/smarty3/contact_head.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<script language="javascript" type="text/javascript" + *}} +<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> diff --git a/view/tpl/smarty3/contact_slider.tpl b/view/tpl/smarty3/contact_slider.tpl index 5885b4d5b..80fa6f056 100644 --- a/view/tpl/smarty3/contact_slider.tpl +++ b/view/tpl/smarty3/contact_slider.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> + *}} +<div id="contact-slider" class="slider" style="height: 32px; position: relative; left: 5%; width: 90%;"><input id="contact-range" type="text" name="fake-closeness" value="{{$val}}" /></div> <script> $("#contact-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { $("#contact-closeness-mirror").val(v); } }); </script> diff --git a/view/tpl/smarty3/contact_template.tpl b/view/tpl/smarty3/contact_template.tpl index e06083fcb..a426508eb 100644 --- a/view/tpl/smarty3/contact_template.tpl +++ b/view/tpl/smarty3/contact_template.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div class="contact-entry-wrapper" id="contact-entry-wrapper-{{$contact.id}}" > <div class="contact-entry-photo-wrapper" > <a href="{{$contact.edit}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" alt="{{$contact.name}}" /></a> diff --git a/view/tpl/smarty3/contacts-template.tpl b/view/tpl/smarty3/contacts-template.tpl index 0f7b6bc77..66f3f5c87 100644 --- a/view/tpl/smarty3/contacts-template.tpl +++ b/view/tpl/smarty3/contacts-template.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> + *}} +<h1>{{$header}}{{if $total}} ({{$total}}){{/if}}</h1> {{if $finding}}<h4>{{$finding}}</h4>{{/if}} diff --git a/view/tpl/smarty3/content.tpl b/view/tpl/smarty3/content.tpl index c29375342..811f92dd5 100644 --- a/view/tpl/smarty3/content.tpl +++ b/view/tpl/smarty3/content.tpl @@ -2,5 +2,6 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="content-begin"></div> + *}} +<div id="content-begin"></div> <div id="content-end"></div> diff --git a/view/tpl/smarty3/conv.tpl b/view/tpl/smarty3/conv.tpl index 431c09119..c91ab635a 100644 --- a/view/tpl/smarty3/conv.tpl +++ b/view/tpl/smarty3/conv.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{foreach $threads as $thread}} + *}} +{{foreach $threads as $thread}} <div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper"> {{foreach $thread.items as $item}} {{if $item.comment_firstcollapsed}} diff --git a/view/tpl/smarty3/conv_frame.tpl b/view/tpl/smarty3/conv_frame.tpl index 723858771..81d655be2 100644 --- a/view/tpl/smarty3/conv_frame.tpl +++ b/view/tpl/smarty3/conv_frame.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="threads-begin"></div> + *}} +<div id="threads-begin"></div> <div id="threads-end"></div> <div id="conversation-end"></div> diff --git a/view/tpl/smarty3/conv_item.tpl b/view/tpl/smarty3/conv_item.tpl index 4b7a94f35..37baa81bf 100644 --- a/view/tpl/smarty3/conv_item.tpl +++ b/view/tpl/smarty3/conv_item.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{if $item.comment_firstcollapsed}} + *}} +{{if $item.comment_firstcollapsed}} <div class="hide-comments-outer"> <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span> </div> diff --git a/view/tpl/smarty3/conversation.tpl b/view/tpl/smarty3/conversation.tpl index cf70fd042..837fbc11f 100644 --- a/view/tpl/smarty3/conversation.tpl +++ b/view/tpl/smarty3/conversation.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="threads-begin"></div> + *}} +<div id="threads-begin"></div> {{foreach $threads as $thread}} <div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper"> {{foreach $thread.items as $item}} diff --git a/view/tpl/smarty3/convobj.tpl b/view/tpl/smarty3/convobj.tpl index 9b9165673..2a714c100 100644 --- a/view/tpl/smarty3/convobj.tpl +++ b/view/tpl/smarty3/convobj.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{foreach $threads as $item}} + *}} +{{foreach $threads as $item}} {{include file="{{$item.template}}"}} {{/foreach}} diff --git a/view/tpl/smarty3/crepair.tpl b/view/tpl/smarty3/crepair.tpl index 275dca4af..8d3ed7df8 100644 --- a/view/tpl/smarty3/crepair.tpl +++ b/view/tpl/smarty3/crepair.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" > <h4>{{$contact_name}}</h4> diff --git a/view/tpl/smarty3/cropbody.tpl b/view/tpl/smarty3/cropbody.tpl index a0c24f7b2..e6fcd355f 100644 --- a/view/tpl/smarty3/cropbody.tpl +++ b/view/tpl/smarty3/cropbody.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <p id="cropimage-desc"> {{$desc}} </p> diff --git a/view/tpl/smarty3/crophead.tpl b/view/tpl/smarty3/crophead.tpl index 068c811d5..d51b87d12 100644 --- a/view/tpl/smarty3/crophead.tpl +++ b/view/tpl/smarty3/crophead.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script> + *}} + <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script> <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script> <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script> <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" /> diff --git a/view/tpl/smarty3/delegate.tpl b/view/tpl/smarty3/delegate.tpl index a6b365f54..7aa85cf39 100644 --- a/view/tpl/smarty3/delegate.tpl +++ b/view/tpl/smarty3/delegate.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$header}}</h3> + *}} +<h3>{{$header}}</h3> <div id="delegate-desc" class="delegate-desc">{{$desc}}</div> diff --git a/view/tpl/smarty3/dfrn_req_confirm.tpl b/view/tpl/smarty3/dfrn_req_confirm.tpl index 195f55d78..c941a201d 100644 --- a/view/tpl/smarty3/dfrn_req_confirm.tpl +++ b/view/tpl/smarty3/dfrn_req_confirm.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <p id="dfrn-request-homecoming" > {{$welcome}} <br /> diff --git a/view/tpl/smarty3/dfrn_request.tpl b/view/tpl/smarty3/dfrn_request.tpl index 839301956..b08a0b731 100644 --- a/view/tpl/smarty3/dfrn_request.tpl +++ b/view/tpl/smarty3/dfrn_request.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h1>{{$header}}</h1> <p id="dfrn-request-intro"> diff --git a/view/tpl/smarty3/diasp_dec_hdr.tpl b/view/tpl/smarty3/diasp_dec_hdr.tpl index 2343bdc86..c3305ecd0 100644 --- a/view/tpl/smarty3/diasp_dec_hdr.tpl +++ b/view/tpl/smarty3/diasp_dec_hdr.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<decrypted_hdeader> + *}} +<decrypted_hdeader> <iv>{{$inner_iv}}</iv> <aes_key>{{$inner_key}}</aes_key> <author> diff --git a/view/tpl/smarty3/directory_header.tpl b/view/tpl/smarty3/directory_header.tpl index 057bad685..293e65be2 100644 --- a/view/tpl/smarty3/directory_header.tpl +++ b/view/tpl/smarty3/directory_header.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$dirlbl}}</h1> + *}} +<h1>{{$dirlbl}}</h1> {{if $search}} <h4>{{$finddsc}} {{$safetxt}}</h4> diff --git a/view/tpl/smarty3/directory_item.tpl b/view/tpl/smarty3/directory_item.tpl index d9a4225f9..ae52646b8 100644 --- a/view/tpl/smarty3/directory_item.tpl +++ b/view/tpl/smarty3/directory_item.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div class="directory-item lframe" id="directory-item-{{$id}}" > <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > <div class="contact-photo" id="directory-photo-{{$id}}" > diff --git a/view/tpl/smarty3/direntry.tpl b/view/tpl/smarty3/direntry.tpl index 85696098b..c1009efc7 100644 --- a/view/tpl/smarty3/direntry.tpl +++ b/view/tpl/smarty3/direntry.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div class="directory-item lframe" id="directory-item-{{$entry.id}}" > <div class="contact-photo-wrapper" id="directory-photo-wrapper-{{$entry.id}}" > <div class="contact-photo" id="directory-photo-{{$entry.id}}" > diff --git a/view/tpl/smarty3/display-head.tpl b/view/tpl/smarty3/display-head.tpl index aaa105fa8..7750b655e 100644 --- a/view/tpl/smarty3/display-head.tpl +++ b/view/tpl/smarty3/display-head.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<script> + *}} +<script> $(document).ready(function() { $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); // make auto-complete work in more places diff --git a/view/tpl/smarty3/edpost_head.tpl b/view/tpl/smarty3/edpost_head.tpl index b518ca488..2bf28002d 100644 --- a/view/tpl/smarty3/edpost_head.tpl +++ b/view/tpl/smarty3/edpost_head.tpl @@ -2,4 +2,5 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h2>{{$title}}</h2> + *}} +<h2>{{$title}}</h2> diff --git a/view/tpl/smarty3/email_notify_html.tpl b/view/tpl/smarty3/email_notify_html.tpl index 6631e5ea3..47b476688 100644 --- a/view/tpl/smarty3/email_notify_html.tpl +++ b/view/tpl/smarty3/email_notify_html.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> + *}} +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN"> <html> <head> <title>{{$banner}}</title> diff --git a/view/tpl/smarty3/email_notify_text.tpl b/view/tpl/smarty3/email_notify_text.tpl index 6b307ab40..e164f3023 100644 --- a/view/tpl/smarty3/email_notify_text.tpl +++ b/view/tpl/smarty3/email_notify_text.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + {{$preamble}} {{$title}} diff --git a/view/tpl/smarty3/event.tpl b/view/tpl/smarty3/event.tpl index ace0701e5..1ba472377 100644 --- a/view/tpl/smarty3/event.tpl +++ b/view/tpl/smarty3/event.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{foreach $events as $event}} + *}} +{{foreach $events as $event}} <div class="event"> {{if $event.item.author-name}}<a href="{{$event.item.author-link}}" ><img src="{{$event.item.author-avatar}}" height="32" width="32" />{{$event.item.author-name}}</a>{{/if}} diff --git a/view/tpl/smarty3/event_form.tpl b/view/tpl/smarty3/event_form.tpl index 5c8500414..335a9480b 100644 --- a/view/tpl/smarty3/event_form.tpl +++ b/view/tpl/smarty3/event_form.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$title}}</h3> + *}} +<h3>{{$title}}</h3> <p> {{$desc}} diff --git a/view/tpl/smarty3/event_head.tpl b/view/tpl/smarty3/event_head.tpl index 5caa80ba6..32288b7ad 100644 --- a/view/tpl/smarty3/event_head.tpl +++ b/view/tpl/smarty3/event_head.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' /> + *}} +<link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' /> <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script> diff --git a/view/tpl/smarty3/events-js.tpl b/view/tpl/smarty3/events-js.tpl index f7f69d532..5fa046f5a 100644 --- a/view/tpl/smarty3/events-js.tpl +++ b/view/tpl/smarty3/events-js.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$tabs}} + *}} +{{$tabs}} <h2>{{$title}}</h2> <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> diff --git a/view/tpl/smarty3/events.tpl b/view/tpl/smarty3/events.tpl index ff9e58aab..45366a77d 100644 --- a/view/tpl/smarty3/events.tpl +++ b/view/tpl/smarty3/events.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$tabs}} + *}} +{{$tabs}} <h2>{{$title}}</h2> <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> diff --git a/view/tpl/smarty3/events_reminder.tpl b/view/tpl/smarty3/events_reminder.tpl index 5478e3e11..d8e8ceb2a 100644 --- a/view/tpl/smarty3/events_reminder.tpl +++ b/view/tpl/smarty3/events_reminder.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{if $count}} + *}} +{{if $count}} <div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div> <div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div> <div id="event-title-end"></div> diff --git a/view/tpl/smarty3/failed_updates.tpl b/view/tpl/smarty3/failed_updates.tpl index fb5cccaaa..8161ff2ef 100644 --- a/view/tpl/smarty3/failed_updates.tpl +++ b/view/tpl/smarty3/failed_updates.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h2>{{$banner}}</h2> + *}} +<h2>{{$banner}}</h2> <div id="failed_updates_desc">{{$desc}}</div> diff --git a/view/tpl/smarty3/fake_feed.tpl b/view/tpl/smarty3/fake_feed.tpl index 32d94308d..fd875de71 100644 --- a/view/tpl/smarty3/fake_feed.tpl +++ b/view/tpl/smarty3/fake_feed.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version="1.0" encoding="utf-8" ?> + *}} +<?xml version="1.0" encoding="utf-8" ?> <feed xmlns="http://www.w3.org/2005/Atom" > <id>fake feed</id> diff --git a/view/tpl/smarty3/field.tpl b/view/tpl/smarty3/field.tpl index ec4d6463a..1bf36d84e 100644 --- a/view/tpl/smarty3/field.tpl +++ b/view/tpl/smarty3/field.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + {{if $field.0==select}} {{include file="field_select.tpl"}} {{/if}} diff --git a/view/tpl/smarty3/field_acheckbox.tpl b/view/tpl/smarty3/field_acheckbox.tpl index c45005db8..da0d44ea6 100644 --- a/view/tpl/smarty3/field_acheckbox.tpl +++ b/view/tpl/smarty3/field_acheckbox.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field acheckbox'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input type="checkbox" class="abook-edit-them" name='{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} /> diff --git a/view/tpl/smarty3/field_checkbox.tpl b/view/tpl/smarty3/field_checkbox.tpl index e214bb87d..a4ec3dbba 100644 --- a/view/tpl/smarty3/field_checkbox.tpl +++ b/view/tpl/smarty3/field_checkbox.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field checkbox'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="1" {{if $field.2}}checked="checked"{{/if}}> diff --git a/view/tpl/smarty3/field_combobox.tpl b/view/tpl/smarty3/field_combobox.tpl index 3590e7a1d..d3cc75635 100644 --- a/view/tpl/smarty3/field_combobox.tpl +++ b/view/tpl/smarty3/field_combobox.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field combobox'> <label for='id_{{$field.0}}' id='id_{{$field.0}}_label'>{{$field.1}}</label> {{* html5 don't work on Chrome, Safari and IE9 diff --git a/view/tpl/smarty3/field_custom.tpl b/view/tpl/smarty3/field_custom.tpl index a59db7b2a..c2d73275c 100644 --- a/view/tpl/smarty3/field_custom.tpl +++ b/view/tpl/smarty3/field_custom.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field custom'> <label for='{{$field.0}}'>{{$field.1}}</label> {{$field.2}} diff --git a/view/tpl/smarty3/field_input.tpl b/view/tpl/smarty3/field_input.tpl index 2dd452eff..696ebbad7 100644 --- a/view/tpl/smarty3/field_input.tpl +++ b/view/tpl/smarty3/field_input.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field input'> <label for='id_{{$field.0}}' id='label_{{$field.0}}'>{{$field.1}}</label> <input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> diff --git a/view/tpl/smarty3/field_intcheckbox.tpl b/view/tpl/smarty3/field_intcheckbox.tpl index 1e11677cd..54967feab 100644 --- a/view/tpl/smarty3/field_intcheckbox.tpl +++ b/view/tpl/smarty3/field_intcheckbox.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field checkbox'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}}> diff --git a/view/tpl/smarty3/field_openid.tpl b/view/tpl/smarty3/field_openid.tpl index 2040515ee..b00ddabcd 100644 --- a/view/tpl/smarty3/field_openid.tpl +++ b/view/tpl/smarty3/field_openid.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field input openid'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> diff --git a/view/tpl/smarty3/field_password.tpl b/view/tpl/smarty3/field_password.tpl index 71effbb35..5889d2e9c 100644 --- a/view/tpl/smarty3/field_password.tpl +++ b/view/tpl/smarty3/field_password.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field password'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> diff --git a/view/tpl/smarty3/field_radio.tpl b/view/tpl/smarty3/field_radio.tpl index 8ac6b17b2..1d7b56ec6 100644 --- a/view/tpl/smarty3/field_radio.tpl +++ b/view/tpl/smarty3/field_radio.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field radio'> <label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label> <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked="true"{{/if}}> diff --git a/view/tpl/smarty3/field_richtext.tpl b/view/tpl/smarty3/field_richtext.tpl index 5bfc6c84e..38992f0f8 100644 --- a/view/tpl/smarty3/field_richtext.tpl +++ b/view/tpl/smarty3/field_richtext.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field richtext'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext">{{$field.2}}</textarea> diff --git a/view/tpl/smarty3/field_select.tpl b/view/tpl/smarty3/field_select.tpl index 884a51e2f..2a4117a70 100644 --- a/view/tpl/smarty3/field_select.tpl +++ b/view/tpl/smarty3/field_select.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}'> diff --git a/view/tpl/smarty3/field_select_raw.tpl b/view/tpl/smarty3/field_select_raw.tpl index 1221ccfba..50e34985f 100644 --- a/view/tpl/smarty3/field_select_raw.tpl +++ b/view/tpl/smarty3/field_select_raw.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}'> diff --git a/view/tpl/smarty3/field_textarea.tpl b/view/tpl/smarty3/field_textarea.tpl index 8fe8dd83e..5d71999d4 100644 --- a/view/tpl/smarty3/field_textarea.tpl +++ b/view/tpl/smarty3/field_textarea.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} + *}} + <div class='field textarea'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <textarea name='{{$field.0}}' id='id_{{$field.0}}'>{{$field.2}}</textarea> diff --git a/view/tpl/smarty3/field_themeselect.tpl b/view/tpl/smarty3/field_themeselect.tpl index c89295cc4..be24ff2c6 100644 --- a/view/tpl/smarty3/field_themeselect.tpl +++ b/view/tpl/smarty3/field_themeselect.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} <script>$(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> + *}} + <script>$(function(){ previewTheme($("#id_{{$field.0}}")[0]); });</script> <div class='field select'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5=='preview'}}onchange="previewTheme(this);"{{/if}} > diff --git a/view/tpl/smarty3/field_yesno.tpl b/view/tpl/smarty3/field_yesno.tpl index 71a757929..e982c2f05 100644 --- a/view/tpl/smarty3/field_yesno.tpl +++ b/view/tpl/smarty3/field_yesno.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} <div class='field yesno'> + *}} + <div class='field yesno'> <label for='id_{{$field.0}}'>{{$field.1}}</label> <div class='onoff' id="id_{{$field.0}}_onoff"> <input type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"> diff --git a/view/tpl/smarty3/fileas_widget.tpl b/view/tpl/smarty3/fileas_widget.tpl index 5a1e57a84..f03f169a2 100644 --- a/view/tpl/smarty3/fileas_widget.tpl +++ b/view/tpl/smarty3/fileas_widget.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="fileas-sidebar" class="widget"> + *}} +<div id="fileas-sidebar" class="widget"> <h3>{{$title}}</h3> <div id="nets-desc">{{$desc}}</div> diff --git a/view/tpl/smarty3/filebrowser.tpl b/view/tpl/smarty3/filebrowser.tpl index 706cd07b6..b408ca687 100644 --- a/view/tpl/smarty3/filebrowser.tpl +++ b/view/tpl/smarty3/filebrowser.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<!DOCTYPE html> + *}} +<!DOCTYPE html> <html> <head> <script type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script> diff --git a/view/tpl/smarty3/filer_dialog.tpl b/view/tpl/smarty3/filer_dialog.tpl index 8e4b42ce3..f17a06766 100644 --- a/view/tpl/smarty3/filer_dialog.tpl +++ b/view/tpl/smarty3/filer_dialog.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{include file="field_combobox.tpl"}} + *}} +{{include file="field_combobox.tpl"}} <div class="settings-submit-wrapper" > <input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" /> </div> diff --git a/view/tpl/smarty3/follow.tpl b/view/tpl/smarty3/follow.tpl index 3217da5cc..2c3b451b3 100644 --- a/view/tpl/smarty3/follow.tpl +++ b/view/tpl/smarty3/follow.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="follow-sidebar" class="widget"> + *}} +<div id="follow-sidebar" class="widget"> <h3>{{$connect}}</h3> <div id="connect-desc">{{$desc}}</div> <form action="follow" method="post" /> diff --git a/view/tpl/smarty3/follow_slap.tpl b/view/tpl/smarty3/follow_slap.tpl index a57c26a17..b31b4ef95 100644 --- a/view/tpl/smarty3/follow_slap.tpl +++ b/view/tpl/smarty3/follow_slap.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} <entry> + *}} + <entry> <author> <name>{{$name}}</name> <uri>{{$profile_page}}</uri> diff --git a/view/tpl/smarty3/generic_links_widget.tpl b/view/tpl/smarty3/generic_links_widget.tpl index 678db38ec..c12273c7b 100644 --- a/view/tpl/smarty3/generic_links_widget.tpl +++ b/view/tpl/smarty3/generic_links_widget.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="widget{{if $class}} {{$class}}{{/if}}"> + *}} +<div class="widget{{if $class}} {{$class}}{{/if}}"> {{if $title}}<h3>{{$title}}</h3>{{/if}} {{if $desc}}<div class="desc">{{$desc}}</div>{{/if}} diff --git a/view/tpl/smarty3/group_drop.tpl b/view/tpl/smarty3/group_drop.tpl index 5ae49fc61..84d380e30 100644 --- a/view/tpl/smarty3/group_drop.tpl +++ b/view/tpl/smarty3/group_drop.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" > + *}} +<div class="group-delete-wrapper button" id="group-delete-wrapper-{{$id}}" > <a href="group/drop/{{$id}}?t={{$form_security_token}}" onclick="return confirmDelete();" id="group-delete-icon-{{$id}}" diff --git a/view/tpl/smarty3/group_edit.tpl b/view/tpl/smarty3/group_edit.tpl index 1b068f93f..b7b14eba3 100644 --- a/view/tpl/smarty3/group_edit.tpl +++ b/view/tpl/smarty3/group_edit.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h2>{{$title}}</h2> + *}} +<h2>{{$title}}</h2> <div id="group-edit-wrapper" > diff --git a/view/tpl/smarty3/group_selection.tpl b/view/tpl/smarty3/group_selection.tpl index 6c50dbf9f..f16bb5159 100644 --- a/view/tpl/smarty3/group_selection.tpl +++ b/view/tpl/smarty3/group_selection.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="field custom"> + *}} +<div class="field custom"> <label for="group-selection" id="group-selection-lbl">{{$label}}</label> <select name="group-selection" id="group-selection" > {{foreach $groups as $group}} diff --git a/view/tpl/smarty3/group_side.tpl b/view/tpl/smarty3/group_side.tpl index 8a31224d4..b6532fb6d 100644 --- a/view/tpl/smarty3/group_side.tpl +++ b/view/tpl/smarty3/group_side.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="widget" id="group-sidebar"> + *}} +<div class="widget" id="group-sidebar"> <h3>{{$title}}</h3> <div id="sidebar-group-list"> diff --git a/view/tpl/smarty3/groupeditor.tpl b/view/tpl/smarty3/groupeditor.tpl index 894b19602..4fad30d5a 100644 --- a/view/tpl/smarty3/groupeditor.tpl +++ b/view/tpl/smarty3/groupeditor.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="group"> + *}} +<div id="group"> <h3>{{$groupeditor.label_members}}</h3> <div id="group-members" class="contact_list"> {{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}} diff --git a/view/tpl/smarty3/head.tpl b/view/tpl/smarty3/head.tpl index 18bb1882f..314d159d6 100644 --- a/view/tpl/smarty3/head.tpl +++ b/view/tpl/smarty3/head.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> + *}} +<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> <meta name="generator" content="{{$generator}}" /> diff --git a/view/tpl/smarty3/hide_comments.tpl b/view/tpl/smarty3/hide_comments.tpl index d0e45d4db..50a354122 100644 --- a/view/tpl/smarty3/hide_comments.tpl +++ b/view/tpl/smarty3/hide_comments.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="hide-comments-outer"> + *}} +<div class="hide-comments-outer"> <span id="hide-comments-total-{{$id}}" class="hide-comments-total">{{$num_comments}}</span> <span id="hide-comments-{{$id}}" class="hide-comments fakelink" onclick="showHideComments({{$id}});">{{$hide_text}}</span> </div> <div id="collapsed-comments-{{$id}}" class="collapsed-comments" style="display: {{$display}};"> diff --git a/view/tpl/smarty3/install.tpl b/view/tpl/smarty3/install.tpl index af206467a..cfb90e61f 100644 --- a/view/tpl/smarty3/install.tpl +++ b/view/tpl/smarty3/install.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h1>{{$title}}</h1> <h2>{{$pass}}</h2> diff --git a/view/tpl/smarty3/install_checks.tpl b/view/tpl/smarty3/install_checks.tpl index ed7d27757..9d5ce0eeb 100644 --- a/view/tpl/smarty3/install_checks.tpl +++ b/view/tpl/smarty3/install_checks.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <h2>{{$pass}}</h2> <form action="{{$baseurl}}/index.php?q=setup" method="post"> <table> diff --git a/view/tpl/smarty3/install_db.tpl b/view/tpl/smarty3/install_db.tpl index fede33a80..fe8aee85b 100644 --- a/view/tpl/smarty3/install_db.tpl +++ b/view/tpl/smarty3/install_db.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h1>{{$title}}</h1> <h2>{{$pass}}</h2> diff --git a/view/tpl/smarty3/install_settings.tpl b/view/tpl/smarty3/install_settings.tpl index 0b4c54284..f91122737 100644 --- a/view/tpl/smarty3/install_settings.tpl +++ b/view/tpl/smarty3/install_settings.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h1>{{$title}}</h1> <h2>{{$pass}}</h2> diff --git a/view/tpl/smarty3/intros.tpl b/view/tpl/smarty3/intros.tpl index fc240d3e3..4fd27d370 100644 --- a/view/tpl/smarty3/intros.tpl +++ b/view/tpl/smarty3/intros.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div class="intro-wrapper" id="intro-{{$contact_id}}" > <div class="intro-fullname" id="intro-fullname-{{$contact_id}}" >{{$fullname}}</div> diff --git a/view/tpl/smarty3/intros_header.tpl b/view/tpl/smarty3/intros_header.tpl index c9adc1473..2dbf065d7 100644 --- a/view/tpl/smarty3/intros_header.tpl +++ b/view/tpl/smarty3/intros_header.tpl @@ -2,4 +2,5 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$title}}</h3> + *}} +<h3>{{$title}}</h3> diff --git a/view/tpl/smarty3/invite.tpl b/view/tpl/smarty3/invite.tpl index d1f94560a..a47ee639b 100644 --- a/view/tpl/smarty3/invite.tpl +++ b/view/tpl/smarty3/invite.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<form action="invite" method="post" id="invite-form" > + *}} +<form action="invite" method="post" id="invite-form" > <div id="invite-wrapper"> <h3>{{$invite}}</h3> diff --git a/view/tpl/smarty3/jot-header.tpl b/view/tpl/smarty3/jot-header.tpl index 8659b4fe1..4563c195b 100644 --- a/view/tpl/smarty3/jot-header.tpl +++ b/view/tpl/smarty3/jot-header.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <script language="javascript" type="text/javascript"> var editor=false; diff --git a/view/tpl/smarty3/jot.tpl b/view/tpl/smarty3/jot.tpl index 0ec7728fa..87e00413c 100644 --- a/view/tpl/smarty3/jot.tpl +++ b/view/tpl/smarty3/jot.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div id="profile-jot-wrapper" > <div id="profile-jot-banner-wrapper"> <div id="profile-jot-desc" > </div> diff --git a/view/tpl/smarty3/jot_geotag.tpl b/view/tpl/smarty3/jot_geotag.tpl index 196ede81d..1ed2367aa 100644 --- a/view/tpl/smarty3/jot_geotag.tpl +++ b/view/tpl/smarty3/jot_geotag.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + if(navigator.geolocation) { navigator.geolocation.getCurrentPosition(function(position) { $('#jot-coord').val(position.coords.latitude + ' ' + position.coords.longitude); diff --git a/view/tpl/smarty3/js_strings.tpl b/view/tpl/smarty3/js_strings.tpl index acdc95a1e..34337e5bb 100644 --- a/view/tpl/smarty3/js_strings.tpl +++ b/view/tpl/smarty3/js_strings.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <script> var aStr = { diff --git a/view/tpl/smarty3/lang_selector.tpl b/view/tpl/smarty3/lang_selector.tpl index f27838785..a1aee8277 100644 --- a/view/tpl/smarty3/lang_selector.tpl +++ b/view/tpl/smarty3/lang_selector.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div> + *}} +<div id="lang-select-icon" class="icon s22 language" title="{{$title}}" onclick="openClose('language-selector');" ></div> <div id="language-selector" style="display: none;" > <form action="#" method="post" > <select name="system_language" onchange="this.form.submit();" > diff --git a/view/tpl/smarty3/like_noshare.tpl b/view/tpl/smarty3/like_noshare.tpl index ef97eceec..b8258d64a 100644 --- a/view/tpl/smarty3/like_noshare.tpl +++ b/view/tpl/smarty3/like_noshare.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}"> + *}} +<div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}"> <a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a> <a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a> <img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> diff --git a/view/tpl/smarty3/login.tpl b/view/tpl/smarty3/login.tpl index 393c08e2f..e530429b2 100644 --- a/view/tpl/smarty3/login.tpl +++ b/view/tpl/smarty3/login.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <form action="{{$dest_url}}" id="{{$form_id}}" method="post" > <input type="hidden" name="auth-params" value="login" /> diff --git a/view/tpl/smarty3/logout.tpl b/view/tpl/smarty3/logout.tpl index 8174f416c..582d77ed6 100644 --- a/view/tpl/smarty3/logout.tpl +++ b/view/tpl/smarty3/logout.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<form action="{{$dest_url}}" method="post" > + *}} +<form action="{{$dest_url}}" method="post" > <div class="logout-wrapper"> <input type="hidden" name="auth-params" value="logout" /> <input type="submit" name="submit" id="logout-button" value="{{$logout}}" /> diff --git a/view/tpl/smarty3/lostpass.tpl b/view/tpl/smarty3/lostpass.tpl index 91b19dd72..0e437ca48 100644 --- a/view/tpl/smarty3/lostpass.tpl +++ b/view/tpl/smarty3/lostpass.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$title}}</h3> + *}} +<h3>{{$title}}</h3> <p id="lostpass-desc"> {{$desc}} diff --git a/view/tpl/smarty3/magicsig.tpl b/view/tpl/smarty3/magicsig.tpl index 39ba6fb14..af8dbb5bc 100644 --- a/view/tpl/smarty3/magicsig.tpl +++ b/view/tpl/smarty3/magicsig.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version="1.0" encoding="UTF-8"?> + *}} +<?xml version="1.0" encoding="UTF-8"?> <me:env xmlns:me="http://salmon-protocol.org/ns/magic-env"> <me:data type="application/atom+xml"> {{$data}} diff --git a/view/tpl/smarty3/mail_conv.tpl b/view/tpl/smarty3/mail_conv.tpl index a98a0f031..8587efbb5 100644 --- a/view/tpl/smarty3/mail_conv.tpl +++ b/view/tpl/smarty3/mail_conv.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="mail-conv-outside-wrapper"> + *}} +<div class="mail-conv-outside-wrapper"> <div class="mail-conv-sender" > <a href="{{$mail.from_url}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" /></a> <div class="mail-conv-sender-name" >{{$mail.from_name}}</div> diff --git a/view/tpl/smarty3/mail_display.tpl b/view/tpl/smarty3/mail_display.tpl index e39a054ba..e14d55478 100644 --- a/view/tpl/smarty3/mail_display.tpl +++ b/view/tpl/smarty3/mail_display.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + {{foreach $mails as $mail}} {{include file="mail_conv.tpl"}} {{/foreach}} diff --git a/view/tpl/smarty3/mail_head.tpl b/view/tpl/smarty3/mail_head.tpl index d2eec5ecb..f7a39fa8b 100644 --- a/view/tpl/smarty3/mail_head.tpl +++ b/view/tpl/smarty3/mail_head.tpl @@ -2,6 +2,7 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$messages}}</h3> + *}} +<h3>{{$messages}}</h3> {{$tab_content}} diff --git a/view/tpl/smarty3/mail_list.tpl b/view/tpl/smarty3/mail_list.tpl index d836bebc5..ffc75b794 100644 --- a/view/tpl/smarty3/mail_list.tpl +++ b/view/tpl/smarty3/mail_list.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="mail-list-outside-wrapper"> + *}} +<div class="mail-list-outside-wrapper"> <div class="mail-list-sender" > <a href="{{$from_url}}" class="mail-list-sender-url" ><img class="mail-list-sender-photo" src="{{$from_photo}}" height="32" width="32" alt="{{$from_name}}" /></a> <div class="mail-list-sender-name" >{{$from_name}}</div> diff --git a/view/tpl/smarty3/main_slider.tpl b/view/tpl/smarty3/main_slider.tpl index 37fec9531..481e23077 100644 --- a/view/tpl/smarty3/main_slider.tpl +++ b/view/tpl/smarty3/main_slider.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div> + *}} +<div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div> <script> $("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { var carr = v.split(";"); diff --git a/view/tpl/smarty3/match.tpl b/view/tpl/smarty3/match.tpl index 6eab82ae6..14b725466 100644 --- a/view/tpl/smarty3/match.tpl +++ b/view/tpl/smarty3/match.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="profile-match-wrapper"> + *}} +<div class="profile-match-wrapper"> <div class="profile-match-photo"> <a href="{{$url}}"> <img src="{{$photo}}" alt="{{$name}}" title="{{$name}}[{{$tags}}]" /> diff --git a/view/tpl/smarty3/message_side.tpl b/view/tpl/smarty3/message_side.tpl index 2ae2c612b..7da22ee3e 100644 --- a/view/tpl/smarty3/message_side.tpl +++ b/view/tpl/smarty3/message_side.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="message-sidebar" class="widget"> + *}} +<div id="message-sidebar" class="widget"> <div id="message-new"><a href="{{$new.url}}" class="{{if $new.sel}}newmessage-selected{{/if}}">{{$new.label}}</a> </div> <ul class="message-ul"> diff --git a/view/tpl/smarty3/micropro_img.tpl b/view/tpl/smarty3/micropro_img.tpl index f3d3db76b..de134adba 100644 --- a/view/tpl/smarty3/micropro_img.tpl +++ b/view/tpl/smarty3/micropro_img.tpl @@ -2,4 +2,5 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div> + *}} +<div class="contact-block-div{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}><img class="contact-block-img{{if $class}} {{$class}}{{/if}}" src="{{$photo}}" title="{{$title}}" alt="{{$name}}" /></a></div> diff --git a/view/tpl/smarty3/micropro_txt.tpl b/view/tpl/smarty3/micropro_txt.tpl index e9bba06f9..a6438812b 100644 --- a/view/tpl/smarty3/micropro_txt.tpl +++ b/view/tpl/smarty3/micropro_txt.tpl @@ -2,4 +2,5 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div> + *}} +<div class="contact-block-textdiv{{if $class}} {{$class}}{{/if}}"><a class="contact-block-link{{if $class}} {{$class}}{{/if}}{{if $click}} fakelink{{/if}}" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}} title="{{$title}}">{{$name}}</a></div> diff --git a/view/tpl/smarty3/moderated_comment.tpl b/view/tpl/smarty3/moderated_comment.tpl index 633a5d762..1e4e9b6d4 100644 --- a/view/tpl/smarty3/moderated_comment.tpl +++ b/view/tpl/smarty3/moderated_comment.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> + *}} + <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;"> <form class="comment-edit-form" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;"> <input type="hidden" name="type" value="{{$type}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> diff --git a/view/tpl/smarty3/mood_content.tpl b/view/tpl/smarty3/mood_content.tpl index 2da0682a3..461303318 100644 --- a/view/tpl/smarty3/mood_content.tpl +++ b/view/tpl/smarty3/mood_content.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$title}}</h3> + *}} +<h3>{{$title}}</h3> <div id="mood-desc">{{$desc}}</div> diff --git a/view/tpl/smarty3/msg-header.tpl b/view/tpl/smarty3/msg-header.tpl index 2cfc7a6a9..4c47e1d6d 100644 --- a/view/tpl/smarty3/msg-header.tpl +++ b/view/tpl/smarty3/msg-header.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl index c222a30fa..c72b6e34a 100644 --- a/view/tpl/smarty3/nav.tpl +++ b/view/tpl/smarty3/nav.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<header> + *}} +<header> <div id="site-location">{{$sitelocation}}</div> <div id="banner">{{$banner}}</div> </header> diff --git a/view/tpl/smarty3/netfriend.tpl b/view/tpl/smarty3/netfriend.tpl index f0ac479de..e8658e0bc 100644 --- a/view/tpl/smarty3/netfriend.tpl +++ b/view/tpl/smarty3/netfriend.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="intro-approve-as-friend-desc">{{$approve_as}}</div> + *}} +<div class="intro-approve-as-friend-desc">{{$approve_as}}</div> <div class="intro-approve-as-friend-wrapper"> <label class="intro-approve-as-friend-label" for="intro-approve-as-friend-{{$intro_id}}">{{$as_friend}}</label> diff --git a/view/tpl/smarty3/new_channel.tpl b/view/tpl/smarty3/new_channel.tpl index db158d622..c76eaf04e 100644 --- a/view/tpl/smarty3/new_channel.tpl +++ b/view/tpl/smarty3/new_channel.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h2>{{$title}}</h2> + *}} +<h2>{{$title}}</h2> <form action="new_channel" method="post" id="newchannel-form"> diff --git a/view/tpl/smarty3/nogroup-template.tpl b/view/tpl/smarty3/nogroup-template.tpl index f2b2b4ca3..7d103a655 100644 --- a/view/tpl/smarty3/nogroup-template.tpl +++ b/view/tpl/smarty3/nogroup-template.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$header}}</h1> + *}} +<h1>{{$header}}</h1> {{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} diff --git a/view/tpl/smarty3/notifications.tpl b/view/tpl/smarty3/notifications.tpl index 626e97687..834a7a016 100644 --- a/view/tpl/smarty3/notifications.tpl +++ b/view/tpl/smarty3/notifications.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h1>{{$notif_header}}</h1> {{include file="common_tabs.tpl"}} diff --git a/view/tpl/smarty3/notifications_comments_item.tpl b/view/tpl/smarty3/notifications_comments_item.tpl index 9e0f196ea..9913e6cf7 100644 --- a/view/tpl/smarty3/notifications_comments_item.tpl +++ b/view/tpl/smarty3/notifications_comments_item.tpl @@ -2,6 +2,7 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="notif-item"> + *}} +<div class="notif-item"> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div>
\ No newline at end of file diff --git a/view/tpl/smarty3/notifications_dislikes_item.tpl b/view/tpl/smarty3/notifications_dislikes_item.tpl index 9e0f196ea..9913e6cf7 100644 --- a/view/tpl/smarty3/notifications_dislikes_item.tpl +++ b/view/tpl/smarty3/notifications_dislikes_item.tpl @@ -2,6 +2,7 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="notif-item"> + *}} +<div class="notif-item"> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div>
\ No newline at end of file diff --git a/view/tpl/smarty3/notifications_friends_item.tpl b/view/tpl/smarty3/notifications_friends_item.tpl index 9e0f196ea..9913e6cf7 100644 --- a/view/tpl/smarty3/notifications_friends_item.tpl +++ b/view/tpl/smarty3/notifications_friends_item.tpl @@ -2,6 +2,7 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="notif-item"> + *}} +<div class="notif-item"> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div>
\ No newline at end of file diff --git a/view/tpl/smarty3/notifications_likes_item.tpl b/view/tpl/smarty3/notifications_likes_item.tpl index ca23e8009..792b285bc 100644 --- a/view/tpl/smarty3/notifications_likes_item.tpl +++ b/view/tpl/smarty3/notifications_likes_item.tpl @@ -2,6 +2,7 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="notif-item"> + *}} +<div class="notif-item"> <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div>
\ No newline at end of file diff --git a/view/tpl/smarty3/notifications_network_item.tpl b/view/tpl/smarty3/notifications_network_item.tpl index d5b0e8212..c3381d682 100644 --- a/view/tpl/smarty3/notifications_network_item.tpl +++ b/view/tpl/smarty3/notifications_network_item.tpl @@ -2,6 +2,7 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="notif-item"> + *}} +<div class="notif-item"> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div> diff --git a/view/tpl/smarty3/notifications_posts_item.tpl b/view/tpl/smarty3/notifications_posts_item.tpl index 9e0f196ea..9913e6cf7 100644 --- a/view/tpl/smarty3/notifications_posts_item.tpl +++ b/view/tpl/smarty3/notifications_posts_item.tpl @@ -2,6 +2,7 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="notif-item"> + *}} +<div class="notif-item"> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div>
\ No newline at end of file diff --git a/view/tpl/smarty3/notify.tpl b/view/tpl/smarty3/notify.tpl index 9e0f196ea..9913e6cf7 100644 --- a/view/tpl/smarty3/notify.tpl +++ b/view/tpl/smarty3/notify.tpl @@ -2,6 +2,7 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="notif-item"> + *}} +<div class="notif-item"> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_when}}</span></a> </div>
\ No newline at end of file diff --git a/view/tpl/smarty3/oauth_authorize.tpl b/view/tpl/smarty3/oauth_authorize.tpl index e02057a3e..d7f1963d2 100644 --- a/view/tpl/smarty3/oauth_authorize.tpl +++ b/view/tpl/smarty3/oauth_authorize.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <div class='oauthapp'> <img src='{{$app.icon}}'> diff --git a/view/tpl/smarty3/oauth_authorize_done.tpl b/view/tpl/smarty3/oauth_authorize_done.tpl index 75e187db9..12d4c6f48 100644 --- a/view/tpl/smarty3/oauth_authorize_done.tpl +++ b/view/tpl/smarty3/oauth_authorize_done.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <p>{{$info}}</p> <code>{{$code}}</code> diff --git a/view/tpl/smarty3/oembed_video.tpl b/view/tpl/smarty3/oembed_video.tpl index fa9c67fa9..bdfa11509 100644 --- a/view/tpl/smarty3/oembed_video.tpl +++ b/view/tpl/smarty3/oembed_video.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<a href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;' style='float:left; margin: 1em; position: relative;'> + *}} +<a href='{{$embedurl}}' onclick='this.innerHTML=Base64.decode("{{$escapedhtml}}"); return false;' style='float:left; margin: 1em; position: relative;'> <img width='{{$tw}}' height='{{$th}}' src='{{$turl}}' > <div style='position: absolute; top: 0px; left: 0px; width: {{$twpx}}; height: {{$thpx}}; background: url({{$baseurl}}/images/icons/48/play.png) no-repeat center center;'></div> </a> diff --git a/view/tpl/smarty3/oexchange_xrd.tpl b/view/tpl/smarty3/oexchange_xrd.tpl index ff545bd3d..04a8e1847 100644 --- a/view/tpl/smarty3/oexchange_xrd.tpl +++ b/view/tpl/smarty3/oexchange_xrd.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version='1.0' encoding='UTF-8'?> + *}} +<?xml version='1.0' encoding='UTF-8'?> <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <Subject>{{$base}}</Subject> diff --git a/view/tpl/smarty3/opensearch.tpl b/view/tpl/smarty3/opensearch.tpl index a1cf16118..63d2a1752 100644 --- a/view/tpl/smarty3/opensearch.tpl +++ b/view/tpl/smarty3/opensearch.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version="1.0" encoding="UTF-8"?> + *}} +<?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> <ShortName>Friendika@{{$nodename}}</ShortName> <Description>Search in Friendika@{{$nodename}}</Description> diff --git a/view/tpl/smarty3/pagetypes.tpl b/view/tpl/smarty3/pagetypes.tpl index c5e484707..15cd3047a 100644 --- a/view/tpl/smarty3/pagetypes.tpl +++ b/view/tpl/smarty3/pagetypes.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} {{include file="field_radio.tpl" field=$page_normal}} + *}} + {{include file="field_radio.tpl" field=$page_normal}} {{include file="field_radio.tpl" field=$page_community}} {{include file="field_radio.tpl" field=$page_prvgroup}} {{include file="field_radio.tpl" field=$page_soapbox}} diff --git a/view/tpl/smarty3/peoplefind.tpl b/view/tpl/smarty3/peoplefind.tpl index ec461c9b2..5417ee0ed 100644 --- a/view/tpl/smarty3/peoplefind.tpl +++ b/view/tpl/smarty3/peoplefind.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="peoplefind-sidebar" class="widget"> + *}} +<div id="peoplefind-sidebar" class="widget"> <h3>{{$findpeople}}</h3> <div id="peoplefind-desc">{{$desc}}</div> <form action="dirfind" method="post" /> diff --git a/view/tpl/smarty3/photo_album.tpl b/view/tpl/smarty3/photo_album.tpl index 5db5644a1..56ee6b61c 100644 --- a/view/tpl/smarty3/photo_album.tpl +++ b/view/tpl/smarty3/photo_album.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}"> + *}} +<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$id}}"> <a href="{{$photolink}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$id}}" title="{{$phototitle}}"> <img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" /> <p class='caption'>{{$desc}}</p> diff --git a/view/tpl/smarty3/photo_drop.tpl b/view/tpl/smarty3/photo_drop.tpl index 84b156d74..ed500fd0a 100644 --- a/view/tpl/smarty3/photo_drop.tpl +++ b/view/tpl/smarty3/photo_drop.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" > + *}} +<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" > <a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> </div> <div class="wall-item-delete-end"></div> diff --git a/view/tpl/smarty3/photo_edit.tpl b/view/tpl/smarty3/photo_edit.tpl index 2f03ef31a..fefe7f10b 100644 --- a/view/tpl/smarty3/photo_edit.tpl +++ b/view/tpl/smarty3/photo_edit.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <form action="photos/{{$nickname}}/{{$resource_id}}" method="post" id="photo_edit_form" > <input type="hidden" name="item_id" value="{{$item_id}}" /> diff --git a/view/tpl/smarty3/photo_item.tpl b/view/tpl/smarty3/photo_item.tpl index ce848c4e9..7d6ac96ee 100644 --- a/view/tpl/smarty3/photo_item.tpl +++ b/view/tpl/smarty3/photo_item.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="wall-item-outside-wrapper{{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > + *}} +<div class="wall-item-outside-wrapper{{$indent}}" id="wall-item-outside-wrapper-{{$id}}" > <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" > <a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}"> <img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a> diff --git a/view/tpl/smarty3/photo_top.tpl b/view/tpl/smarty3/photo_top.tpl index 1a0f89e77..b34e1e639 100644 --- a/view/tpl/smarty3/photo_top.tpl +++ b/view/tpl/smarty3/photo_top.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$photo.id}}"> <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}"> <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" /> diff --git a/view/tpl/smarty3/photo_view.tpl b/view/tpl/smarty3/photo_view.tpl index 6dc2df008..94f71bdd8 100644 --- a/view/tpl/smarty3/photo_view.tpl +++ b/view/tpl/smarty3/photo_view.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="live-display"></div> + *}} +<div id="live-display"></div> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> diff --git a/view/tpl/smarty3/photos_recent.tpl b/view/tpl/smarty3/photos_recent.tpl index 334d7ae13..cb2411df3 100644 --- a/view/tpl/smarty3/photos_recent.tpl +++ b/view/tpl/smarty3/photos_recent.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$title}}</h3> + *}} +<h3>{{$title}}</h3> {{if $can_post}} <a id="photo-top-upload-link" href="{{$upload.1}}">{{$upload.0}}</a> {{/if}} diff --git a/view/tpl/smarty3/photos_upload.tpl b/view/tpl/smarty3/photos_upload.tpl index fc5d2f8c1..713e1169d 100644 --- a/view/tpl/smarty3/photos_upload.tpl +++ b/view/tpl/smarty3/photos_upload.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$pagename}}</h3> + *}} +<h3>{{$pagename}}</h3> <div id="photos-usage-message">{{$usage}}</div> diff --git a/view/tpl/smarty3/poco_entry_xml.tpl b/view/tpl/smarty3/poco_entry_xml.tpl index 5050817d2..d6e139cb5 100644 --- a/view/tpl/smarty3/poco_entry_xml.tpl +++ b/view/tpl/smarty3/poco_entry_xml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<entry> + *}} +<entry> {{if $entry.id}}<id>{{$entry.id}}</id>{{/if}} {{if $entry.displayName}}<displayName>{{$entry.displayName}}</displayName>{{/if}} {{if $entry.preferredUsername}}<preferredUsername>{{$entry.preferredUsername}}</preferredUsername>{{/if}} diff --git a/view/tpl/smarty3/poco_xml.tpl b/view/tpl/smarty3/poco_xml.tpl index 3d6325fe3..b8cd8fc08 100644 --- a/view/tpl/smarty3/poco_xml.tpl +++ b/view/tpl/smarty3/poco_xml.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version="1.0" encoding="utf-8"?> + *}} +<?xml version="1.0" encoding="utf-8"?> <response> {{if $response.sorted}}<sorted>{{$response.sorted}}</sorted>{{/if}} {{if $response.filtered}}<filtered>{{$response.filtered}}</filtered>{{/if}} diff --git a/view/tpl/smarty3/poke_content.tpl b/view/tpl/smarty3/poke_content.tpl index c5a98a50d..6235aca0c 100644 --- a/view/tpl/smarty3/poke_content.tpl +++ b/view/tpl/smarty3/poke_content.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$title}}</h3> + *}} +<h3>{{$title}}</h3> <div id="poke-desc">{{$desc}}</div> diff --git a/view/tpl/smarty3/posted_date_widget.tpl b/view/tpl/smarty3/posted_date_widget.tpl index f9e9757f9..2f5838edb 100644 --- a/view/tpl/smarty3/posted_date_widget.tpl +++ b/view/tpl/smarty3/posted_date_widget.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="datebrowse-sidebar" class="widget"> + *}} +<div id="datebrowse-sidebar" class="widget"> <h3>{{$title}}</h3> <script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script> <select id="posted-date-selector" name="posted-date-select" onchange="dateSubmit($(this).val());" size="{{$size}}"> diff --git a/view/tpl/smarty3/profed_head.tpl b/view/tpl/smarty3/profed_head.tpl index 3c862d64a..37a038d4f 100644 --- a/view/tpl/smarty3/profed_head.tpl +++ b/view/tpl/smarty3/profed_head.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<script language="javascript" type="text/javascript" + *}} +<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> diff --git a/view/tpl/smarty3/profile-hide-friends.tpl b/view/tpl/smarty3/profile-hide-friends.tpl index 0ccb6c608..6e3d395d0 100644 --- a/view/tpl/smarty3/profile-hide-friends.tpl +++ b/view/tpl/smarty3/profile-hide-friends.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<p id="hide-friends-text"> + *}} +<p id="hide-friends-text"> {{$desc}} </p> diff --git a/view/tpl/smarty3/profile-hide-wall.tpl b/view/tpl/smarty3/profile-hide-wall.tpl index a1062dae2..755908d17 100644 --- a/view/tpl/smarty3/profile-hide-wall.tpl +++ b/view/tpl/smarty3/profile-hide-wall.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<p id="hide-wall-text"> + *}} +<p id="hide-wall-text"> {{$desc}} </p> diff --git a/view/tpl/smarty3/profile-in-directory.tpl b/view/tpl/smarty3/profile-in-directory.tpl index fb234ecde..0efd1bf5c 100644 --- a/view/tpl/smarty3/profile-in-directory.tpl +++ b/view/tpl/smarty3/profile-in-directory.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<p id="profile-in-directory"> + *}} +<p id="profile-in-directory"> {{$desc}} </p> diff --git a/view/tpl/smarty3/profile-in-netdir.tpl b/view/tpl/smarty3/profile-in-netdir.tpl index 2f082765a..b9cb456ea 100644 --- a/view/tpl/smarty3/profile-in-netdir.tpl +++ b/view/tpl/smarty3/profile-in-netdir.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<p id="profile-in-directory"> + *}} +<p id="profile-in-directory"> {{$desc}} </p> diff --git a/view/tpl/smarty3/profile_advanced.tpl b/view/tpl/smarty3/profile_advanced.tpl index 4208dc18d..f8743c011 100644 --- a/view/tpl/smarty3/profile_advanced.tpl +++ b/view/tpl/smarty3/profile_advanced.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h2>{{$title}}</h2> + *}} +<h2>{{$title}}</h2> <dl id="aprofile-fullname" class="aprofile"> <dt>{{$profile.fullname.0}}</dt> diff --git a/view/tpl/smarty3/profile_edit.tpl b/view/tpl/smarty3/profile_edit.tpl index c2b29f590..3a2652a68 100644 --- a/view/tpl/smarty3/profile_edit.tpl +++ b/view/tpl/smarty3/profile_edit.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{$default}} + *}} +{{$default}} <h1>{{$banner}}</h1> diff --git a/view/tpl/smarty3/profile_edlink.tpl b/view/tpl/smarty3/profile_edlink.tpl index 7950d1d42..9424bcc3d 100644 --- a/view/tpl/smarty3/profile_edlink.tpl +++ b/view/tpl/smarty3/profile_edlink.tpl @@ -2,5 +2,6 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div> + *}} +<div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles/{{$profid}}" ></a></div> <div class="clear"></div>
\ No newline at end of file diff --git a/view/tpl/smarty3/profile_entry.tpl b/view/tpl/smarty3/profile_entry.tpl index 9b5f3ed00..4774fd11b 100644 --- a/view/tpl/smarty3/profile_entry.tpl +++ b/view/tpl/smarty3/profile_entry.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div class="profile-listing" > <div class="profile-listing-photo-wrapper" > <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a> diff --git a/view/tpl/smarty3/profile_listing_header.tpl b/view/tpl/smarty3/profile_listing_header.tpl index 6112e570b..f77bdcc80 100644 --- a/view/tpl/smarty3/profile_listing_header.tpl +++ b/view/tpl/smarty3/profile_listing_header.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$header}}</h1> + *}} +<h1>{{$header}}</h1> <p id="profile-listing-desc" class="button" > <a href="profile_photo" >{{$chg_photo}}</a> </p> diff --git a/view/tpl/smarty3/profile_photo.tpl b/view/tpl/smarty3/profile_photo.tpl index 70f98cf6a..dee2471cf 100644 --- a/view/tpl/smarty3/profile_photo.tpl +++ b/view/tpl/smarty3/profile_photo.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <form enctype="multipart/form-data" action="profile_photo" method="post"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> diff --git a/view/tpl/smarty3/profile_publish.tpl b/view/tpl/smarty3/profile_publish.tpl index 686627fd1..1dc9eb7fc 100644 --- a/view/tpl/smarty3/profile_publish.tpl +++ b/view/tpl/smarty3/profile_publish.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<p id="profile-publish-desc-{{$instance}}"> + *}} +<p id="profile-publish-desc-{{$instance}}"> {{$pubdesc}} </p> diff --git a/view/tpl/smarty3/profile_vcard.tpl b/view/tpl/smarty3/profile_vcard.tpl index 42f15e641..422b43720 100644 --- a/view/tpl/smarty3/profile_vcard.tpl +++ b/view/tpl/smarty3/profile_vcard.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="vcard"> + *}} +<div class="vcard"> {{if $profile.edit}} <div class="action"> diff --git a/view/tpl/smarty3/prv_message.tpl b/view/tpl/smarty3/prv_message.tpl index be475ea60..1f41d2662 100644 --- a/view/tpl/smarty3/prv_message.tpl +++ b/view/tpl/smarty3/prv_message.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h3>{{$header}}</h3> <div id="prvmail-wrapper" > diff --git a/view/tpl/smarty3/pwdreset.tpl b/view/tpl/smarty3/pwdreset.tpl index c62c4c478..e86e1227f 100644 --- a/view/tpl/smarty3/pwdreset.tpl +++ b/view/tpl/smarty3/pwdreset.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$lbl1}}</h3> + *}} +<h3>{{$lbl1}}</h3> <p> {{$lbl2}} diff --git a/view/tpl/smarty3/register.tpl b/view/tpl/smarty3/register.tpl index 415f8b738..98d888f08 100644 --- a/view/tpl/smarty3/register.tpl +++ b/view/tpl/smarty3/register.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h2>{{$title}}</h2> + *}} +<h2>{{$title}}</h2> <form action="register" method="post" id="register-form"> diff --git a/view/tpl/smarty3/remote_friends_common.tpl b/view/tpl/smarty3/remote_friends_common.tpl index b22db16a6..5844aac87 100644 --- a/view/tpl/smarty3/remote_friends_common.tpl +++ b/view/tpl/smarty3/remote_friends_common.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div id="remote-friends-in-common" class="bigwidget"> + *}} +<div id="remote-friends-in-common" class="bigwidget"> <div id="rfic-desc">{{$desc}} {{if $linkmore}}<a href="{{$base}}/common/rem/{{$uid}}/{{$cid}}">{{$more}}</a>{{/if}}</div> {{if $items}} {{foreach $items as $item}} diff --git a/view/tpl/smarty3/removeme.tpl b/view/tpl/smarty3/removeme.tpl index ac0b7575a..3fe12a223 100644 --- a/view/tpl/smarty3/removeme.tpl +++ b/view/tpl/smarty3/removeme.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <div id="remove-account-wrapper"> diff --git a/view/tpl/smarty3/saved_searches_aside.tpl b/view/tpl/smarty3/saved_searches_aside.tpl index 8a6d04dbc..034d1f6db 100644 --- a/view/tpl/smarty3/saved_searches_aside.tpl +++ b/view/tpl/smarty3/saved_searches_aside.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="widget" id="saved-search-list"> + *}} +<div class="widget" id="saved-search-list"> <h3 id="search">{{$title}}</h3> {{$searchbox}} diff --git a/view/tpl/smarty3/search_item.tpl b/view/tpl/smarty3/search_item.tpl index 5af5e23d4..838d72568 100644 --- a/view/tpl/smarty3/search_item.tpl +++ b/view/tpl/smarty3/search_item.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<a name="{{$item.id}}" ></a> + *}} +<a name="{{$item.id}}" ></a> <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" > <div class="wall-item-info" id="wall-item-info-{{$item.id}}"> diff --git a/view/tpl/smarty3/settings.tpl b/view/tpl/smarty3/settings.tpl index 58fd6a4f7..a2710ddb6 100644 --- a/view/tpl/smarty3/settings.tpl +++ b/view/tpl/smarty3/settings.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$ptitle}}</h1> + *}} +<h1>{{$ptitle}}</h1> {{$nickname_block}} diff --git a/view/tpl/smarty3/settings_account.tpl b/view/tpl/smarty3/settings_account.tpl index 2a8a5524d..a12283ff2 100644 --- a/view/tpl/smarty3/settings_account.tpl +++ b/view/tpl/smarty3/settings_account.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <div id="settings-remove-account-link"> diff --git a/view/tpl/smarty3/settings_addons.tpl b/view/tpl/smarty3/settings_addons.tpl index ea6be2b24..52b71f1db 100644 --- a/view/tpl/smarty3/settings_addons.tpl +++ b/view/tpl/smarty3/settings_addons.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <form action="settings/addon" method="post" autocomplete="off"> diff --git a/view/tpl/smarty3/settings_connectors.tpl b/view/tpl/smarty3/settings_connectors.tpl index ac0732cb1..5df839411 100644 --- a/view/tpl/smarty3/settings_connectors.tpl +++ b/view/tpl/smarty3/settings_connectors.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <form action="settings/connectors" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> diff --git a/view/tpl/smarty3/settings_display.tpl b/view/tpl/smarty3/settings_display.tpl index 3f92f5b73..3558e5cc9 100644 --- a/view/tpl/smarty3/settings_display.tpl +++ b/view/tpl/smarty3/settings_display.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$ptitle}}</h1> + *}} +<h1>{{$ptitle}}</h1> <form action="settings/display" id="settings-form" method="post" autocomplete="off" > <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> diff --git a/view/tpl/smarty3/settings_features.tpl b/view/tpl/smarty3/settings_features.tpl index c1c517dba..797d3da2c 100644 --- a/view/tpl/smarty3/settings_features.tpl +++ b/view/tpl/smarty3/settings_features.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <form action="settings/features" method="post" autocomplete="off"> diff --git a/view/tpl/smarty3/settings_nick_set.tpl b/view/tpl/smarty3/settings_nick_set.tpl index 0e1d2bb2a..fb886695e 100644 --- a/view/tpl/smarty3/settings_nick_set.tpl +++ b/view/tpl/smarty3/settings_nick_set.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div id="settings-nick-wrapper" > <div id="settings-nickname-desc" class="info-message">{{$desc}} <strong>'{{$nickname}}@{{$basepath}}'</strong>{{$subdir}}</div> </div> diff --git a/view/tpl/smarty3/settings_nick_subdir.tpl b/view/tpl/smarty3/settings_nick_subdir.tpl index c8f762a43..874185db5 100644 --- a/view/tpl/smarty3/settings_nick_subdir.tpl +++ b/view/tpl/smarty3/settings_nick_subdir.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<p> + *}} +<p> It appears that your website is located in a subdirectory of the<br /> {{$hostname}} website, so this setting may not work reliably.<br /> </p> diff --git a/view/tpl/smarty3/settings_oauth.tpl b/view/tpl/smarty3/settings_oauth.tpl index 460cf5834..feab78210 100644 --- a/view/tpl/smarty3/settings_oauth.tpl +++ b/view/tpl/smarty3/settings_oauth.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <form action="settings/oauth" method="post" autocomplete="off"> diff --git a/view/tpl/smarty3/settings_oauth_edit.tpl b/view/tpl/smarty3/settings_oauth_edit.tpl index 23efa07d6..e3960bf75 100644 --- a/view/tpl/smarty3/settings_oauth_edit.tpl +++ b/view/tpl/smarty3/settings_oauth_edit.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h1>{{$title}}</h1> + *}} +<h1>{{$title}}</h1> <form method="POST"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> diff --git a/view/tpl/smarty3/suggest_friends.tpl b/view/tpl/smarty3/suggest_friends.tpl index 460d3cf65..060db0005 100644 --- a/view/tpl/smarty3/suggest_friends.tpl +++ b/view/tpl/smarty3/suggest_friends.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="profile-match-wrapper"> + *}} +<div class="profile-match-wrapper"> <a href="{{$ignlnk}}" title="{{$ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a> <div class="profile-match-photo"> <a href="{{$url}}"> diff --git a/view/tpl/smarty3/suggestions.tpl b/view/tpl/smarty3/suggestions.tpl index a91661fcb..b4f0cbbe5 100644 --- a/view/tpl/smarty3/suggestions.tpl +++ b/view/tpl/smarty3/suggestions.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <div class="intro-wrapper" > <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p> diff --git a/view/tpl/smarty3/tag_slap.tpl b/view/tpl/smarty3/tag_slap.tpl index f42e2cb42..5521b508d 100644 --- a/view/tpl/smarty3/tag_slap.tpl +++ b/view/tpl/smarty3/tag_slap.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}} <entry> + *}} + <entry> <author> <name>{{$name}}</name> <uri>{{$profile_page}}</uri> diff --git a/view/tpl/smarty3/threaded_conversation.tpl b/view/tpl/smarty3/threaded_conversation.tpl index 8ece65f7a..23a2564b7 100644 --- a/view/tpl/smarty3/threaded_conversation.tpl +++ b/view/tpl/smarty3/threaded_conversation.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{foreach $threads as $thread}} + *}} +{{foreach $threads as $thread}} {{foreach $thread.items as $thread_item}} {{include file="{{$thread_item.template}}" item=$thread_item}} {{/foreach}} diff --git a/view/tpl/smarty3/toggle_mobile_footer.tpl b/view/tpl/smarty3/toggle_mobile_footer.tpl index 8f276c896..008d69663 100644 --- a/view/tpl/smarty3/toggle_mobile_footer.tpl +++ b/view/tpl/smarty3/toggle_mobile_footer.tpl @@ -2,5 +2,6 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a> + *}} +<a id="toggle_mobile_link" href="{{$toggle_link}}">{{$toggle_text}}</a> diff --git a/view/tpl/smarty3/viewcontact_template.tpl b/view/tpl/smarty3/viewcontact_template.tpl index 8550c083c..a9837c7f9 100644 --- a/view/tpl/smarty3/viewcontact_template.tpl +++ b/view/tpl/smarty3/viewcontact_template.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<h3>{{$title}}</h3> + *}} +<h3>{{$title}}</h3> {{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} diff --git a/view/tpl/smarty3/wall_item.tpl b/view/tpl/smarty3/wall_item.tpl index 91c15ff7b..1ab1fbff0 100644 --- a/view/tpl/smarty3/wall_item.tpl +++ b/view/tpl/smarty3/wall_item.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<a name="{{$item.id}}" ></a> + *}} +<a name="{{$item.id}}" ></a> <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" > <div class="wall-item-info" id="wall-item-info-{{$item.id}}"> diff --git a/view/tpl/smarty3/wall_thread.tpl b/view/tpl/smarty3/wall_thread.tpl index d366048e5..cab43cfcf 100644 --- a/view/tpl/smarty3/wall_thread.tpl +++ b/view/tpl/smarty3/wall_thread.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{if $item.comment_firstcollapsed}} + *}} +{{if $item.comment_firstcollapsed}} <div class="hide-comments-outer"> <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span> </div> diff --git a/view/tpl/smarty3/wallmessage.tpl b/view/tpl/smarty3/wallmessage.tpl index b8261f732..6eeabe9ed 100644 --- a/view/tpl/smarty3/wallmessage.tpl +++ b/view/tpl/smarty3/wallmessage.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <h3>{{$header}}</h3> <h4>{{$subheader}}</h4> diff --git a/view/tpl/smarty3/wallmsg-header.tpl b/view/tpl/smarty3/wallmsg-header.tpl index 54e9cdc98..1f5a1abc1 100644 --- a/view/tpl/smarty3/wallmsg-header.tpl +++ b/view/tpl/smarty3/wallmsg-header.tpl @@ -3,6 +3,7 @@ * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * *}} + <script language="javascript" type="text/javascript" src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> diff --git a/view/tpl/smarty3/wallwall_item.tpl b/view/tpl/smarty3/wallwall_item.tpl index 55d0fedf6..a7430e8da 100644 --- a/view/tpl/smarty3/wallwall_item.tpl +++ b/view/tpl/smarty3/wallwall_item.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<a name="{{$item.id}}" ></a> + *}} +<a name="{{$item.id}}" ></a> <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}} wallwall" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" > <div class="wall-item-info wallwall" id="wall-item-info-{{$item.id}}"> diff --git a/view/tpl/smarty3/wallwall_thread.tpl b/view/tpl/smarty3/wallwall_thread.tpl index b46f61635..4c17f5106 100644 --- a/view/tpl/smarty3/wallwall_thread.tpl +++ b/view/tpl/smarty3/wallwall_thread.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}{{if $item.comment_firstcollapsed}} + *}} +{{if $item.comment_firstcollapsed}} <div class="hide-comments-outer"> <span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span> </div> diff --git a/view/tpl/smarty3/xchan_vcard.tpl b/view/tpl/smarty3/xchan_vcard.tpl index f470e057f..76f40326b 100644 --- a/view/tpl/smarty3/xchan_vcard.tpl +++ b/view/tpl/smarty3/xchan_vcard.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<div class="vcard"> + *}} +<div class="vcard"> <div class="fn">{{$name}}</div> <div id="profile-photo-wrapper"><img class="vcard-photo photo" src="{{$photo}}" alt="name" /></div> </div> diff --git a/view/tpl/smarty3/xrd_host.tpl b/view/tpl/smarty3/xrd_host.tpl index 8441994fa..1f273e010 100644 --- a/view/tpl/smarty3/xrd_host.tpl +++ b/view/tpl/smarty3/xrd_host.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version='1.0' encoding='UTF-8'?> + *}} +<?xml version='1.0' encoding='UTF-8'?> <XRD xmlns='http://docs.oasis-open.org/ns/xri/xrd-1.0' xmlns:hm='http://host-meta.net/xrd/1.0'> diff --git a/view/tpl/smarty3/xrd_person.tpl b/view/tpl/smarty3/xrd_person.tpl index 36b3a05c8..2b914fa34 100644 --- a/view/tpl/smarty3/xrd_person.tpl +++ b/view/tpl/smarty3/xrd_person.tpl @@ -2,7 +2,8 @@ * AUTOMATICALLY GENERATED TEMPLATE * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN * - *}}<?xml version="1.0" encoding="UTF-8"?> + *}} +<?xml version="1.0" encoding="UTF-8"?> <XRD xmlns="http://docs.oasis-open.org/ns/xri/xrd-1.0"> <Subject>{{$accturi}}</Subject> |