diff --git a/src/resources/lang/en/ui.php b/src/resources/lang/en/ui.php --- a/src/resources/lang/en/ui.php +++ b/src/resources/lang/en/ui.php @@ -47,7 +47,7 @@ 'paired' => "Paired devices", 'pairing-instructions' => "Pair a new device using the following QR-Code:", 'deviceid' => "Device ID", - 'nodevices' => "There are currently no devices", + 'list-empty' => "There are currently no devices", 'delete' => "Remove devices", 'remove-devices' => "Remove Devices", 'remove-devices-text' => "Do you really want to remove all devices permanently?" @@ -96,6 +96,7 @@ . " Please note that this action cannot be undone.", 'dns-verify' => "Domain DNS verification sample:", 'dns-config' => "Domain DNS configuration sample:", + 'list-empty' => "There are no domains in this account.", 'namespace' => "Namespace", 'spf-whitelist' => "SPF Whitelist", 'spf-whitelist-text' => "The Sender Policy Framework allows a sender domain to disclose, through DNS, " @@ -186,7 +187,7 @@ 'create-title' => "Invite for a signup", 'create-email' => "Enter an email address of the person you want to invite.", 'create-csv' => "To send multiple invitations at once, provide a CSV (comma separated) file, or alternatively a plain-text file, containing one email address per line.", - 'empty-list' => "There are no invitations in the database.", + 'list-empty' => "There are no invitations in the database.", 'title' => "Signup invitations", 'search' => "Email address or domain", 'send' => "Send invite(s)", @@ -453,7 +454,6 @@ 'discount-title' => "Account discount", 'distlists' => "Distribution lists", 'domains' => "Domains", - 'domains-none' => "There are no domains in this account.", 'ext-email' => "External Email", 'finances' => "Finances", 'greylisting' => "Greylisting", @@ -461,6 +461,7 @@ . "is temporarily rejected. The originating server should try again after a delay. " . "This time the email will be accepted. Spammers usually do not reattempt mail delivery.", 'list-title' => "User accounts", + 'list-empty' => "There are no users in this account.", 'managed-by' => "Managed by", 'new' => "New user account", 'org' => "Organization", @@ -492,7 +493,6 @@ 'subscriptions' => "Subscriptions", 'subscriptions-none' => "This user has no subscriptions.", 'users' => "Users", - 'users-none' => "There are no users in this account.", ], 'wallet' => [ diff --git a/src/resources/lang/fr/ui.php b/src/resources/lang/fr/ui.php --- a/src/resources/lang/fr/ui.php +++ b/src/resources/lang/fr/ui.php @@ -70,6 +70,7 @@ 'domain' => [ 'dns-verify' => "Exemple de vérification du DNS d'un domaine:", 'dns-config' => "Exemple de configuration du DNS d'un domaine:", + 'list-empty' => "Il y a pas de domaines dans ce compte.", 'namespace' => "Espace de noms", 'verify' => "Vérification du domaine", 'verify-intro' => "Afin de confirmer que vous êtes bien le titulaire du domaine, nous devons exécuter un processus de vérification avant de l'activer définitivement pour la livraison d'e-mails.", @@ -148,7 +149,7 @@ 'create-title' => "Invitation à une inscription", 'create-email' => "Saisissez l'adresse électronique de la personne que vous souhaitez inviter.", 'create-csv' => "Pour envoyer plusieurs invitations à la fois, fournissez un fichier CSV (séparé par des virgules) ou un fichier en texte brut, contenant une adresse e-mail par ligne.", - 'empty-list' => "Il y a aucune invitation dans la mémoire de données.", + 'list-empty' => "Il y a aucune invitation dans la mémoire de données.", 'title' => "Invitation d'inscription", 'search' => "Adresse E-mail ou domaine", 'send' => "Envoyer invitation(s)", @@ -405,7 +406,6 @@ 'discount-title' => "Rabais de compte", 'distlists' => "Listes de Distribution", 'domains' => "Domaines", - 'domains-none' => "Il y a pas de domaines dans ce compte.", 'ext-email' => "E-mail externe", 'finances' => "Finances", 'greylisting' => "Greylisting", @@ -414,6 +414,7 @@ . " Le serveur d'origine doit réessayer après un délai cette fois-ci, le mail sera accepté." . " Les spammeurs ne réessayent généralement pas de remettre le mail.", 'list-title' => "Comptes d'utilisateur", + 'list-empty' => "Il n'y a aucun utilisateur dans ce compte.", 'managed-by' => "Géré par", 'new' => "Nouveau compte d'utilisateur", 'org' => "Organisation", @@ -440,7 +441,6 @@ 'subscriptions' => "Subscriptions", 'subscriptions-none' => "Cet utilisateur n'a pas de subscriptions.", 'users' => "Utilisateurs", - 'users-none' => "Il n'y a aucun utilisateur dans ce compte.", ], 'wallet' => [ diff --git a/src/resources/themes/app.scss b/src/resources/themes/app.scss --- a/src/resources/themes/app.scss +++ b/src/resources/themes/app.scss @@ -170,13 +170,6 @@ padding: 0; } - td { - & > svg + a, - & > svg + span { - margin-left: .4em; - } - } - &.files { table-layout: fixed; diff --git a/src/resources/vue/Admin/SharedFolder.vue b/src/resources/vue/Admin/SharedFolder.vue --- a/src/resources/vue/Admin/SharedFolder.vue +++ b/src/resources/vue/Admin/SharedFolder.vue @@ -74,23 +74,7 @@
- - - - - - - - - - - - - - - - -
{{ $t('form.email') }}
{{ alias }}
{{ $t('shf.aliases-none') }}
+
@@ -99,9 +83,23 @@ diff --git a/src/resources/vue/Domain/List.vue b/src/resources/vue/Domain/List.vue --- a/src/resources/vue/Domain/List.vue +++ b/src/resources/vue/Domain/List.vue @@ -9,26 +9,7 @@
- - - - - - - - - - - - - - - - -
{{ $t('domain.namespace') }}
- - {{ domain.namespace }} -
{{ $t('user.domains-none') }}
+
@@ -36,6 +17,7 @@ diff --git a/src/resources/vue/Reseller/Invitations.vue b/src/resources/vue/Reseller/Invitations.vue --- a/src/resources/vue/Reseller/Invitations.vue +++ b/src/resources/vue/Reseller/Invitations.vue @@ -11,35 +11,20 @@ {{ $t('invitation.create') }} - - - - - - - - - - - - - - - - -
{{ $t('user.ext-email') }}{{ $t('form.created') }}
- {{ inv.created }} - - - {{ $t('btn.delete') }} - - - {{ $t('btn.resend') }} - -
+ + + + @@ -84,14 +69,30 @@ library.add( require('@fortawesome/free-solid-svg-icons/faEnvelopeOpenText').definition, require('@fortawesome/free-solid-svg-icons/faPaperPlane').definition, - require('@fortawesome/free-solid-svg-icons/faRedo').definition, + require('@fortawesome/free-solid-svg-icons/faRotateLeft').definition, ) export default { mixins: [ ListTools ], data() { return { - invitations: [] + invitations: [], + setup: { + buttons: true, + model: 'invitation', + columns: [ + { + prop: 'email', + label: 'user.ext-email', + className: 'email', + contentSlot: 'email' + }, + { + prop: 'created', + className: 'datetime' + } + ] + } } }, mounted() { diff --git a/src/resources/vue/Resource/List.vue b/src/resources/vue/Resource/List.vue --- a/src/resources/vue/Resource/List.vue +++ b/src/resources/vue/Resource/List.vue @@ -10,30 +10,7 @@
- - - - - - - - - - - - - - - - - - -
{{ $t('form.name') }}{{ $t('form.email') }}
- - {{ resource.name }} - - {{ resource.email }} -
{{ $t('resource.list-empty') }}
+
@@ -41,6 +18,7 @@ diff --git a/src/resources/vue/SharedFolder/List.vue b/src/resources/vue/SharedFolder/List.vue --- a/src/resources/vue/SharedFolder/List.vue +++ b/src/resources/vue/SharedFolder/List.vue @@ -5,33 +5,12 @@
{{ $tc('shf.list-title', 2) }} {{ $t('dashboard.beta') }} - + {{ $t('shf.create') }}
- - - - - - - - - - - - - - - - - - -
{{ $t('form.name') }}{{ $t('form.type') }}
- - {{ folder.name }} - {{ $t('shf.type-' + folder.type) }}
{{ $t('shf.list-empty') }}
+
@@ -39,14 +18,17 @@ diff --git a/src/resources/vue/User/List.vue b/src/resources/vue/User/List.vue --- a/src/resources/vue/User/List.vue +++ b/src/resources/vue/User/List.vue @@ -12,22 +12,7 @@ {{ $t('user.create') }} - - - - - - - - - - - - -
{{ $t('form.primary-email') }}
- - {{ user.email }} -
+ @@ -37,8 +22,12 @@ diff --git a/src/resources/vue/Widgets/CompanionappList.vue b/src/resources/vue/Widgets/CompanionappList.vue --- a/src/resources/vue/Widgets/CompanionappList.vue +++ b/src/resources/vue/Widgets/CompanionappList.vue @@ -3,21 +3,7 @@ {{ $t('companion.delete') }} - - - - - - - - - - - - - - -
{{ $t('companion.name') }}{{ $t('companion.deviceid') }}
{{ entry.name }}{{ entry.device_id }}
+