From 5cde31cbd66b5bd64805311802019771b54004ce Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Mon, 30 May 2022 20:16:46 +0530 Subject: [PATCH 1/4] password svg added --- core/css/server.css | 2 +- core/img/app-icons/Password.svg | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 core/img/app-icons/Password.svg diff --git a/core/css/server.css b/core/css/server.css index 74b30ae3..bceb8b9f 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1696,7 +1696,7 @@ .new-icons .tasks {background-image: url("../img/app-icons/Tasks.svg");} .new-icons .photos {background-image: url("../img/app-icons/Gallery.svg");} .new-icons .e-user-support-center {background-image: url("../img/app-icons/Support.svg");} - /* .new-icons .passwords {background-image: url("../img/app-icons/Password.svg");} */ + .new-icons .passwords {background-image: url("../img/app-icons/Password.svg");} .new-icons .onlyoffice_docx {background-image: url("../img/app-icons/Docs.svg");} .new-icons .onlyoffice_xlsx {background-image: url("../img/app-icons/Spreadsheet.svg");} .new-icons .onlyoffice_pptx {background-image: url("../img/app-icons/Presentation.svg");} diff --git a/core/img/app-icons/Password.svg b/core/img/app-icons/Password.svg new file mode 100644 index 00000000..1d4370d3 --- /dev/null +++ b/core/img/app-icons/Password.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + -- GitLab From b0114e9c07202a725f3dbba5601cba54a203fd4f Mon Sep 17 00:00:00 2001 From: Ronak P Patel Date: Tue, 31 May 2022 03:07:36 +0000 Subject: [PATCH 2/4] Revert "Merge branch 'dev/onlyoffice-ecloud-theme' into 'main'" This reverts merge request !70 --- core/css/server.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/css/server.css b/core/css/server.css index 74b30ae3..ff3eabaf 100644 --- a/core/css/server.css +++ b/core/css/server.css @@ -1697,9 +1697,6 @@ .new-icons .photos {background-image: url("../img/app-icons/Gallery.svg");} .new-icons .e-user-support-center {background-image: url("../img/app-icons/Support.svg");} /* .new-icons .passwords {background-image: url("../img/app-icons/Password.svg");} */ - .new-icons .onlyoffice_docx {background-image: url("../img/app-icons/Docs.svg");} - .new-icons .onlyoffice_xlsx {background-image: url("../img/app-icons/Spreadsheet.svg");} - .new-icons .onlyoffice_pptx {background-image: url("../img/app-icons/Presentation.svg");} #appmenu li:hover a, #appmenu li a:focus { font-size: 12px; -- GitLab From 07e49a213af7b1bdbb4c4607a9e17d14707cd2a9 Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 7 Jun 2022 21:24:54 +0530 Subject: [PATCH 3/4] added translations + moved folder into core folder --- {l10n => core/l10n}/de.js | 4 +++- {l10n => core/l10n}/de.json | 4 +++- {l10n => core/l10n}/en.js | 4 +++- {l10n => core/l10n}/en.json | 4 +++- {l10n => core/l10n}/es.js | 4 +++- {l10n => core/l10n}/es.json | 4 +++- {l10n => core/l10n}/fr.js | 4 +++- {l10n => core/l10n}/fr.json | 4 +++- defaults.php | 6 +++--- 9 files changed, 27 insertions(+), 11 deletions(-) rename {l10n => core/l10n}/de.js (87%) rename {l10n => core/l10n}/de.json (87%) rename {l10n => core/l10n}/en.js (86%) rename {l10n => core/l10n}/en.json (86%) rename {l10n => core/l10n}/es.js (85%) rename {l10n => core/l10n}/es.json (85%) rename {l10n => core/l10n}/fr.js (85%) rename {l10n => core/l10n}/fr.json (85%) diff --git a/l10n/de.js b/core/l10n/de.js similarity index 87% rename from l10n/de.js rename to core/l10n/de.js index 7463ef24..c43bf9d9 100644 --- a/l10n/de.js +++ b/core/l10n/de.js @@ -10,6 +10,8 @@ OC.L10N.register( "Create My Account": "Erstelle meinen Account", "Sign in to your account": "Melden Sie sich bei Ihrem Konto an", "Terms & Conditions": "algemene voorwaarden", - "Privacy Policy": "Privacybeleid" + "Privacy Policy": "Privacybeleid", + "All Rights Reserved": "Alle rechten voorbehouden", + "Copyright": "Auteursrechten" }, "nplurals=2; plural=(n != 1);"); \ No newline at end of file diff --git a/l10n/de.json b/core/l10n/de.json similarity index 87% rename from l10n/de.json rename to core/l10n/de.json index 06479711..10af8cc1 100644 --- a/l10n/de.json +++ b/core/l10n/de.json @@ -9,7 +9,9 @@ "Create My Account": "Erstelle meinen Account", "Sign in to your account": "Melden Sie sich bei Ihrem Konto an", "Terms & Conditions": "algemene voorwaarden", - "Privacy Policy": "Privacybeleid" + "Privacy Policy": "Privacybeleid", + "All Rights Reserved": "Alle rechten voorbehouden", + "Copyright": "Auteursrechten" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/l10n/en.js b/core/l10n/en.js similarity index 86% rename from l10n/en.js rename to core/l10n/en.js index dbf4c008..8ad9222c 100755 --- a/l10n/en.js +++ b/core/l10n/en.js @@ -10,6 +10,8 @@ OC.L10N.register( "Create My Account": "Create My Account", "Sign in to your account": "Sign in to your account", "Terms & Conditions": "Terms & Conditions", - "Privacy Policy": "Privacy Policy" + "Privacy Policy": "Privacy Policy", + "All Rights Reserved": "All Rights Reserved", + "Copyright": "Copyright" }, "nplurals=2; plural=(n != 1);"); \ No newline at end of file diff --git a/l10n/en.json b/core/l10n/en.json similarity index 86% rename from l10n/en.json rename to core/l10n/en.json index eef2c3d6..2da6ba29 100755 --- a/l10n/en.json +++ b/core/l10n/en.json @@ -9,7 +9,9 @@ "Create My Account": "Create My Account", "Sign in to your account": "Sign in to your account", "Terms & Conditions": "Terms & Conditions", - "Privacy Policy": "Privacy Policy" + "Privacy Policy": "Privacy Policy", + "All Rights Reserved": "All Rights Reserved", + "Copyright": "Copyright" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/l10n/es.js b/core/l10n/es.js similarity index 85% rename from l10n/es.js rename to core/l10n/es.js index 1e9b9580..8bf7da3a 100644 --- a/l10n/es.js +++ b/core/l10n/es.js @@ -10,6 +10,8 @@ OC.L10N.register( "Create My Account": "Crear mi cuenta", "Sign in to your account": "Iniciar sesión en su cuenta", "Terms & Conditions": "Términos y condiciones", - "Privacy Policy": "Política de privacidad" + "Privacy Policy": "Política de privacidad", + "All Rights Reserved": "Reservados todos los derechos", + "Copyright": "Derechos de autor" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/es.json b/core/l10n/es.json similarity index 85% rename from l10n/es.json rename to core/l10n/es.json index 96bd5b72..0f507fd4 100644 --- a/l10n/es.json +++ b/core/l10n/es.json @@ -9,7 +9,9 @@ "Create My Account": "Crear mi cuenta", "Sign in to your account": "Iniciar sesión en su cuenta", "Terms & Conditions": "Términos y condiciones", - "Privacy Policy": "Política de privacidad" + "Privacy Policy": "Política de privacidad", + "All Rights Reserved": "Reservados todos los derechos", + "Copyright": "Derechos de autor" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/l10n/fr.js b/core/l10n/fr.js similarity index 85% rename from l10n/fr.js rename to core/l10n/fr.js index 307483d3..4a54859a 100644 --- a/l10n/fr.js +++ b/core/l10n/fr.js @@ -10,6 +10,8 @@ OC.L10N.register( "Create My Account": "Créer mon compte", "Sign in to your account": "Connectez-vous à votre compte", "Terms & Conditions": "termes et conditions", - "Privacy Policy": "Politique de confidentialité" + "Privacy Policy": "Politique de confidentialité", + "All Rights Reserved": "Tous les droits sont réservés", + "Copyright": "droits d'auteur" }, "nplurals=2; plural=(n != 1);"); diff --git a/l10n/fr.json b/core/l10n/fr.json similarity index 85% rename from l10n/fr.json rename to core/l10n/fr.json index 90890d1b..f8ec84aa 100644 --- a/l10n/fr.json +++ b/core/l10n/fr.json @@ -9,7 +9,9 @@ "Create My Account": "Créer mon compte", "Sign in to your account": "Connectez-vous à votre compte", "Terms & Conditions": "termes et conditions", - "Privacy Policy": "Politique de confidentialité" + "Privacy Policy": "Politique de confidentialité", + "All Rights Reserved": "Tous les droits sont réservés", + "Copyright": "droits d'auteur" }, "pluralForm": "nplurals=2; plural=(n != 1);" } diff --git a/defaults.php b/defaults.php index e80d2728..08beeca1 100644 --- a/defaults.php +++ b/defaults.php @@ -115,9 +115,9 @@ class OC_Theme { * @return string long footer */ public function getLongFooter() { - $footer = '

Copyright © ' . date('Y') .' '.$this->getName() .'. All Rights Reserved.

' ; - $footer .= '

'.' '.(\OC::$server->getL10N('lib')->t('Terms & Conditions')).' '; - $footer .= ' - '.' '.(\OC::$server->getL10N('lib')->t('Privacy Policy')).'

'; + $footer = '

'.(\OC::$server->getL10N('core')->t('Copyright')).' © ' . date('Y') .' '.$this->getName() .'. '.(\OC::$server->getL10N('core')->t('All Rights Reserved')).'.

' ; + $footer .= '

'.' '.(\OC::$server->getL10N('core')->t('Terms & Conditions')).' '; + $footer .= ' - '.' '.(\OC::$server->getL10N('core')->t('Privacy Policy')).'

'; return $footer; } -- GitLab From 10ef58982ce3c2b529effdd315123306a868694f Mon Sep 17 00:00:00 2001 From: Ronak Patel Date: Tue, 7 Jun 2022 22:01:00 +0530 Subject: [PATCH 4/4] background white for input for dark mode --- core/css/guest.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/css/guest.css b/core/css/guest.css index 52aeeca8..0dbc011d 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -1108,7 +1108,7 @@ a.legal { align-items: flex-start; gap: 40px; height: 100%; - background: #FFFFFF; + background-color: #FFFFFF; flex: none; order: 0; align-self: stretch; @@ -1134,6 +1134,7 @@ a.legal { border-radius: 8px; margin: 12px 0px; font-size: 16px; + background-color: #ffffff; } #body-login .groupbottom, -- GitLab