From 9877344b4d4fcbf7625dc06d3f118635cdd306d8 Mon Sep 17 00:00:00 2001
From: Paolo Arena <paolo.arena77@gmail.com>
Date: Fri, 15 Mar 2019 01:06:40 +0100
Subject: [PATCH] fix menu ShowTask

---
 src/classes/routinestd.ts          |  2 +-
 src/components/todos/todo/todo.vue | 50 ++++++++++++++++++------------
 src/root/home/home.vue             |  8 ++---
 src/statics/i18n.js                |  3 ++
 4 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/src/classes/routinestd.ts b/src/classes/routinestd.ts
index 7e38386..c8f3ebc 100644
--- a/src/classes/routinestd.ts
+++ b/src/classes/routinestd.ts
@@ -11,7 +11,7 @@ export async function askConfirm($q: any, mytitle, mytext, ok, cancel) {
       },
       title: mytitle
     }).then((ris) => {
-      return true
+      return ris
     }).catch(() => {
       return false
     })
diff --git a/src/components/todos/todo/todo.vue b/src/components/todos/todo/todo.vue
index 538692b..b638497 100644
--- a/src/components/todos/todo/todo.vue
+++ b/src/components/todos/todo/todo.vue
@@ -9,29 +9,41 @@
                                icon="settings">
                             <q-menu id="popconfig" self="top right">
                                 <q-list link separator no-border class="todo-menu">
-                                    <div v-for="field in menuPopupConfigTodo" :key="field.value">
-                                        <q-item clickable>
+                                    <q-item clickable v-for="field in menuPopupConfigTodo" :key="field.value">
+                                        <q-item-section avatar>
+                                            <q-icon :name="field.icon"/>
+                                        </q-item-section>
 
-                                            <q-item-section avatar>
-                                                <q-icon :name="field.icon"/>
+                                        <q-item-section>{{field.label}}</q-item-section>
+
+                                        <q-item-section side v-if="showTask(field.value)">
+                                            <q-item-section side>
+                                                <q-icon name="keyboard_arrow_right"/>
                                             </q-item-section>
 
-                                            <q-item-section>
-                                                <q-item-label v-if="showTask(field.value)">
+                                            <q-menu auto-close anchor="bottom middle" self="top middle">
+                                                <q-list dense>
+                                                    <q-item side :icon="field.icon">
 
-                                                    <q-select
-                                                            color="secondary"
-                                                            :label="field.label"
-                                                            v-model="showtype"
-                                                            :options="listOptionShowTask"/>
-                                                </q-item-label>
-                                                <q-item-label v-else>
-                                                    <q-item-section label class="item-menu">{{field.label}}
-                                                    </q-item-section>
-                                                </q-item-label>
-                                            </q-item-section>
-                                        </q-item>
-                                    </div>
+                                                        <q-item-section>
+                                                            <q-list dense>
+                                                                <q-item clickable v-ripple v-for="opt in listOptionShowTask"
+                                                                        :key="opt.value"
+                                                                        @click="showtype = opt.value">
+                                                                    <q-item-section avatar>
+                                                                        <q-icon :name="opt.icon" inverted color="primary"/>
+                                                                    </q-item-section>
+                                                                    <q-item-section>
+                                                                        {{opt.label}}
+                                                                    </q-item-section>
+                                                                </q-item>
+                                                            </q-list>
+                                                        </q-item-section>
+                                                    </q-item>
+                                                </q-list>
+                                            </q-menu>
+                                        </q-item-section>
+                                    </q-item>
                                 </q-list>
                             </q-menu>
                         </q-btn>
diff --git a/src/root/home/home.vue b/src/root/home/home.vue
index 60ce2ea..7d9facb 100644
--- a/src/root/home/home.vue
+++ b/src/root/home/home.vue
@@ -384,7 +384,7 @@
                     </div>
 
                     <div class="q-mt-xs text-weight-thin" style="text-shadow: 4px 4px 8px #555;">
-                        Contacts
+                        {{$t('homepage.contacts')}}
                         <!--Released under the-->
                         <!--<a href="https://github.com/quasarframework/quasar/blob/dev/LICENSE" target="_blank"-->
                         <!--rel="noopener noreferrer" class="doc-link">-->
@@ -397,10 +397,10 @@
                     </div>
 
                 </div>
-                <q-page-scroller position="bottom-right" :scroll-offset="850" :offset="[18, 18]" style="opacity: 0.3">
-                    <q-btn fab icon="keyboard_arrow_up" color="accent" />
-                </q-page-scroller>
             </section>
+            <q-page-scroller position="bottom-right" :scroll-offset="850" :offset="[18, 18]" style="opacity: 0.3">
+                <q-btn fab icon="keyboard_arrow_up" color="accent" />
+            </q-page-scroller>
         </div>
 
     </q-page>
diff --git a/src/statics/i18n.js b/src/statics/i18n.js
index f40ccba..eae4727 100644
--- a/src/statics/i18n.js
+++ b/src/statics/i18n.js
@@ -109,6 +109,7 @@ const messages = {
           'Verranno accettate solo donazioni Libere di privati ed Associazioni no-profit, in linea con i Principi, che serviranno per coprire le spese.<br>' +
           '<strong>Grazie a Tutti per il sostegno</strong>. '
       },
+      contacts: 'Contatti'
     },
     pages: {
       home: 'Principale',
@@ -341,6 +342,7 @@ const messages = {
           'Solo se aceptarán donaciones de particulares y asociaciones sin änimo de lucro, en línea con los Principios, que se utilizarán para cubrir los gastos. <br>' +
           '<strong>Gracias a todos por el apoyo</strong>. '
       },
+      contacts: 'Contactos'
     },
     pages: {
       home: 'Principal',
@@ -566,6 +568,7 @@ const messages = {
           'Only donations from private individuals and non-profit associations will be accepted, in line with the Principles, which will be used to cover the expenses. <br>' +
           '<strong>Thanks all for the support</strong>. '
       },
+      contacts: 'Contacts'
     },
     pages: {
       home: 'Dashboard',