Skip to content
Snippets Groups Projects
Commit 1879d285 authored by Sébastien DA ROCHA's avatar Sébastien DA ROCHA :bicyclist:
Browse files

Merge branch 'redmine-issues/13818' into 'develop'

parents 87d37dca b9a470d4
No related branches found
No related tags found
No related merge requests found
...@@ -67,4 +67,9 @@ ...@@ -67,4 +67,9 @@
border-top: none !important; border-top: none !important;
left: -2px; left: -2px;
width: calc(100% + 4px) !important; width: calc(100% + 4px) !important;
}
/* hide the popup before the map get loaded */
.map-container > #popup.ol-popup {
display: none;
} }
\ No newline at end of file
...@@ -3,7 +3,10 @@ ...@@ -3,7 +3,10 @@
<h3 class="ui header"> <h3 class="ui header">
Types de signalements Types de signalements
</h3> </h3>
<div class="ui middle aligned divided list"> <div
id="feature_type-list"
class="ui middle aligned divided list"
>
<div <div
:class="{ active: loading }" :class="{ active: loading }"
class="ui inverted dimmer" class="ui inverted dimmer"
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
> >
<div <div
:class="[ :class="[
'ui mini modal subscription', 'ui mini modal',
{ 'transition visible active': projectModalType }, { 'transition visible active': projectModalType },
]" ]"
> >
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
</p> </p>
</div> </div>
<button <button
id="validate-modal"
:class="['ui compact fluid button', projectModalType === 'subscribe' && !isSubscriber ? 'green' : 'red']" :class="['ui compact fluid button', projectModalType === 'subscribe' && !isSubscriber ? 'green' : 'red']"
@click="handleModalAction" @click="handleModalAction"
> >
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<div class="filters-container"> <div class="filters-container">
<div class="ui styled accordion"> <div class="ui styled accordion">
<div <div
id="filters"
class="title collapsible-filters" class="title collapsible-filters"
> >
FILTRES FILTRES
...@@ -197,7 +198,6 @@ export default { ...@@ -197,7 +198,6 @@ export default {
.accordion { .accordion {
width: fit-content; width: fit-content;
.collapsible-filters { .collapsible-filters {
cursor: pointer;
font-size: 1.25em; font-size: 1.25em;
padding-right: 0; padding-right: 0;
} }
......
...@@ -81,6 +81,7 @@ ...@@ -81,6 +81,7 @@
form.geom_type.label form.geom_type.label
}}</label> }}</label>
<Dropdown <Dropdown
id="geometry-type"
:options="geomTypeChoices" :options="geomTypeChoices"
:selected="selectedGeomType" :selected="selectedGeomType"
:selection.sync="selectedGeomType" :selection.sync="selectedGeomType"
...@@ -130,6 +131,7 @@ ...@@ -130,6 +131,7 @@
<div class="ui divider" /> <div class="ui divider" />
<button <button
id="send-feature_type"
class="ui teal icon button margin-25" class="ui teal icon button margin-25"
type="button" type="button"
@click="sendFeatureType" @click="sendFeatureType"
......
...@@ -265,6 +265,7 @@ export default { ...@@ -265,6 +265,7 @@ export default {
destroyed() { destroyed() {
this.CLEAR_RELOAD_INTERVAL_ID(); this.CLEAR_RELOAD_INTERVAL_ID();
this.CLOSE_PROJECT_MODAL();
}, },
methods: { methods: {
......
...@@ -159,6 +159,7 @@ ...@@ -159,6 +159,7 @@
for="access_level_pub_feature" for="access_level_pub_feature"
>Visibilité des signalements publiés</label> >Visibilité des signalements publiés</label>
<Dropdown <Dropdown
id="published-visibility"
:options="levelPermissionsPub" :options="levelPermissionsPub"
:selected="form.access_level_pub_feature.name" :selected="form.access_level_pub_feature.name"
:selection.sync="form.access_level_pub_feature" :selection.sync="form.access_level_pub_feature"
...@@ -180,6 +181,7 @@ ...@@ -180,6 +181,7 @@
Visibilité des signalements archivés Visibilité des signalements archivés
</label> </label>
<Dropdown <Dropdown
id="archived-visibility"
:options="levelPermissions" :options="levelPermissions"
:selected="form.access_level_arch_feature.name" :selected="form.access_level_arch_feature.name"
:selection.sync="form.access_level_arch_feature" :selection.sync="form.access_level_arch_feature"
...@@ -240,6 +242,7 @@ ...@@ -240,6 +242,7 @@
<div class="ui divider" /> <div class="ui divider" />
<button <button
id="send-project"
type="button" type="button"
class="ui teal icon button" class="ui teal icon button"
@click="postForm" @click="postForm"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment