Mercurial > gemma
changeset 2119:d17a8dd1dfd3
Merged.
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Tue, 05 Feb 2019 11:39:27 +0100 |
parents | 8a6ed058af22 (current diff) c4e7a6c8da70 (diff) |
children | 817cd8b89a86 |
files | |
diffstat | 3 files changed, 57 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/Pdftool.vue Tue Feb 05 11:39:06 2019 +0100 +++ b/client/src/components/Pdftool.vue Tue Feb 05 11:39:27 2019 +0100 @@ -16,20 +16,34 @@ ></font-awesome-icon> </h6> <div class="p-3 text-left"> - <select @change="applyTemplateToForm" v-model="form.template" class="form-control d-block mb-2 w-100 font-weight-bold"> + <select + @change="applyTemplateToForm" + v-model="form.template" + class="form-control d-block mb-2 w-100 font-weight-bold" + > <option :value="null"><translate>Chose preset</translate></option> - <option v-for="template in templates" :value="template.name"><translate>{{ template.name }}</translate></option> + <option v-for="template in templates" :value="template.name" + ><translate>{{ template.name }}</translate></option + > </select> - <hr class="mb-1"> + <hr class="mb-1" /> <small class="text-muted"><translate>Format</translate></small> - <select @change="compareFormWithTemplates" v-model="form.format" class="form-control form-control-sm d-block mb-2 w-100"> + <select + @change="compareFormWithTemplates" + v-model="form.format" + class="form-control form-control-sm d-block mb-2 w-100" + > <option value="landscape"><translate>landscape</translate></option> <option value="portrait"><translate>portrait</translate></option> </select> <div class="d-flex"> <div class="flex-fill mr-2"> <small class="text-muted"><translate>Resolution</translate></small> - <select @change="compareFormWithTemplates" v-model="form.resolution" class="form-control form-control-sm mb-2 d-block w-100"> + <select + @change="compareFormWithTemplates" + v-model="form.resolution" + class="form-control form-control-sm mb-2 d-block w-100" + > <option value="80">80 dpi</option> <option value="120">120 dpi</option> <option value="200">200 dpi</option> @@ -37,7 +51,11 @@ </div> <div class="flex-fill ml-2"> <small class="text-muted"><translate>Size</translate></small> - <select @change="compareFormWithTemplates" v-model="form.paperSize" class="form-control form-control-sm mb-2 d-block w-100"> + <select + @change="compareFormWithTemplates" + v-model="form.paperSize" + class="form-control form-control-sm mb-2 d-block w-100" + > <option value="a3"><translate>ISO A3</translate></option> <option value="a4"><translate>ISO A4</translate></option> </select>
--- a/client/src/components/importqueue/Importqueuedetail.vue Tue Feb 05 11:39:06 2019 +0100 +++ b/client/src/components/importqueue/Importqueuedetail.vue Tue Feb 05 11:39:27 2019 +0100 @@ -17,7 +17,9 @@ {{ job.signer }} </div> <div @click="showDetails(job.id)" class="state mt-1 mr-2"> - {{ job.state }} + <span :class="{ 'text-danger': job.state.toUpperCase() == 'FAILED' }">{{ + job.state + }}</span> </div> <div @click="showDetails(job.id)" class="mt-1 text-info detailsbutton"> <font-awesome-icon @@ -67,13 +69,40 @@ class="detailsrow" > <td class="type"> - <span class="condensed">{{ entry.kind.toUpperCase() }}</span> + <span + :class="[ + 'condensed', + { + 'text-danger': entry.kind.toUpperCase() == 'ERROR', + 'text-warning': entry.kind.toUpperCase() == 'WARN' + } + ]" + >{{ entry.kind.toUpperCase() }}</span + > </td> <td class="datetime"> - <span class="condensed">{{ formatDateTime(entry.time) }}</span> + <span + :class="[ + 'condensed', + { + 'text-danger': entry.kind.toUpperCase() == 'ERROR', + 'text-warning': entry.kind.toUpperCase() == 'WARN' + } + ]" + >{{ formatDateTime(entry.time) }}</span + > </td> <td class="message"> - <span class="condensed">{{ entry.message }}</span> + <span + :class="[ + 'condensed', + { + 'text-danger': entry.kind.toUpperCase() == 'ERROR', + 'text-warning': entry.kind.toUpperCase() == 'WARN' + } + ]" + >{{ entry.message }}</span + > </td> </tr> </tbody>
--- a/client/src/components/usermanagement/Usermanagement.vue Tue Feb 05 11:39:06 2019 +0100 +++ b/client/src/components/usermanagement/Usermanagement.vue Tue Feb 05 11:39:27 2019 +0100 @@ -70,7 +70,6 @@ <font-awesome-icon v-tooltip="roleLabel(user.role)" :icon="roleIcon(user.role)" - @click="deleteUser(user.user)" ></font-awesome-icon> </td> <td>