From 138dc1e87f7186301149e3b60a7494ec3daec591 Mon Sep 17 00:00:00 2001
From: Anton Vakhrushev <anwinged@ya.ru>
Date: Wed, 24 Jun 2020 14:15:14 +0300
Subject: [PATCH] More compact view

---
 src/DashboardView/VillageStateList.vue       | 29 ++++----------------
 src/DashboardView/VillageStateStatusLine.vue | 16 +++++++++++
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/DashboardView/VillageStateList.vue b/src/DashboardView/VillageStateList.vue
index 8d91be3..50b11e2 100644
--- a/src/DashboardView/VillageStateList.vue
+++ b/src/DashboardView/VillageStateList.vue
@@ -95,19 +95,7 @@
             </td>
           </tr>
 
-          <tr class="normal-line">
-            <td class="right" colspan="7">
-              <a class="village-quick-link" :href="quartersPath(villageState.village)">Казармы</a>
-              <a class="village-quick-link" :href="horseStablePath(villageState.village)"
-                >Конюшни</a
-              >
-              <a class="village-quick-link" :href="collectionPointPath(villageState.village)"
-                >Войска</a
-              >
-            </td>
-          </tr>
-
-          <status-line :village-state="villageState" />
+          <status-line class="second-line" :village-state="villageState" />
         </template>
       </tbody>
     </table>
@@ -117,7 +105,7 @@
 <script>
 import ResourceBalance from './ResourceBalance';
 import VillageResource from './VillageResource';
-import { COLLECTION_POINT_ID, HORSE_STABLE_ID, MARKET_ID, QUARTERS_ID } from '../Core/Buildings';
+import { MARKET_ID } from '../Core/Buildings';
 import { path } from '../Helpers/Path';
 import { Actions } from './Store';
 import { translateProductionQueue } from '../Core/ProductionQueue';
@@ -170,15 +158,6 @@ export default {
         y: toVillage.crd.y,
       });
     },
-    collectionPointPath(village) {
-      return path('/build.php', { newdid: village.id, gid: COLLECTION_POINT_ID, tt: 1 });
-    },
-    quartersPath(village) {
-      return path('/build.php', { newdid: village.id, gid: QUARTERS_ID });
-    },
-    horseStablePath(village) {
-      return path('/build.php', { newdid: village.id, gid: HORSE_STABLE_ID });
-    },
     renderTimeInSeconds(value) {
       return secondsToTime(value);
     },
@@ -216,6 +195,10 @@ export default {
   padding: 4px;
 }
 
+.second-line td {
+  padding: 0 4px 4px;
+}
+
 .filling-line td {
   padding: 0;
   border: 1px solid #ddd;
diff --git a/src/DashboardView/VillageStateStatusLine.vue b/src/DashboardView/VillageStateStatusLine.vue
index 6520b9e..b521063 100644
--- a/src/DashboardView/VillageStateStatusLine.vue
+++ b/src/DashboardView/VillageStateStatusLine.vue
@@ -4,12 +4,18 @@
       режим
       <a href="#" v-text="settings.receiveResourcesMode" v-on:click.prevent="toggleMode()"></a>,
       <span v-text="status"></span>
+      |
+      <a class="village-quick-link" :href="quartersPath(villageState.village)">Казармы</a>
+      <a class="village-quick-link" :href="horseStablePath(villageState.village)">Конюшни</a>
+      <a class="village-quick-link" :href="collectionPointPath(villageState.village)">Войска</a>
     </td>
   </tr>
 </template>
 
 <script>
 import { Actions } from './Store';
+import { path } from '../Helpers/Path';
+import { COLLECTION_POINT_ID, HORSE_STABLE_ID, QUARTERS_ID } from '../Core/Buildings';
 
 export default {
   props: {
@@ -33,6 +39,15 @@ export default {
       const villageId = this.villageState.id;
       this.$store.dispatch(Actions.ToggleVillageReceiveMode, { villageId });
     },
+    collectionPointPath(village) {
+      return path('/build.php', { newdid: village.id, gid: COLLECTION_POINT_ID, tt: 1 });
+    },
+    quartersPath(village) {
+      return path('/build.php', { newdid: village.id, gid: QUARTERS_ID });
+    },
+    horseStablePath(village) {
+      return path('/build.php', { newdid: village.id, gid: HORSE_STABLE_ID });
+    },
   },
 };
 </script>
@@ -47,5 +62,6 @@ export default {
 }
 .status-line {
   @extend %right;
+  @extend %small-cell;
 }
 </style>