1
0
Fork 0

Merge branch 'master' into develop

This commit is contained in:
Hypolite Petovan 2019-06-23 17:40:52 -04:00
commit b9ab613777
164 changed files with 30233 additions and 26266 deletions

View file

@ -1,4 +1,21 @@
// @license magnet:?xt=urn:btih:0b31508aeb0634b347b8270c7bee4d411b5d4109&dn=agpl-3.0.txt AGPLv3-or-later
// https://developer.mozilla.org/en-US/docs/Web/API/Element/matches#Polyfill
if (!Element.prototype.matches) {
Element.prototype.matches =
Element.prototype.matchesSelector ||
Element.prototype.mozMatchesSelector ||
Element.prototype.msMatchesSelector ||
Element.prototype.oMatchesSelector ||
Element.prototype.webkitMatchesSelector ||
function(s) {
var matches = (this.document || this.ownerDocument).querySelectorAll(s),
i = matches.length;
while (--i >= 0 && matches.item(i) !== this) {}
return i > -1;
};
}
function resizeIframe(obj) {
_resizeIframe(obj, 0);
}

File diff suppressed because it is too large Load diff

View file

@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: friendica\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-05-15 08:55-0400\n"
"PO-Revision-Date: 2019-05-16 17:26+0000\n"
"PO-Revision-Date: 2019-05-17 14:06+0000\n"
"Last-Translator: Aditoo\n"
"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
"MIME-Version: 1.0\n"
@ -9645,80 +9645,80 @@ msgstr "Dvoufázové ověřování úspěšně zakázáno."
msgid ""
"<p>Use an application on a mobile device to get two-factor authentication "
"codes when prompted on login.</p>"
msgstr ""
msgstr "<p>Pomocí aplikace na mobilním zařízení získejte při přihlášení kódy pro dvoufázové ověřování.</p>"
#: src/Module/Settings/TwoFactor/Index.php:90
msgid "Authenticator app"
msgstr ""
msgstr "Autentizační aplikace"
#: src/Module/Settings/TwoFactor/Index.php:91
msgid "Configured"
msgstr ""
msgstr "Nakonfigurováno"
#: src/Module/Settings/TwoFactor/Index.php:91
msgid "Not Configured"
msgstr ""
msgstr "Nenakonfigurováno"
#: src/Module/Settings/TwoFactor/Index.php:92
msgid "<p>You haven't finished configuring your authenticator app.</p>"
msgstr ""
msgstr "<p>Nedokončil/a jste konfiguraci vaší autentizační aplikace.</p>"
#: src/Module/Settings/TwoFactor/Index.php:93
msgid "<p>Your authenticator app is correctly configured.</p>"
msgstr ""
msgstr "<p>Vaše autentizační aplikace je správně nakonfigurována.</p>"
#: src/Module/Settings/TwoFactor/Index.php:95
msgid "Recovery codes"
msgstr ""
msgstr "Záložní kódy"
#: src/Module/Settings/TwoFactor/Index.php:96
msgid "Remaining valid codes"
msgstr ""
msgstr "Zbývající platné kódy"
#: src/Module/Settings/TwoFactor/Index.php:98
msgid ""
"<p>These one-use codes can replace an authenticator app code in case you "
"have lost access to it.</p>"
msgstr ""
msgstr "<p>Tyto jednorázové kódy mohou nahradit kód autentizační aplikace, pokud k ní ztratíte přístup.</p>"
#: src/Module/Settings/TwoFactor/Index.php:101
msgid "Current password:"
msgstr ""
msgstr "Aktuální heslo:"
#: src/Module/Settings/TwoFactor/Index.php:101
msgid ""
"You need to provide your current password to change two-factor "
"authentication settings."
msgstr ""
msgstr "Pro změnu nastavení dvoufázového ověřování musíte poskytnout vaše aktuální heslo."
#: src/Module/Settings/TwoFactor/Index.php:102
msgid "Enable two-factor authentication"
msgstr ""
msgstr "Povolit dvoufázové ověřování"
#: src/Module/Settings/TwoFactor/Index.php:103
msgid "Disable two-factor authentication"
msgstr ""
msgstr "Zakázat dvoufázové ověřování"
#: src/Module/Settings/TwoFactor/Index.php:104
msgid "Show recovery codes"
msgstr ""
msgstr "Zobrazit záložní kódy"
#: src/Module/Settings/TwoFactor/Index.php:105
msgid "Finish app configuration"
msgstr ""
msgstr "Dokončit konfiguraci aplikace"
#: src/Module/Settings/TwoFactor/Recovery.php:34
#: src/Module/Settings/TwoFactor/Verify.php:41
msgid "Please enter your password to access this page."
msgstr ""
msgstr "Pro přístup k této stránce prosím zadejte své heslo."
#: src/Module/Settings/TwoFactor/Recovery.php:50
msgid "New recovery codes successfully generated."
msgstr ""
msgstr "Nové záložní kódy byly úspěšně vygenerovány."
#: src/Module/Settings/TwoFactor/Recovery.php:76
msgid "Two-factor recovery codes"
msgstr ""
msgstr "Dvoufázové záložní kódy"
#: src/Module/Settings/TwoFactor/Recovery.php:78
msgid ""
@ -9727,30 +9727,30 @@ msgid ""
"codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your "
"device and dont have the recovery codes you will lose access to your "
"account.</p>"
msgstr ""
msgstr "<p>Záložní kódy mohou být použity pro přístup k vašemu účtu, pokud ztratíte přístup k vašemu zařízení a nemůžete obdržet dvoufázové autentizační kódy.</p><p><strong>Uložte je na bezpečné místo!</strong> Pokud zratíte vaše zařízení a nemáte Záložní kódy, ztratíte přístup ke svému účtu.</p>"
#: src/Module/Settings/TwoFactor/Recovery.php:80
msgid ""
"When you generate new recovery codes, you must copy the new codes. Your old "
"codes wont work anymore."
msgstr ""
msgstr "Když vygenerujete nové záložní kódy, musíte si zkopírovat nové kódy. Vaše staré kódy již nebudou fungovat."
#: src/Module/Settings/TwoFactor/Recovery.php:81
msgid "Generate new recovery codes"
msgstr ""
msgstr "Vygenerovat nové záložní kódy"
#: src/Module/Settings/TwoFactor/Recovery.php:83
msgid "Next: Verification"
msgstr ""
msgstr "Další: Ověření"
#: src/Module/Settings/TwoFactor/Verify.php:63
msgid "Two-factor authentication successfully activated."
msgstr ""
msgstr "Dvoufázové ověření úspěšně aktivováno."
#: src/Module/Settings/TwoFactor/Verify.php:67
#: src/Module/TwoFactor/Recovery.php:46 src/Module/TwoFactor/Verify.php:41
msgid "Invalid code, please retry."
msgstr ""
msgstr "Neplatný kód, prosím zkuste to znovu."
#: src/Module/Settings/TwoFactor/Verify.php:96
#, php-format
@ -9770,33 +9770,33 @@ msgid ""
"\t<dt>Hashing algorithm</dt>\n"
"\t<dd>SHA-1</dd>\n"
"</dl>"
msgstr ""
msgstr "<p>Nebo můžete zadat autentizační nastavení manuálně:</p>\n<dl>\n\t<dt>Vydavatel</dt>\n\t<dd>%s</dd>\n\t<dt>Jméno účtu</dt>\n\t<dd>%s</dd>\n\t<dt>Tajný klíč</dt>\n\t<dd>%s</dd>\n\t<dt>Typ</dt>\n\t<dd>Založený na čase</dd>\n\t<dt>Počet číslic</dt>\n\t<dd>6</dd>\n\t<dt>Hashovací algoritmus</dt>\n\t<dd>SHA-1</dd>\n</dl>"
#: src/Module/Settings/TwoFactor/Verify.php:116
msgid "Two-factor code verification"
msgstr ""
msgstr "Ověření dvoufázového kódu"
#: src/Module/Settings/TwoFactor/Verify.php:118
msgid ""
"<p>Please scan this QR Code with your authenticator app and submit the "
"provided code.</p>"
msgstr ""
msgstr "<p>Prosím naskenujte tento QR kód vaší autentizační aplikací a zadejte poskytnutý kód.</p>"
#: src/Module/Settings/TwoFactor/Verify.php:120
#, php-format
msgid ""
"<p>Or you can open the following URL in your mobile devicde:</p><p><a "
"href=\"%s\">%s</a></p>"
msgstr ""
msgstr "<p>Nebo můžete otevřít na vašem mobilním zařízení následující URL: </p><p><a href=\"%s\">%s</a></p>"
#: src/Module/Settings/TwoFactor/Verify.php:126
#: src/Module/TwoFactor/Verify.php:63
msgid "Please enter a code from your authentication app"
msgstr ""
msgstr "Prosím zadejte kód z vaší autentizační aplikace"
#: src/Module/Settings/TwoFactor/Verify.php:127
msgid "Verify code and enable two-factor authentication"
msgstr ""
msgstr "Ověřit kód a povolit dvoufázové ověřování"
#: src/Module/Special/HTTPException.php:32
msgid "Bad Request"
@ -9899,40 +9899,40 @@ msgstr "Prohlášení o soukromí"
#: src/Module/TwoFactor/Recovery.php:41
#, php-format
msgid "Remaining recovery codes: %d"
msgstr ""
msgstr "Zbývající záložní kódy: %d"
#: src/Module/TwoFactor/Recovery.php:65
msgid "Two-factor recovery"
msgstr ""
msgstr "Dvoufázové záložní kódy"
#: src/Module/TwoFactor/Recovery.php:66
msgid ""
"<p>You can enter one of your one-time recovery codes in case you lost access"
" to your mobile device.</p>"
msgstr ""
msgstr "<p>Pokud jste ztratil/a přístup k vašemu mobilnímu zařízení , můžete zadat jeden z vašich jednorázových záložních kódů.</p>"
#: src/Module/TwoFactor/Recovery.php:67 src/Module/TwoFactor/Verify.php:62
#, php-format
msgid "Dont have your phone? <a href=\"%s\">Enter a two-factor recovery code</a>"
msgstr ""
msgstr "Nemáte svůj mobil? <a href=\"%s\">Zadejte dvoufázový záložní kód</a>"
#: src/Module/TwoFactor/Recovery.php:68
msgid "Please enter a recovery code"
msgstr ""
msgstr "Prosím zadejte záložní kód"
#: src/Module/TwoFactor/Recovery.php:69
msgid "Submit recovery code and complete login"
msgstr ""
msgstr "Odeslat záložní kód a dokončit přihlášení"
#: src/Module/TwoFactor/Verify.php:61
msgid ""
"<p>Open the two-factor authentication app on your device to get an "
"authentication code and verify your identity.</p>"
msgstr ""
msgstr "<p>Otevřete na vašem zařízení aplikaci pro dvoufázové ověřování, získejte autentizační kód a ověřte svou identitu.</p>"
#: src/Module/TwoFactor/Verify.php:64
msgid "Verify code and complete login"
msgstr ""
msgstr "Ověřit kód a dokončit přihlášení"
#: src/Object/Post.php:137
msgid "This entry was edited"

View file

@ -2216,36 +2216,36 @@ $a->strings["Registration successful."] = "Registrace byla úspěšná.";
$a->strings["Your registration can not be processed."] = "Vaši registraci nelze zpracovat.";
$a->strings["Your registration is pending approval by the site owner."] = "Vaše registrace čeká na schválení vlastníkem serveru.";
$a->strings["Two-factor authentication successfully disabled."] = "Dvoufázové ověřování úspěšně zakázáno.";
$a->strings["<p>Use an application on a mobile device to get two-factor authentication codes when prompted on login.</p>"] = "";
$a->strings["Authenticator app"] = "";
$a->strings["Configured"] = "";
$a->strings["Not Configured"] = "";
$a->strings["<p>You haven't finished configuring your authenticator app.</p>"] = "";
$a->strings["<p>Your authenticator app is correctly configured.</p>"] = "";
$a->strings["Recovery codes"] = "";
$a->strings["Remaining valid codes"] = "";
$a->strings["<p>These one-use codes can replace an authenticator app code in case you have lost access to it.</p>"] = "";
$a->strings["Current password:"] = "";
$a->strings["You need to provide your current password to change two-factor authentication settings."] = "";
$a->strings["Enable two-factor authentication"] = "";
$a->strings["Disable two-factor authentication"] = "";
$a->strings["Show recovery codes"] = "";
$a->strings["Finish app configuration"] = "";
$a->strings["Please enter your password to access this page."] = "";
$a->strings["New recovery codes successfully generated."] = "";
$a->strings["Two-factor recovery codes"] = "";
$a->strings["<p>Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your device and dont have the recovery codes you will lose access to your account.</p>"] = "";
$a->strings["When you generate new recovery codes, you must copy the new codes. Your old codes wont work anymore."] = "";
$a->strings["Generate new recovery codes"] = "";
$a->strings["Next: Verification"] = "";
$a->strings["Two-factor authentication successfully activated."] = "";
$a->strings["Invalid code, please retry."] = "";
$a->strings["<p>Or you can submit the authentication settings manually:</p>\n<dl>\n\t<dt>Issuer</dt>\n\t<dd>%s</dd>\n\t<dt>Account Name</dt>\n\t<dd>%s</dd>\n\t<dt>Secret Key</dt>\n\t<dd>%s</dd>\n\t<dt>Type</dt>\n\t<dd>Time-based</dd>\n\t<dt>Number of digits</dt>\n\t<dd>6</dd>\n\t<dt>Hashing algorithm</dt>\n\t<dd>SHA-1</dd>\n</dl>"] = "";
$a->strings["Two-factor code verification"] = "";
$a->strings["<p>Please scan this QR Code with your authenticator app and submit the provided code.</p>"] = "";
$a->strings["<p>Or you can open the following URL in your mobile devicde:</p><p><a href=\"%s\">%s</a></p>"] = "";
$a->strings["Please enter a code from your authentication app"] = "";
$a->strings["Verify code and enable two-factor authentication"] = "";
$a->strings["<p>Use an application on a mobile device to get two-factor authentication codes when prompted on login.</p>"] = "<p>Pomocí aplikace na mobilním zařízení získejte při přihlášení kódy pro dvoufázové ověřování.</p>";
$a->strings["Authenticator app"] = "Autentizační aplikace";
$a->strings["Configured"] = "Nakonfigurováno";
$a->strings["Not Configured"] = "Nenakonfigurováno";
$a->strings["<p>You haven't finished configuring your authenticator app.</p>"] = "<p>Nedokončil/a jste konfiguraci vaší autentizační aplikace.</p>";
$a->strings["<p>Your authenticator app is correctly configured.</p>"] = "<p>Vaše autentizační aplikace je správně nakonfigurována.</p>";
$a->strings["Recovery codes"] = "Záložní kódy";
$a->strings["Remaining valid codes"] = "Zbývající platné kódy";
$a->strings["<p>These one-use codes can replace an authenticator app code in case you have lost access to it.</p>"] = "<p>Tyto jednorázové kódy mohou nahradit kód autentizační aplikace, pokud k ní ztratíte přístup.</p>";
$a->strings["Current password:"] = "Aktuální heslo:";
$a->strings["You need to provide your current password to change two-factor authentication settings."] = "Pro změnu nastavení dvoufázového ověřování musíte poskytnout vaše aktuální heslo.";
$a->strings["Enable two-factor authentication"] = "Povolit dvoufázové ověřování";
$a->strings["Disable two-factor authentication"] = "Zakázat dvoufázové ověřování";
$a->strings["Show recovery codes"] = "Zobrazit záložní kódy";
$a->strings["Finish app configuration"] = "Dokončit konfiguraci aplikace";
$a->strings["Please enter your password to access this page."] = "Pro přístup k této stránce prosím zadejte své heslo.";
$a->strings["New recovery codes successfully generated."] = "Nové záložní kódy byly úspěšně vygenerovány.";
$a->strings["Two-factor recovery codes"] = "Dvoufázové záložní kódy";
$a->strings["<p>Recovery codes can be used to access your account in the event you lose access to your device and cannot receive two-factor authentication codes.</p><p><strong>Put these in a safe spot!</strong> If you lose your device and dont have the recovery codes you will lose access to your account.</p>"] = "<p>Záložní kódy mohou být použity pro přístup k vašemu účtu, pokud ztratíte přístup k vašemu zařízení a nemůžete obdržet dvoufázové autentizační kódy.</p><p><strong>Uložte je na bezpečné místo!</strong> Pokud zratíte vaše zařízení a nemáte Záložní kódy, ztratíte přístup ke svému účtu.</p>";
$a->strings["When you generate new recovery codes, you must copy the new codes. Your old codes wont work anymore."] = "Když vygenerujete nové záložní kódy, musíte si zkopírovat nové kódy. Vaše staré kódy již nebudou fungovat.";
$a->strings["Generate new recovery codes"] = "Vygenerovat nové záložní kódy";
$a->strings["Next: Verification"] = "Další: Ověření";
$a->strings["Two-factor authentication successfully activated."] = "Dvoufázové ověření úspěšně aktivováno.";
$a->strings["Invalid code, please retry."] = "Neplatný kód, prosím zkuste to znovu.";
$a->strings["<p>Or you can submit the authentication settings manually:</p>\n<dl>\n\t<dt>Issuer</dt>\n\t<dd>%s</dd>\n\t<dt>Account Name</dt>\n\t<dd>%s</dd>\n\t<dt>Secret Key</dt>\n\t<dd>%s</dd>\n\t<dt>Type</dt>\n\t<dd>Time-based</dd>\n\t<dt>Number of digits</dt>\n\t<dd>6</dd>\n\t<dt>Hashing algorithm</dt>\n\t<dd>SHA-1</dd>\n</dl>"] = "<p>Nebo můžete zadat autentizační nastavení manuálně:</p>\n<dl>\n\t<dt>Vydavatel</dt>\n\t<dd>%s</dd>\n\t<dt>Jméno účtu</dt>\n\t<dd>%s</dd>\n\t<dt>Tajný klíč</dt>\n\t<dd>%s</dd>\n\t<dt>Typ</dt>\n\t<dd>Založený na čase</dd>\n\t<dt>Počet číslic</dt>\n\t<dd>6</dd>\n\t<dt>Hashovací algoritmus</dt>\n\t<dd>SHA-1</dd>\n</dl>";
$a->strings["Two-factor code verification"] = "Ověření dvoufázového kódu";
$a->strings["<p>Please scan this QR Code with your authenticator app and submit the provided code.</p>"] = "<p>Prosím naskenujte tento QR kód vaší autentizační aplikací a zadejte poskytnutý kód.</p>";
$a->strings["<p>Or you can open the following URL in your mobile devicde:</p><p><a href=\"%s\">%s</a></p>"] = "<p>Nebo můžete otevřít na vašem mobilním zařízení následující URL: </p><p><a href=\"%s\">%s</a></p>";
$a->strings["Please enter a code from your authentication app"] = "Prosím zadejte kód z vaší autentizační aplikace";
$a->strings["Verify code and enable two-factor authentication"] = "Ověřit kód a povolit dvoufázové ověřování";
$a->strings["Bad Request"] = "Špatný požadavek";
$a->strings["Unauthorized"] = "Neautorizováno";
$a->strings["Forbidden"] = "Zakázáno";
@ -2263,14 +2263,14 @@ $a->strings["At the time of registration, and for providing communications betwe
$a->strings["This data is required for communication and is passed on to the nodes of the communication partners and is stored there. Users can enter additional private data that may be transmitted to the communication partners accounts."] = "Tato data jsou vyžadována ke komunikaci a jsou předávána serverům komunikačních partnerů a jsou tam ukládána. Uživatelé mohou zadávat dodatečná soukromá data, která mohou být odeslána na účty komunikačních partnerů.";
$a->strings["At any point in time a logged in user can export their account data from the <a href=\"%1\$s/settings/uexport\">account settings</a>. If the user wants to delete their account they can do so at <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. The deletion of the account will be permanent. Deletion of the data will also be requested from the nodes of the communication partners."] = "Přihlášený uživatel si kdykoliv může exportovat svoje data účtu z <a href=\"%1\$s/settings/uexport\">nastavení účtu</a>. Pokud by chtěl uživatel svůj účet smazat, může tak učinit na stránce <a href=\"%1\$s/removeme\">%1\$s/removeme</a>. Smazání účtu bude trvalé. Na serverech komunikačních partnerů bude zároveň vyžádáno smazání dat.";
$a->strings["Privacy Statement"] = "Prohlášení o soukromí";
$a->strings["Remaining recovery codes: %d"] = "";
$a->strings["Two-factor recovery"] = "";
$a->strings["<p>You can enter one of your one-time recovery codes in case you lost access to your mobile device.</p>"] = "";
$a->strings["Dont have your phone? <a href=\"%s\">Enter a two-factor recovery code</a>"] = "";
$a->strings["Please enter a recovery code"] = "";
$a->strings["Submit recovery code and complete login"] = "";
$a->strings["<p>Open the two-factor authentication app on your device to get an authentication code and verify your identity.</p>"] = "";
$a->strings["Verify code and complete login"] = "";
$a->strings["Remaining recovery codes: %d"] = "Zbývající záložní kódy: %d";
$a->strings["Two-factor recovery"] = "Dvoufázové záložní kódy";
$a->strings["<p>You can enter one of your one-time recovery codes in case you lost access to your mobile device.</p>"] = "<p>Pokud jste ztratil/a přístup k vašemu mobilnímu zařízení , můžete zadat jeden z vašich jednorázových záložních kódů.</p>";
$a->strings["Dont have your phone? <a href=\"%s\">Enter a two-factor recovery code</a>"] = "Nemáte svůj mobil? <a href=\"%s\">Zadejte dvoufázový záložní kód</a>";
$a->strings["Please enter a recovery code"] = "Prosím zadejte záložní kód";
$a->strings["Submit recovery code and complete login"] = "Odeslat záložní kód a dokončit přihlášení";
$a->strings["<p>Open the two-factor authentication app on your device to get an authentication code and verify your identity.</p>"] = "<p>Otevřete na vašem zařízení aplikaci pro dvoufázové ověřování, získejte autentizační kód a ověřte svou identitu.</p>";
$a->strings["Verify code and complete login"] = "Ověřit kód a dokončit přihlášení";
$a->strings["This entry was edited"] = "Tato položka byla upravena";
$a->strings["Private Message"] = "Soukromá zpráva";
$a->strings["Delete locally"] = "Smazat lokálně";

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -44,11 +44,6 @@
{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
</ul>
<ul>
<!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
</ul>
</div> {{* End of contact-edit-status-wrapper *}}
{{* Some information about the contact from the profile *}}

View file

@ -44,6 +44,7 @@
<script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js"></script>
<script type="text/javascript" src="view/js/acl.js" ></script>
<script type="text/javascript" src="view/asset/base64/base64.min.js" ></script>
<script type="text/javascript" src="view/asset/dompurify/dist/purify.min.js"></script>
<script type="text/javascript" src="view/js/main.js" ></script>
<script>

View file

@ -21,8 +21,8 @@
{{* here are the differnt actions like privat message, poke, delete and so on *}}
{{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}
<div class="hover-card-actions-social">
{{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.pm.1}}')" aria-label="{{$profile.actions.pm.0}}" title="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
{{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.poke.1}}')" aria-label="{{$profile.actions.poke.0}}" title="{{$profile.actions.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
{{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm add-to-modal" href="{{$profile.actions.pm.1}}" aria-label="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true" title="{{$profile.actions.pm.0}}"></i><span class="sr-only">{{$profile.actions.pm.0}}</span></a>{{/if}}
{{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm add-to-modal" href="{{$profile.actions.poke.1}}" aria-label="{{$profile.actions.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true" title="{{$profile.actions.poke.0}}"></i><span class="sr-only">{{$profile.actions.poke.0}}</span></a>{{/if}}
</div>
<div class="hover-card-actions-connection">
{{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" aria-label="{{$profile.actions.network.0}}" title="{{$profile.actions.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}

View file

@ -0,0 +1,20 @@
<div class="generic-page-wrapper">
{{include file="section_title.tpl"}}
<ul role="menubar" class="tabs">
<li role="menuitem"><a href="profile/{{$nickname}}/contacts" class="tab button{{if !$type || $type == 'all'}} active{{/if}}">{{$all_label}}</a></li>
<li role="menuitem"><a href="profile/{{$nickname}}/contacts/followers" class="tab button{{if $type == 'followers'}} active{{/if}}">{{$followers_label}}</a></li>
<li role="menuitem"><a href="profile/{{$nickname}}/contacts/following" class="tab button{{if $type == 'following'}} active{{/if}}">{{$following_label}}</a></li>
<li role="menuitem"><a href="profile/{{$nickname}}/contacts/mutuals" class="tab button{{if $type == 'mutuals'}} active{{/if}}">{{$mutuals_label}}</a></li>
</ul>
<div id="viewcontact_wrapper-{{$id}}">
{{foreach $contacts as $contact}}
{{include file="contact_template.tpl"}}
{{/foreach}}
</div>
<div class="clear"></div>
<div id="view-contact-end"></div>
{{$paginate nofilter}}
</div>

View file

@ -50,21 +50,20 @@
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links">
<ul>
{{if $connect}}
{{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{if $unfollow_link}}
<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/if}}
{{if $wallmessage}}
{{if $follow_link}}
<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
{{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
{{if $subscribe_feed}}
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
{{if $subscribe_feed_link}}
<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>

View file

@ -6,7 +6,7 @@
<ul role="menu" id="saved-search-ul">
{{foreach $saved as $search}}
<li role="menuitem" class="saved-search-li clear">
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}"></a>
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="iconspacer savedsearchdrop " href="network?remove=1&amp;search={{$search.encodedterm}}"></a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a>
</li>
{{/foreach}}

View file

@ -1,31 +0,0 @@
<entry>
<author>
<name>{{$name}}</name>
<uri>{{$profile_page}}</uri>
<link rel="photo" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}" />
</author>
<id>{{$item_id}}</id>
<title>{{$title}}</title>
<published>{{$published}}</published>
<content type="{{$type}}" >{{$content nofilter}}</content>
<link rel="mentioned" href="{{$accturi}}" />
<as:actor>
<as:object-type>http://activitystrea.ms/schema/1.0/person</as:object-type>
<id>{{$profile_page}}</id>
<title></title>
<link rel="avatar" type="image/jpeg" media:width="175" media:height="175" href="{{$photo}}"/>
<link rel="avatar" type="image/jpeg" media:width="80" media:height="80" href="{{$thumb}}"/>
<poco:preferredUsername>{{$nick}}</poco:preferredUsername>
<poco:displayName>{{$name}}</poco:displayName>
</as:actor>
<as:verb>{{$verb}}</as:verb>
<as:object>
<as:object-type></as:object-type>
</as:object>
<as:target>
<as:object-type></as:object-type>
</as:target>
</entry>

View file

@ -0,0 +1,80 @@
<div id="welcome" class="generic-page-wrapper">
<h1>{{$welcome nofilter}}</h1>
<h3>{{$checklist nofilter}}</h3>
<div style="font-size: 120%;">
{{$description nofilter}}
<h4>{{$started nofilter}}</h4>
<ul>
<li>
<a target="newmember" href="help/Quick-Start-guide">{{$quickstart_link}}</a><br />
{{$quickstart_txt nofilter}}
</li>
</ul>
<h4>{{$settings nofilter}}</h4>
<ul>
<li>
<a target="newmember" href="settings">{{$settings_link}}</a><br />
{{$settings_txt nofilter}}
</li>
<li>
{{$settings_other nofilter}}
</ul>
<h4>{{$profile nofilter}}</h4>
<ul>
<li>
<a target="newmember" href="profile_photo">{{$profile_photo_link}}</a><br />
{{$profile_photo_txt nofilter}}
</li>
<li>
<a target="newmember" href="profiles">{{$profiles_link}}</a><br />
{{$profiles_txt nofilter}}
</li>
<li>
<a target="newmember" href="profiles">{{$profiles_keywords_link}}</a><br />
{{$profiles_keywords_txt nofilter}}
</li>
</ul>
<h4>{{$connecting nofilter}}</h4>
<ul>
{{if $mail_disabled}}
<li>
<a target="newmember" href="settings/connectors">{{$import_mail_link}}</a><br />
{{$import_mail_txt nofilter}}
</li>
{{/if}}
<li>
<a target="newmember" href="contact">{{$contact_link}}</a><br />
{{$contact_txt nofilter}}
</li>
<li>
<a target="newmember" href="directory">{{$directory_link}}</a><br />
{{$directory_txt nofilter}}
</li>
<li>
<a target="newmember" href="contact">{{$finding_link}}</a><br />
{{$finding_txt nofilter}}
</li>
</ul>
<h4>{{$groups nofilter}}</h4>
<ul>
<li>
<a target="newmember" href="contact">{{$group_contact_link}}</a><br />
{{$group_contact_txt nofilter}}
</li>
{{if $newuser_private}}
<li>
<a target="newmember" href="help/Groups-and-Privacy">{{$private_link}}</a><br />
{{$private_txt nofilter}}
</li>
{{/if}}
</ul>
<h4>{{$help}}</h4>
<ul>
<li>
<a target="newmember" href="help">{{$help_link}}</a><br />
{{$help_txt nofilter}}
</li>
</ul>
</div>
</div>

View file

@ -1,5 +1,4 @@
<script>
function showHideDates() {
if( $('#posted-date-selector-drop').is(':visible')) {
$('#posted-date-selector-drop').hide();
@ -10,14 +9,8 @@ function showHideDates() {
$('#posted-date-collapse').html(window.showFewer);
}
}
function dateSubmit(dateurl) {
window.location.href = dateurl;
}
</script>
<div id="datebrowse-sidebar" class="widget">
<h3>{{$title}}</h3>
<ul id="posted-date-selector" class="datebrowse-ul">
@ -35,7 +28,7 @@ function dateSubmit(dateurl) {
<ul class="datebrowse-ul">
{{foreach $arr as $d}}
<li class="tool">
<a class="datebrowse-link" href="#" onclick="dateSubmit('{{$url}}/{{$d.1}}/{{$d.2}}'); return false;">{{$d.0}}</a>
<a class="datebrowse-link" href="{{$url}}/{{$d.1}}/{{$d.2}}">{{$d.0}}</a>
</li>
{{/foreach}}
</ul>

View file

@ -10,5 +10,20 @@
{{/if}}
{{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
{{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
<div id="profile-extra-links">
<ul>
{{if $follow_link}}
<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
{{if $unfollow_link}}
<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/if}}
{{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
</ul>
</div>
<div id="profile-vcard-break"></div>
</div>

View file

@ -18,7 +18,7 @@
<Link rel="http://portablecontacts.net/spec/1.0"
href="{{$poco_url}}" />
<Link rel="http://webfinger.net/rel/avatar"
type="image/jpeg"
type="{{$type}}"
href="{{$photo}}" />
<Link rel="http://joindiaspora.com/seed_location"
type="text/html"

View file

@ -50,9 +50,10 @@ nav #banner #logo-text a { color: #ffffff; }
.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; }
.nav-selected.nav-link { color: #ffffff!important; border-bottom: 0px}
.nav-commlink, .nav-login-link {background-color: #b7bab3;}
.nav-commlink, .nav-login-link, .nav-logout-link {background-color: #b7bab3;}
.nav-commlink:link, .nav-commlink:visited,
.nav-login-link:link, .nav-login-link:visited{
.nav-login-link:link, .nav-login-link:visited,
.nav-logout-link:link, .nav-logout-link:visited {
color: #ffffff;
}

View file

@ -33,7 +33,7 @@ aside { background-image: url('imgeasterbunny/border.jpg'); }
div.wall-item-content-wrapper.shiny { background-image: url('imgeasterbunny/shiny.png'); }
.nav-commlink, .nav-login-link {
.nav-commlink, .nav-login-link, .nav-logout-link {
background-color: #aed3b2;
}

View file

@ -4,9 +4,10 @@ a:link, a:visited { color: #549f4f; text-decoration: none; }
a:hover {text-decoration: underline; }
.nav-selected.nav-link { color: #549f4f!important; border-bottom: 0px}
.nav-commlink, .nav-login-link {background-color: #aed3b2;}
.nav-commlink, .nav-login-link, .nav-logout-link {background-color: #aed3b2;}
.nav-commlink:link, .nav-commlink:visited,
.nav-login-link:link, .nav-login-link:visited{
.nav-login-link:link, .nav-login-link:visited,
.nav-logout-link:link, .nav-logout-link:visited{
color: #ffffff;
}

View file

@ -10,7 +10,7 @@ section { background-image: url('imgpurplezero/border.jpg'); }
div.wall-item-content-wrapper.shiny { background-image: url('imgpurplezero/shiny.png'); }
.nav-commlink, .nav-login-link {
.nav-commlink, .nav-login-link, .nav-logout-link {
background-color: #aed3b2;
}

View file

@ -159,7 +159,7 @@ nav #banner #logo-text a {
nav #banner #logo-text a:hover { text-decoration: none; }
.nav-commlink, .nav-login-link {
.nav-commlink, .nav-login-link, .nav-logout-link {
display: block;
height: 15px;
margin-top: 67px;
@ -680,10 +680,6 @@ input#dfrn-url {
clear: both;
}
#viewcontacts {
margin-top: 15px;
}
#profile-edit-default-desc {
color: #FF0000;
border: 1px solid #FF8888;

View file

@ -36,21 +36,20 @@
{{include file="diaspora_vcard.tpl"}}
<div id="profile-vcard-break"></div>
<div id="profile-vcard-break"></div>
<div id="profile-extra-links">
<ul>
{{if $connect}}
{{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{if $unfollow_link}}
<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/if}}
{{if $wallmessage}}
{{if $follow_link}}
<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
{{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
{{if $subscribe_feed}}
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
{{if $subscribe_feed_link}}
<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>

View file

@ -2317,7 +2317,7 @@ ul.dropdown-menu li:hover {
.manage-content-wrapper, .notes-content-wrapper,
.message-content-wrapper, .apps-content-wrapper,
#adminpage, .delegate-content-wrapper, .uexport-content-wrapper,
.viewcontacts-content-wrapper, .dfrn_request-content-wrapper,
.dfrn_request-content-wrapper,
.friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper,
.profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper,
.fsuggest-content-wrapper {
@ -3547,7 +3547,7 @@ section .profile-match-wrapper {
right: 10px;
}
.generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .viewcontacts-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
.generic-page-wrapper, .profile_photo-content-wrapper, .videos-content-wrapper, .suggest-content-wrapper, .common-content-wrapper, .help-content-wrapper, .allfriends-content-wrapper, .match-content-wrapper, .dirfind-content-wrapper, .directory-content-wrapper, .manage-content-wrapper, .notes-content-wrapper, .message-content-wrapper, .apps-content-wrapper, #adminpage, .delegate-content-wrapper, .uexport-content-wrapper, .dfrn_request-content-wrapper, .friendica-content-wrapper, .credits-content-wrapper, .nogroup-content-wrapper, .profperm-content-wrapper, .invite-content-wrapper, .tos-content-wrapper, .fsuggest-content-wrapper {
border-radius: 0;
padding: 10px;
}

View file

@ -55,7 +55,7 @@ $(document).ready(function(){
var hctrigger = 'manual';
};
// Timeoute until the hover-card does appear
// Timeout until the hover-card does appear
setTimeout(function(){
if(targetElement.is(":hover") && parseInt(targetElement.attr('data-awaiting-hover-card'),10) == timeNow) {
if($('.hovercard').length == 0) { // no card if there already is one open
@ -81,6 +81,9 @@ $(document).ready(function(){
template: '<div class="popover hovercard" data-card-created="' + timeNow + '"><div class="arrow"></div><div class="popover-content hovercard-content"></div></div>',
content: data,
container: "body",
sanitizeFn: function (content) {
return DOMPurify.sanitize(content)
},
}).popover('show');
}
});

View file

@ -82,6 +82,9 @@ $(document).ready(function() {
trigger: "hover",
placement: "auto",
template: '<div class="popover hovercard event-card"><div class="arrow"></div><div class="popover-content hovercard-content"></div></div>',
sanitizeFn: function (content) {
return DOMPurify.sanitize(content)
},
});
}

View file

@ -93,6 +93,21 @@ $(document).ready(function(){
input.val(img);
});
// Generic delegated event to open an anchor URL in a modal.
// Used in the hovercard.
document.getElementsByTagName('body')[0].addEventListener('click', function(e) {
var target = e.target;
while (target) {
if (target.matches && target.matches('a.add-to-modal')) {
addToModal(target.href);
e.preventDefault();
return false;
}
target = target.parentNode || null;
}
});
});
// Overwrite Dialog.show from main js to load the filebrowser into a bs modal.

View file

@ -106,7 +106,10 @@ $(document).ready(function(){
delay: {
show: 500,
hide: 100
}
},
sanitizeFn: function (content) {
return DOMPurify.sanitize(content)
},
});
// initialize the bootstrap-select

View file

@ -58,11 +58,6 @@
{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
</ul>
<ul>
<!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
</ul>
</div> {{* End of contact-edit-status-wrapper *}}
<div id="contact-edit-links-end"></div>

View file

@ -65,6 +65,7 @@
<script type="text/javascript" src="view/asset/imagesloaded/imagesloaded.pkgd.min.js"></script>
<script type="text/javascript" src="view/js/acl.js"></script>
<script type="text/javascript" src="view/asset/base64/base64.min.js"></script>
<script type="text/javascript" src="view/asset/dompurify/dist/purify.min.js"></script>
<script type="text/javascript" src="view/js/main.js"></script>
<script type="text/javascript" src="view/theme/frio/frameworks/bootstrap/js/bootstrap.min.js"></script>

View file

@ -0,0 +1,20 @@
<div class="generic-page-wrapper">
{{include file="section_title.tpl"}}
<ul class="nav nav-tabs">
<li role="presentation"{{if !$type || $type == 'all'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts">{{$all_label}}</a></li>
<li role="presentation"{{if $type == 'followers'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/followers">{{$followers_label}}</a></li>
<li role="presentation"{{if $type == 'following'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/following">{{$following_label}}</a></li>
<li role="presentation"{{if $type == 'mutuals'}} class="active"{{/if}}><a href="profile/{{$nickname}}/contacts/mutuals">{{$mutuals_label}}</a></li>
</ul>
<ul id="viewcontact_wrapper{{if $id}}-{{$id}}{{/if}}" class="viewcontact_wrapper media-list">
{{foreach $contacts as $contact}}
<li>{{include file="contact_template.tpl"}}</li>
{{/foreach}}
</ul>
<div class="clear"></div>
<div id="view-contact-end"></div>
{{$paginate nofilter}}
</div>

View file

@ -46,23 +46,24 @@
{{if $account_type}}<div class="account-type">({{$account_type}})</div>{{/if}}
</div>
{{if $follow_link || $unfollow_link || $wallmessage_link}}
<div id="profile-extra-links">
{{if $connect}}
{{if $follow_link || $unfollow_link}}
<div id="dfrn-request-link-button">
{{if $remoteconnect}}
<a id="dfrn-request-link" class="btn btn-primary btn-sm" href="{{$remoteconnect}}">
<span class=""><i class="fa fa-user-plus"></i></span>
<span class="">{{$connect}}</span>
{{if $unfollow_link}}
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
<span class=""><i class="fa fa-user-times"></i></span>
<span class="">{{$unfollow}}</span>
</a>
{{else}}
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="dfrn_request/{{$profile.nickname}}">
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}">
<span class=""><i class="fa fa-user-plus"></i></span>
<span class="">{{$connect}}</span>
<span class="">{{$follow}}</span>
</a>
{{/if}}
</div>
{{/if}}
{{if $wallmessage}}
{{if $wallmessage_link}}
<div id="wallmessage-link-botton">
<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
<span class=""><i class="fa fa-envelope"></i></span>
@ -71,6 +72,7 @@
</div>
{{/if}}
</div>
{{/if}}
<div class="clear"></div>

View file

@ -6,7 +6,7 @@
<ul role="menu" id="saved-search-ul">
{{foreach $saved as $search}}
<li role="menuitem" class="saved-search-li clear">
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network/?f=&amp;remove=1&amp;search={{$search.encodedterm}}">
<a title="{{$search.delete}}" onclick="return confirmDelete();" id="drop-saved-search-term-{{$search.id}}" class="savedsearchdrop pull-right widget-action faded-icon" href="network?remove=1&amp;search={{$search.encodedterm}}">
<i class="fa fa-trash" aria-hidden="true"></i>
</a>
<a id="saved-search-term-{{$search.id}}" class="savedsearchterm" href="search?search={{$search.encodedterm}}">{{$search.term}}</a>

View file

@ -34,5 +34,30 @@
{{if $network_link}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_link nofilter}}</dd></dl>{{/if}}
</div>
<div id="profile-extra-links">
<div id="dfrn-request-link-button">
{{if $follow_link}}
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$follow_link}}"">
<span class=""><i class="fa fa-user-plus"></i></span>
<span class="">{{$follow}}</span>
</a>
{{/if}}
{{if $unfollow_link}}
<a id="dfrn-request-link" class="btn btn-labeled btn-primary btn-sm" href="{{$unfollow_link}}">
<span class=""><i class="fa fa-user-times"></i></span>
<span class="">{{$unfollow}}</span>
</a>
{{/if}}
</div>
{{if $wallmessage_link}}
<div id="wallmessage-link-botton">
<button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
<span class=""><i class="fa fa-envelope"></i></span>
<span class="">{{$wallmessage}}</span>
</button>
</div>
{{/if}}
</div>
</div>
</div>

View file

@ -255,8 +255,6 @@ function frio_remote_nav($a, &$nav)
}
if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
// user menu
$nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
$nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];

View file

@ -69,21 +69,20 @@
{{/if}}
{{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links">
<ul>
{{if $connect}}
{{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{if $unfollow_link}}
<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/if}}
{{if $wallmessage}}
{{if $follow_link}}
<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
{{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
{{if $subscribe_feed}}
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
{{if $subscribe_feed_link}}
<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>

View file

@ -5,7 +5,7 @@
{{foreach $saved as $search}}
<li class="tool {{if $search.selected}}selected{{/if}}">
<a href="search?search={{$search.encodedterm}}" class="label" >{{$search.term}}</a>
<a href="network/?f=&remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
<a href="network?remove=1&search={{$search.encodedterm}}" class="action icon s10 delete" title="{{$search.delete}}" onclick="return confirmDelete();"></a>
</li>
{{/foreach}}
</ul>

View file

@ -2834,10 +2834,6 @@ margin-left: 0px;
clear: both;
}
#viewcontacts {
margin-top: 15px;
}
.contact-entry-wrapper .contact-entry-photo-wrapper {
float: left;
margin-right: 10px;

View file

@ -763,6 +763,7 @@ nav #nav-directory-link,
nav #nav-apps-link,
nav #nav-apps-link,
nav #nav-login-link,
nav #nav-logout-link,
nav #nav-messages-linkmenu,
nav #nav-notifications-linkmenu,
nav #nav-site-linkmenu,

View file

@ -45,11 +45,6 @@
{{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
{{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
</ul>
<ul>
<!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
{{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
</ul>
</div> {{* End of contact-edit-status-wrapper *}}
{{* Some information about the contact from the profile *}}

View file

@ -102,6 +102,11 @@
<a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
</li>
{{/if}}
{{if $nav.logout}}
<li role="menuitem" id="nav-logout-link" class="nav-menu">
<a class="{{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a>
</li>
{{/if}}
{{if $nav.search}}
<li role="search" id="nav-search-box">

View file

@ -61,21 +61,20 @@
{{if $about}}<dl class="about"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
{{include file="diaspora_vcard.tpl"}}
<div id="profile-extra-links">
<ul>
{{if $connect}}
{{if $remoteconnect}}
<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
{{else}}
<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
{{/if}}
{{if $unfollow_link}}
<li><a id="dfrn-request-link" href="{{$unfollow_link}}">{{$unfollow}}</a></li>
{{/if}}
{{if $wallmessage}}
{{if $follow_link}}
<li><a id="dfrn-request-link" href="{{$follow_link}}">{{$follow}}</a></li>
{{/if}}
{{if $wallmessage_link}}
<li><a id="wallmessage-link" href="{{$wallmessage_link}}">{{$wallmessage}}</a></li>
{{/if}}
{{if $subscribe_feed}}
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
{{if $subscribe_feed_link}}
<li><a id="subscribe-feed-link" href="{{$subscribe_feed_link}}">{{$subscribe_feed}}</a></li>
{{/if}}
</ul>
</div>

View file

@ -230,7 +230,7 @@ function vier_community_info()
$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
$entry = [
'url' => 'network?f=&cid=' . $contact['id'],
'url' => 'network?cid=' . $contact['id'],
'external_url' => Contact::magicLink($contact['url']),
'name' => $contact['name'],
'cid' => $contact['id'],