Mercurial > gemma
changeset 905:84d1051c5e99
Merged
author | Sascha Wilde <wilde@intevation.de> |
---|---|
date | Tue, 02 Oct 2018 16:51:49 +0200 |
parents | e4b72a199258 (current diff) 2990a878b16b (diff) |
children | 67b334aaff39 |
files | |
diffstat | 8 files changed, 56 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/application/Linetool.vue Tue Oct 02 13:34:59 2018 +0200 +++ b/client/src/application/Linetool.vue Tue Oct 02 16:51:49 2018 +0200 @@ -20,13 +20,13 @@ z-index: 2; } -.fa-pencil-inverted { +.inverted { color: #0077ff; } </style> <script> -import { mapGetters } from "vuex"; +import { mapGetters, mapState } from "vuex"; export default { name: "linetool", @@ -37,11 +37,14 @@ }, computed: { ...mapGetters("application", ["drawMode"]), + ...mapState("mapstore", ["identifiedFeatures", "selectedMorph"]), icon() { return { fa: true, - "fa-pencil": true, - "fa-pencil-inverted": this.drawMode + "fa-pencil": !this.selectedMorph, + "fa-pencil inverted": !this.selectedMorph && this.drawMode, + "fa-cut": this.selectedMorph, + "fa-cut inverted": this.selectedMorph && this.drawMode }; } }
--- a/client/src/application/Main.vue Tue Oct 02 13:34:59 2018 +0200 +++ b/client/src/application/Main.vue Tue Oct 02 16:51:49 2018 +0200 @@ -33,7 +33,7 @@ margin: { top: 20, right: 40, - bottom: 20, + bottom: 30, left: 40 } };
--- a/client/src/application/Morphtool.vue Tue Oct 02 13:34:59 2018 +0200 +++ b/client/src/application/Morphtool.vue Tue Oct 02 16:51:49 2018 +0200 @@ -1,49 +1,74 @@ <template> <div v-if="selectedBottleneck || selectedMorph" class="morphcontainer"> - <div v-if="surveyList" class="ui-element card card-body shadow"> + <div v-if="surveyList && !drawMode" class="ui-element card card-body shadow"> <div class="headline"> - <h5>{{selectedBottleneck.get("objnam")}}</h5> + <h4>{{selectedBottleneck.get("objnam")}}</h4> + <hr> + <div @click="clearSelection" class="float-left ui-element d-flex morphtoolminus"> + <i class="fa fa-close morphtoolsminus"></i> + </div> </div> <ul class="list-group surveylist"> <li v-for="survey of surveyList.surveys" :key="survey.data_info" class="list-group-item" @click.prevent="selectSurvey(survey)"> <a href="#" @click.prevent="">{{survey.date_info}}</a> </li> </ul> - <div @click="clearSelection" class="float-left ui-element d-flex shadow morphtoolminus"> - <i class="fa fa-minus morphtoolsminus"></i> + </div> + <div v-if="selectedMorph" @click="clearSelection" class="ui-element shadow morphtool"> + <div class="d-flex flex-row justify-content-between"> + <i class="fa fa-close text-danger"></i> + <small>Bottleneck: </small> + <h6>{{selectedBottleneck.get("objnam")}} <small>( {{selectedMorph.date_info}} )</small></h6> </div> </div> - <div v-else @click="clearSelection" class="float-right ui-element d-flex shadow morphtool"> - <i class="fa fa-object-ungroup"></i> - </div> </div> </template> -<style lang="scss"> -.morphcontainer { - position: relative; - margin-bottom: $offset; +<style scoped lang="scss"> +.headline { + margin-right: $offset; margin-left: $offset; } +.morphcontainer { + margin-bottom: $offset; + margin-left: auto; + margin-right: $large-offset + $icon-width; + border-radius: $border-radius; +} .surveylist { + text-align: left; margin-bottom: $offset !important; margin-left: $offset; margin-right: $offset; } + +.surveylist li { + margin-left: auto; + margin-right: auto; + border-style: none; + padding-bottom: 0rem; +} + .morphtool { position: relative; background-color: white; padding: $small-offset; border-radius: $border-radius; height: $icon-width; - width: $icon-height; margin-right: $offset; + margin-top: auto; + margin-bottom: auto; z-index: 2; } + +.morphcontainer i { + margin-right: $small-offset; +} + .morphtoolminus { position: absolute; - bottom: 0; - left: 0; + top: 0; + right: 0; background-color: white; padding: $small-offset; border-radius: $border-radius; @@ -74,6 +99,7 @@ for (let feature of this.identifiedFeatures) { let id = feature.getId(); if (id && id.replace(/[.][^.]*$/, "") === "bottlenecks") { + this.$store.commit("mapstore/setSelectedMorph", null); return feature; } }
--- a/client/src/application/Topbar.vue Tue Oct 02 13:34:59 2018 +0200 +++ b/client/src/application/Topbar.vue Tue Oct 02 16:51:49 2018 +0200 @@ -18,7 +18,7 @@ </ul> </div> </div> - <div v-if="routeName == 'mainview'" class="splitbutton"> + <div v-if="routeName == 'mainview' && currentProfile.length" class="splitbutton"> <i @click="splitScreen" class="ui-element splitscreen fa fa-window-restore shadow"></i> </div> <div class="">
--- a/client/src/fairway/store.js Tue Oct 02 13:34:59 2018 +0200 +++ b/client/src/fairway/store.js Tue Oct 02 16:51:49 2018 +0200 @@ -10,10 +10,7 @@ minAlt: 0, maxAlt: 0, currentProfile: [], - waterLevels: [ - { year: "2016", level: DEMOLEVEL, color: "#005DFF" }, - { year: "2017", level: 147.2, color: "#639CFF" } - ], + waterLevels: [{ year: "2016", level: DEMOLEVEL, color: "#005DFF" }], selectedWaterLevel: DEMOLEVEL, fairwayCoordinates: [], startPoint: null,
--- a/client/src/layers/Identify.vue Tue Oct 02 13:34:59 2018 +0200 +++ b/client/src/layers/Identify.vue Tue Oct 02 16:51:49 2018 +0200 @@ -37,7 +37,7 @@ <style lang="scss"> .features { height: $identify-height; - overflow-y: scroll; + overflow-y: auto; margin-bottom: $x-large-offset + $large-offset; } .versioninfo {
--- a/client/src/map/Maplayer.vue Tue Oct 02 13:34:59 2018 +0200 +++ b/client/src/map/Maplayer.vue Tue Oct 02 16:51:49 2018 +0200 @@ -14,11 +14,11 @@ @media print { .mapfull { width: 2000px; - heigth: 2828px; + height: 2828px; } .mapsplit { width: 2000px; - heigth: 2828px; + height: 2828px; } } </style>