Skip to content

Commit 4b9709a

Browse files
committed
reorder municipality button, no search in workspace
1 parent c2fc869 commit 4b9709a

File tree

3 files changed

+21
-28
lines changed

3 files changed

+21
-28
lines changed

vue/src/components/SnapshotList.vue

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
<v-list class="snapshotlist"
1414
three-line>
1515

16-
<v-subheader
17-
v-if="snapshots.length != 0 && title"
18-
style="color:black;font-weight:700;"
19-
class="px-0">{{ title }}
20-
</v-subheader>
21-
2216
<v-list-item class="px-2 mb-4" dense
2317
v-for="snapshot in snapshots" :key="snapshot.id"
2418
:to="createRouteLink(snapshot.pk)">
@@ -64,11 +58,7 @@ export default {
6458
type: String,
6559
default: ''
6660
},
67-
snapshots: Array,
68-
title: {
69-
type: String,
70-
default: ''
71-
}
61+
snapshots: Array
7262
},
7363
7464
methods: {

vue/src/views/Snapshot.vue

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,34 +48,33 @@
4848
<search :dense="true" :term="municipalityName"/>
4949

5050
<div class="nodata pb-8">
51-
<div v-if="hash" class="smaller hint">
52-
<h4>{{ $t('hasSnapshot.title') }}</h4>
53-
<p>{{ $t('hasSnapshot.p1', { municipalityText: municipalityText }) }}</p>
54-
<p>{{ $t('hasSnapshot.p2') }}</p>
55-
</div>
56-
<div v-else class="smaller hint">
51+
<div v-if="!hash" class="smaller hint">
5752
<h4>{{ $t('noSnapshot.title') }}</h4>
5853
<p>{{ $t('noSnapshot.p1', { municipalityText: municipalityText }) }}</p>
5954
<p>{{ $t('noSnapshot.p2') }}</p>
6055
</div>
61-
<div class="useractions">
62-
<v-btn small block outlined color="primary">
63-
<router-link key="signup" :to="'/' + $i18n.locale + '/signup/'">
64-
{{ $t('calltoactionText', { municipalityText: municipalityText }) }}
65-
</router-link>
66-
</v-btn>
67-
</div>
6856

6957
<snapshot-list
7058
v-if="snapshotsMunicipality"
7159
:snapshots="snapshotsMunicipality"
7260
/>
7361
</div>
7462

63+
<v-subheader
64+
class="px-0 snapshot-list-title">{{ listtitleText }}
65+
</v-subheader>
66+
67+
<div class="useractions">
68+
<v-btn small block outlined color="primary">
69+
<router-link key="signup" :to="'/' + $i18n.locale + '/signup/'">
70+
{{ $t('calltoactionText', { municipalityText: municipalityText }) }}
71+
</router-link>
72+
</v-btn>
73+
</div>
74+
7575
<snapshot-list
7676
v-if="snapshotsExamples"
7777
:snapshots="snapshotsExamples"
78-
:title="listtitleText"
7978
/>
8079
</div>
8180

vue/src/views/Workspace.vue

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
id="snapshotnav"
1717
clipped="clipped"
1818
app
19-
width="320">
19+
width="320"
20+
v-model="snapshotnav">
2021
<router-link id="logo" :to="'/' + $i18n.locale + '/'" class="px-4 py-1 d-block">
2122
<img alt="gemeindescan logo" height="50" src="@/assets/images/gemeindescan-logo.svg">
2223
</router-link>
2324

2425
<v-divider />
2526

2627
<div id="snapshotnavContent" class="ma-4">
27-
<search :dense="true" :term="municipalityName"/>
2828

2929
<div class="nodata pb-8">
3030
<div class="smaller hint">
3131
<h4>{{ title }}</h4>
32-
<p>{{ description }}</p>
32+
<p class="show-linebreaks">{{ description }}</p>
3333
</div>
3434
</div>
3535

@@ -70,6 +70,10 @@
7070
font-weight: 900;
7171
}
7272
73+
.show-linebreaks {
74+
white-space: pre-wrap;
75+
}
76+
7377
h4 {
7478
margin-bottom: 0.8em;
7579
}

0 commit comments

Comments
 (0)