t('Access forbidden')); ?>
-
-
-
-
-
-
- t('You have multiple identities associated with a different ownCloud accounts. Because of that, we were unable to reliably determine to which ownCloud account we should log you in.')); ?>
-
- t('The problematic identities are')); ?>
-
-
- $ocids): ?>
-
-
- getSamlUid()); ?> → - - -
- (t('eduID identity')); ?> → t('ownCloud account')); ?>) -
--
- t('You have two options how to solve this issue ')); ?> -
- t('A. We can merge you all identities into the one, then you can see all your data in one account ')); ?> - t('Please contact us on ')); ?>support@cesnet.cz - t(' to resolve this situation.')); ?> -
- t('B. If you have serious reasons to use two separate accounts in CESNET e-infrastructure, please contact user support at: du-support@cesnet.cz')); ?> - t('Please continue to the following tutorial')); ?> -
-t('To use ownCloud service it is required to have valid affiliation (employee, student) with one of the membership organization that are fulfilling the Access Policy (AP) for the CESNET Large Infrastructure.')); ?>
+t('Access forbidden')); ?>
+ +">t('Return to login page')); ?> diff --git a/core/templates/404.php b/core/templates/404.php new file mode 100644 index 0000000..dde88d9 --- /dev/null +++ b/core/templates/404.php @@ -0,0 +1,25 @@ +printPage(); + exit; +} +// @codeCoverageIgnoreEnd +?> + + + +t('File not found')); ?>
+ + \ No newline at end of file diff --git a/core/templates/altmail.php b/core/templates/altmail.php index 7582252..8cc2254 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,18 +1,16 @@ t("Dear user,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link']))); -if ( isset($_['expiration']) ) { - print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); +if (isset($_['expiration'])) { + print_unescaped($l->t("The share will expire on %s.", [$_['expiration']])); print_unescaped("\n\n"); } if (isset($_['personal_note'])) { // TRANSLATORS personal note in share notification email - print_unescaped($l->t("Personal note from the sender: %s.", [$_['personal_note']])); + print_unescaped($l->t("Personal note from the sender: \n %s.", $_['personal_note'])); print_unescaped("\n\n"); } // TRANSLATORS term at the end of a mail p($l->t("Your CESNET Storage Department Team")); ?> --- -getName() . ' - ' . $theme->getSlogan()); ?> -getBaseUrl()); +inc('plain.mail.footer')); diff --git a/core/templates/altmail.php.bak b/core/templates/altmail.php.bak deleted file mode 100644 index 6ab65d5..0000000 --- a/core/templates/altmail.php.bak +++ /dev/null @@ -1,18 +0,0 @@ -t("Hello,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link']))); -if ( isset($_['expiration']) ) { - print_unescaped($l->t("The share will expire on %s.", array($_['expiration']))); - print_unescaped("\n\n"); -} -if (isset($_['personal_note'])) { - // TRANSLATORS personal note in share notification email - print_unescaped($l->t("Personal note from the sender: %s.", [$_['personal_note']])); - print_unescaped("\n\n"); -} -// TRANSLATORS term at the end of a mail -p($l->t("Your CESNET Storage Department Team")); -?> - --- -getName() . ' - ' . $theme->getSlogan()); ?> -getBaseUrl()); diff --git a/core/templates/error.php b/core/templates/error.php new file mode 100644 index 0000000..27a5131 --- /dev/null +++ b/core/templates/error.php @@ -0,0 +1,12 @@ +Error
+ +">t('Return to login page')); ?> diff --git a/core/templates/exception.php b/core/templates/exception.php new file mode 100644 index 0000000..fe3cd65 --- /dev/null +++ b/core/templates/exception.php @@ -0,0 +1,33 @@ + +t('Internal Server Error')) ?>
+ +t('The server encountered an internal error and was unable to complete your request.')) ?>
+t('Please contact the server administrator if this error reappears multiple times and include the technical details below in your report.')) ?>
+t('More details can be found in the server log.', [link_to_docs('admin-logfiles')])); ?>
++
t('Technical details')) ?>
+ + + ++
t('Trace')) ?>
+ + + diff --git a/core/templates/internalaltmail.php b/core/templates/internalaltmail.php index 9682ebb..37cdd13 100644 --- a/core/templates/internalaltmail.php +++ b/core/templates/internalaltmail.php @@ -1,13 +1,10 @@ t("Dear user,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link']))); -if ( isset($_['expiration']) ) { +if (isset($_['expiration'])) { print_unescaped($l->t("The share will expire on %s.", [$_['expiration']])); print_unescaped("\n\n"); } // TRANSLATORS term at the end of a mail p($l->t("Your CESNET Storage Department Team")); ?> - --- -getName() . ' - ' . $theme->getSlogan()); ?> -getBaseUrl()); +inc('plain.mail.footer')); diff --git a/core/templates/internalmail.php b/core/templates/internalmail.php index 6327e6f..5b429fa 100644 --- a/core/templates/internalmail.php +++ b/core/templates/internalmail.php @@ -1,39 +1,37 @@
-
| |||||||||||||||||||||||||
->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + getHTMLName()); ?> +
+ + + ++ t('Apps')); ?> +
+ + +
+
+
+
+
+
+
+
+
+
+ ->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32]));?>){kind=small}
+
+
+
+ -
+
+
-
+ class="active">
+
+ + +
+
+ -
+ >
+
); ?>)
+ t('Log out'));?>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/templates/login.php b/core/templates/login.php
index d6d45cb..ab83351 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -1,4 +1,7 @@
-
+
-
-
-
+
+
+
+
+
diff --git a/core/templates/lostpassword/email.php b/core/templates/lostpassword/email.php
index f88c980..9fef10e 100644
--- a/core/templates/lostpassword/email.php
+++ b/core/templates/lostpassword/email.php
@@ -34,8 +34,7 @@
print_unescaped(\str_replace('{link}', "{$_['link']}", $l->t('Please use the following link to reset your password: {link}')));
print_unescaped("
+
+
+ + ownCloud @ CESNET +
++ t('Sync, Share & Backup all of your academic data.')); ?> +
+▘▘▖▘▘▘▘▘▘▘▖▘▘▘▘▘▖▘▘▘▖▘▘▖▖▖▘▘▘▘▖▘▘▖▖▘▘▖▘▘▘▘▘▘▘▖▘▖▘▘▘▖▖▘▖▖
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ "); // TRANSLATORS term at the end of a mail -p($l->t("Cheers!")); -?> +p($l->t('Your CESNET Storage Department Team'));?>
-
| |||||||||||||||||||||||||
' . $this->getSlogan() . '
'; + $l10n = $this->getL10n(); + $footer = '© '.date("Y").' '.$this->getEntity().''. + '' . $this->getSlogan(); + if ($this->getImprintUrl() !== '') { + $footer .= ' | ' . $l10n->t('Imprint') . ''; + } + if ($this->getPrivacyPolicyUrl() !== '') { + $footer .= ' | '. $l10n->t('Privacy Policy') .''; + } return $footer; } @@ -133,33 +161,21 @@ public function getShortFooter() { * @return string long footer */ public function getLongFooter() { - $cesnetLink = '© 2018 ' . $this->getEntity() . '
' . $this->getSlogan(); - $footer = '' - . ''; + $l10n = $this->getL10n(); + $footer = '© '.date("Y").' '.$this->getEntity().''. + '
' . $this->getSlogan(); + if ($this->getImprintUrl() !== '') { + $footer .= ' | ' . $l10n->t('Imprint') . ''; + } + + if ($this->getPrivacyPolicyUrl() !== '') { + $footer .= ' | '. $l10n->t('Privacy Policy') .''; + } return $footer; } public function buildDocLinkToKey($key) { - switch ($key) { - case 'user-sharing-federated' : { - if ($this->lang === 'cs') { - $key='sdileni_souboru'; - } else { - $key='how_to_share_your_files'; - } - break; - } - } - return $this->getDocBaseUrl() . $key; + return $this->getDocBaseUrl() . '/server/10.0/go.php?to=' . $key; } /** diff --git a/docs/screenshot.png b/docs/screenshot.png new file mode 100644 index 0000000..fa1a47a Binary files /dev/null and b/docs/screenshot.png differ diff --git a/settings/l10n/cs.json b/settings/l10n/cs.json index fc379bd..b6ef2e2 100644 --- a/settings/l10n/cs.json +++ b/settings/l10n/cs.json @@ -1,8 +1,10 @@ -{ "translations": { - "Your CESNET Storage Department Team" : "Váš tým Datových uložišť CESNET", - "Your %s account was created" : "Váš %s účet byl vytvořen", - "Sign In to ownCloud" : "Přihlásit se do ownCloudu", - "Dear user,
your ownCloud account at CESNET Data Storage has been succesfully created for you.
Below are listed details about your account.
Your username: %s
Server address: %s
User manual
If you have any questions or problems, feel free to contact us at support@cesnet.cz.
" : "Dobrý den,
Váš ownCloud účet na DÚ CESNET byl úspěšně založen.
Níže jsou uvedeny informace o Vašem účtu.
Uživatelské jméno: %s
Adresa serveru: %s
Uživatelský manuál
V případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.
", - "Dear user,\n\nyour ownCloud account at CESNET Data Storage has been succesfully created for you.\n\nBelow are listed details about your account.\n\nYour username: %s\nServer address: %s\nUser manual: https://du.cesnet.cz/en/navody/owncloud/start\n\nIf you have any questions or problems, feel free to contact us at support@cesnet.cz.\n\n" : "Dobrý den,\n\nVáš ownCloud účet na DÚ CESNET byl úspěšně založen.\n\nNíže jsou uvedeny informace o Vašem účtu.\n\nUživatelské jméno: %s\nAdresa serveru: %s\nUživatelský manuál: https://du.cesnet.cz/en/navody/owncloud/start\n\nV případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.\n\n" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" +{ + "translations": { + "Your CESNET Storage Department Team": "Váš tým Datových uložišť CESNET", + "Your %s account was created": "Váš %s účet byl vytvořen", + "Sign In to ownCloud": "Přihlásit se do ownCloudu", + "Dear user,
your ownCloud account at CESNET Data Storage has been succesfully created for you.
Below are listed details about your account.
Your username: %s
Server address: %s
User manual
If you have any questions or problems, feel free to contact us at support@cesnet.cz.
": "Dobrý den,
Váš ownCloud účet na DÚ CESNET byl úspěšně založen.
Níže jsou uvedeny informace o Vašem účtu.
Uživatelské jméno: %s
Adresa serveru: %s
Uživatelský manuál
V případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.
", + "Dear user,\n\nyour ownCloud account at CESNET Data Storage has been succesfully created for you.\n\nBelow are listed details about your account.\n\nYour username: %s\nServer address: %s\nUser manual: https://du.cesnet.cz/en/navody/owncloud/start\n\nIf you have any questions or problems, feel free to contact us at support@cesnet.cz.\n\n": "Dobrý den,\n\nVáš ownCloud účet na DÚ CESNET byl úspěšně založen.\n\nNíže jsou uvedeny informace o Vašem účtu.\n\nUživatelské jméno: %s\nAdresa serveru: %s\nUživatelský manuál: https://du.cesnet.cz/en/navody/owncloud/start\n\nV případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.\n\n" + }, + "pluralForm": "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" } diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json index fc379bd..b6ef2e2 100644 --- a/settings/l10n/cs_CZ.json +++ b/settings/l10n/cs_CZ.json @@ -1,8 +1,10 @@ -{ "translations": { - "Your CESNET Storage Department Team" : "Váš tým Datových uložišť CESNET", - "Your %s account was created" : "Váš %s účet byl vytvořen", - "Sign In to ownCloud" : "Přihlásit se do ownCloudu", - "Dear user,
your ownCloud account at CESNET Data Storage has been succesfully created for you.
Below are listed details about your account.
Your username: %s
Server address: %s
User manual
If you have any questions or problems, feel free to contact us at support@cesnet.cz.
" : "Dobrý den,
Váš ownCloud účet na DÚ CESNET byl úspěšně založen.
Níže jsou uvedeny informace o Vašem účtu.
Uživatelské jméno: %s
Adresa serveru: %s
Uživatelský manuál
V případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.
", - "Dear user,\n\nyour ownCloud account at CESNET Data Storage has been succesfully created for you.\n\nBelow are listed details about your account.\n\nYour username: %s\nServer address: %s\nUser manual: https://du.cesnet.cz/en/navody/owncloud/start\n\nIf you have any questions or problems, feel free to contact us at support@cesnet.cz.\n\n" : "Dobrý den,\n\nVáš ownCloud účet na DÚ CESNET byl úspěšně založen.\n\nNíže jsou uvedeny informace o Vašem účtu.\n\nUživatelské jméno: %s\nAdresa serveru: %s\nUživatelský manuál: https://du.cesnet.cz/en/navody/owncloud/start\n\nV případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.\n\n" -},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" +{ + "translations": { + "Your CESNET Storage Department Team": "Váš tým Datových uložišť CESNET", + "Your %s account was created": "Váš %s účet byl vytvořen", + "Sign In to ownCloud": "Přihlásit se do ownCloudu", + "Dear user,
your ownCloud account at CESNET Data Storage has been succesfully created for you.
Below are listed details about your account.
Your username: %s
Server address: %s
User manual
If you have any questions or problems, feel free to contact us at support@cesnet.cz.
": "Dobrý den,
Váš ownCloud účet na DÚ CESNET byl úspěšně založen.
Níže jsou uvedeny informace o Vašem účtu.
Uživatelské jméno: %s
Adresa serveru: %s
Uživatelský manuál
V případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.
", + "Dear user,\n\nyour ownCloud account at CESNET Data Storage has been succesfully created for you.\n\nBelow are listed details about your account.\n\nYour username: %s\nServer address: %s\nUser manual: https://du.cesnet.cz/en/navody/owncloud/start\n\nIf you have any questions or problems, feel free to contact us at support@cesnet.cz.\n\n": "Dobrý den,\n\nVáš ownCloud účet na DÚ CESNET byl úspěšně založen.\n\nNíže jsou uvedeny informace o Vašem účtu.\n\nUživatelské jméno: %s\nAdresa serveru: %s\nUživatelský manuál: https://du.cesnet.cz/en/navody/owncloud/start\n\nV případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.\n\n" + }, + "pluralForm": "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;" } diff --git a/settings/templates/email.new_user.php b/settings/templates/email.new_user.php index e65c947..67fe0a9 100644 --- a/settings/templates/email.new_user.php +++ b/settings/templates/email.new_user.php @@ -12,7 +12,7 @@
your ownCloud account at CESNET Data Storage has been succesfully created.
Below are listed details about your account.
Your username: %s
Server address: %s
User manual
If you have any questions or problems, feel free to contact us at support@cesnet.cz.
', + print_unescaped($l->t('Dear user,
your ownCloud account at CESNET Data Storage has been succesfully created.
Details about your account are listed below.
Your username: %s
Server address: %s
User manual
If you have any questions or problems, feel free to contact us at support@cesnet.cz.
', array($_['username'], 'https://owncloud.cesnet.cz', 'https://owncloud.cesnet.cz'))); // TRANSLATORS term at the end of a mail @@ -25,7 +25,7 @@
getName()); ?> - - getSlogan()); ?> + getSlogan()); ?>
getBaseUrl());?>
-
| ||||||||||||