X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2FApp.vue;h=18425c0dd43af2d4e25f7bf327065de8f347feb1;hb=efdfb4c70f4a4391b8571726d924cdf58baba41c;hp=d65d3806f2427b1e45a54f37c7d48390f5286bea;hpb=aafe9f160744bf8f507d1cebd398cc11d798e090;p=vchess.git

diff --git a/client/src/App.vue b/client/src/App.vue
index d65d3806..18425c0d 100644
--- a/client/src/App.vue
+++ b/client/src/App.vue
@@ -1,6 +1,5 @@
 <template lang="pug">
 #app
-  Language
   Settings
   ContactForm
   UpsertUser
@@ -9,7 +8,7 @@
       .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
         // Menu (top of page):
         // Left: hall, variants, problems, mygames
-        // Right: usermenu, settings, flag
+        // Right: usermenu, settings
         nav
           label.drawer-toggle(for="drawerControl")
           input#drawerControl.drawer(type="checkbox")
@@ -18,32 +17,30 @@
             #leftMenu
               router-link(to="/")
                 | {{ st.tr["Hall"] }}
+              router-link(to="/mygames")
+                | {{ st.tr["My games"] }}
               router-link(to="/variants")
                 | {{ st.tr["Variants"] }}
               router-link(to="/problems")
                 | {{ st.tr["Problems"] }}
-              router-link(to="/mygames")
-                | {{ st.tr["My games"] }}
             #rightMenu
-              .clickable(onClick="doClick('modalUser')")
+              .clickable(onClick="window.doClick('modalUser')")
                 | {{ st.user.id > 0 ? (st.user.name || "@nonymous") : "Login" }}
-              .clickable(onClick="doClick('modalSettings')")
-                | {{ st.tr["Settings"] }}
-              .clickable#flagContainer(onClick="doClick('modalLang')")
-                img(v-if="!!st.lang" :src="flagImage")
+              #divSettings.clickable(onClick="window.doClick('modalSettings')")
+                span {{ st.tr["Settings"] }}
+                img(src="/images/icons/settings.svg")
     router-view
   .row
     .col-sm-12.col-md-10.col-md-offset-1.col-lg-8.col-lg-offset-2
       footer
         router-link.menuitem(to="/about") {{ st.tr["About"] }}
         router-link.menuitem(to="/news") {{ st.tr["News"] }}
-        p.clickable(onClick="doClick('modalContact')")
+        p.clickable(onClick="window.doClick('modalContact')")
           | {{ st.tr["Contact"] }}
 </template>
 
 <script>
 import ContactForm from "@/components/ContactForm.vue";
-import Language from "@/components/Language.vue";
 import Settings from "@/components/Settings.vue";
 import UpsertUser from "@/components/UpsertUser.vue";
 import { store } from "./store.js";
@@ -51,20 +48,14 @@ import { processModalClick } from "./utils/modalClick.js";
 export default {
   components: {
     ContactForm,
-    Language,
     Settings,
-    UpsertUser,
+    UpsertUser
   },
   data: function() {
     return {
-      st: store.state,
+      st: store.state
     };
   },
-  computed: {
-    flagImage: function() {
-      return `/images/flags/${this.st.lang}.svg`;
-    },
-  },
   mounted: function() {
     let dialogs = document.querySelectorAll("div[role='dialog']");
     dialogs.forEach(d => {
@@ -73,12 +64,11 @@ export default {
   },
   methods: {
     hideDrawer: function(e) {
-      if (e.target.innerText == "Forum")
-        return; //external link
+      if (e.target.innerText == "Forum") return; //external link
       e.preventDefault(); //TODO: why is this needed?
       document.getElementsByClassName("drawer")[0].checked = false;
-    },
-  },
+    }
+  }
 };
 </script>
 
@@ -143,6 +133,16 @@ table
   th, td
     padding: 5px
 
+#divSettings
+  padding: 0 10px 0 0
+  height: 100%
+  & > span
+    vertical-align: middle
+  & > img
+    padding: 0
+    height: 24px
+    vertical-align: middle
+
 @media screen and (max-width: 767px)
   table
     tr > th, td
@@ -175,12 +175,6 @@ nav
         justify-content: flex-end
         & > div
           display: inline-block
-          &#flagContainer
-            display: inline-flex
-          & > img
-            padding: 0
-            width: 36px
-            height: 27px
     @media screen and (max-width: 767px)
       & > #leftMenu
         margin-top: 42px
@@ -192,17 +186,9 @@ nav
       & > #rightMenu
         padding-top: 5px
         border-top: 1px solid darkgrey
-        & > div
-          &#flagContainer
-            display: inline-flex
-          & > img
-            padding: 0
-            width: 36px
-            height: 27px
 
 @media screen and (max-width: 767px)
   nav
-    z-index: 5000 //to hide currently selected piece if any
     height: 42px
     border: none
     & > label.drawer-toggle
@@ -211,6 +197,8 @@ nav
       position: absolute
       top: -22px
       //padding: -5px 0 0 10px
+    & > #menuBar
+      z-index: 5000 //to hide currently selected piece if any
 
 [type="checkbox"].drawer+*
   right: -767px