IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 1300-Gray-out-Register-button-further-when-disabled

Browse Source
This commit is contained in:
Alexander Friedland 2022-01-19 15:14:48 +01:00 committed by GitHub
commit df0051b09a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/src/locales/de.json
View File

@ -120,7 +120,6 @@
"overview": "Übersicht", "overview": "Übersicht",
"privacy_policy": "Datenschutzerklärung", "privacy_policy": "Datenschutzerklärung",
"publisher": { "publisher": {
"infoNoRegister": "Dies ist für die Registrieung nicht nötig.",
"infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!", "infoText": "Wenn dir dein Empfehlungsgeber seine Publisher-Id gegeben hat, trage sie hier ein, sonst lass das Feld bitte unverändert!",
"publisherId": "Publisher-Id" "publisherId": "Publisher-Id"
}, },

1
frontend/src/locales/en.json
View File

@ -120,7 +120,6 @@
"overview": "Overview", "overview": "Overview",
"privacy_policy": "Privacy policy", "privacy_policy": "Privacy policy",
"publisher": { "publisher": {
"infoNoRegister": "This is not necessary for registration.",
"infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!", "infoText": "If your referrer has given you his publisher id, enter it here, otherwise leave the field unchanged!",
"publisherId": "PublisherID" "publisherId": "PublisherID"
}, },

41
frontend/src/views/Pages/AccountOverview.vue
View File

@ -1,33 +1,19 @@
<template> <template>
<div> <div>
<div class="container-fluid"> <div class="container-fluid">
<b-row> <b-row class="ml-1 mr-1 mb-2">
<b-col class="col-6"> <b-col class="col-6 p-3 g-border">
<b-row> <status class="gdd-status-gdd" :pending="pending" :balance="balance" status-text="GDD" />
<b-col class="col-11 ml-2 p-3 bg-lightgrey">
<status
class="gdd-status-gdd"
:pending="pending"
:balance="balance"
status-text="GDD"
/>
</b-col>
</b-row>
</b-col> </b-col>
<b-col class="col-6 text-right bg-lightgrey"> <b-col class="col-6 p-3 text-right g-border">
<b-row> <status
<b-col class="p-3"> class="gdd-status-gdt"
<status :pending="pending"
class="gdd-status-gdt" :balance="GdtBalance"
:pending="pending" status-text="GDT"
:balance="GdtBalance" />
status-text="GDT"
/>
</b-col>
</b-row>
</b-col> </b-col>
</b-row> </b-row>
<br />
<gdd-transaction-list <gdd-transaction-list
:transactions="transactions" :transactions="transactions"
:pageSize="5" :pageSize="5"
@ -75,3 +61,10 @@ export default {
}, },
} }
</script> </script>
<style>
.g-border {
border: #ffffff 2px;
border-style: inset;
border-radius: 5px;
}
</style>

1
frontend/src/views/Pages/Register.vue
View File

@ -145,7 +145,6 @@
class="text-center mt-1 shadow-lg p-3 mb-5 rounded" class="text-center mt-1 shadow-lg p-3 mb-5 rounded"
> >
{{ $t('publisher.infoText') }} {{ $t('publisher.infoText') }}
<span class="text-dark">{{ $t('publisher.infoNoRegister') }}</span>
<div class="text-center"> <div class="text-center">
<b-icon icon="chevron-up" aria-hidden="true"></b-icon> <b-icon icon="chevron-up" aria-hidden="true"></b-icon>
</div> </div>