diff --git a/pom.xml b/pom.xml index 60d38c7..0d5853a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 fr.lirmm @@ -225,6 +224,14 @@ jsoup 1.13.1 + + + org.apache.commons + commons-digester3 + 3.2 + with-deps + + diff --git a/src/main/webapp/assets/img/against.png b/src/main/webapp/assets/img/against.png deleted file mode 100644 index 067ea54..0000000 Binary files a/src/main/webapp/assets/img/against.png and /dev/null differ diff --git a/src/main/webapp/assets/img/calendar.png b/src/main/webapp/assets/img/calendar.png new file mode 100644 index 0000000..2192275 Binary files /dev/null and b/src/main/webapp/assets/img/calendar.png differ diff --git a/src/main/webapp/assets/img/cancel.png b/src/main/webapp/assets/img/cancel.png new file mode 100644 index 0000000..5325e77 Binary files /dev/null and b/src/main/webapp/assets/img/cancel.png differ diff --git a/src/main/webapp/assets/img/delete.png b/src/main/webapp/assets/img/delete.png new file mode 100644 index 0000000..577e11b Binary files /dev/null and b/src/main/webapp/assets/img/delete.png differ diff --git a/src/main/webapp/assets/img/edit.png b/src/main/webapp/assets/img/edit.png new file mode 100644 index 0000000..f3552b7 Binary files /dev/null and b/src/main/webapp/assets/img/edit.png differ diff --git a/src/main/webapp/assets/img/for.png b/src/main/webapp/assets/img/for.png deleted file mode 100644 index ee6b9da..0000000 Binary files a/src/main/webapp/assets/img/for.png and /dev/null differ diff --git a/src/main/webapp/assets/img/neutral.png b/src/main/webapp/assets/img/neutral.png deleted file mode 100644 index 6608a22..0000000 Binary files a/src/main/webapp/assets/img/neutral.png and /dev/null differ diff --git a/src/main/webapp/assets/js/views/agenda.vue b/src/main/webapp/assets/js/views/agenda.vue index a8f5444..fbd0f0e 100644 --- a/src/main/webapp/assets/js/views/agenda.vue +++ b/src/main/webapp/assets/js/views/agenda.vue @@ -3,33 +3,100 @@
- {{ program.title }} + {{ program.title }} + - {{ program.description }} + {{ program.description }} + - {{ + {{ new Date(program.date).toLocaleString() }} + {{ + editionProgram.date.toISOString() + }} - {{ program.url }} + + {{ program.url }} + +
+
+ +
@@ -48,6 +115,51 @@ .block { display: block; } + +#modifySondage { + background-color: #b84000; + padding: 1rem; + border-radius: 0.5rem; + color: white; + border-color: transparent; + box-shadow: 0.1rem 0.1rem 1rem #b84000; + margin-bottom: 2rem; + cursor: pointer; +} +.edit-btn { + background-color: #808080; + padding: 1rem; + border-radius: 0.5rem; + color: white; + border-color: transparent; + box-shadow: 0.1rem 0.1rem 1rem #808080; + margin-bottom: 2rem; + cursor: pointer; + width: 50px; + height: 50px; +} +.delete-btn { + background-color: #dd2034; + padding: 1rem; + border-radius: 0.5rem; + color: white; + border-color: transparent; + box-shadow: 0.1rem 0.1rem 1rem #dd2034; + margin-bottom: 2rem; + cursor: pointer; + width: 50px; + height: 50px; +} +.cancel-btn { + background-color: #b84000; + padding: 1rem; + border-radius: 0.5rem; + color: white; + border-color: transparent; + box-shadow: 0.1rem 0.1rem 1rem #b84000; + margin-bottom: 2rem; + cursor: pointer; +} \ No newline at end of file + diff --git a/src/main/webapp/assets/js/views/home.vue b/src/main/webapp/assets/js/views/home.vue index e15826f..03b77eb 100644 --- a/src/main/webapp/assets/js/views/home.vue +++ b/src/main/webapp/assets/js/views/home.vue @@ -56,7 +56,7 @@ image
diff --git a/src/main/webapp/assets/js/views/sondage.vue b/src/main/webapp/assets/js/views/sondage.vue index f6fd2b0..b8ae382 100644 --- a/src/main/webapp/assets/js/views/sondage.vue +++ b/src/main/webapp/assets/js/views/sondage.vue @@ -54,7 +54,7 @@ @click="vote(subtheme, `FOR`)" v-if="checkVoteAvalaibility(subtheme.id)" > - Intervenir | {{ subtheme.for }} + Participation certaine | {{ subtheme.for }} @@ -66,7 +66,7 @@ v-if="checkVoteAvalaibility(subtheme.id)" > Intervenir selon son évolution | {{ subtheme.neutral }}Participation possible | {{ subtheme.neutral }} @@ -78,7 +78,7 @@ @click="vote(subtheme, `AGAINST`)" v-if="checkVoteAvalaibility(subtheme.id)" > - Observer | {{ subtheme.against }} + Simple observateur | {{ subtheme.against }} @@ -88,7 +88,7 @@ :key="subtheme.id" class="text-centered" > - {{ subtheme.for }} + {{ subtheme.for }} participant(s)