Mercurial > gemma
changeset 2920:c1f2b9148cc8
client: removed more unnecessary closing tags and opzimized imports
author | Markus Kottlaender <markus@intevation.de> |
---|---|
date | Wed, 03 Apr 2019 16:23:25 +0200 |
parents | 6c5364ff0abb |
children | 96ac7a980ec2 |
files | client/src/components/ImportWaterwayProfiles.vue client/src/components/importschedule/Importscheduledetail.vue client/src/components/layers/Layerselect.vue client/src/components/systemconfiguration/ColorSettings.vue client/src/components/usermanagement/Userdetail.vue |
diffstat | 5 files changed, 45 insertions(+), 50 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/ImportWaterwayProfiles.vue Wed Apr 03 16:10:11 2019 +0200 +++ b/client/src/components/ImportWaterwayProfiles.vue Wed Apr 03 16:23:25 2019 +0200 @@ -117,6 +117,9 @@ export default { name: "importwaterwayprofiles", + components: { + Spacer: () => import("./Spacer") + }, data() { return { url: "https://service.d4d-portal.info/wamos/wfs/", @@ -172,9 +175,6 @@ }); }); } - }, - components: { - Spacer: () => import("./Spacer") } }; </script>
--- a/client/src/components/importschedule/Importscheduledetail.vue Wed Apr 03 16:10:11 2019 +0200 +++ b/client/src/components/importschedule/Importscheduledetail.vue Wed Apr 03 16:23:25 2019 +0200 @@ -15,33 +15,33 @@ </small> </div> <select v-model="import_" class="custom-select" id="importtype"> - <option :value="$options.IMPORTTYPES.BOTTLENECK" - ><translate>Bottlenecks</translate></option - > - <option :value="$options.IMPORTTYPES.WATERWAYAXIS" - ><translate>Waterway axis</translate></option - > - <option :value="$options.IMPORTTYPES.GAUGEMEASUREMENT" - ><translate>Gauge measurement</translate></option - > - <option :value="$options.IMPORTTYPES.FAIRWAYAVAILABILITY" - ><translate>Available fairway depths</translate></option - > - <option :value="$options.IMPORTTYPES.WATERWAYAREA" - ><translate>Waterway area</translate></option - > - <option :value="$options.IMPORTTYPES.FAIRWAYDIMENSION" - ><translate>Fairway dimension</translate></option - > - <option :value="$options.IMPORTTYPES.WATERWAYGAUGES" - ><translate>Waterway gauges</translate></option - > - <option :value="$options.IMPORTTYPES.DISTANCEMARKSVIRTUAL" - ><translate>Distance marks virtual</translate></option - > - <option :value="$options.IMPORTTYPES.DISTANCEMARKSASHORE" - ><translate>Distance marks ashore</translate></option - > + <option :value="$options.IMPORTTYPES.BOTTLENECK"> + <translate>Bottlenecks</translate> + </option> + <option :value="$options.IMPORTTYPES.WATERWAYAXIS"> + <translate>Waterway axis</translate> + </option> + <option :value="$options.IMPORTTYPES.GAUGEMEASUREMENT"> + <translate>Gauge measurement</translate> + </option> + <option :value="$options.IMPORTTYPES.FAIRWAYAVAILABILITY"> + <translate>Available fairway depths</translate> + </option> + <option :value="$options.IMPORTTYPES.WATERWAYAREA"> + <translate>Waterway area</translate> + </option> + <option :value="$options.IMPORTTYPES.FAIRWAYDIMENSION"> + <translate>Fairway dimension</translate> + </option> + <option :value="$options.IMPORTTYPES.WATERWAYGAUGES"> + <translate>Waterway gauges</translate> + </option> + <option :value="$options.IMPORTTYPES.DISTANCEMARKSVIRTUAL"> + <translate>Distance marks virtual</translate> + </option> + <option :value="$options.IMPORTTYPES.DISTANCEMARKSASHORE"> + <translate>Distance marks ashore</translate> + </option> </select> </div> <div class="flex-column ml-4"> @@ -95,7 +95,7 @@ " @urlChanged="setUrl" :url="url" - ></Availablefairwaydepth> + /> <Bottleneck v-if="import_ == $options.IMPORTTYPES.BOTTLENECK" @urlChanged="setUrl" @@ -103,7 +103,7 @@ :url="url" :tolerance="tolerance" :directImport="directImport" - ></Bottleneck> + /> <Distancemarksvirtual v-if="import_ == $options.IMPORTTYPES.DISTANCEMARKSVIRTUAL" @urlChanged="setUrl" @@ -112,7 +112,7 @@ :url="url" :username="username" :password="password" - ></Distancemarksvirtual> + /> <Distancemarksashore v-if="import_ == $options.IMPORTTYPES.DISTANCEMARKSASHORE" @urlChanged="setUrl" @@ -121,7 +121,7 @@ :url="url" :featureType="featureType" :sortBy="sortBy" - ></Distancemarksashore> + /> <Faiwaydimensions v-if="import_ == $options.IMPORTTYPES.FAIRWAYDIMENSION" @urlChanged="setUrl" @@ -140,14 +140,14 @@ :maxWidth="maxWidth" :sourceOrganization="sourceOrganization" :depth="depth" - ></Faiwaydimensions> + /> <Gaugemeasurement v-if=" import_ == $options.IMPORTTYPES.GAUGEMEASUREMENT && !directImport " @urlChanged="setUrl" :url="url" - ></Gaugemeasurement> + /> <Waterwayarea v-if="import_ == $options.IMPORTTYPES.WATERWAYAREA" @urlChanged="setUrl" @@ -156,7 +156,7 @@ :url="url" :featureType="featureType" :sortBy="sortBy" - ></Waterwayarea> + /> <Waterwaygauges v-if="import_ == $options.IMPORTTYPES.WATERWAYGAUGES" @urlChanged="setUrl" @@ -165,7 +165,7 @@ :url="url" :username="username" :password="password" - ></Waterwaygauges> + /> <Waterwayaxis v-if="import_ == $options.IMPORTTYPES.WATERWAYAXIS" @urlChanged="setUrl" @@ -174,7 +174,7 @@ :url="url" :featureType="featureType" :sortBy="sortBy" - ></Waterwayaxis> + /> <template v-if="!directImport || !directImportAvailable"> <div class="d-flex flex-row"> @@ -411,12 +411,8 @@ class="shadow-sm btn btn-outline-info trigger" :disabled="!triggerActive || !isValid" > - <font-awesome-icon - class="fa-fw mr-2" - fixed-width - icon="play" - ></font-awesome-icon - ><translate>Trigger import</translate> + <font-awesome-icon class="fa-fw mr-2" fixed-width icon="play" /> + <translate>Trigger import</translate> </button> </form> </div>
--- a/client/src/components/layers/Layerselect.vue Wed Apr 03 16:10:11 2019 +0200 +++ b/client/src/components/layers/Layerselect.vue Wed Apr 03 16:23:25 2019 +0200 @@ -51,6 +51,7 @@ import { HTTP } from "@/lib/http"; import { mapState } from "vuex"; import { LAYERS } from "@/store/map.js"; + export default { props: ["layername", "layerindex", "isVisible"], name: "layerselect",
--- a/client/src/components/systemconfiguration/ColorSettings.vue Wed Apr 03 16:10:11 2019 +0200 +++ b/client/src/components/systemconfiguration/ColorSettings.vue Wed Apr 03 16:23:25 2019 +0200 @@ -43,9 +43,7 @@ * Bernhard Reiter <bernhard@intevation.de> * Markus Kottländer <markus@intevation.de> */ -import { Chrome } from "vue-color"; -import { Compact } from "vue-color"; - +import { Chrome, Compact } from "vue-color"; import { HTTP } from "@/lib/http"; import { displayError } from "@/lib/errors.js";
--- a/client/src/components/usermanagement/Userdetail.vue Wed Apr 03 16:10:11 2019 +0200 +++ b/client/src/components/usermanagement/Userdetail.vue Wed Apr 03 16:23:25 2019 +0200 @@ -99,7 +99,7 @@ :placeholder="passwordPlaceholder" :label="passwordLabel" :passworderrors="errors.password" - ></PasswordField> + /> </div> <div class="form-group row"> <PasswordField @@ -107,7 +107,7 @@ :placeholder="passwordRePlaceholder" :label="passwordReLabel" :passworderrors="errors.passwordre" - ></PasswordField> + /> </div> </div> <div>