Mercurial > gemma
changeset 1529:a679f765d7b0
layout
author | Thomas Junk <thomas.junk@intevation.de> |
---|---|
date | Fri, 07 Dec 2018 12:26:26 +0100 |
parents | 5874cedd7f91 |
children | e7830ab6bacc |
files | client/src/components/admin/Importqueue.vue client/src/components/admin/importschedule/Importschedule.vue client/src/components/admin/importschedule/Importscheduledetail.vue client/src/components/admin/usermanagement/Passwordfield.vue client/src/components/admin/usermanagement/Userdetail.vue client/src/components/admin/usermanagement/Usermanagement.vue |
diffstat | 6 files changed, 189 insertions(+), 150 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/admin/Importqueue.vue Fri Dec 07 12:21:55 2018 +0100 +++ b/client/src/components/admin/Importqueue.vue Fri Dec 07 12:26:26 2018 +0100 @@ -1,7 +1,7 @@ <template> <div class="d-flex flex-row"> <div :class="spacerStyle"></div> - <div class="mt-3"> + <div class="mt-3 flex-grow-1"> <div class="card importqueuecard shadow-xs"> <h6 class="mb-0 py-2 px-3 border-bottom d-flex text-info align-items-center" @@ -244,7 +244,9 @@ } .importqueuecard { - width: 75vw; + width: 97%; + margin-left: $offset; + margin-right: $offset; min-height: 20rem; }
--- a/client/src/components/admin/importschedule/Importschedule.vue Fri Dec 07 12:21:55 2018 +0100 +++ b/client/src/components/admin/importschedule/Importschedule.vue Fri Dec 07 12:26:26 2018 +0100 @@ -148,7 +148,8 @@ } .schedulecard { - width: 40vw; + width: 50vw; + margin-right: $offset; min-height: 20rem; }
--- a/client/src/components/admin/importschedule/Importscheduledetail.vue Fri Dec 07 12:21:55 2018 +0100 +++ b/client/src/components/admin/importschedule/Importscheduledetail.vue Fri Dec 07 12:26:26 2018 +0100 @@ -10,8 +10,16 @@ </span> </h6> <div class="card-body"> - <h1>lalala</h1> - <form @submit.prevent="save" class="ml-3"></form> + <form @submit.prevent="save" class="ml-3"> + <small class="text-muted"> <translate>Imports</translate> </small> + <select v-model="import_" class="custom-select" id="depthreference"> + <option + v-for="option in this.$options.depthReferenceOptions" + :key="option" + >{{ option }}</option + > + </select> + </form> </div> </div> </div> @@ -22,6 +30,11 @@ export default { name: "importscheduledetail", + data() { + return { + import_: null + }; + }, computed: { ...mapState("imports", ["importScheduleDetailVisible"]) }, @@ -36,7 +49,9 @@ <style lang="scss" scoped> .importscheduledetails { + width: 45%; margin-top: $offset; margin-left: $offset; + margin-right: $offset; } </style>
--- a/client/src/components/admin/usermanagement/Passwordfield.vue Fri Dec 07 12:21:55 2018 +0100 +++ b/client/src/components/admin/usermanagement/Passwordfield.vue Fri Dec 07 12:26:26 2018 +0100 @@ -1,6 +1,8 @@ <template> - <div> - <label for="password">{{ this.label }}</label> + <div class="w-100"> + <div class="d-flex flex-row"> + <label for="password">{{ this.label }}</label> + </div> <div class="d-flex d-row"> <input :type="isPasswordVisible"
--- a/client/src/components/admin/usermanagement/Userdetail.vue Fri Dec 07 12:21:55 2018 +0100 +++ b/client/src/components/admin/usermanagement/Userdetail.vue Fri Dec 07 12:26:26 2018 +0100 @@ -1,163 +1,172 @@ <template> - <div class="userdetails h-100 mt-3 mr-auto shadow fadeIn animated"> - <div class="card"> - <h6 - class="mb-0 py-2 px-3 border-bottom d-flex text-info align-items-center" - > - {{ this.cardHeader }} - <span @click="closeDetailview" class="closebutton"> - <font-awesome-icon icon="times"></font-awesome-icon> - </span> - </h6> - <div class="card-body"> - <form @submit.prevent="save" class="ml-3"> - <div class="formfields"> - <div v-if="currentUser.isNew" class="form-group row"> - <label for="user"> <translate>Username</translate> </label> - <input - type="user" - :placeholder="userNamePlaceholder" - class="form-control form-control-sm" - id="user" - aria-describedby="userHelp" - v-model="currentUser.user" - /> - <div v-show="errors.user" class="text-danger"> - <small> - <font-awesome-icon - icon="exclamation-triangle" - ></font-awesome-icon> - {{ errors.user }} - </small> - </div> - </div> - <div class="form-group row"> - <label for="country"> <translate>Country</translate> </label> - <select - class="form-control form-control-sm" - v-on:change="validateCountry" - v-model="currentUser.country" - > - <option disabled value> - <translate>Please select one</translate> - </option> - <option - v-for="country in countries" - v-bind:value="country" - v-bind:key="country" - >{{ country }}</option - > - </select> - <div v-show="errors.country" class="text-danger"> - <small> - <font-awesome-icon - icon="exclamation-triangle" - ></font-awesome-icon> - {{ errors.country }} - </small> - </div> + <div class="userdetails mt-3 shadow fadeIn animated card"> + <h6 + class="mb-0 py-2 px-3 border-bottom d-flex text-info align-items-center" + > + {{ this.cardHeader }} + <span @click="closeDetailview" class="closebutton"> + <font-awesome-icon icon="times"></font-awesome-icon> + </span> + </h6> + <div class="card-body"> + <form @submit.prevent="save" class="ml-3"> + <div class="formfields"> + <div v-if="currentUser.isNew" class="form-group row"> + <label for="user"> <translate>Username</translate> </label> + <input + type="user" + :placeholder="userNamePlaceholder" + class="form-control form-control-sm" + id="user" + aria-describedby="userHelp" + v-model="currentUser.user" + /> + <div v-show="errors.user" class="text-danger"> + <small> + <font-awesome-icon + icon="exclamation-triangle" + ></font-awesome-icon> + {{ errors.user }} + </small> </div> - <div class="form-group row"> - <label for="email"> <translate>Email address</translate> </label> - <input - type="email" - v-on:change="validateEmailaddress" - class="form-control form-control-sm" - id="email" - aria-describedby="emailHelp" - v-model="currentUser.email" - /> - <div v-show="errors.email" class="text-danger"> - <small> - <font-awesome-icon - icon="exclamation-triangle" - ></font-awesome-icon> - {{ errors.email }} - </small> - </div> - </div> - <div class="form-group row"> - <label for="role"> <translate>Role</translate> </label> - <select - class="form-control form-control-sm" - v-on:change="validateRole" - v-model="currentUser.role" + </div> + <div class="form-group row"> + <label for="country"> <translate>Country</translate> </label> + <select + class="form-control form-control-sm" + v-on:change="validateCountry" + v-model="currentUser.country" + > + <option disabled value> + <translate>Please select one</translate> + </option> + <option + v-for="country in countries" + v-bind:value="country" + v-bind:key="country" + >{{ country }}</option > - <option disabled value> - <translate>Please select one</translate> - </option> - <option value="sys_admin"> - <translate>Sysadmin</translate> - </option> - <option value="waterway_admin"> - <translate>Waterway Admin</translate> - </option> - <option value="waterway_user"> - <translate>Waterway User</translate> - </option> - </select> - <div v-show="errors.role" class="text-danger"> - <small> - <font-awesome-icon - icon="exclamation-triangle" - ></font-awesome-icon> - {{ errors.role }} - </small> - </div> - </div> - <div class="form-group row"> - <PasswordField - @fieldchange="passwordChanged" - :placeholder="passwordPlaceholder" - :label="passwordLabel" - :passworderrors="errors.password" - ></PasswordField> - </div> - <div class="form-group row"> - <PasswordField - @fieldchange="passwordReChanged" - :placeholder="passwordRePlaceholder" - :label="passwordReLabel" - :passworderrors="errors.passwordre" - ></PasswordField> + </select> + <div v-show="errors.country" class="text-danger"> + <small> + <font-awesome-icon + icon="exclamation-triangle" + ></font-awesome-icon> + {{ errors.country }} + </small> </div> </div> - <div> - <button - type="submit" - :disabled="submitted" - class="shadow-sm btn btn-info pull-right" - > - <translate>Submit</translate> - </button> + <div class="form-group row"> + <label for="email"> <translate>Email address</translate> </label> + <input + type="email" + v-on:change="validateEmailaddress" + class="form-control form-control-sm" + id="email" + aria-describedby="emailHelp" + v-model="currentUser.email" + /> + <div v-show="errors.email" class="text-danger"> + <small> + <font-awesome-icon + icon="exclamation-triangle" + ></font-awesome-icon> + {{ errors.email }} + </small> + </div> </div> - <div - v-if="currentUser.role != 'waterway_user'" - class="form-group row d-flex flex-row justify-content-start mailbutton" + <div class="form-group row"> + <label for="role"> <translate>Role</translate> </label> + <select + class="form-control form-control-sm" + v-on:change="validateRole" + v-model="currentUser.role" + > + <option disabled value> + <translate>Please select one</translate> + </option> + <option value="sys_admin"> + <translate>Sysadmin</translate> + </option> + <option value="waterway_admin"> + <translate>Waterway Admin</translate> + </option> + <option value="waterway_user"> + <translate>Waterway User</translate> + </option> + </select> + <div v-show="errors.role" class="text-danger"> + <small> + <font-awesome-icon + icon="exclamation-triangle" + ></font-awesome-icon> + {{ errors.role }} + </small> + </div> + </div> + <div class="form-group row"> + <PasswordField + @fieldchange="passwordChanged" + :placeholder="passwordPlaceholder" + :label="passwordLabel" + :passworderrors="errors.password" + ></PasswordField> + </div> + <div class="form-group row"> + <PasswordField + @fieldchange="passwordReChanged" + :placeholder="passwordRePlaceholder" + :label="passwordReLabel" + :passworderrors="errors.passwordre" + ></PasswordField> + </div> + </div> + <div> + <button + type="submit" + :disabled="submitted" + class="shadow-sm btn btn-info submit-button" > - <a @click="sendTestMail" class="btn btn-light"> - <font-awesome-icon icon="paper-plane"></font-awesome-icon> - <translate>Send testmail</translate> - </a> - <div v-if="mailsent"><translate>Mail was sent</translate></div> - </div> - </form> - </div> + <translate>Submit</translate> + </button> + </div> + <div + v-if="currentUser.role != 'waterway_user'" + class="form-group row d-flex flex-row justify-content-start mailbutton" + > + <a @click="sendTestMail" class="btn btn-light"> + <font-awesome-icon icon="paper-plane"></font-awesome-icon> + <translate>Send testmail</translate> + </a> + <div v-if="mailsent"><translate>Mail was sent</translate></div> + </div> + </form> </div> </div> </template> <style lang="scss" scoped> +.submit-button { + position: absolute; + right: $offset; + bottom: $offset; +} .mailbutton { width: 12vw; + position: absolute; + left: $large-offset; + bottom: 0; } .formfields { - width: 10vw; + width: 60%; } .userdetails { - min-width: 40vw; + height: 600px; + margin-top: $offset; + margin-left: $offset; + margin-right: $offset; } form {
--- a/client/src/components/admin/usermanagement/Usermanagement.vue Fri Dec 07 12:21:55 2018 +0100 +++ b/client/src/components/admin/usermanagement/Usermanagement.vue Fri Dec 07 12:26:26 2018 +0100 @@ -109,7 +109,10 @@ </div> </div> </div> - <Userdetail v-if="isUserDetailsVisible"></Userdetail> + <Userdetail + class="d-flex userdetails" + v-if="isUserDetailsVisible" + ></Userdetail> </div> </div> </div> @@ -118,6 +121,13 @@ <style scoped lang="scss"> @import "../../../assets/tooltip.scss"; +.content { + width: 100%; +} + +.userdetails { + width: 50%; +} .spacer { height: 100vh; margin-left: $offset; @@ -146,11 +156,11 @@ } .userlistsmall { - width: 30vw; + width: 100%; } .userlistextended { - width: 70vw; + width: 100%; } .table {