diff options
Diffstat (limited to 'view')
128 files changed, 2291 insertions, 981 deletions
diff --git a/view/cs/follow_notify_eml.tpl b/view/cs/follow_notify_eml.tpl index 440ba9ca4..ba07b19da 100644 --- a/view/cs/follow_notify_eml.tpl +++ b/view/cs/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Milý/Milá $username, +Dear {{$myname}}, -Máte nového následovatele na $sitename - '$requestor'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Můžete si prohlédnout jeho/její profil na $url. +You may visit their profile at {{$url}}. -Přihlaste se na váš server k odsouhlasení nebo ignorování/zrušení žádosti. +Please login to your site to approve or ignore/cancel the request. -$siteurl +{{$siteurl}} -S pozdravem, +Regards, - $sitename administrátor + {{$sitename}} administrator diff --git a/view/cs/friend_complete_eml.tpl b/view/cs/friend_complete_eml.tpl index 50bb7e105..1c647b994 100644 --- a/view/cs/friend_complete_eml.tpl +++ b/view/cs/friend_complete_eml.tpl @@ -1,17 +1,22 @@ -Milý/Milá $username, +Dear {{$username}}, - Skvělé zprávy... '$fn' na '$dfrn_url' odsouhlasil Váš požadavek na spojení na '$sitename'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Jste nyní přátelé a můžete si vyměňovat aktualizace statusu, fotek a e-mailů bez omezení. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Pokud budete chtít tento vztah jakkoliv upravit, navštivte Vaši stránku "Kontakty" na $sitename. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$siteurl +{{$siteurl}} -(Nyní můžete například vytvořit separátní profil s informacemi, které nebudou viditelné veřejně, a nastavit právo pro zobrazení tohoto profilu pro '$fn'). +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -S pozdravem, +Sincerely, - $sitename administrátor + {{$sitename}} Administrator + diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/cs/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/cs/intro_complete_eml.tpl b/view/cs/intro_complete_eml.tpl index 91753f35d..2c2428d68 100644 --- a/view/cs/intro_complete_eml.tpl +++ b/view/cs/intro_complete_eml.tpl @@ -1,17 +1,22 @@ -Milý/Milá $username, +Dear {{$username}}, + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - '$fn' na '$dfrn_url' odsouhlasil Váš požadavek na spojení na '$sitename'. + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. - '$fn' Vás označil za svého "fanouška", což jistým způsobem omezuje komunikaci (například v oblasti soukromých zpráv a některých profilových interakcí. Pokud je toto celebritní nebo komunitní stránka, bylo toto nastavení byla přijato automaticky. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - '$fn' může v budoucnu rozšířit toto spojení na oboustranné nebo jinak méně restriktivní. + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at - Nyní začnete dostávat veřejné aktualizace statusu od '$fn', které se objeví ve Vaší stránce "Síť" na webu +{{$siteurl}} -$siteurl +Sincerely, -S pozdravem, - - $sitename administrátor + {{$sitename}} Administrator diff --git a/view/cs/lostpass_eml.tpl b/view/cs/lostpass_eml.tpl index 05042ddce..3b79d2791 100644 --- a/view/cs/lostpass_eml.tpl +++ b/view/cs/lostpass_eml.tpl @@ -1,23 +1,32 @@ -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. +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 +below or paste it into your web browser address bar. -Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Klikněte na tento odkaz pro prověření Vaší identity: +Your password will not be changed unless we can verify that you +issued this request. -$reset_link +Follow this link to verify your identity: -Poté obdržíte další zprávu obsahující nové heslo. +{{$reset_link}} -Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení. +You will then receive a follow-up message containing the new password. -Přihlašovací údaje jsou tato: +You may change that password from your account settings page after logging in. -Adresa webu: $siteurl -Přihlašovací jméno: $email +The login details are as follows: -S pozdravem, +Site Location: {{$siteurl}} +Login Name: {{$email}} - $sitename administrátor + + + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl index 5447d2e80..0d94be3c2 100644 --- a/view/cs/passchanged_eml.tpl +++ b/view/cs/passchanged_eml.tpl @@ -1,14 +1,20 @@ -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). - -Vaše přihlašovací údaje jsou tato: +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). + + +Your login details are as follows: -Adresa webu: $siteurl -Přihlašovací jméno: $email -Heslo: $new_password +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte. +You may change that password from your account settings page after logging in. -S pozdravem, - $sitename administrátor + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/cs/register_open_eml.tpl b/view/cs/register_open_eml.tpl index f8e42678b..4b397201c 100644 --- a/view/cs/register_open_eml.tpl +++ b/view/cs/register_open_eml.tpl @@ -1,23 +1,19 @@ -Milý/milá $username, - Díky za registraci na $sitename. Váš účet byl vytvořen. -Vaše přihlašovací údaje jsou tato: -Adresa webu: $siteurl -Přihlašovací jméno: $email -Heslo: $password +An account has been created at {{$sitename}} for this email address. +The login details are as follows: -Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte. +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce. +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Můžete také přidat některé základní informace do Vašeho defaultního profilu (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt. +Thank you and welcome to {{$sitename}}. -Doporučujeme nastavit celé jméno, přidat profilové foto, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a zemi, ve které žijete. Nemusíte zadávat víc informací. +Sincerely, + {{$sitename}} Administrator -Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. -Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto položek můžete získat nové a zajímavé přátele. - -Díky a vítejte na $sitename. - -S pozdravem, - $sitename administrátor + diff --git a/view/cs/register_verify_eml.tpl b/view/cs/register_verify_eml.tpl index 4b34c6b6d..85d9a12d3 100644 --- a/view/cs/register_verify_eml.tpl +++ b/view/cs/register_verify_eml.tpl @@ -1,22 +1,25 @@ -Na webu $sitename byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení. +A new user registration request was received at {{$sitename}} which requires +your approval. -Přihlašovací údaje jsou tato: -Celé jméno: $username -Adresa webu: $siteurl -Přihlašovací jméno: $email +The login details are as follows: -Pro odsouhlasení tohoto požadavku prosím klikněte na následující odkaz: +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} +To approve this request please visit the following link: -$siteurl/regmod/allow/$hash +{{$siteurl}}/regmod/allow/{{$hash}} -Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz: +To deny the request and remove the account, please visit: -$siteurl/regmod/deny/$hash +{{$siteurl}}/regmod/deny/{{$hash}} + + +Thank you. -Díky. diff --git a/view/cs/request_notify_eml.tpl b/view/cs/request_notify_eml.tpl index 74010c79c..d01b8ff27 100644 --- a/view/cs/request_notify_eml.tpl +++ b/view/cs/request_notify_eml.tpl @@ -1,15 +1,17 @@ -Milý/Milá $username, +Dear {{$myname}}, -Právě jste obdržel/obdržela požadavek na spojení na webu $sitename +You have just received a connection request at {{$sitename}} -od '$requestor'. +from '{{$requestor}}'. -Můžete navštívit jeho/její profil na následujícím odkazu $url. +You may visit their profile at {{$url}}. -Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$siteurl +{{$siteurl}} -S pozdravem, - $sitename administrátor +Regards, + + {{$sitename}} administrator diff --git a/view/cs/update_fail_eml.tpl b/view/cs/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/cs/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/css/mod_thing.css b/view/css/mod_thing.css new file mode 100644 index 000000000..2a2ba7c92 --- /dev/null +++ b/view/css/mod_thing.css @@ -0,0 +1,27 @@ + + +.thing-profile #contact-profile-selector { + margin-left: 0; +} + +.thing-verb-label { + margin-top: 15px; +} + +.thing-verb { + margin-bottom: 15px; +} + +.thing-label { + float: left; + width: 250px; +} + +.thing-input { + float: left; + margin-bottom: 15px; +} + +.thing-field-end { + clear: both; +}
\ No newline at end of file diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl index a866a08a2..ba07b19da 100644 --- a/view/de/follow_notify_eml.tpl +++ b/view/de/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Hallo $[myname], +Dear {{$myname}}, -Du hast einen neuen Anhänger auf $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Du kannst das Profil unter $[url] besuchen. +You may visit their profile at {{$url}}. -Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen. +Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -beste Grüße, +Regards, - $[sitename] Administrator
\ No newline at end of file + {{$sitename}} administrator diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl index 39f2725ea..1c647b994 100644 --- a/view/de/friend_complete_eml.tpl +++ b/view/de/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Hallo $[username], +Dear {{$username}}, - Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat -deine Kontaktanfrage auf '$[sitename]' bestätigt. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails -ohne Einschränkungen austauschen. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du -Änderungen an diesem Kontakt vornehmen willst. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$[siteurl] +{{$siteurl}} -[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält, -die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben]. +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Beste Grüße, +Sincerely, - $[sitename] Administrator + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/de/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl index 9d47a6fb1..2c2428d68 100644 --- a/view/de/intro_complete_eml.tpl +++ b/view/de/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Hallo $[username], +Dear {{$username}}, - '$[fn]' auf '$[dfrn_url]' hat deine Verbindungsanfrage -auf '$[sitename]' akzeptiert. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - '$[fn]' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen -Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil -Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen -automatisch angewandt. + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. - '$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende -Beziehung in der Zukunft erweitert wird. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Du empfängst ab sofort die öffentlichen Beiträge von '$[fn]', -auf deiner "Netzwerk" Seite. + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} -Beste Grüße, +Sincerely, - $[sitename] Administrator
\ No newline at end of file + {{$sitename}} Administrator diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl index 9f71bbfb1..3b79d2791 100644 --- a/view/de/lostpass_eml.tpl +++ b/view/de/lostpass_eml.tpl @@ -1,32 +1,32 @@ -Hallo $[username], - Auf $[sitename] wurde eine Anfrage zum Zurücksetzen deines -Passworts empfangen. Um diese zu bestätigen folge bitte dem Link -weiter unten oder kopiere ihn in die Adressleiste deines Browsers. +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 +below or paste it into your web browser address bar. -Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE -bitte diese Mail und den Link. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Dein Passwort wird nicht geändert werden solange wir nicht überprüfen -konnten, dass du die Anfrage gestellt hast. +Your password will not be changed unless we can verify that you +issued this request. -Folge diesem Link um deine Identität zu verifizieren: +Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} -Du wirst eine weitere Email erhalten mit dem neuen Passwort. +You will then receive a follow-up message containing the new password. -Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern. +You may change that password from your account settings page after logging in. -Die Login-Details sind die folgenden: +The login details are as follows: -Adresse der Seite: $[siteurl] -Login Name: $[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} -Grüße, - $[sitename] Administrator +Sincerely, + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl index dcabbbe49..0d94be3c2 100644 --- a/view/de/passchanged_eml.tpl +++ b/view/de/passchanged_eml.tpl @@ -1,20 +1,20 @@ -Hallo $[username], - Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese -Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort -in etwas, was du dir merken kannst). +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). -Deine Login Daten wurden wie folgt geändert: +Your login details are as follows: -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[new_password] +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist. +You may change that password from your account settings page after logging in. -Beste Grüße, - $[sitename] Administrator +Sincerely, + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl index 4392e8da2..4b397201c 100644 --- a/view/de/register_open_eml.tpl +++ b/view/de/register_open_eml.tpl @@ -1,34 +1,19 @@ -Hallo $[username], - Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. -Hier die Login Details: +An account has been created at {{$sitename}} for this email address. +The login details are as follows: +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[password] +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. +Thank you and welcome to {{$sitename}}. -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. +Sincerely, + {{$sitename}} Administrator -Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, -damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen, -sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und -vielleicht auch in welchen Land du lebst; falls du nicht konkreter -werden möchtest. - -Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. -Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen -ein paar neue und interessante Freunde zu finden. - - -Danke und willkommen auf $[sitename]. - -Beste Grüße, - $[sitename] Administrator - -
\ No newline at end of file + diff --git a/view/de/register_verify_eml.tpl b/view/de/register_verify_eml.tpl index 8f25f5c36..85d9a12d3 100644 --- a/view/de/register_verify_eml.tpl +++ b/view/de/register_verify_eml.tpl @@ -1,25 +1,25 @@ -Eine Neuanmeldung auf $[sitename] benötigt -deine Aufmerksamkeit. +A new user registration request was received at {{$sitename}} which requires +your approval. -Die Login-Einzelheiten sind die folgenden: +The login details are as follows: -Kompletter Name: $[username] -Adresse der Seite: $[siteurl] -Login Name: $[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} +To approve this request please visit the following link: -Um die Anfrage zu bestätigen besuche bitte: +{{$siteurl}}/regmod/allow/{{$hash}} -$[siteurl]/regmod/allow/$[hash] +To deny the request and remove the account, please visit: -Um die Anfrage abzulehnen und den Account zu löschen besuche bitte: +{{$siteurl}}/regmod/deny/{{$hash}} -$[siteurl]/regmod/deny/$[hash] +Thank you. -Danke! diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl index 057044e8c..d01b8ff27 100644 --- a/view/de/request_notify_eml.tpl +++ b/view/de/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Hallo $[myname], +Dear {{$myname}}, -du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename] +You have just received a connection request at {{$sitename}} -erhalten. +from '{{$requestor}}'. -Du kannst sein/ihr Profil unter $[url] finden. +You may visit their profile at {{$url}}. -Bitte melde dich an um die komplette Vorstellung einzusehen -und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Beste Grüße, +Regards, - $[sitename] Administrator
\ No newline at end of file + {{$sitename}} administrator diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl index cfb55e240..a7df8fc2f 100644 --- a/view/de/update_fail_eml.tpl +++ b/view/de/update_fail_eml.tpl @@ -1,11 +1,13 @@ -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.
-Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen.
-Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein.
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
-Die Fehlermeldung lautet '$error'.
+The error message is '{{$error}}'.
-Tut mir Leid!
-Deine friendica Instanz auf $siteurl
\ No newline at end of file +Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/eo/follow_notify_eml.tpl b/view/eo/follow_notify_eml.tpl index e76453ac1..ba07b19da 100644 --- a/view/eo/follow_notify_eml.tpl +++ b/view/eo/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Kara $[myname], +Dear {{$myname}}, -Vi havas novan abonanton ĉe $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Vi povas viziti ilian profilon ĉe $[url]. +You may visit their profile at {{$url}}. -Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton. +Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Salutoj, +Regards, - [$sitename] administranto
\ No newline at end of file + {{$sitename}} administrator diff --git a/view/eo/friend_complete_eml.tpl b/view/eo/friend_complete_eml.tpl index f429ca450..1c647b994 100644 --- a/view/eo/friend_complete_eml.tpl +++ b/view/eo/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Kara $[username], +Dear {{$username}}, - Boegaj novaĵoj.... '$[fn]' ĉe '$[dfrn_url]' aprobis -vian kontaktpeton ĉe '$[sitename]'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn -senkatene. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Bonvolu viziti vian 'Kontaktoj' paĝon ĉe $[sitename] se vi volas -ŝangi la rilaton. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$[siteurl] +{{$siteurl}} -[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne -haveblas al la komuna publiko - kaj rajtigi '$[fn]' al ĝi]' +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Salutoj, +Sincerely, - $[sitename] administranto + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/eo/htconfig.tpl b/view/eo/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/eo/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/eo/intro_complete_eml.tpl b/view/eo/intro_complete_eml.tpl index 56a4fd880..2c2428d68 100644 --- a/view/eo/intro_complete_eml.tpl +++ b/view/eo/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Kara $[username], +Dear {{$username}}, - '$[fn]' ĉe '$[dfrn_url]' akceptis -vian kontaktpeton ĉe '$[sitename]'. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - '$[fn]' elektis vin kiel "admiranto", kio malpermesas -kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj -agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj -aŭtomate aktiviĝis. + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. - '$[fn]' eblas konverti la rilaton al ambaŭdirekta rilato -aŭ apliki pli da permesoj. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Vi ekricevos publikajn afiŝojn de '$[fn]', -kiuj aperos sur via 'Reto' paĝo ĉe + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} -Salutoj, +Sincerely, - $[sitename] administranto
\ No newline at end of file + {{$sitename}} Administrator diff --git a/view/eo/lostpass_eml.tpl b/view/eo/lostpass_eml.tpl index 26d1a3c23..3b79d2791 100644 --- a/view/eo/lostpass_eml.tpl +++ b/view/eo/lostpass_eml.tpl @@ -1,32 +1,32 @@ -Kara $[username], - $[sitename] ricevis peton por rekomencigi vian pasvorton. -Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon -aŭ alglui ĝin en la adreskampo de via retumilo. +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 +below or paste it into your web browser address bar. -Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la -sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi -kiu petis la ŝanĝon. +Your password will not be changed unless we can verify that you +issued this request. -Sekvu ĉi tion ligilon por konfirmi vian identecon: +Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} -Poste, vi ricevos mesaĝon enhavonte la novan pasvorton. +You will then receive a follow-up message containing the new password. -Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti. +You may change that password from your account settings page after logging in. -La akreditaĵoj estas: +The login details are as follows: -Retejo:»$[siteurl] -Salutnomo:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} -Salutoj, - $[sitename] administranto +Sincerely, + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/eo/passchanged_eml.tpl b/view/eo/passchanged_eml.tpl index ee775d5dd..0d94be3c2 100644 --- a/view/eo/passchanged_eml.tpl +++ b/view/eo/passchanged_eml.tpl @@ -1,20 +1,20 @@ -Kara $[username], - Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun -informon (aŭ tuj ŝanĝu vian pasvorton al -iu kiun vi povas memori). +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). -Jen viaj legitimaĵoj: +Your login details are as follows: -Retejo:»$[siteurl] -Salutnomo:»$[email] -Pasvorto:»$[new_password] +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita. +You may change that password from your account settings page after logging in. -Salutoj, - $[sitename] administranto +Sincerely, + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/eo/register_open_eml.tpl b/view/eo/register_open_eml.tpl index 735ea9a4b..4b397201c 100644 --- a/view/eo/register_open_eml.tpl +++ b/view/eo/register_open_eml.tpl @@ -1,34 +1,19 @@ -Kara $[username], - Dankon pro via registrado ĉe $[sitename]. Vian konton estas kreita. -Jen viaj legitimaĵoj: +An account has been created at {{$sitename}} for this email address. +The login details are as follows: +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Retejo:»$[siteurl] -Salutnomo:»$[email] -Pasvorto:»$[password] +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas -ensalutita. +Thank you and welcome to {{$sitename}}. -Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn. +Sincerely, + {{$sitename}} Administrator -Eble vi volas aldoni kelkajn bazajn informojn al via profilo -(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj. - -Ni rekomendas agordi vian plenan noman, aldoni profilbildon, -kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj -eble en kiu lando vi loĝas, se vi ne volas pli specifa -ol tio. - -Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas. -Se vi novas kaj ne konas iun ĉi tie, ili eble helpas -vin trovi novajn kaj interesajn amikojn. - - -Dankon kaj bonvenon ĉe $[sitename]. - -Salutoj, - $[sitename] administranto - -
\ No newline at end of file + diff --git a/view/eo/register_verify_eml.tpl b/view/eo/register_verify_eml.tpl index cc99ab4b6..85d9a12d3 100644 --- a/view/eo/register_verify_eml.tpl +++ b/view/eo/register_verify_eml.tpl @@ -1,25 +1,25 @@ -Nova peto por registrado atendas ĉe $[sitename] -kaj bezonas vian aprobon. +A new user registration request was received at {{$sitename}} which requires +your approval. -Jen la detaloj de la peto: +The login details are as follows: -Plena Nomo:»$[username] -Retejo:»$[siteurl] -Salutnomo:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} +To approve this request please visit the following link: -Aprobonte la peton, bonvolu klaki tiun ligilon: +{{$siteurl}}/regmod/allow/{{$hash}} -$[siteurl]/regmod/allow/$[hash] +To deny the request and remove the account, please visit: -Malaprobonte kaj forviŝonte la konton, bonvolu klaki: +{{$siteurl}}/regmod/deny/{{$hash}} -$[siteurl]/regmod/deny/$[hash] +Thank you. -Dankon! diff --git a/view/eo/request_notify_eml.tpl b/view/eo/request_notify_eml.tpl index eb91414b9..d01b8ff27 100644 --- a/view/eo/request_notify_eml.tpl +++ b/view/eo/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Kara $[myname], +Dear {{$myname}}, -Vi ĵus ricevis kontaktpeton ĉe $[sitename] +You have just received a connection request at {{$sitename}} -de '$[requestor]'. +from '{{$requestor}}'. -Vi eblas viziti la profilon de la petanto ĉe $[url]. +You may visit their profile at {{$url}}. -Bonvolu ensaluti en la retejo por vidi la plenan prezenton -kaj aprobi aŭ ignori/nuligi la peton. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Salutoj, +Regards, - $[sitename] administranto
\ No newline at end of file + {{$sitename}} administrator diff --git a/view/eo/update_fail_eml.tpl b/view/eo/update_fail_eml.tpl index f7e0d8bce..a7df8fc2f 100644 --- a/view/eo/update_fail_eml.tpl +++ b/view/eo/update_fail_eml.tpl @@ -1,11 +1,13 @@ -Saluton!
-Mi estas $sitename.
-La programistoj de Frienda eldonis ĝisdatigon $update antaŭ ne longe,
-sed kiam mi provis instali ĝin, io terure malsukcesis.
-Tio tuj bezonas riparon kaj mi ne povas fari ĝin sole. Bonvolu kontakti
-Friendica programistion se vi ne povas helpi vin mem. Mia datumbazo eble ne plu validas.
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
-La erarmesaĝo estas '$error'.
+The error message is '{{$error}}'.
-Mi bedaŭras,
-via Friendica servilo ĉe $siteurl
\ No newline at end of file +Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl index 17bd2c01c..ba07b19da 100644 --- a/view/es/follow_notify_eml.tpl +++ b/view/es/follow_notify_eml.tpl @@ -1,13 +1,14 @@ -Estimado/a $myname, +Dear {{$myname}}, -Tienes un nuevo seguidor en $sitename - '$requestor'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Puedes visitar su perfil en $url. +You may visit their profile at {{$url}}. -Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud. +Please login to your site to approve or ignore/cancel the request. -$siteurl +{{$siteurl}} +Regards, - $sitename + {{$sitename}} administrator diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl index 0dc867efd..1c647b994 100644 --- a/view/es/friend_complete_eml.tpl +++ b/view/es/friend_complete_eml.tpl @@ -1,19 +1,22 @@ -Estimado/a $username, +Dear {{$username}}, - Grandes noticias... '$fn' a '$dfrn_url' ha aceptado tu solicitud de conexión en '$sitename'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico -sin restricción alguna. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Visita tu página de 'Contactos' en $sitename si desear realizar cualquier cambio en esta relación. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$siteurl +{{$siteurl}} -[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general -- y asignar derechos de visualización a '$fn']. +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. +Sincerely, - $sitename + {{$sitename}} Administrator diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/es/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl index a2964808c..2c2428d68 100644 --- a/view/es/intro_complete_eml.tpl +++ b/view/es/intro_complete_eml.tpl @@ -1,21 +1,22 @@ -Estimado/a $username, +Dear {{$username}}, - '$fn' en '$dfrn_url' ha aceptado tu petición -conexión a '$sitename'. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - '$fn' ha optado por aceptarte come "fan", que restringe ciertas -formas de comunicación, como mensajes privados y algunas interacciones -con el perfil. Si eres una "celebridad" o una página de comunidad, -estos ajustes se aplican automáticamente + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. - '$fn' puede optar por extender esto en una relación más permisiva -en el futuro. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Empezarás a recibir las actualizaciones públicas de estado de '$fn', -que aparecerán en tu página "Red" en + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$siteurl +{{$siteurl}} +Sincerely, - $sitename + {{$sitename}} Administrator diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl index 607744bfe..3b79d2791 100644 --- a/view/es/lostpass_eml.tpl +++ b/view/es/lostpass_eml.tpl @@ -1,34 +1,32 @@ -Estimado/a $username, - - Se ha recibido una solicitud en $sitename recientemente para restablecer -tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de -verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador. +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 +below or paste it into your web browser address bar. -Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora -y/o elimina este mensaje. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien -emitió esta solicitud. +Your password will not be changed unless we can verify that you +issued this request. -Sigue este enlace para verificar tu identidad: +Follow this link to verify your identity: -$reset_link +{{$reset_link}} -A continuación recibirás un mensaje con la nueva contraseña. +You will then receive a follow-up message containing the new password. -Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de -configuración. +You may change that password from your account settings page after logging in. -Los datos de acceso son los siguientes: +The login details are as follows: -Sitio: $siteurl -Nombre: $email +Site Location: {{$siteurl}} +Login Name: {{$email}} -Saludos, - La administración de $sitename +Sincerely, + {{$sitename}} Administrator diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl index 7959846b7..0d94be3c2 100644 --- a/view/es/passchanged_eml.tpl +++ b/view/es/passchanged_eml.tpl @@ -1,19 +1,20 @@ -Estimado/a $username, +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). - Tu contraseña ha sido modificada como has solicitado. Anota esta información -(o cambia inmediatamente la contraseña con algo que recuerdes). +Your login details are as follows: -Tus datos de acceso son los siguientes: +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Sitio: $siteurl -Nombre: $email -Contraseña: $new_password +You may change that password from your account settings page after logging in. -Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil. - - $sitename +Sincerely, + {{$sitename}} Administrator diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl index 7c7a90b40..4b397201c 100644 --- a/view/es/register_open_eml.tpl +++ b/view/es/register_open_eml.tpl @@ -1,21 +1,19 @@ -Estimado/a $username, +An account has been created at {{$sitename}} for this email address. +The login details are as follows: - Gracias por registrarte en $sitename. Tu cuenta ha sido creada. +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Los datos de acceso son los siguientes: +Thank you and welcome to {{$sitename}}. -Sitio: $siteurl -Nombre: $email -Contraseña: $password - - -Después de acceder puedes cambiar tu contraseña en la página de "Configuración". - -Toma un momento para revisar las otras configuraciones de la cuenta en esa página. - - -Gracias y bienvenido/a $sitename. +Sincerely, + {{$sitename}} Administrator diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl index 9f2cc4d9b..85d9a12d3 100644 --- a/view/es/register_verify_eml.tpl +++ b/view/es/register_verify_eml.tpl @@ -1,22 +1,25 @@ -Se ha recibido la solicitud de registro de un nuevo usuario en -$sitename que requiere tu aprobación. +A new user registration request was received at {{$sitename}} which requires +your approval. -Los datos de acceso son los siguientes: -Nombre Completo: $username -Sitio: $siteurl -Nombre: $email +The login details are as follows: +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} -Para aprobar esta solicitud, visita el siguiente enlace: +To approve this request please visit the following link: -$siteurl/regmod/allow/$hash -Para denegar la solicitud y eliminar la cuenta, por favor visita: +{{$siteurl}}/regmod/allow/{{$hash}} -$siteurl/regmod/deny/$hash +To deny the request and remove the account, please visit: -Gracias. + +{{$siteurl}}/regmod/deny/{{$hash}} + + +Thank you. diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl index 6161c45c1..d01b8ff27 100644 --- a/view/es/request_notify_eml.tpl +++ b/view/es/request_notify_eml.tpl @@ -1,13 +1,17 @@ -Estimado/a $myname, +Dear {{$myname}}, -Acabas de recibir una solicitud de conexión de '$requestor' en $sitename. +You have just received a connection request at {{$sitename}} -Puedes visitar su perfil en $url. +from '{{$requestor}}'. -Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud. +You may visit their profile at {{$url}}. -$siteurl +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. +{{$siteurl}} - $sitename +Regards, + + {{$sitename}} administrator diff --git a/view/es/update_fail_eml.tpl b/view/es/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/es/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl index 10d0b343b..ba07b19da 100644 --- a/view/fr/follow_notify_eml.tpl +++ b/view/fr/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Cher(e) $myname, +Dear {{$myname}}, -Une nouvelle personne - $requestor - vous suit désormais sur $sitename. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Vous pouvez consulter son profil sur $url. +You may visit their profile at {{$url}}. -Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande. +Please login to your site to approve or ignore/cancel the request. -$siteurl +{{$siteurl}} -Cordialement, +Regards, - l'administrateur de $sitename + {{$sitename}} administrator diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl index 1f2553b5e..1c647b994 100644 --- a/view/fr/friend_complete_eml.tpl +++ b/view/fr/friend_complete_eml.tpl @@ -1,23 +1,22 @@ -Cher(e) $username, +Dear {{$username}}, - Grande nouvelle… « $fn » (de « $dfrn_url ») a accepté votre -demande de connexion à « $sitename ». + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Vous êtes désormais dans une relation réciproque et pouvez échanger des -photos, des humeurs et des messages sans restriction. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Merci de visiter votre page « Contacts » sur $sitename pour toute -modification que vous souhaiteriez apporter à cette relation. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$siteurl +{{$siteurl}} -[Par exemple, vous pouvez créer un profil spécifique avec des informations -cachées au grand public - et ainsi assigner des droits privilégiés à -« $fn »]/ +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Sincèremment, +Sincerely, - l'administrateur de $sitename + {{$sitename}} Administrator diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/fr/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl index f698cfeb7..2c2428d68 100644 --- a/view/fr/intro_complete_eml.tpl +++ b/view/fr/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Cher(e) $username, +Dear {{$username}}, - « $fn » du site « $dfrn_url » a accepté votre -demande de mise en relation sur « $sitename ». + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - « $fn » a décidé de vous accepter comme « fan », ce qui restreint -certains de vos moyens de communication - tels que les messages privés et -certaines interactions avec son profil. S'il s'agit de la page d'une -célébrité et/ou communauté, ces réglages ont été définis automatiquement. + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. - « $fn » pourra choisir d'étendre votre relation à quelque chose de -plus permissif dans l'avenir. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Vous allez commencer à recevoir les mises à jour publiques du -statut de « $fn », lesquelles apparaîtront sur votre page « Réseau » sur + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$siteurl +{{$siteurl}} -Sincèrement votre, +Sincerely, - l'administrateur de $sitename + {{$sitename}} Administrator diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl index 96c11d723..3b79d2791 100644 --- a/view/fr/lostpass_eml.tpl +++ b/view/fr/lostpass_eml.tpl @@ -1,34 +1,32 @@ -Cher(e) $username, +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 +below or paste it into your web browser address bar. - Nous avons récemment reçu, chez $sitename, une demande de remise -à zéro du mot de passe protégeant votre compte. Pour confirmer cette -demande, merci de cliquer sur le lien de vérification suivant, ou de le -coller dans la barre d'adresse de votre navigateur web. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre -le lien en question, et d'ignorer/supprimer ce courriel. +Your password will not be changed unless we can verify that you +issued this request. -Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu -nous assurer que vous êtes bien à l'origine de cette demande. +Follow this link to verify your identity: -Merci de suivre le lien suivant pour confirmer votre identité : +{{$reset_link}} -$reset_link +You will then receive a follow-up message containing the new password. -Vous recevrez en retour un message avec votre nouveau mot de passe. +You may change that password from your account settings page after logging in. -Vous pourrez ensuite changer ce mot de passe, après connexion, dans la -page des réglages du compte. +The login details are as follows: -Les informations du compte concerné sont : +Site Location: {{$siteurl}} +Login Name: {{$email}} -Site : $siteurl -Pseudo/Courriel : $email -Sincèrement votre, - l'administrateur de $sitename +Sincerely, + {{$sitename}} Administrator diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl index 4ea8899fc..0d94be3c2 100644 --- a/view/fr/passchanged_eml.tpl +++ b/view/fr/passchanged_eml.tpl @@ -1,20 +1,20 @@ -Cher(e) $username, +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). - Votre mot de passe a été modifié comme demandé. Merci de conserver -cette information pour un usage ultérieur (ou bien de changer votre mot de -passe immédiatement en quelque chose dont vous vous souviendrez). -Vos informations de connexion sont désormais : +Your login details are as follows: -Site : $siteurl -Pseudo/Courriel : $email -Mot de passe : $new_password +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, -après connexion +You may change that password from your account settings page after logging in. -Sincèrement votre, - l'administrateur de $sitename + +Sincerely, + {{$sitename}} Administrator diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl index 5d9e737c3..4b397201c 100644 --- a/view/fr/register_open_eml.tpl +++ b/view/fr/register_open_eml.tpl @@ -1,22 +1,19 @@ -Cher(e) $username, +An account has been created at {{$sitename}} for this email address. +The login details are as follows: - Merci de votre inscription à $sitename. Votre compte a été créé. -Les informations de connexion sont les suivantes : +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Site : $siteurl -Pseudo/Courriel : $email -Mot de passe : $password +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte, -après connexion. +Thank you and welcome to {{$sitename}}. -Merci de prendre quelques minutes pour découvrir les autres réglages disponibles -sur cette page. - -Merci, et bienvenue sur $sitename. - -Sincèrement votre, - l'administrateur de $sitename +Sincerely, + {{$sitename}} Administrator diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl index 9cb31a6a8..85d9a12d3 100644 --- a/view/fr/register_verify_eml.tpl +++ b/view/fr/register_verify_eml.tpl @@ -1,27 +1,25 @@ -Une nouvelle demande d'inscription a été reçue sur $sitename, et elle -nécessite votre approbation. +A new user registration request was received at {{$sitename}} which requires +your approval. -Les informations de connexion sont les suivantes : +The login details are as follows: -Nom complet : $username -Site : $siteurl -Pseudo/Courriel : $email +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} +To approve this request please visit the following link: -Pour approuver cette demande, merci de suivre le lien : +{{$siteurl}}/regmod/allow/{{$hash}} -$siteurl/regmod/allow/$hash +To deny the request and remove the account, please visit: -Pour rejeter cette demande et supprimer le compte associé, -merci de suivre le lien : +{{$siteurl}}/regmod/deny/{{$hash}} -$siteurl/regmod/deny/$hash - -En vous remerçiant. +Thank you. diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl index 9234ceaaa..d01b8ff27 100644 --- a/view/fr/request_notify_eml.tpl +++ b/view/fr/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Cher(e) $myname, +Dear {{$myname}}, -Vous venez de recevoir une demande de mise en relation sur $sitename +You have just received a connection request at {{$sitename}} -venant de « $requestor ». +from '{{$requestor}}'. -Vous pouvez visiter son profil sur $url. +You may visit their profile at {{$url}}. -Vous pouvez vous connecter à votre site pour voir la demande -complète et l'approuver ou l'ignorer/annuler. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$siteurl +{{$siteurl}} -Cordialement, +Regards, - l'administrateur de $sitename + {{$sitename}} administrator diff --git a/view/fr/update_fail_eml.tpl b/view/fr/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/fr/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/it/follow_notify_eml.tpl b/view/it/follow_notify_eml.tpl index c85a0cdc9..ba07b19da 100644 --- a/view/it/follow_notify_eml.tpl +++ b/view/it/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Ciao $[myname], +Dear {{$myname}}, -Un nuovo utente ha iniziato a seguirti su $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Puoi vedere il suo profilo su $[url]. +You may visit their profile at {{$url}}. -Accedi sul tuo sito per approvare o ignorare la richiesta. +Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Saluti, +Regards, - L'amministratore di $[sitename]
\ No newline at end of file + {{$sitename}} administrator diff --git a/view/it/friend_complete_eml.tpl b/view/it/friend_complete_eml.tpl index 890b0148c..1c647b994 100644 --- a/view/it/friend_complete_eml.tpl +++ b/view/it/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Ciao $[username], +Dear {{$username}}, - Ottime notizie... '$[fn]' di '$[dfrn_url]' ha accettato -la tua richiesta di connessione su '$[sitename]'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email -senza restrizioni. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Vai nella pagina 'Contatti' di $[sitename] se vuoi effettuare -qualche modifica riguardo questa relazione +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$[siteurl] +{{$siteurl}} -[Ad esempio, potresti creare un profilo separato con le informazioni che non -sono disponibili pubblicamente - ed permettere di vederlo a '$[fn]']. +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Saluti, +Sincerely, - l'amministratore di $[sitename] + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/it/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/it/intro_complete_eml.tpl b/view/it/intro_complete_eml.tpl index 46fe7018b..2c2428d68 100644 --- a/view/it/intro_complete_eml.tpl +++ b/view/it/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Ciao $[username], +Dear {{$username}}, - '$[fn]' di '$[dfrn_url]' ha accettato -la tua richiesta di connessione a '$[sitename]'. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - '$[fn]' ha deciso di accettarti come "fan", il che restringe -alcune forme di comunicazione - come i messaggi privati e alcune -interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno -applicate automaticamente. + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. - '$[fn]' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva -. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Inizierai a ricevere gli aggiornamenti di stato pubblici da '$[fn]', -che apparirà nella tua pagina 'Rete' + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} -Saluti, +Sincerely, - l'amministratore di $[sitename]
\ No newline at end of file + {{$sitename}} Administrator diff --git a/view/it/lostpass_eml.tpl b/view/it/lostpass_eml.tpl index 26d3d6817..3b79d2791 100644 --- a/view/it/lostpass_eml.tpl +++ b/view/it/lostpass_eml.tpl @@ -1,32 +1,32 @@ -Ciao $[username], - Su $[sitename] è stata ricevuta una richiesta di azzeramento di password per un account. -Per confermare la richiesta, clicca sul link di verifica -qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. +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 +below or paste it into your web browser address bar. -Se NON hai richiesto l'azzeramento, NON seguire il link -e ignora e/o cancella questa email. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -La tua password non sarà modificata finché non avremo verificato che -hai fatto questa richiesta. +Your password will not be changed unless we can verify that you +issued this request. -Per verificare la tua identità clicca su: +Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} -Dopo la verifica riceverai un messaggio di risposta con la nuova password. +You will then receive a follow-up message containing the new password. -Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso. +You may change that password from your account settings page after logging in. -I dati di accesso sono i seguenti: +The login details are as follows: -Sito:»$[siteurl] -Nome utente:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} -Saluti, - l'amministratore di $[sitename] +Sincerely, + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/it/passchanged_eml.tpl b/view/it/passchanged_eml.tpl index ab3f1aede..0d94be3c2 100644 --- a/view/it/passchanged_eml.tpl +++ b/view/it/passchanged_eml.tpl @@ -1,20 +1,20 @@ -Ciao $[username], - La tua password è cambiata come hai richiesto. Conserva queste -informazioni (oppure cambia immediatamente la password con -qualcosa che ti è più facile ricordare). +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). -I tuoi dati di access sono i seguenti: +Your login details are as follows: -Sito:»$[siteurl] -Nome utente:»$[email] -Password:»$[new_password] +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso. +You may change that password from your account settings page after logging in. -Saluti, - l'amministratore di $[sitename] +Sincerely, + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/it/register_open_eml.tpl b/view/it/register_open_eml.tpl index 11a7752bc..4b397201c 100644 --- a/view/it/register_open_eml.tpl +++ b/view/it/register_open_eml.tpl @@ -1,34 +1,19 @@ -Ciao $[username], - Grazie per aver effettuato la registrazione a $[sitename]. Il tuo account è stato creato. -I dettagli di accesso sono i seguenti +An account has been created at {{$sitename}} for this email address. +The login details are as follows: +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Sito:»$[siteurl] -Nome utente:»$[email] -Password:»$[password] +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso -. +Thank you and welcome to {{$sitename}}. -Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina. +Sincerely, + {{$sitename}} Administrator -Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo -(nella pagina "Profilo") per rendere agli altri più facile trovarti. - -Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto, -di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e -magari il paese dove vivi; se non vuoi essere più dettagliato -di così. - -Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. -Se ancora non conosci nessuno qui, potrebbe esserti di aiuto -per farti nuovi e interessanti amici. - - -Grazie. Siamo contenti di darti il benvenuto su $[sitename] - -Saluti, - l'amministratore di $[sitename] - -
\ No newline at end of file + diff --git a/view/it/register_verify_eml.tpl b/view/it/register_verify_eml.tpl index baac57976..85d9a12d3 100644 --- a/view/it/register_verify_eml.tpl +++ b/view/it/register_verify_eml.tpl @@ -1,25 +1,25 @@ -Su $[sitename] è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede -la tua approvazione. +A new user registration request was received at {{$sitename}} which requires +your approval. -I tuoi dati di accesso sono i seguenti: +The login details are as follows: -Nome completo:»$[username] -Sito:»$[siteurl] -Nome utente:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} +To approve this request please visit the following link: -Per approvare questa richiesta clicca su: +{{$siteurl}}/regmod/allow/{{$hash}} -$[siteurl]/regmod/allow/$[hash] +To deny the request and remove the account, please visit: -Per negare la richiesta e rimuove il profilo, clicca su: +{{$siteurl}}/regmod/deny/{{$hash}} -$[siteurl]/regmod/deny/$[hash] +Thank you. -Grazie. diff --git a/view/it/request_notify_eml.tpl b/view/it/request_notify_eml.tpl index 1360be90c..d01b8ff27 100644 --- a/view/it/request_notify_eml.tpl +++ b/view/it/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Ciao $[myname], +Dear {{$myname}}, -Hai appena ricevuto una richiesta di connessione da $[sitename] +You have just received a connection request at {{$sitename}} -da '$[requestor]'. +from '{{$requestor}}'. -Puoi visitare il suo profilo su $[url]. +You may visit their profile at {{$url}}. -Accedi al tuo sito per vedere la richiesta completa -e approva o ignora/annulla la richiesta. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Saluti, +Regards, - l'amministratore di $[sitename]
\ No newline at end of file + {{$sitename}} administrator diff --git a/view/it/update_fail_eml.tpl b/view/it/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/it/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/nb-no/follow_notify_eml.tpl b/view/nb-no/follow_notify_eml.tpl index 73a347027..ba07b19da 100644 --- a/view/nb-no/follow_notify_eml.tpl +++ b/view/nb-no/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Kjære $[myname], +Dear {{$myname}}, -Du har en ny følgesvenn på $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Du kan besøke profilen deres på $[url]. +You may visit their profile at {{$url}}. -Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen. +Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Med vennlig hilsen, +Regards, - $[sitename] administrator
\ No newline at end of file + {{$sitename}} administrator diff --git a/view/nb-no/friend_complete_eml.tpl b/view/nb-no/friend_complete_eml.tpl index 4526c94d0..1c647b994 100644 --- a/view/nb-no/friend_complete_eml.tpl +++ b/view/nb-no/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Kjære $[username], +Dear {{$username}}, - Gode nyheter... '$[fn]' ved '$[dfrn_url]' har godtatt -din forespørsel om kobling hos '$[sitename]'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post -uten hindringer. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Vennligst besøk din side "Kontakter" ved $[sitename] hvis du ønsker å gjøre -noen endringer på denne forbindelsen. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$[siteurl] +{{$siteurl}} -[For eksempel, så kan du lage en egen profil med informasjon som ikke er -tilgjengelig for alle - og angi visningsrettigheter til '$[fn]']. +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Med vennlig hilsen, +Sincerely, - $[sitename] administrator + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/nb-no/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/nb-no/intro_complete_eml.tpl b/view/nb-no/intro_complete_eml.tpl index 17b0be5a8..2c2428d68 100644 --- a/view/nb-no/intro_complete_eml.tpl +++ b/view/nb-no/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Kjære $[username], +Dear {{$username}}, - '$[fn]' ved '$[dfrn_url]' har godtatt -din forespørsel om kobling ved $[sitename]'. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - '$[fn]' har valgt å godta deg som "fan", som begrenser -noen typer kommunikasjon - slik som private meldinger og noen profilhandlinger. -Hvis dette er en kjendis- eller forumside, så ble disse innstillingene -angitt automatisk. + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. - '$[fn]' kan velge å utvide dette til en to-veis eller mer åpen -forbindelse i fremtiden. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Du vil nå motta offentlige statusoppdateringer fra '$[fn]', -som vil vises på din "Nettverk"-side ved + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} -Med vennlig hilsen, +Sincerely, - $[sitename] administrator
\ No newline at end of file + {{$sitename}} Administrator diff --git a/view/nb-no/lostpass_eml.tpl b/view/nb-no/lostpass_eml.tpl index 762c8c2e9..3b79d2791 100644 --- a/view/nb-no/lostpass_eml.tpl +++ b/view/nb-no/lostpass_eml.tpl @@ -1,32 +1,32 @@ -Kjære $[username], - En forespørsel ble nylig mottatt hos $[sitename] om å tilbakestille din kontos -passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken -nedenfor eller lim den inn på adresselinjen i nettleseren din. +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 +below or paste it into your web browser address bar. -Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken -som er oppgitt og ignorer og/eller slett denne e-posten. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du -sendte denne forespørselen. +Your password will not be changed unless we can verify that you +issued this request. -Følg denne lenken for å bekrefte din identitet: +Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} -Du vil da motta en oppfølgings melding med det nye passordet. +You will then receive a follow-up message containing the new password. -Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging. +You may change that password from your account settings page after logging in. -Innloggingsdetaljene er som følger: +The login details are as follows: -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} -Beste hilsen, - $[sitename] administrator +Sincerely, + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/nb-no/passchanged_eml.tpl b/view/nb-no/passchanged_eml.tpl index 6f153d38c..0d94be3c2 100644 --- a/view/nb-no/passchanged_eml.tpl +++ b/view/nb-no/passchanged_eml.tpl @@ -1,20 +1,20 @@ -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 -noe du husker). +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). -Dine logg inn-detaljer er som følger: +Your login details are as follows: -Nettsted:»$[siteurl] -Brukernavn:»$[email] -Passord:»$[new_password] +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging. +You may change that password from your account settings page after logging in. -Med vennlig hilsen, - $[sitename] administrator +Sincerely, + {{$sitename}} Administrator -
\ No newline at end of file + diff --git a/view/nb-no/register_open_eml.tpl b/view/nb-no/register_open_eml.tpl index 345ca0b65..4b397201c 100644 --- a/view/nb-no/register_open_eml.tpl +++ b/view/nb-no/register_open_eml.tpl @@ -1,34 +1,19 @@ -Kjære $[username], - Takk for at du registrerte deg hos $[sitename]. Kontoen din er opprettet. -Innloggingsdetaljene er som følger: +An account has been created at {{$sitename}} for this email address. +The login details are as follows: +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] -Passord:»$[password] +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget -inn. +Thank you and welcome to {{$sitename}}. -Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden. +Sincerely, + {{$sitename}} Administrator -Du vil antakelig ønske å legge til litt grunnleggende informasjon til standardprofilen din -(på siden "Profiler") slik at folk lettere kan finne deg. - -Vi anbefaler å oppgi fullt navn, legge til et profilbilde, -legge til noen "nøkkelord" for profilen (svært nyttig for å få nye venner) - og -kanskje hvilket land du bor i, hvis du ikke ønsker å være mer spesifikk -enn det. - -Vi respekterer ditt privatliv fullt ut, og ingen av disse elementene er nødvendige. -Hvis du er ny og ikke kjenner noen her, så kan de hjelpe -deg å få noen nye og interessante venner. - - -Takk og velkommen til $[sitename]. - -Beste hilsen, - $[sitename] administrator - -
\ No newline at end of file + diff --git a/view/nb-no/register_verify_eml.tpl b/view/nb-no/register_verify_eml.tpl index 4c2176d7d..85d9a12d3 100644 --- a/view/nb-no/register_verify_eml.tpl +++ b/view/nb-no/register_verify_eml.tpl @@ -1,25 +1,25 @@ -En ny forespørsel om brukerregistering ble mottatt hos $[sitename] og krever -din godkjenning. +A new user registration request was received at {{$sitename}} which requires +your approval. -Innloggingsdetaljene er som følger: +The login details are as follows: -Fullt navn:»$[username] -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} +To approve this request please visit the following link: -For å godkjenne denne forespørselen, vennligst besøk følgende lenke: +{{$siteurl}}/regmod/allow/{{$hash}} -$[siteurl]/regmod/allow/$[hash] +To deny the request and remove the account, please visit: -For å avslå denne forespørselen og fjerne kontoen, vennligst besøk: +{{$siteurl}}/regmod/deny/{{$hash}} -$[siteurl]/regmod/deny/$[hash] +Thank you. -Mange takk. diff --git a/view/nb-no/request_notify_eml.tpl b/view/nb-no/request_notify_eml.tpl index e6a62c51f..d01b8ff27 100644 --- a/view/nb-no/request_notify_eml.tpl +++ b/view/nb-no/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Kjære $[myname], +Dear {{$myname}}, -Du har akkurat mottatt en kontaktforespørsel hos $[sitename] +You have just received a connection request at {{$sitename}} -fra '$[requestor]'. +from '{{$requestor}}'. -Du kan besøke profilen på $[url]. +You may visit their profile at {{$url}}. -Vennligst logg inn på ditt nettsted for å se hele introduksjonen -og godkjenne eller ignorere/avbryte forespørselen. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Beste hilsen, +Regards, - $[siteurl] administrator
\ No newline at end of file + {{$sitename}} administrator diff --git a/view/nb-no/update_fail_eml.tpl b/view/nb-no/update_fail_eml.tpl index a4a3cf950..a7df8fc2f 100644 --- a/view/nb-no/update_fail_eml.tpl +++ b/view/nb-no/update_fail_eml.tpl @@ -1,11 +1,13 @@ -Hei,
-jeg er $sitename.
-Friendica-utviklerne slapp nylig oppdateringen $update,
-men da jeg prøvde å installere den, gikk noe forferdelig galt.
-Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en
-Friendica-utvikler hvis du ikke kan hjelpe meg på egenhånd. Databasen min er kanskje ugyldig.
+Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
-Feilmeldingen er '$error'.
+The error message is '{{$error}}'.
-Jeg beklager,
-din Friendica-tjener hos $siteurl
\ No newline at end of file +Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/pt-br/follow_notify_eml.tpl b/view/pt-br/follow_notify_eml.tpl new file mode 100644 index 000000000..ba07b19da --- /dev/null +++ b/view/pt-br/follow_notify_eml.tpl @@ -0,0 +1,14 @@ + +Dear {{$myname}}, + +You have a new follower at {{$sitename}} - '{{$requestor}}'. + +You may visit their profile at {{$url}}. + +Please login to your site to approve or ignore/cancel the request. + +{{$siteurl}} + +Regards, + + {{$sitename}} administrator diff --git a/view/pt-br/friend_complete_eml.tpl b/view/pt-br/friend_complete_eml.tpl new file mode 100644 index 000000000..1c647b994 --- /dev/null +++ b/view/pt-br/friend_complete_eml.tpl @@ -0,0 +1,22 @@ + +Dear {{$username}}, + + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. + +You are now mutual friends and may exchange status updates, photos, and email +without restriction. + +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. + +{{$siteurl}} + +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. + +Sincerely, + + {{$sitename}} Administrator + + diff --git a/view/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/pt-br/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/pt-br/intro_complete_eml.tpl b/view/pt-br/intro_complete_eml.tpl new file mode 100644 index 000000000..2c2428d68 --- /dev/null +++ b/view/pt-br/intro_complete_eml.tpl @@ -0,0 +1,22 @@ + +Dear {{$username}}, + + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. + + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. + + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. + + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at + +{{$siteurl}} + +Sincerely, + + {{$sitename}} Administrator diff --git a/view/pt-br/lostpass_eml.tpl b/view/pt-br/lostpass_eml.tpl new file mode 100644 index 000000000..3b79d2791 --- /dev/null +++ b/view/pt-br/lostpass_eml.tpl @@ -0,0 +1,32 @@ + +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 +below or paste it into your web browser address bar. + +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. + +Your password will not be changed unless we can verify that you +issued this request. + +Follow this link to verify your identity: + +{{$reset_link}} + +You will then receive a follow-up message containing the new password. + +You may change that password from your account settings page after logging in. + +The login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} + + + + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/pt-br/passchanged_eml.tpl b/view/pt-br/passchanged_eml.tpl new file mode 100644 index 000000000..0d94be3c2 --- /dev/null +++ b/view/pt-br/passchanged_eml.tpl @@ -0,0 +1,20 @@ + +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). + + +Your login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} + +You may change that password from your account settings page after logging in. + + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/pt-br/register_open_eml.tpl b/view/pt-br/register_open_eml.tpl new file mode 100644 index 000000000..4b397201c --- /dev/null +++ b/view/pt-br/register_open_eml.tpl @@ -0,0 +1,19 @@ + +An account has been created at {{$sitename}} for this email address. +The login details are as follows: + +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) + +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. + +Thank you and welcome to {{$sitename}}. + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/pt-br/register_verify_eml.tpl b/view/pt-br/register_verify_eml.tpl new file mode 100644 index 000000000..85d9a12d3 --- /dev/null +++ b/view/pt-br/register_verify_eml.tpl @@ -0,0 +1,25 @@ + +A new user registration request was received at {{$sitename}} which requires +your approval. + + +The login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: + + +{{$siteurl}}/regmod/allow/{{$hash}} + + +To deny the request and remove the account, please visit: + + +{{$siteurl}}/regmod/deny/{{$hash}} + + +Thank you. + diff --git a/view/pt-br/request_notify_eml.tpl b/view/pt-br/request_notify_eml.tpl new file mode 100644 index 000000000..d01b8ff27 --- /dev/null +++ b/view/pt-br/request_notify_eml.tpl @@ -0,0 +1,17 @@ + +Dear {{$myname}}, + +You have just received a connection request at {{$sitename}} + +from '{{$requestor}}'. + +You may visit their profile at {{$url}}. + +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. + +{{$siteurl}} + +Regards, + + {{$sitename}} administrator diff --git a/view/pt-br/update_fail_eml.tpl b/view/pt-br/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/pt-br/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/ru/follow_notify_eml.tpl b/view/ru/follow_notify_eml.tpl new file mode 100644 index 000000000..ba07b19da --- /dev/null +++ b/view/ru/follow_notify_eml.tpl @@ -0,0 +1,14 @@ + +Dear {{$myname}}, + +You have a new follower at {{$sitename}} - '{{$requestor}}'. + +You may visit their profile at {{$url}}. + +Please login to your site to approve or ignore/cancel the request. + +{{$siteurl}} + +Regards, + + {{$sitename}} administrator diff --git a/view/ru/friend_complete_eml.tpl b/view/ru/friend_complete_eml.tpl new file mode 100644 index 000000000..1c647b994 --- /dev/null +++ b/view/ru/friend_complete_eml.tpl @@ -0,0 +1,22 @@ + +Dear {{$username}}, + + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. + +You are now mutual friends and may exchange status updates, photos, and email +without restriction. + +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. + +{{$siteurl}} + +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. + +Sincerely, + + {{$sitename}} Administrator + + diff --git a/view/ru/htconfig.tpl b/view/ru/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/ru/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/ru/intro_complete_eml.tpl b/view/ru/intro_complete_eml.tpl new file mode 100644 index 000000000..2c2428d68 --- /dev/null +++ b/view/ru/intro_complete_eml.tpl @@ -0,0 +1,22 @@ + +Dear {{$username}}, + + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. + + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. + + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. + + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at + +{{$siteurl}} + +Sincerely, + + {{$sitename}} Administrator diff --git a/view/ru/lostpass_eml.tpl b/view/ru/lostpass_eml.tpl new file mode 100644 index 000000000..3b79d2791 --- /dev/null +++ b/view/ru/lostpass_eml.tpl @@ -0,0 +1,32 @@ + +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 +below or paste it into your web browser address bar. + +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. + +Your password will not be changed unless we can verify that you +issued this request. + +Follow this link to verify your identity: + +{{$reset_link}} + +You will then receive a follow-up message containing the new password. + +You may change that password from your account settings page after logging in. + +The login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} + + + + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/ru/passchanged_eml.tpl b/view/ru/passchanged_eml.tpl new file mode 100644 index 000000000..0d94be3c2 --- /dev/null +++ b/view/ru/passchanged_eml.tpl @@ -0,0 +1,20 @@ + +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). + + +Your login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} + +You may change that password from your account settings page after logging in. + + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/ru/register_open_eml.tpl b/view/ru/register_open_eml.tpl new file mode 100644 index 000000000..4b397201c --- /dev/null +++ b/view/ru/register_open_eml.tpl @@ -0,0 +1,19 @@ + +An account has been created at {{$sitename}} for this email address. +The login details are as follows: + +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) + +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. + +Thank you and welcome to {{$sitename}}. + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/ru/register_verify_eml.tpl b/view/ru/register_verify_eml.tpl new file mode 100644 index 000000000..85d9a12d3 --- /dev/null +++ b/view/ru/register_verify_eml.tpl @@ -0,0 +1,25 @@ + +A new user registration request was received at {{$sitename}} which requires +your approval. + + +The login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: + + +{{$siteurl}}/regmod/allow/{{$hash}} + + +To deny the request and remove the account, please visit: + + +{{$siteurl}}/regmod/deny/{{$hash}} + + +Thank you. + diff --git a/view/ru/request_notify_eml.tpl b/view/ru/request_notify_eml.tpl new file mode 100644 index 000000000..d01b8ff27 --- /dev/null +++ b/view/ru/request_notify_eml.tpl @@ -0,0 +1,17 @@ + +Dear {{$myname}}, + +You have just received a connection request at {{$sitename}} + +from '{{$requestor}}'. + +You may visit their profile at {{$url}}. + +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. + +{{$siteurl}} + +Regards, + + {{$sitename}} administrator diff --git a/view/ru/update_fail_eml.tpl b/view/ru/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/ru/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl index fee08bdca..ba07b19da 100644 --- a/view/sv/follow_notify_eml.tpl +++ b/view/sv/follow_notify_eml.tpl @@ -1,12 +1,14 @@ -$myname, -'$requestor' på $sitename vill följa dina uppdateringar här på Friendika. +Dear {{$myname}}, -Besök dennes profil på $url. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Logga in för att godkänna eller avslå förfrågan. +You may visit their profile at {{$url}}. -$siteurl +Please login to your site to approve or ignore/cancel the request. -Hälsningar, -$sitename admin +{{$siteurl}} + +Regards, + + {{$sitename}} administrator diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl index 2b8b0238e..1c647b994 100644 --- a/view/sv/friend_complete_eml.tpl +++ b/view/sv/friend_complete_eml.tpl @@ -1,17 +1,22 @@ -$username, -Goda nyheter... '$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. +Dear {{$username}}, -Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden -utan begränsningar. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Gå in på din sida 'Kontakter' på $sitename om du vill göra några -ändringar när det gäller denna kontakt. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -$siteurl +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -[Du kan exempelvis skapa en separat profil med information som inte -är tillgänglig för vem som helst, och ge visningsrättigheter till '$fn']. +{{$siteurl}} -Hälsningar, -$sitename admin +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. + +Sincerely, + + {{$sitename}} Administrator + + diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/sv/htconfig.tpl @@ -0,0 +1,70 @@ +<?php + +// Set the following for your MySQL installation +// Copy or rename this file to .htconfig.php + +$db_host = '{{$dbhost}}'; +$db_port = '{{$dbport}}'; +$db_user = '{{$dbuser}}'; +$db_pass = '{{$dbpass}}'; +$db_data = '{{$dbdata}}'; + +/* + * Notice: Many of the following settings will be available in the admin panel + * after a successful site install. Once they are set in the admin panel, they + * are stored in the DB - and the DB setting will over-ride any corresponding + * setting in this file + * + * The command-line tool util/config is able to query and set the DB items + * directly if for some reason the admin panel is not available and a system + * setting requires modification. + * + */ + + +// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". +// It can be changed later and only applies to timestamps for anonymous viewers. + +$default_timezone = '{{$timezone}}'; + +// What is your site name? + +$a->config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl index 1f24af25f..2c2428d68 100644 --- a/view/sv/intro_complete_eml.tpl +++ b/view/sv/intro_complete_eml.tpl @@ -1,19 +1,22 @@ -$username, -'$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. +Dear {{$username}}, -'$fn' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar -i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion -mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts -per automatik. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -'$fn' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer -tillåtande kommunikationsform i framtiden. + '{{$fn}}' has chosen to accept you a "fan", which restricts +some forms of communication - such as private messaging and some profile +interactions. If this is a celebrity or community page, these settings were +applied automatically. -Du kommer hädanefter att få statusuppdateringar från '$fn', -vilka kommer att synas på din Nätverk-sida på + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. -$siteurl + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -Hälsningar, -$sitename admin +{{$siteurl}} + +Sincerely, + + {{$sitename}} Administrator diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl index df338fa69..3b79d2791 100644 --- a/view/sv/lostpass_eml.tpl +++ b/view/sv/lostpass_eml.tpl @@ -1,29 +1,32 @@ -$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å -klistra in länken i adressfältet i din webbläsare. +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 +below or paste it into your web browser address bar. -Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. -Då kan du ignorera det här meddelandet. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du -initierat detta. +Your password will not be changed unless we can verify that you +issued this request. -Med den här länken kan du bekräfta din identitet: +Follow this link to verify your identity: -$reset_link +{{$reset_link}} -Sedan kommer du att få ett meddelande med ett nytt lösenord. +You will then receive a follow-up message containing the new password. -Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. +You may change that password from your account settings page after logging in. -Detaljerna ser ut så här: +The login details are as follows: -Webbplats: $siteurl -Inloggningsnamn: $email +Site Location: {{$siteurl}} +Login Name: {{$email}} -Hälsningar, -$sitename admin -
\ No newline at end of file + + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl index 590462468..0d94be3c2 100644 --- a/view/sv/passchanged_eml.tpl +++ b/view/sv/passchanged_eml.tpl @@ -1,18 +1,20 @@ -$username, +Dear {{$username}}, + Your password has been changed as requested. Please retain this +information for your records (or change your password immediately to +something that you will remember). -Lösenordet har ändrats enligt din begäran. Behåll den här -informationen om den skulle behövas i framtiden. (eller ändra lösenord -på en gång till något som du kommer ihåg). +Your login details are as follows: -Här är dina inloggningsuppgifter: +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Webbplats: $siteurl -Användarnamn: $email -Lösenord: $new_password +You may change that password from your account settings page after logging in. -När du loggat in kan du byta lösenord bland inställningarna. -Hälsningar, -$sitename admin +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl index 1471c9b98..4b397201c 100644 --- a/view/sv/register_open_eml.tpl +++ b/view/sv/register_open_eml.tpl @@ -1,17 +1,19 @@ -$username, -Tack för att du registrerat dig på $sitename. Kontot har skapats. -Här är dina inloggningsuppgifter: -Webbplats: $siteurl -Användarnamn: $email -Lösenord: $password +An account has been created at {{$sitename}} for this email address. +The login details are as follows: -Lösenordet kan ändras på sidan Inställningar efter att du loggat in. +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Ägna en liten stund åt att gå igenom alla kontoinställningar där. +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Välkommen till $sitename. +Thank you and welcome to {{$sitename}}. -Hälsningar, -$sitename admin +Sincerely, + {{$sitename}} Administrator + diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl index aa72bc9aa..85d9a12d3 100644 --- a/view/sv/register_verify_eml.tpl +++ b/view/sv/register_verify_eml.tpl @@ -1,17 +1,25 @@ -En registreringsförfrågan som kräver svar har mottagits -på $sitename +A new user registration request was received at {{$sitename}} which requires +your approval. -Här är inloggningsuppgifterna: -Fullständigt namn: $username -Webbplats: $siteurl -Användarnamn: $email +The login details are as follows: +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} -Gå till denna adress om du vill godkänna: -$siteurl/regmod/allow/$hash +To approve this request please visit the following link: -Gå till denna adress om du vill avslå förfrågan och ta bort kontot: -$siteurl/regmod/deny/$hash + +{{$siteurl}}/regmod/allow/{{$hash}} + + +To deny the request and remove the account, please visit: + + +{{$siteurl}}/regmod/deny/{{$hash}} + + +Thank you. diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl index 893bce17c..d01b8ff27 100644 --- a/view/sv/request_notify_eml.tpl +++ b/view/sv/request_notify_eml.tpl @@ -1,13 +1,17 @@ -$myname, -Du har just fått en kontaktförfrågan på $sitename från '$requestor' +Dear {{$myname}}, -Profilen finns på $url. +You have just received a connection request at {{$sitename}} -Logga in för att se hela förfrågan och godkänna eller -avslå den. +from '{{$requestor}}'. -$siteurl +You may visit their profile at {{$url}}. -Hälsningar, -$sitename admin +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. + +{{$siteurl}} + +Regards, + + {{$sitename}} administrator diff --git a/view/sv/update_fail_eml.tpl b/view/sv/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/sv/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey,
+I'm the web server at {{$sitename}};
+
+The Red Matrix developers released update {{$update}} recently,
+but when I tried to install it, something went terribly wrong.
+This needs to be fixed soon and it requires human intervention.
+Please contact a Red developer if you can not figure out how to
+fix it on your own. My database might be invalid.
+
+The error message is '{{$error}}'.
+
+Apologies for the inconvenience,
+ your web server at {{$siteurl}}
\ No newline at end of file diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css index 74e109f95..43912be69 100644 --- a/view/theme/redbasic/css/dark.css +++ b/view/theme/redbasic/css/dark.css @@ -167,4 +167,16 @@ ul.menu-popup .menu-sep { .my-comment-photo { border-radius: 5px; box-shadow: 4px 4px 3px #000; -}
\ No newline at end of file +} + + +div#pagelist-content-wrapper { +width: 80%; +background: #111; +margin-left: auto; +margin-right: auto; +} + +div.page-list-item { +margin: 20px; +} diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css index eeb822f72..277ea5596 100644 --- a/view/theme/redbasic/css/fancy.css +++ b/view/theme/redbasic/css/fancy.css @@ -1,7 +1,7 @@ /* There's probably some stuff in here we don't need, and maybe some missing stuff we do need. We can clean it up incrementaly, just get the heavy lifting done for now */ aside { -border-radius: 0px 0px 20px 0px;} +border-radius: $radiuspx;} .tab { @@ -9,9 +9,9 @@ border-radius: 0px 0px 20px 0px;} background-color: #f00; color: #fff !important; font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 20px; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; margin: 0; width: auto; margin-left: 8px; @@ -38,7 +38,7 @@ border-radius: 0px 0px 20px 0px;} .wall-item-content-wrapper { position: relative; - border-radius: 10px; + border-radius: $radiuspx; box-shadow: 8px 8px 8px #000; border: 1px solid #eec; } @@ -68,7 +68,7 @@ opacity: 1; ul.menu-popup { background: #dd0000; color: #eec; - border-radius: 0px 0px 20px 20px; + border-radius: $radiuspx; z-index: 100000; -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7); diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index d56f69f8d..34f42f9a8 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -115,8 +115,8 @@ a:hover, .fakelink:hover { color: #44AAFF; text-decoration: underline; } input { border: 1px solid #666666; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; padding: 3px; } @@ -209,8 +209,8 @@ nav #site-location { border: 1px solid #444; background-color: #ccc; padding: 10px; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; } @@ -268,8 +268,8 @@ header #banner #logo-text { border-bottom: 0px; background-color: #aec0d3; color: #565854; - -moz-border-radius: 5px 5px 0px 0px; - border-radius: 5px 5px 0px 0px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx;; } nav .nav-link { @@ -398,7 +398,7 @@ footer { margin-bottom: 5px; font-weight: bold; border: solid 1px #ffffff; - border-radius: 5px; + border-radius: $radiuspx; } #jot-title::-webkit-input-placeholder{font-weight: bold;} @@ -926,6 +926,9 @@ footer { .wall-item-content-wrapper { margin-top: 10px; position: relative; + border-radius: $radiuspx; + border: 1px solid #eec; + /* background: #fff; */ /* border-radius: 5px; */ /* box-shadow: 12px 12px 12px #111; */ @@ -1177,7 +1180,7 @@ footer { padding: 3px 1px 1px 3px; border: 1px solid #ccc; padding: 8px; - border-radius: 5px 5px 5px 5px; + border-radius: $radiuspx; /* box-shadow: 5px 5px 5px #666 inset; */ } @@ -1278,7 +1281,7 @@ footer { height: auto; width: auto; background-color: #0080FF; - border-radius: 5px; + border-radius: $radiuspx; border: 2px outset; box-shadow: 5px 5px 5px #666; margin-right: 8px; @@ -1656,8 +1659,8 @@ border: 1px #111; /* #profile-jot-text_parent, .mceLayout { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } */ @@ -1680,8 +1683,8 @@ tr.mceLast { padding: 8px; margin-right: 0px; width: 90%; - -moz-border-radius: 5px; - border-radius: 5px; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; /* box-shadow: 4px 4px 3px 0 #666 inset; */ } #profile-jot-text:hover { @@ -1695,16 +1698,16 @@ tr.mceLast { } .wall-item-photo, .photo, .contact-block-img, .my-comment-photo { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } #datebrowse-sidebar select { margin-left: 25px; - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; opacity: 0.3; filter:alpha(opacity=30); } @@ -1739,8 +1742,8 @@ tr.mceLast { } .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } @@ -1749,9 +1752,9 @@ tr.mceLast { background-color: #0080FF; color: #eeeeec; font-weight: bold; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; border: 2px outset #222420 !important; margin: 0; float: right; @@ -1765,8 +1768,8 @@ tr.mceLast { } .settings-widget .selected { - border-radius: 5px; - -moz-border-radius: 5px; + border-radius: $radiuspx; + -moz-border-radius: $radiuspx; box-shadow: 4px 4px 3px 0 #444444; } @@ -2273,9 +2276,9 @@ aside input[type='text'] { border-bottom: 1px solid #eec; padding: 8px; margin-top: 5px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; } @@ -2441,7 +2444,7 @@ aside input[type='text'] { } #nav-user-linkmenu img { - border-radius: 5px; + border-radius: $radiuspx; margin-top: -4px; } @@ -2820,16 +2823,20 @@ aside input[type='text'] { margin-top: 10px; } -.body-tag, .filesavetags, .categorytags { +.posttags a, .body-tag, .filesavetags, .categorytags { opacity: 0.5; filter:alpha(opacity=50); } -.body-tag:hover, .filesavetags:hover, .categorytags:hover { +.posttags a:hover, .body-tag:hover, .filesavetags:hover, .categorytags:hover { opacity: 1.0 !important; filter:alpha(opacity=100) !important; } +.posttags, .body-tag { + margin-top: 15px; +} + .item-select { opacity: 0.1; filter:alpha(opacity=10); @@ -3262,6 +3269,9 @@ brain is weird like that */ background-color:#ffffff; padding: 4px; clear:left; } +.acpopupitem.taggable { + background-color: #ddddff; +} .acpopupitem img { float: left; margin-right: 4px; @@ -3463,9 +3473,9 @@ nav .nav-menu-icon { height: 22px; padding: 5px; /* margin: 3px 10px; */ - -moz-border-radius: 5px 5px 0 0; - -webkit-border-radius: 5px 5px 0 0; - border-radius: 5px 5px 0 0; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; } nav .nav-menu-icon.selected { background-color: #FF0000; @@ -3497,9 +3507,9 @@ nav .nav-menu.selected a { nav .nav-notify { background-color: #0080FF; color: #fff; - -moz-border-radius: 5px 5px 5px 5px; - -webkit-border-radius: 5px 5px 5px 5px; - border-radius: 5px 5px 5px 5px; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; opacity: 0.6; filter:alpha(opacity=60); @@ -3642,9 +3652,9 @@ ul.menu-popup { max-height: 400px; overflow-y: scroll;overflow-style:scrollbar; background-color:#FFFFFF; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius:5px; + -moz-border-radius: $radiuspx; + -webkit-border-radius: $radiuspx; + border-radius: $radiuspx; border: 1px solid #888; } #nav-notifications-menu .contactname { font-weight: bold; font-size: 0.9em; } @@ -3711,9 +3721,9 @@ ul.menu-popup { background-position: 7px 7px; background-repeat: no-repeat; padding: 7px 5px 0px 30px; - -webkit-border-radius: 5px ; - -moz-border-radius: 5px; - border-radius: 5px; + -webkit-border-radius: $radiuspx; + -moz-border-radius: $radiuspx; + border-radius: $radiuspx; color: #999999; } #acl-showall.selected { @@ -3746,6 +3756,10 @@ ul.menu-popup { float: left; margin: 4px; } +.acl-list-item.taggable { + background-color: #ddddff; +} + .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} .acl-list-item a { font-size: 8px; @@ -3829,3 +3843,73 @@ span.mail-date { float:left; width: 200px; } + + +.tag1 { + font-size : 1.0em !important; + } +.tag2 { + font-size : 1.2em !important; + } + + +.tag3 { + font-size : 1.4em !important; + } + + +.tag4 { + font-size : 1.6em !important; + } + + +.tag5 { + font-size : 1.8em !important; + } + + +.tag6 { + font-size : 2.0em !important; + } + + +.tag7 { + font-size : 2.2em !important; + } + + +.tag8 { + font-size : 2.4em !important; + } + + +.tag9 { + font-size : 2.6em !important; + } + + +.tag10 { + font-size : 2.8em !important; + } + +.profile-thing-list { + list-style-type: none; +} +/* +.profile-thing-list li { + float: left; + margin-right: 25px; +} +*/ + + +div#pagelist-content-wrapper { +width: 80%; +background: #fff; +margin-left: auto; +margin-right: auto; +} + +div.page-list-item { +margin: 20px; +} diff --git a/view/theme/redbasic/img/bg.png b/view/theme/redbasic/img/bg.png Binary files differdeleted file mode 100644 index eae49e037..000000000 --- a/view/theme/redbasic/img/bg.png +++ /dev/null diff --git a/view/theme/redbasic/img/events.png b/view/theme/redbasic/img/events.png Binary files differdeleted file mode 100644 index 96dd86899..000000000 --- a/view/theme/redbasic/img/events.png +++ /dev/null diff --git a/view/theme/redbasic/img/head.jpg b/view/theme/redbasic/img/head.jpg Binary files differdeleted file mode 100644 index 6210b76be..000000000 --- a/view/theme/redbasic/img/head.jpg +++ /dev/null diff --git a/view/theme/redbasic/img/home.png b/view/theme/redbasic/img/home.png Binary files differdeleted file mode 100644 index d1ba7b3f3..000000000 --- a/view/theme/redbasic/img/home.png +++ /dev/null diff --git a/view/theme/redbasic/img/introductions.png b/view/theme/redbasic/img/introductions.png Binary files differdeleted file mode 100644 index 9e0498227..000000000 --- a/view/theme/redbasic/img/introductions.png +++ /dev/null diff --git a/view/theme/redbasic/img/lock.cur b/view/theme/redbasic/img/lock.cur Binary files differdeleted file mode 100644 index 892c5e851..000000000 --- a/view/theme/redbasic/img/lock.cur +++ /dev/null diff --git a/view/theme/redbasic/img/message.png b/view/theme/redbasic/img/message.png Binary files differdeleted file mode 100644 index f3fea75ee..000000000 --- a/view/theme/redbasic/img/message.png +++ /dev/null diff --git a/view/theme/redbasic/img/network.png b/view/theme/redbasic/img/network.png Binary files differdeleted file mode 100644 index f3e45c3ec..000000000 --- a/view/theme/redbasic/img/network.png +++ /dev/null diff --git a/view/theme/redbasic/img/settings.png b/view/theme/redbasic/img/settings.png Binary files differdeleted file mode 100644 index a935b225e..000000000 --- a/view/theme/redbasic/img/settings.png +++ /dev/null diff --git a/view/theme/redbasic/php/config.php b/view/theme/redbasic/php/config.php index 9b1cf1fbd..5917b1e36 100644 --- a/view/theme/redbasic/php/config.php +++ b/view/theme/redbasic/php/config.php @@ -16,7 +16,9 @@ function theme_content(&$a) { $iconset = get_pconfig(local_user(), 'redbasic', 'iconset'); $shiny = get_pconfig(local_user(), 'redbasic', 'shiny'); $colour_scheme = get_pconfig(local_user(), 'redbasic', 'colour_scheme'); - return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme); + $radius = get_pconfig(local_user(),'redbasic','radius'); + + return redbasic_form($a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius); } function theme_post(&$a) { @@ -33,6 +35,7 @@ function theme_post(&$a) { set_pconfig(local_user(), 'redbasic', 'iconset', $_POST['redbasic_iconset']); set_pconfig(local_user(), 'redbasic', 'shiny', $_POST['redbasic_shiny']); set_pconfig(local_user(), 'redbasic', 'colour_scheme', $_POST['redbasic_colour_scheme']); + set_pconfig(local_user(), 'redbasic', 'radius', $_POST['redbasic_radius']); } } @@ -67,7 +70,7 @@ function theme_post(&$a) { //} // These aren't all used yet, but they're not bloat - we'll use drop down menus in idiot mode. -function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme) { +function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolour, $opaquenav, $displaystyle, $linkcolour, $iconset, $shiny, $colour_scheme,$radius) { $line_heights = array( "1.3" => "1.3", "---" => "---", @@ -141,6 +144,7 @@ function redbasic_form(&$a, $font_size, $line_height, $colour, $shadow, $navcolo '$linkcolour' => array('redbasic_linkcolour', t('Display colour of links - hex value, do not include the #'), $linkcolour, '', $linkcolours), '$iconset' => array('redbasic_iconset', t('Icons'), $iconset, '', $iconsets), '$shiny' => array('redbasic_shiny', t('Shiny style'), $shiny, '', $shinys), + '$radius' => array('redbasic_radius', t('Corner radius'), $radius, t('0-99 default: 5')), ));} if(! feature_enabled(local_user(),'expert')) { diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 31b83394f..aa88443bc 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -17,6 +17,7 @@ $displaystyle = false; $linkcolour = false; $shiny = false; + $radius = 5; $site_line_height = get_config("redbasic","line_height"); $site_redbasic_font_size = get_config("redbasic", "font_size" ); $site_colour = get_config("redbasic", "colour" ); @@ -25,6 +26,10 @@ $displaystyle = get_config("redbasic", "displaystyle" ); $linkcolour = get_config("redbasic", "linkcolour" ); $shiny = get_config("redbasic", "shiny" ); + + $x = get_config('redbasic','radius'); + if($x !== false) + $radius = $x; if (local_user()) { $line_height = get_pconfig(local_user(), "redbasic","line_height"); @@ -35,6 +40,10 @@ $displaystyle = get_pconfig(local_user(), "redbasic", "displaystyle"); $linkcolour = get_pconfig(local_user(), "redbasic", "linkcolour"); $shiny = get_pconfig(local_user(), "redbasic", "shiny"); + $x = get_pconfig(local_user(),'redbasic','radius'); + if($x !== false) + $radius = $x; + if (! feature_enabled(local_user(),'expert')) {$colour_scheme = get_pconfig(local_user(), "redbasic", "colour_scheme");} } @@ -45,6 +54,8 @@ // Dark themes are very different - we need to do some of these from scratch, so don't bother setting vars for anything else if ($colour_scheme === 'dark') {$colour = 'dark'; $navcolour = 'black';} if ($colour_scheme === 'redbasic'){$navcolour = 'red';} + $shadows = false; + $radius = 5; } // This is probably the easiest place to apply global settings. Don't bother with site line height and such. Instead, check pconfig for global user settings. @@ -70,7 +81,7 @@ $x = str_replace("\n","",$x); logger('pcss compress: final size: ' . strlen($x), LOGGER_DEBUG); } - echo $x; + echo str_replace(array('$radius'),array($radius),$x); } echo "\r\n"; @@ -124,7 +135,8 @@ if ($displaystyle === "fancy") {if (file_exists('view/theme/' . current_theme() . '/css/fancy.css')) { $fancy = (file_get_contents('view/theme/' . current_theme() . '/css/fancy.css')); - echo "$fancy";} + echo str_replace(array('$radius'),array($radius),$fancy); + } } // Put the # here to force hex colours - if we don't, somebody is going to do something odd, using RGB and we're all going to be confused on the support forums diff --git a/view/theme/redbasic/tpl/theme_settings.tpl b/view/theme/redbasic/tpl/theme_settings.tpl index f8d9f223c..cd980fbc3 100755 --- a/view/theme/redbasic/tpl/theme_settings.tpl +++ b/view/theme/redbasic/tpl/theme_settings.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} {{include file="field_select.tpl" field=$colour}} {{include file="field_input.tpl" field=$font_size}} @@ -21,6 +16,8 @@ {{include file="field_select.tpl" field=$shiny}} +{{include file="field_input.tpl" field=$radius}} + <div class="settings-submit-wrapper"> <input type="submit" value="{{$submit}}" class="settings-submit" name="redbasic-settings-submit" /> </div> diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 442692b3d..c373976ab 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -75,6 +75,15 @@ </div> +{{if $multiprofs }} +<div> +<h3>{{$lbl_vis1}}</h3> +<div>{{$lbl_vis2}}</div> + +{{$profile_select}} +</div> +{{/if}} + <input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" /> </form> diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index aebef71ee..d21073b56 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -1,8 +1,3 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} <div id="acl-wrapper"> <input id="acl-search"> <a href="#" id="acl-showall">{{$showall}}</a> diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index eaf067c27..a0167075d 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -51,6 +51,7 @@ {{include file="field_select.tpl" field=$theme}} {{include file="field_select.tpl" field=$theme_mobile}} {{include file="field_select.tpl" field=$theme_accessibility}} + {{include file="field_input.tpl" field=$site_channel}} {{include file="field_select.tpl" field=$ssl_policy}} <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 78e911213..99c2c7868 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -17,7 +17,7 @@ {{$head_js}} -<link rel="shortcut icon" href="{{$baseurl}}/images/rhash-32.png" /> +<link rel="shortcut icon" href="{{$icon}}" /> <link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl index 33ab84df7..d2016e41c 100755 --- a/view/tpl/photo_album.tpl +++ b/view/tpl/photo_album.tpl @@ -1,14 +1,4 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -<script type="text/javascript" charset="utf-8"> - $(document).ready(function(){ - $("a[rel^='prettyPhoto']").prettyPhoto(); - }); -</script> - +{{include file="prettyphoto.tpl"}} <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}}" rel="{{$rel}}"> <img src="{{$imgsrc}}" alt="{{$imgalt}}" title="{{$phototitle}}" class="photo-album-photo lframe resize{{$twist}}" id="photo-album-photo-{{$id}}" /> diff --git a/view/tpl/photo_edit.tpl b/view/tpl/photo_edit.tpl deleted file mode 100755 index fefe7f10b..000000000 --- a/view/tpl/photo_edit.tpl +++ /dev/null @@ -1,55 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * 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}}" /> - - <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$newalbum}}</label> - <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$album}}" /> - - <div id="photo-edit-albumname-end"></div> - - <label id="photo-edit-caption-label" for="photo-edit-caption">{{$capt_label}}</label> - <input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$caption}}" /> - - <div id="photo-edit-caption-end"></div> - - <label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$tag_label}}</label> - <input name="newtag" id="photo-edit-newtag" size="84" title="{{$help_tags}}" type="text" /> - - <div id="photo-edit-tags-end"></div> - <div id="photo-edit-rotate-wrapper"> - <div id="photo-edit-rotate-label"> - {{$rotatecw}}<br> - {{$rotateccw}} - </div> - <input type="radio" name="rotate" value="1" /><br> - <input type="radio" name="rotate" value="2" /> - </div> - <div id="photo-edit-rotate-end"></div> - - <div id="photo-edit-perms" class="photo-edit-perms" > - <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$permissions}}"/> - <span id="jot-perms-icon" class="icon {{$lockstate}}" ></span>{{$permissions}} - </a> - <div id="photo-edit-perms-menu-end"></div> - - <div style="display: none;"> - <div id="photo-edit-perms-select" > - {{$aclselect}} - </div> - </div> - </div> - <div id="photo-edit-perms-end"></div> - - <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" /> - <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete()"; /> - - <div id="photo-edit-end"></div> -</form> - - diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index fe090409a..f825dcba6 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -1,21 +1,10 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -<script type="text/javascript" charset="utf-8"> - $(document).ready(function(){ - $("a[rel^='prettyPhoto']").prettyPhoto(); - }); -</script> +{{include file="prettyphoto.tpl"}} <div id="live-display"></div> <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> {{if $tools}} -<a id="photo-edit-link" href="{{$tools.edit.0}}">{{$tools.edit.1}}</a> -| <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> {{/if}} {{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}} @@ -32,7 +21,58 @@ {{/if}} {{if $tags.2}}<div id="tag-remove"><a href="{{$tags.2}}">{{$tags.3}}</a></div>{{/if}} -{{if $edit}}{{$edit}}{{/if}} +{{if $edit}} +<div id="photo-edit-edit-wrapper" class="fakelink" onclick="openClose('photo-edit-edit');">{{$edit.edit}}</div> +<div id="photo-edit-edit" style="display: none;"> +<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" > + + <input type="hidden" name="item_id" value="{{$item_id}}" /> + + <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> + <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" /> + + <div id="photo-edit-albumname-end"></div> + + <label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label> + <input id="photo-edit-caption" type="text" size="84" name="desc" value="{{$edit.caption}}" /> + + <div id="photo-edit-caption-end"></div> + + <label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label> + <input name="newtag" id="photo-edit-newtag" size="84" title="{{$edit.help_tags}}" type="text" /> + + <div id="photo-edit-tags-end"></div> + <div id="photo-edit-rotate-wrapper"> + <div id="photo-edit-rotate-label"> + {{$edit.rotatecw}}<br> + {{$edit.rotateccw}} + </div> + <input type="radio" name="rotate" value="1" /><br> + <input type="radio" name="rotate" value="2" /> + </div> + <div id="photo-edit-rotate-end"></div> + + <div id="photo-edit-perms" class="photo-edit-perms" > + <a href="#photo-edit-perms-select" id="photo-edit-perms-menu" class="button popupbox" title="{{$edit.permissions}}"/> + <span id="jot-perms-icon" class="icon {{$edit.lockstate}}" ></span>{{$edit.permissions}} + </a> + <div id="photo-edit-perms-menu-end"></div> + + <div style="display: none;"> + <div id="photo-edit-perms-select" > + {{$edit.aclselect}} + </div> + </div> + </div> + <div id="photo-edit-perms-end"></div> + + <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}" /> + <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete()"; /> + + <div id="photo-edit-end"></div> +</form> +</div> +{{/if}} {{if $likebuttons}} <div id="photo-like-div"> diff --git a/view/tpl/prettyphoto.tpl b/view/tpl/prettyphoto.tpl new file mode 100644 index 000000000..6d047e620 --- /dev/null +++ b/view/tpl/prettyphoto.tpl @@ -0,0 +1,6 @@ +<script type="text/javascript" charset="utf-8"> + $(document).ready(function(){ + $("a[rel^='prettyPhoto']").prettyPhoto(); + }); +</script> + diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index f8743c011..0d1750085 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -170,6 +170,18 @@ </dl> {{/if}} - +{{if $things}} +{{foreach $things as $key => $items}} +<b>{{$profile.fullname.1}} {{$key}}</b> +<ul class="profile-thing-list"> +{{foreach $items as $item}} +<li>{{if $item.img}}<img src="{{$item.img}}" width="100" height="100" alt="{{$item.term}}" />{{/if}} +<a href="{{$item.url}}" >{{$item.term}}</a> +</li> +{{/foreach}} +</ul> +<div class="clear"></div> +{{/foreach}} +{{/if}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 864599244..33cc9b75b 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -10,7 +10,7 @@ <div id="profile-edit-links"> <ul> <li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li> -<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li> +<li><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li> <li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li> <li></li> <li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li> diff --git a/view/tpl/thing_input.tpl b/view/tpl/thing_input.tpl new file mode 100644 index 000000000..06cbfe917 --- /dev/null +++ b/view/tpl/thing_input.tpl @@ -0,0 +1,28 @@ +<h2>{{$thing_hdr}}</h2> +<form action="thing" method="post" > + +{{if $multiprof }} +<div class="thing-profile-label">{{$profile_lbl}}</div> + +<div class="thing-profile">{{$profile_select}}</div> +{{/if}} + +<div class="thing-verb-label">{{$verb_lbl}}</div> + +<div class="thing-verb">{{$verb_select}}</div> + + +<label class="thing-label" for="thing-term">{{$thing_lbl}}</label> +<input type="text" class="thing-input" id="thing-term" name="term" /> +<div class="thing-field-end"></div> +<label class="thing-label" for="thing-url">{{$url_lbl}}</label> +<input type="text" class="thing-input" id="thing-url" name="url" /> +<div class="thing-field-end"></div> +<label class="thing-label" for="thing-img">{{$img_lbl}}</label> +<input type="text" class="thing-input" id="thing-img" name="img" /> +<div class="thing-field-end"></div> + +<div class="thing-end"></div> + +<input type="submit" class="thing-submit" name="submit" value="{{$submit}}" /> +</form> diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl new file mode 100644 index 000000000..5c00dee6b --- /dev/null +++ b/view/tpl/webpagelist.tpl @@ -0,0 +1,13 @@ +{{if $pages}} + + <div id="pagelist-content-wrapper"> + {{foreach $pages as $key => $items}} + {{foreach $items as $item}} + <div class="page-list-item"><a href="editwebpage/{{$item.url}}">{{$editlink}}</a> | <a href="page/{{$channel}}/{{$item.title}}">{{$view}}</a> {{$item.title}}</div> + {{/foreach}} + {{/foreach}} + </div> + + <div class="clear"></div> + +{{/if}} |
