From f2d0cd1f6aa082ea580812ae53926132bc32ade3 Mon Sep 17 00:00:00 2001 From: senderfm Date: Tue, 9 Jul 2019 10:00:45 +0200 Subject: [PATCH 1/5] footer created, new pages, imprint, terms and conditions, history, privacy policy, imprint created and languages adapted --- webapp/layouts/default.vue | 22 ++++++- webapp/locales/de.json | 15 +++++ webapp/locales/en.json | 14 ++++ webapp/locales/es.json | 14 ++++ webapp/locales/fr.json | 14 ++++ webapp/locales/it.json | 17 ++++- webapp/locales/nl.json | 17 ++++- webapp/locales/pl.json | 17 ++++- webapp/locales/pt.json | 18 +++++- webapp/pages/admin.vue | 4 +- webapp/pages/changelog/index.vue | 14 ++++ webapp/pages/imprint/index.vue | 72 +++++++++++++++++++++ webapp/pages/privacy/index.vue | 13 ++++ webapp/pages/terms-and-conditions/index.vue | 13 ++++ 14 files changed, 256 insertions(+), 8 deletions(-) create mode 100644 webapp/pages/changelog/index.vue create mode 100644 webapp/pages/imprint/index.vue create mode 100644 webapp/pages/privacy/index.vue create mode 100644 webapp/pages/terms-and-conditions/index.vue diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 93ba809f4..3cd9d7126 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -92,7 +92,17 @@ - +
@@ -123,6 +133,7 @@ export default { data() { return { mobileSearchVisible: false, + footerOpen: false, } }, computed: { @@ -271,4 +282,13 @@ export default { } } } +.ds-footer { + text-align: center; + position: fixed; + bottom: 0px; + z-index: 10; + background-color: white; + width: 100%; + padding: 10px 10px; +} diff --git a/webapp/locales/de.json b/webapp/locales/de.json index 430402c84..e937b65f0 100644 --- a/webapp/locales/de.json +++ b/webapp/locales/de.json @@ -2,6 +2,21 @@ "filter-menu": { "title": "Deine Filterblase" }, + "site": { + "made": "Mit ❤ gemacht", + "imprint": "Impressum", + "termsAc": "Nutzungsbedingungen", + "privacy": "Datenschutz", + "changelog": "Änderungen & Verlauf", + "contact": "Kontakt", + "tribunal": "Registergericht", + "register": "Registernummer", + "director": "Geschäftsführer", + "taxident": "Umsatzsteuer-Identifikationsnummer gemäß § 27 a Umsatzsteuergesetz (Deutschland)", + "responsible": "Verantwortlicher gemäß § 55 Abs. 2 RStV ", + "bank": "Bankverbindung", + "germany": "Deutschland" + }, "login": { "copy": "Wenn Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.", "login": "Einloggen", diff --git a/webapp/locales/en.json b/webapp/locales/en.json index de5884f61..6f01db0ae 100644 --- a/webapp/locales/en.json +++ b/webapp/locales/en.json @@ -2,6 +2,20 @@ "filter-menu": { "title": "Your filter bubble" }, + "site": { + "made": "With ❤ made", + "imprint": "Imprint", + "termsAc": "terms and conditions", + "privacy": "data protection", + "changelog": "Changes & History", + "contact": "Contact", + "tribunal": "register court", + "register": "register number", + "director": "Managing Director", + "taxident": "Value added tax identification number according to § 27 a Value Added Tax Act (Germany)", + "responsible": "Responsible according to § 55 Abs. 2 RStV (Germany) ", + "bank": "bank account" + }, "login": { "copy": "If you already have a human-connection account, login here.", "login": "Login", diff --git a/webapp/locales/es.json b/webapp/locales/es.json index dc2c44a1f..823b90205 100644 --- a/webapp/locales/es.json +++ b/webapp/locales/es.json @@ -2,6 +2,20 @@ "filter-menu": { "title": "Su burbuja de filtro" }, + "site": { + "made": "Con ❤ realizado", + "imprint": "Pie de imprenta", + "termsAc": "términos y condiciones", + "privacy": "protección de datos", + "changelog": "Cambios e historia", + "contact": "Contacto", + "tribunal": "tribunal de registro", + "register": "número de registro", + "director": "Director General", + "taxident": "Número de identificación del impuesto sobre el valor añadido según el § 27 a de la Ley del Impuesto sobre el Valor Añadido (Alemania)", + "responsible": "Responsable según § 55 Abs. 2 RStV (Alemania)", + "bank": "cuenta" + }, "login": { "copy": "Si ya tiene una cuenta de Human Connection, inicie sesión aquí.", "login": "Iniciar sesión", diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json index cfcabc221..a036c3d4c 100644 --- a/webapp/locales/fr.json +++ b/webapp/locales/fr.json @@ -2,6 +2,20 @@ "filter-menu": { "title": "Votre bulle de filtre" }, + "site": { + "made": "Avec ❤ fait", + "imprint": "Mentions légales", + "termsAc": "modalités et conditions", + "privacy": "protection des données", + "changelog": "Changements et historique", + "contact": "Contacter", + "tribunal": "tribunal de registre", + "register": "numéro de registre", + "director": "Directeur Général", + "taxident": "Numéro d'identification à la taxe sur la valeur ajoutée selon § 27 a de la loi sur la taxe sur la valeur ajoutée (Allemagne)", + "responsible": "Responsable selon § 55 Abs. 2 RStV (Allemagne)", + "bank": "Bankverbindung" + }, "login": { "copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.", "login": "Connexion", diff --git a/webapp/locales/it.json b/webapp/locales/it.json index 25005a07a..968ee3269 100644 --- a/webapp/locales/it.json +++ b/webapp/locales/it.json @@ -1,4 +1,19 @@ { + "site": { + "made": "Con ❤ fatto", + "imprint": "Impressum", + "termsAc": "Condizioni d'uso", + "privacy": "protezione dei dati", + "changelog": "Cambiamenti e storia", + "contact": "Contatto", + "tribunal": "registro tribunale", + "register": "numero di registro", + "director": "Direttore Generale", + "taxident": "Numero di identificazione dell'imposta sul valore aggiunto ai sensi del § 27 a Legge sull'imposta sul valore aggiunto (Germania)", + "responsible": "Responsabile ai sensi del § 55 Abs. 2 RStV (Germania)", + "bank": "conto bancario", + "germany": "Germania" + }, "login": { "copy": "Se sei gia registrato su Human Connection, accedi qui.", "login": "Accesso", @@ -126,4 +141,4 @@ "edit": "Modifica", "delete": "Cancella" } -} \ No newline at end of file +} diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json index 6c52877a4..a2bde02f1 100644 --- a/webapp/locales/nl.json +++ b/webapp/locales/nl.json @@ -1,4 +1,19 @@ { + "site": { + "made": "Met ❤ gemaakt", + "imprint": "Afdruk", + "termsAc": "Gebruiksvoorwaarden", + "privacy": "gegevensbescherming", + "changelog": "Veranderingen & Geschiedenis", + "contact": "contact", + "tribunal": "registerrechtbank", + "register": "inschrijfnummer", + "director": "Directeur", + "taxident": "Identificatienummer voor de belasting over de toegevoegde waarde overeenkomstig § 27 a Wet op de belasting over de toegevoegde waarde (Duitsland).", + "responsible": "Verantwoordelijk volgens § 55 Abs. 2 RStV (Duitsland).", + "bank": "bankrekening", + "germany": "Duitsland" + }, "login": { "copy": "Als u al een mini-aansluiting account heeft, log dan hier in.", "login": "Inloggen", @@ -156,4 +171,4 @@ "shoutButton": { "shouted": "uitgeroepen" } -} \ No newline at end of file +} diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json index 506a04f1b..f53d95c3d 100644 --- a/webapp/locales/pl.json +++ b/webapp/locales/pl.json @@ -1,4 +1,19 @@ { + "site": { + "made": "Z ❤ zrobiony", + "imprint": "Nadruk", + "termsAc": "Warunki użytkowania", + "privacy": "ochrona danych", + "changelog": "Zmiany i historia", + "contact": "Kontakt", + "tribunal": "sąd rejestrowy", + "register": "numer rejestracyjny", + "director": "Dyrektor zarządzający", + "taxident": "Numer identyfikacyjny podatku od wartości dodanej zgodnie z § 27 a Ustawa o podatku od wartości dodanej (Niemcy)", + "responsible": "Odpowiedzialny zgodnie z § 55 Abs. 2 RStV (Niemcy)", + "bank": "rachunek bankowy", + "germany": "Niemcy" + }, "login": { "copy": "Jeśli masz już konto Human Connection, zaloguj się tutaj.", "login": "logowanie", @@ -187,4 +202,4 @@ "shoutButton": { "shouted": "krzyczeć" } -} \ No newline at end of file +} diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json index 0636ba6f9..d84e00c08 100644 --- a/webapp/locales/pt.json +++ b/webapp/locales/pt.json @@ -1,4 +1,20 @@ { + "site": { + "made": "Com ❤ feito", + "imprint": "Impressão", + "termsAc": "termos e condições", + "privacy": "protecção de dados", + "changelog": "Mudanças e Histórico", + "contact": "Contato", + "tribunal": "tribunal", + "tribunal": "tribunal de registo", + "register": "número de registo", + "director": "Diretor Administrativo", + "taxident": "Número de identificação do imposto sobre o valor acrescentado de acordo com o § 27 da Lei do Imposto sobre o Valor Acrescentado (Alemanha)", + "responsible": "Responsável segundo § 55 Abs. 2 RStV (Alemanha) ", + "bank": "conta bancária", + "germany": "Alemanha" + }, "login": { "copy": "Se você já tem uma conta no Human Connection, entre aqui.", "login": "Entrar", @@ -187,4 +203,4 @@ "shoutButton": { "shouted": "Aclamou" } -} \ No newline at end of file +} diff --git a/webapp/pages/admin.vue b/webapp/pages/admin.vue index 0cbee05d5..818cb58b5 100644 --- a/webapp/pages/admin.vue +++ b/webapp/pages/admin.vue @@ -1,8 +1,6 @@ + + diff --git a/webapp/pages/imprint/index.vue b/webapp/pages/imprint.vue similarity index 94% rename from webapp/pages/imprint/index.vue rename to webapp/pages/imprint.vue index 8ce393576..67e144237 100644 --- a/webapp/pages/imprint/index.vue +++ b/webapp/pages/imprint.vue @@ -70,3 +70,13 @@
+ + diff --git a/webapp/pages/privacy/index.vue b/webapp/pages/privacy.vue similarity index 73% rename from webapp/pages/privacy/index.vue rename to webapp/pages/privacy.vue index d126ff2e0..b68b27e28 100644 --- a/webapp/pages/privacy/index.vue +++ b/webapp/pages/privacy.vue @@ -11,3 +11,13 @@ + + diff --git a/webapp/pages/terms-and-conditions/index.vue b/webapp/pages/terms-and-conditions.vue similarity index 74% rename from webapp/pages/terms-and-conditions/index.vue rename to webapp/pages/terms-and-conditions.vue index 1410453fd..428f3147a 100644 --- a/webapp/pages/terms-and-conditions/index.vue +++ b/webapp/pages/terms-and-conditions.vue @@ -11,3 +11,13 @@ + +