Mercurial > gemma
changeset 2919:6c5364ff0abb
client: removed a lot of unnecessary closing tags
line wrap: on
line diff
--- a/client/src/components/ImportApprovedGaugeMeasurement.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/ImportApprovedGaugeMeasurement.vue Wed Apr 03 16:10:11 2019 +0200 @@ -1,6 +1,6 @@ <template> <div class="d-flex flex-row"> - <Spacer></Spacer> + <Spacer /> <div class="card sysconfig mt-2 shadow-xs w-100 h-100 mr-2"> <UIBoxHeader icon="upload" :title="importGaugmeasurmentLabel" /> <div class="card-body stretches-card"> @@ -45,11 +45,7 @@ class="btn btn-info mt-4" type="button" > - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="play" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="play" /> <translate>Trigger import</translate> </button> </div>
--- a/client/src/components/ImportSoundingresults.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/ImportSoundingresults.vue Wed Apr 03 16:10:11 2019 +0200 @@ -1,7 +1,7 @@ <template> <div class="main d-flex flex-column"> <div class="d-flex flex-row"> - <Spacer></Spacer> + <Spacer /> <div class="card shadow-xs mt-2 mr-2 w-100 h-100"> <UIBoxHeader icon="upload" :title="importSoundingresultsLabel" /> <div v-if="editState"> @@ -160,14 +160,13 @@ import { HTTP } from "@/lib/http"; import { displayError, displayInfo } from "@/lib/errors.js"; import { mapState } from "vuex"; -import Spacer from "./Spacer"; const IMPORTSTATE = { UPLOAD: "UPLOAD", EDIT: "EDIT" }; export default { name: "imports", components: { - Spacer + Spacer: () => import("@/components/Spacer") }, data() { return {
--- a/client/src/components/ImportStretches.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/ImportStretches.vue Wed Apr 03 16:10:11 2019 +0200 @@ -129,7 +129,7 @@ @click="togglePipette('start')" :class="{ 'text-info': pipetteStart }" icon="bullseye" - ></font-awesome-icon> + /> </span> </div> <span class="text-left text-danger"> @@ -154,7 +154,7 @@ @click="togglePipette('end')" :class="{ 'text-info': pipetteEnd }" icon="bullseye" - ></font-awesome-icon> + /> </span> </div> <span class="text-left text-danger">
--- a/client/src/components/ImportWaterwayProfiles.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/ImportWaterwayProfiles.vue Wed Apr 03 16:10:11 2019 +0200 @@ -1,6 +1,6 @@ <template> <div class="d-flex flex-row"> - <Spacer></Spacer> + <Spacer /> <div class="card sysconfig mt-2 shadow-xs w-100 h-100 mr-2"> <UIBoxHeader icon="upload" :title="importWaterwayProfilesLabel" /> <div class="card-body stretches-card"> @@ -87,11 +87,7 @@ class="btn btn-info mt-4" type="button" > - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="play" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="play" /> <translate>Trigger import</translate> </button> </div>
--- a/client/src/components/Logs.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/Logs.vue Wed Apr 03 16:10:11 2019 +0200 @@ -1,7 +1,7 @@ <template> <div class="main d-flex flex-column"> <div class="d-flex flex-row"> - <Spacer></Spacer> + <Spacer /> <div class="card logs shadow-xs mt-2 mr-2"> <UIBoxHeader icon="book" title="Logs" /> <div class="logoutput text-left bg-white">
--- a/client/src/components/PageNotFound.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/PageNotFound.vue Wed Apr 03 16:10:11 2019 +0200 @@ -1,10 +1,10 @@ <template> <div class="main d-flex flex-row" style="position: relative;"> - <Spacer></Spacer> + <Spacer /> <div class="my-auto mx-auto"> <h1> - <font-awesome-icon icon="frown-open" fixed-width></font-awesome-icon>We - are sorry. The ressource you requested could not be found. + <font-awesome-icon icon="frown-open" fixed-width /> + We are sorry. The ressource you requested could not be found. </h1> </div> </div>
--- a/client/src/components/Search.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/Search.vue Wed Apr 03 16:10:11 2019 +0200 @@ -2,7 +2,7 @@ <div :class="searchbarContainerStyle"> <div class="input-group-prepend m-0 d-print-none"> <span @click="toggleSearchbar" :class="searchButtonStyle" for="search"> - <font-awesome-icon icon="search"></font-awesome-icon> + <font-awesome-icon icon="search" /> </span> </div> <div
--- a/client/src/components/Sidebar.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/Sidebar.vue Wed Apr 03 16:10:11 2019 +0200 @@ -8,7 +8,7 @@ @click="$store.commit('application/showSidebar', !showSidebar)" class="menubutton ui-element d-print-none p-2 bg-white rounded position-absolute d-flex justify-content-center" > - <font-awesome-icon class="fa-fw" icon="bars"></font-awesome-icon> + <font-awesome-icon class="fa-fw" icon="bars" /> </div> <div class="menu text-nowrap text-left"> <router-link to="/"> @@ -16,15 +16,11 @@ class="fa-fw mr-2" fixed-width icon="map-marked-alt" - ></font-awesome-icon> + /> <span class="fix-trans-space" v-translate>Map</span> </router-link> <router-link to="/bottlenecks"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="ship" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="ship" /> <span class="fix-trans-space" v-translate>Bottlenecks</span> </router-link> <div v-if="isWaterwayAdmin"> @@ -33,7 +29,7 @@ class="fa-fw mr-2" fixed-width icon="clipboard-check" - ></font-awesome-icon> + /> <span class="fix-trans-space" v-translate>Import review</span> <span class="indicator" v-if="showSidebar && stagingNotifications"> {{ stagingNotifications }} @@ -42,11 +38,7 @@ </div> <div v-if="isSysAdmin"> <router-link to="/stretches"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="road" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="road" /> <span class="fix-trans-space" v-translate>Define stretches</span> </router-link> </div> @@ -54,37 +46,21 @@ <small class="text-muted pl-3"> <translate>Import</translate> </small> <hr class="m-0" /> <router-link to="/importsoundingresults"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="upload" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="upload" /> <span class="fix-trans-space" v-translate>Soundingresults</span> </router-link> <router-link to="/importapprovedgaugemeasurement"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="upload" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="upload" /> <span class="fix-trans-space" v-translate >Approved Gaugemeasurements</span > </router-link> <router-link to="/importwaterwayprofiles"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="upload" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="upload" /> <span class="fix-trans-space" v-translate>Waterway Profiles</span> </router-link> <router-link to="/importschedule"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="clock" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="clock" /> <translate class="fix-trans-space">Imports</translate> </router-link> <small class="text-muted pl-3"> @@ -98,37 +74,25 @@ class="fa-fw mr-2" fixed-width icon="users-cog" - ></font-awesome-icon> + /> <span class="fix-trans-space" v-translate>Users</span> </router-link> </div> <div v-if="isWaterwayAdmin"> <router-link to="/systemconfiguration"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="wrench" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="wrench" /> <span class="fix-trans-space" v-translate>Configuration</span> </router-link> </div> <div v-if="isSysAdmin"> <router-link to="/logs"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="book" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="book" /> <span class="fix-trans-space" v-translate>Logs</span> </router-link> </div> <hr class="m-0" /> <a @click="logoff" href="#" class="logout"> - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="power-off" - ></font-awesome-icon> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="power-off" /> <span class="fix-trans-space" v-translate>Logout</span> {{ user }} </a> </div>
--- a/client/src/components/Zoom.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/Zoom.vue Wed Apr 03 16:10:11 2019 +0200 @@ -4,19 +4,19 @@ class="zoom-button border-0 bg-white rounded-left ui-element" @click="zoomOut" > - <font-awesome-icon icon="minus"></font-awesome-icon> + <font-awesome-icon icon="minus" /> </button> <button class="zoom-button border-0 bg-white ui-element border-right" @click="refreshMap" > - <font-awesome-icon icon="redo"></font-awesome-icon> + <font-awesome-icon icon="redo" /> </button> <button class="zoom-button border-0 bg-white rounded-right ui-element border-right" @click="zoomIn" > - <font-awesome-icon icon="plus"></font-awesome-icon> + <font-awesome-icon icon="plus" /> </button> </div> </template>
--- a/client/src/components/fairway/Profiles.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/fairway/Profiles.vue Wed Apr 03 16:10:11 2019 +0200 @@ -187,7 +187,7 @@ <button class="btn btn-info btn-sm w-100" @click="toggleCutTool"> <font-awesome-icon :icon="cutTool && cutTool.getActive() ? 'times' : 'plus'" - ></font-awesome-icon> + /> {{ cutTool && cutTool.getActive() ? "Cancel" : "New" }} </button> </div>
--- a/client/src/components/importoverview/LogDetail.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/importoverview/LogDetail.vue Wed Apr 03 16:10:11 2019 +0200 @@ -27,14 +27,11 @@ (LOS: {{ details.summary.los }}) </span> </div> - <StretchDetail - v-if="isStretch && isPending" - :entry="entry" - ></StretchDetail> + <StretchDetail v-if="isStretch && isPending" :entry="entry" /> <SoundingResultDetail :entry="entry" v-if="isSoundingResult && isPending" - ></SoundingResultDetail> + /> </div> <div v-if="entry.id === showAdditional && isPending" @@ -53,10 +50,7 @@ /> <span class="text-info"><translate>Logs</translate></span> </div> - <AdditionalLog - v-if="entry.id === showLogs" - class="d-flex flex-row" - ></AdditionalLog> + <AdditionalLog v-if="entry.id === showLogs" class="d-flex flex-row" /> </div> </template>
--- a/client/src/components/importoverview/LogEntry.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/importoverview/LogEntry.vue Wed Apr 03 16:10:11 2019 +0200 @@ -33,7 +33,7 @@ class="text-warning" icon="exclamation-triangle" fixed-width - ></font-awesome-icon> + /> </div> <div style="flex-grow: 1; padding: 0;" class="table-cell text-right"> <button @@ -41,20 +41,14 @@ @click="toggleApproval($options.STATES.APPROVED)" v-if="entry.state === 'pending'" > - <font-awesome-icon - class="small pointer" - icon="check" - ></font-awesome-icon> + <font-awesome-icon class="small pointer" icon="check" /> </button> <button :class="['action rejected', { active: isRejected }]" @click="toggleApproval($options.STATES.REJECTED)" v-if="entry.state === 'pending'" > - <font-awesome-icon - icon="times" - class="small pointer" - ></font-awesome-icon> + <font-awesome-icon icon="times" class="small pointer" /> </button> </div> </div>
--- a/client/src/components/importschedule/Importschedule.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/importschedule/Importschedule.vue Wed Apr 03 16:10:11 2019 +0200 @@ -1,6 +1,6 @@ <template> <div class="d-flex flex-row"> - <Spacer></Spacer> + <Spacer /> <div class="mt-2 w-100"> <div class="card flex-grow-1 schedulecard shadow-xs"> <UIBoxHeader icon="clock" :title="importScheduleLabel" /> @@ -8,7 +8,7 @@ <div class="searchgroup input-group"> <div class="input-group-prepend"> <span class="input-group-text" id="search"> - <font-awesome-icon icon="search"></font-awesome-icon> + <font-awesome-icon icon="search" /> </span> </div> <input @@ -47,7 +47,7 @@ class="fa-fw mr-2" fixed-width icon="check" - ></font-awesome-icon> + /> </div> <div class="table-cell col justify-content-end"> <button @@ -55,24 +55,21 @@ class="btn btn-xs btn-dark mr-1" :disabled="importScheduleDetailVisible" > - <font-awesome-icon - icon="pencil-alt" - fixed-width - ></font-awesome-icon> + <font-awesome-icon icon="pencil-alt" fixed-width /> </button> <button @click="deleteSchedule(schedule)" class="btn btn-xs btn-dark mr-1" :disabled="importScheduleDetailVisible" > - <font-awesome-icon icon="trash" fixed-width></font-awesome-icon> + <font-awesome-icon icon="trash" fixed-width /> </button> <button @click="triggerManualImport(schedule.id)" class="btn btn-xs btn-dark" :disabled="importScheduleDetailVisible" > - <font-awesome-icon icon="play" fixed-width></font-awesome-icon> + <font-awesome-icon icon="play" fixed-width /> </button> </div> </template> @@ -88,7 +85,7 @@ </div> </div> </div> - <Importscheduledetail></Importscheduledetail> + <Importscheduledetail /> </div> </template>
--- a/client/src/components/importschedule/importtypes/Distancemarksvirtual.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/importschedule/importtypes/Distancemarksvirtual.vue Wed Apr 03 16:10:11 2019 +0200 @@ -56,9 +56,7 @@ class="input-group-text ml-2" @click="passwordVisible = !passwordVisible" > - <font-awesome-icon - :icon="passwordVisible ? 'eye-slash' : 'eye'" - ></font-awesome-icon> + <font-awesome-icon :icon="passwordVisible ? 'eye-slash' : 'eye'" /> </span> </div> <div v-if="!password" class="d-flex flex-row">
--- a/client/src/components/importschedule/importtypes/Waterwaygauges.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/importschedule/importtypes/Waterwaygauges.vue Wed Apr 03 16:10:11 2019 +0200 @@ -56,9 +56,7 @@ class="input-group-text ml-2" @click="passwordVisible = !passwordVisible" > - <font-awesome-icon - :icon="passwordVisible ? 'eye-slash' : 'eye'" - ></font-awesome-icon> + <font-awesome-icon :icon="passwordVisible ? 'eye-slash' : 'eye'" /> </span> </div> <div v-if="!password" class="d-flex flex-row">
--- a/client/src/components/systemconfiguration/Systemconfiguration.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/systemconfiguration/Systemconfiguration.vue Wed Apr 03 16:10:11 2019 +0200 @@ -1,6 +1,6 @@ <template> <div class="d-flex flex-row"> - <Spacer></Spacer> + <Spacer /> <div class="card sysconfig mt-2 shadow-xs"> <UIBoxHeader icon="wrench" :title="systemconfigurationLabel" /> <div class="card-body text-left">
--- a/client/src/components/toolbar/Gauges.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/toolbar/Gauges.vue Wed Apr 03 16:10:11 2019 +0200 @@ -7,7 +7,7 @@ <font-awesome-icon icon="ruler-vertical" :class="{ 'text-info': showGauges }" - ></font-awesome-icon> + /> </div> </template>
--- a/client/src/components/toolbar/Identify.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/toolbar/Identify.vue Wed Apr 03 16:10:11 2019 +0200 @@ -4,10 +4,7 @@ class="toolbar-button" v-tooltip="label" > - <font-awesome-icon - icon="info" - :class="{ 'text-info': showIdentify }" - ></font-awesome-icon> + <font-awesome-icon icon="info" :class="{ 'text-info': showIdentify }" /> <span :class="[ 'indicator',
--- a/client/src/components/toolbar/Layers.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/toolbar/Layers.vue Wed Apr 03 16:10:11 2019 +0200 @@ -7,7 +7,7 @@ <font-awesome-icon icon="layer-group" :class="{ 'text-info': showLayers }" - ></font-awesome-icon> + /> </div> </template>
--- a/client/src/components/toolbar/Linetool.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/toolbar/Linetool.vue Wed Apr 03 16:10:11 2019 +0200 @@ -4,7 +4,7 @@ icon="ruler" :class="{ 'text-info': lineTool && lineTool.getActive() }" v-tooltip="label" - ></font-awesome-icon> + /> </div> </template>
--- a/client/src/components/toolbar/Pdftool.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/toolbar/Pdftool.vue Wed Apr 03 16:10:11 2019 +0200 @@ -4,10 +4,7 @@ class="toolbar-button" v-tooltip="label" > - <font-awesome-icon - icon="file-pdf" - :class="{ 'text-info': showPdfTool }" - ></font-awesome-icon> + <font-awesome-icon icon="file-pdf" :class="{ 'text-info': showPdfTool }" /> </div> </template>
--- a/client/src/components/toolbar/Polygontool.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/toolbar/Polygontool.vue Wed Apr 03 16:10:11 2019 +0200 @@ -4,7 +4,7 @@ icon="draw-polygon" :class="{ 'text-info': polygonTool && polygonTool.getActive() }" v-tooltip="label" - ></font-awesome-icon> + /> </div> </template>
--- a/client/src/components/toolbar/Profiles.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/toolbar/Profiles.vue Wed Apr 03 16:10:11 2019 +0200 @@ -7,7 +7,7 @@ <font-awesome-icon icon="chart-area" :class="{ 'text-info': showProfiles }" - ></font-awesome-icon> + /> </div> </template>
--- a/client/src/components/toolbar/Toolbar.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/toolbar/Toolbar.vue Wed Apr 03 16:10:11 2019 +0200 @@ -21,7 +21,7 @@ <font-awesome-icon class="pointer" :icon="expandToolbar ? 'angle-up' : 'angle-down'" - ></font-awesome-icon> + /> </div> </div> </template>
--- a/client/src/components/usermanagement/Passwordfield.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/usermanagement/Passwordfield.vue Wed Apr 03 16:10:11 2019 +0200 @@ -12,14 +12,12 @@ :required="required" /> <span class="input-group-text" @click="showPassword"> - <font-awesome-icon - :icon="readablePassword ? 'eye-slash' : 'eye'" - ></font-awesome-icon> + <font-awesome-icon :icon="readablePassword ? 'eye-slash' : 'eye'" /> </span> </div> <div v-show="passworderrors" class="text-danger"> <small> - <font-awesome-icon icon="exclamation-triangle"></font-awesome-icon> + <font-awesome-icon icon="exclamation-triangle" /> {{ this.passworderrors }} </small> </div>
--- a/client/src/components/usermanagement/Userdetail.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/usermanagement/Userdetail.vue Wed Apr 03 16:10:11 2019 +0200 @@ -20,9 +20,7 @@ /> <div v-show="errors.user" class="text-danger"> <small> - <font-awesome-icon - icon="exclamation-triangle" - ></font-awesome-icon> + <font-awesome-icon icon="exclamation-triangle" /> {{ errors.user }} </small> </div> @@ -46,9 +44,7 @@ </select> <div v-show="errors.country" class="text-danger"> <small> - <font-awesome-icon - icon="exclamation-triangle" - ></font-awesome-icon> + <font-awesome-icon icon="exclamation-triangle" /> {{ errors.country }} </small> </div> @@ -65,9 +61,7 @@ /> <div v-show="errors.email" class="text-danger"> <small> - <font-awesome-icon - icon="exclamation-triangle" - ></font-awesome-icon> + <font-awesome-icon icon="exclamation-triangle" /> {{ errors.email }} </small> </div> @@ -94,9 +88,7 @@ </select> <div v-show="errors.role" class="text-danger"> <small> - <font-awesome-icon - icon="exclamation-triangle" - ></font-awesome-icon> + <font-awesome-icon icon="exclamation-triangle" /> {{ errors.role }} </small> </div>
--- a/client/src/components/usermanagement/Usermanagement.vue Wed Apr 03 15:49:44 2019 +0200 +++ b/client/src/components/usermanagement/Usermanagement.vue Wed Apr 03 16:10:11 2019 +0200 @@ -1,6 +1,6 @@ <template> <div class="main d-flex flex-row" style="position: relative;"> - <Spacer></Spacer> + <Spacer /> <div class="d-flex content py-2"> <div :class="userlistStyle"> <div class="card shadow-xs"> @@ -27,7 +27,7 @@ v-tooltip="roleLabel(user.role)" :icon="roleIcon(user.role)" class="fa-lg" - ></font-awesome-icon> + /> </div> <div class="table-cell col-4" @click="selectUser(user.user)"> {{ user.user }} @@ -68,7 +68,7 @@ v-if="this.page !== 1" class="mr-2 btn btn-sm btn-light align-self-center" > - <font-awesome-icon icon="angle-left"></font-awesome-icon> + <font-awesome-icon icon="angle-left" /> </button> {{ this.page }} / {{ this.pages }} <button @@ -76,7 +76,7 @@ v-if="this.page !== this.pages" class="ml-2 btn btn-sm btn-light align-self-center" > - <font-awesome-icon icon="angle-right"></font-awesome-icon> + <font-awesome-icon icon="angle-right" /> </button> </div> <button @click="addUser" class="btn btn-info addbutton shadow-sm"> @@ -85,7 +85,7 @@ </div> </div> </div> - <Userdetail v-if="isUserDetailsVisible"></Userdetail> + <Userdetail v-if="isUserDetailsVisible" /> </div> </div> </template>