Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Camp create: choose prototype UX improvement #4162

Merged
merged 10 commits into from
Dec 19, 2023
11 changes: 11 additions & 0 deletions frontend/src/components/buttons/ButtonContinue.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<template>
<v-btn color="primary" v-bind="$attrs" v-on="$listeners">
{{ $tc('global.button.continue') }}
</v-btn>
</template>

<script>
export default {
name: 'ButtonContinue',
}
</script>
2 changes: 2 additions & 0 deletions frontend/src/components/form/base/ESelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
:name="name"
:vid="veeId"
:rules="veeRules"
:skip-if-empty="skipIfEmpty"
:required="required"
:immediate="immediateValidation"
class="e-form-container"
Expand Down Expand Up @@ -38,6 +39,7 @@ export default {
mixins: [formComponentPropsMixin, formComponentMixin],
props: {
immediateValidation: { type: Boolean, default: false },
skipIfEmpty: { type: Boolean, default: true },
},
}
</script>
Expand Down
13 changes: 13 additions & 0 deletions frontend/src/components/layout/ContentActions.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<template>
<v-card-actions>
<div class="d-flex gap-2 flex-wrap flex-grow-1">
<slot />
</div>
</v-card-actions>
</template>

<script>
export default {
name: 'ContentActions',
}
</script>
19 changes: 18 additions & 1 deletion frontend/src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@
"cancel": "Abbrechen",
"close": "Schliessen",
"content": "Inhalt",
"continue": "Weiter",
"create": "Erstellen",
"delete": "Löschen",
"discard": "Verwerfen",
Expand Down Expand Up @@ -591,10 +592,26 @@
},
"campCreate": {
"create": "Lager erstellen",
"noContent": "Keine Inhalte",
"noPrototype": "Keine Vorlage",
"noPrototypeAlert": {
"description": "Du musst alle Einstellungen manuell vornehmen. Es sind keine Blockvorlagen & Layouts vorhanden. Dies ist nur für erfahrene Nutzende geeignet.",
"title": "Achtung: Du hast \"Keine Vorlage\" ausgewählt."
},
"period": {
"add": "Weiteren Lagerabschnitt hinzufügen",
"remove": "Diesen Lagerabschnitt entfernen"
},
"prototypeHint": "Kopiere Kategorien, Blockvorlagen und Blockstatus von einer Lagervorlage",
"prototypeHintEmpty": "Keine Kategorien, Blockvorlagen und Blockstatus aus einer Lagervorlage kopieren",
"prototypeHintSelected": "Kopiere Kategorien, Blockvorlagen und Blockstatus von dieser Lagervorlage",
"steps": {
"configurate": "Konfigurieren",
"infos": "Infos",
"template": "Vorlage"
},
"submitTooltip": "Bitte fülle alle Pflichtfelder aus.",
"submitTooltipPrototype": "Du must noch auswählen ob und welche Lagervorlage du verwenden möchtest.",
"title": "Lager erstellen"
},
"camps": {
Expand Down Expand Up @@ -625,4 +642,4 @@
"profile": "Profil"
}
}
}
}
19 changes: 18 additions & 1 deletion frontend/src/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@
"cancel": "Cancel",
"close": "Close",
"content": "Content",
"continue": "Continue",
"create": "Create",
"delete": "Delete",
"discard": "Discard",
Expand Down Expand Up @@ -591,10 +592,26 @@
},
"campCreate": {
"create": "Create the Camp",
"noContent": "No Content",
"noPrototype": "No template",
"noPrototypeAlert": {
"description": "You must make all settings manually. There are no block templates & layouts available. This is only suitable for experienced users.",
"title": "Attention: You chose \"No template\"."
},
"period": {
"add": "Add a period",
"remove": "Remove period"
},
"prototypeHint": "Copy categories, activity templates and states from a template.",
"prototypeHintEmpty": "Don't copy categories, activity templates and states.",
"prototypeHintSelected": "Copy categories, activity templates and states from this template.",
"steps": {
"configurate": "Configure",
"infos": "Info",
"template": "Template"
},
"submitTooltip": "Please fill out all required fields.",
"submitTooltipPrototype": "You need to choose if and which template you want.",
"title": "Create a Camp"
},
"camps": {
Expand Down Expand Up @@ -625,4 +642,4 @@
"profile": "Profile"
}
}
}
}
19 changes: 18 additions & 1 deletion frontend/src/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@
"cancel": "Annuler",
"close": "Fermer",
"content": "Contenu",
"continue": "Continuer",
"create": "Créer",
"delete": "Effacer",
"discard": "Rejeter",
Expand Down Expand Up @@ -591,10 +592,26 @@
},
"campCreate": {
"create": "Créer le camp",
"noContent": "Pas de contenu",
"noPrototype": "Pas de modèle",
"noPrototypeAlert": {
"description": "Tu dois effectuer tous les réglages manuellement. Il n'y a pas de modèles de blocs ni de mises en page. Ceci ne convient qu'aux utilisateurs expérimentés.",
"title": "Attention : Vous avez choisi \"Pas de modèle\"."
},
"period": {
"add": "Ajouter une période",
"remove": "Effacer la période"
},
"prototypeHint": "Copie les catégories, les modèles de blocs et les états de blocs d'un modèle de camp.",
"prototypeHintEmpty": "Ne pas copier de catégories, de modèles de blocs et de statuts de blocs à partir d'un modèle de camp.",
"prototypeHintSelected": "Copie les catégories, les modèles de blocs et les statuts de blocs de ce modèle de camp.",
"steps": {
"configurate": "Configuration",
"infos": "Info",
"template": "Modèle"
},
"submitTooltip": "Remplis tous les champs obligatoires.",
"submitTooltipPrototype": "Tu dois encore choisir si tu veux utiliser un modèle de champ et lequel.",
"title": "Créer un camp"
},
"camps": {
Expand Down Expand Up @@ -625,4 +642,4 @@
"profile": "Profil"
}
}
}
}
19 changes: 18 additions & 1 deletion frontend/src/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@
"cancel": "Annullare",
"close": "Chiudi",
"content": "Contenuto",
"continue": "Continuare",
"create": "Creare",
"delete": "Cancellare",
"discard": "Scartare",
Expand Down Expand Up @@ -591,10 +592,26 @@
},
"campCreate": {
"create": "Creare il campo",
"noContent": "Nessun contenuto",
"noPrototype": "Nessun modello",
"noPrototypeAlert": {
"description": "È necessario effettuare tutte le impostazioni manualmente. Non sono disponibili modelli e layout di blocco. È adatto solo agli utenti esperti.",
"title": "Nota bene: avete scelto \"Nessun modello\"."
},
"period": {
"add": "Aggiungere un periodo",
"remove": "Cancellare un periodo"
},
"prototypeHint": "Copiare le categorie, i modelli di blocco e lo stato dei blocchi da un modello di campo.",
"prototypeHintEmpty": "Non copiare categorie, modelli di blocco e stati di blocco da un modello di campo.",
"prototypeHintSelected": "Copiate le categorie, i modelli di blocco e lo stato dei blocchi da questo modello di campo.",
"steps": {
"configurate": "Configurazione",
"infos": "Info",
"template": "Modello"
},
"submitTooltip": "Compilare tutti i campi richiesti.",
"submitTooltipPrototype": "È ancora necessario selezionare se e quale modello di campo si desidera utilizzare. ",
"title": "Creare il campo"
},
"camps": {
Expand Down Expand Up @@ -625,4 +642,4 @@
"profile": "Profilo"
}
}
}
}
Loading