From c02bc267996c6f4c242ff4bcea15aad53703e8a4 Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Sat, 4 Dec 2021 00:10:41 +0900
Subject: [PATCH] =?UTF-8?q?misc:=20=EA=B0=B1=EC=8B=A0/=EB=A1=9C=EB=B9=84?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B2=84=ED=8A=BC=20=EC=9C=84=EC=B9=98=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/index.php              | 140 ++++++++++++++++++++-----------------
 hwe/scss/main.scss         |  25 +++----
 hwe/ts/ReservedCommand.vue |   4 +-
 3 files changed, 90 insertions(+), 79 deletions(-)

diff --git a/hwe/index.php b/hwe/index.php
index e2a99fc8..855d68e6 100644
--- a/hwe/index.php
+++ b/hwe/index.php
@@ -255,74 +255,84 @@ if (!$otherTextInfo) {
             <?php endif; ?>
             <div id="map_view" class="gx-0">
                 <div id="mapZone" class="view-item"><?= getMapHtml($mapTheme) ?></div>
-                <div class="view-item" id="reservedCommandList"></div>
+                <div class="view-item" id="reservedCommandZone">
+                    <div id="reservedCommandList"></div>
+                    <div id="actionMiniPlate" class="gx-0 row">
+                        <div class="col">
+                            <div class="gx-1 row">
+                                <div class="col-8 d-grid"><button type='button' class='btn btn-sammo-base2 refreshPage'>갱 신</button></div>
+                                <div class="col-4 d-grid"><button type='button' class='btn btn-sammo-base2' onclick="location.replace('../')">로비로</button></div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
                 <div id="cityInfo" class="view-item" style="border:none;text-align:center;"><?= cityInfo($generalObj) ?></div>
-                <div id="routeButtons" class="view-item row justify-content-center"><button type='button' class='btn btn-sammo-base2 col-2 refreshPage'>갱 신</button><button type='button' class='btn btn-sammo-base2 col-3' onclick="location.replace('../')">로비로</button></div>
-            </div>
-            <div class="row gx-0">
-                <div class="col-md-6" id="nation-position"><?php myNationInfo($generalObj); ?></div>
-                <div class="col-md-6" id="general-position"><?php generalInfo($generalObj); ?></div>
-            </div>
-
-            <div class="row gx-0"><?= commandButton() ?></div>
-            <div class="row gx-0">
-                <div class="col-md-6" id="general_public_record-position">
-                    <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
-                    <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
-                </div>
-                <div class="col-md-6" id="general_log-position">
-                    <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
-                    <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
-                </div>
-                <div class="col-12" id="world_history-position">
-                    <div class="bg1 center s-border-tb"><b>중원 정세</b></div>
-                    <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
-                </div>
-            </div>
-            <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?></div>
-            <div class="message_input_form bg0 gx-0 row">
-                <div id="mailbox_list-col" class="col-6 col-md-2 d-grid">
-                    <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
-                    </select>
-                </div>
-                <div id="msg_input-col" class="col-12 col-md-8 d-grid">
-                    <input type="text" id="msg_input" maxlength="99" class="form-control">
-                </div>
-                <div id="msg_submit-col" class="col-6 col-md-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
-            </div>
-            <div id="message_board" class="row gx-0">
-                <div class="col-md-6 board_side bg0" id='public_talk_position'>
-                    <div class="board_header bg0">전체 메시지(최고99자)</div>
-                    <section class="public_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-                <div class="col-md-6 board_side bg0" id='national_talk_position'>
-                    <div class="board_header bg0">국가 메시지(최고99자)</div>
-                    <section class="national_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-
-
-
-
-                <div class="col-md-6 board_side bg0" id='private_talk_position'>
-                    <div class="board_header bg0">개인 메시지(최고99자)</div>
-                    <section class="private_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
-
-                <div class="col-md-6 board_side bg0" id='diplomacy_talk_position'>
-                    <div class="board_header bg0">외교 메시지(최고99자)</div>
-                    <section class="diplomacy_message">
-                        <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
-                    </section>
-                </div>
             </div>
         </div>
-        <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?><?= banner() ?></div>
+        <div class="row gx-0">
+            <div class="col-md-6" id="nation-position"><?php myNationInfo($generalObj); ?></div>
+            <div class="col-md-6" id="general-position"><?php generalInfo($generalObj); ?></div>
+        </div>
+
+        <div class="row gx-0"><?= commandButton() ?></div>
+        <div class="row gx-0">
+            <div class="col-md-6" id="general_public_record-position">
+                <div class="bg1 center s-border-tb"><b>장수 동향</b></div>
+                <div id="general_public_record" style="text-align:left;"><?= formatHistoryToHTML(getGlobalActionLogRecent(15)) ?></div>
+            </div>
+            <div class="col-md-6" id="general_log-position">
+                <div class="bg1 center s-border-tb"><b>개인 기록</b></div>
+                <div id="general_log" style="text-align:left;"><?= formatHistoryToHTML(getGeneralActionLogRecent($me['no'], 15)) ?></div>
+            </div>
+            <div class="col-12" id="world_history-position">
+                <div class="bg1 center s-border-tb"><b>중원 정세</b></div>
+                <div id="world_history" colspan=2 style="text-align:left;"><?= formatHistoryToHTML(getGlobalHistoryLogRecent(15)) ?></div>
+            </div>
+        </div>
+        <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?></div>
+        <div class="message_input_form bg0 gx-0 row">
+            <div id="mailbox_list-col" class="col-6 col-md-2 d-grid">
+                <select id="mailbox_list" size="1" class="form-control bg-dark text-white">
+                </select>
+            </div>
+            <div id="msg_input-col" class="col-12 col-md-8 d-grid">
+                <input type="text" id="msg_input" maxlength="99" class="form-control">
+            </div>
+            <div id="msg_submit-col" class="col-6 col-md-2 d-grid"><button id="msg_submit" class="btn btn-primary">서신전달&amp;갱신</button></div>
+        </div>
+        <div id="message_board" class="row gx-0">
+            <div class="col-md-6 board_side bg0" id='public_talk_position'>
+                <div class="board_header bg0">전체 메시지(최고99자)</div>
+                <section class="public_message">
+                    <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="public">이전 메시지 불러오기</button></div>
+                </section>
+            </div>
+            <div class="col-md-6 board_side bg0" id='national_talk_position'>
+                <div class="board_header bg0">국가 메시지(최고99자)</div>
+                <section class="national_message">
+                    <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="national">이전 메시지 불러오기</button></div>
+                </section>
+            </div>
+
+
+
+
+            <div class="col-md-6 board_side bg0" id='private_talk_position'>
+                <div class="board_header bg0">개인 메시지(최고99자)</div>
+                <section class="private_message">
+                    <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="private">이전 메시지 불러오기</button></div>
+                </section>
+            </div>
+
+            <div class="col-md-6 board_side bg0" id='diplomacy_talk_position'>
+                <div class="board_header bg0">외교 메시지(최고99자)</div>
+                <section class="diplomacy_message">
+                    <div class="d-grid"><button type="button" class="load_old_message btn btn-secondary" data-msg_type="diplomacy">이전 메시지 불러오기</button></div>
+                </section>
+            </div>
+        </div>
+    </div>
+    <div class="row toolbars gx-0"><?= allButton($gameStor->npcmode == 1) ?><?= banner() ?></div>
     </div>
     <?php
     if ($con == 1) {
diff --git a/hwe/scss/main.scss b/hwe/scss/main.scss
index 35b898da..8ff27e08 100644
--- a/hwe/scss/main.scss
+++ b/hwe/scss/main.scss
@@ -78,7 +78,7 @@ body {
 @include media-breakpoint-up(md) {
     #map_view {
         grid-template-columns: 700px 300px;
-        grid-template-rows: 520px 130px auto;
+        grid-template-rows: 520px 130px;
     }
 
     #mapZone {
@@ -93,18 +93,20 @@ body {
     }
 
 
-    #routeButtons {
-        grid-column: 1 / 3;
-        grid-row: 3 / 4;
-    }
-
-    #reservedCommandList {
+    #reservedCommandZone {
         width: 300px;
         grid-column: 2 / 3;
         grid-row: 1 / 3;
         position: relative;
     }
 
+    #actionMiniPlate{
+        position: absolute;
+        right: 0;
+        bottom: 1em;
+        width: 290px;
+    }
+
     .commandPad {
         position: absolute;
         z-index: 7;
@@ -170,6 +172,7 @@ body {
         display: grid;
         grid-template-columns: repeat(5, 1fr);
         padding: 0;
+        gap: 1px;
     }
 
     .toolbars>.buttonPlate {
@@ -217,17 +220,15 @@ body {
     }
 
 
-    #reservedCommandList {
+    #reservedCommandZone {
         grid-column: 1 / 2;
         grid-row: 2 / 3;
     }
 
-    #routeButtons {
-        grid-column: 1 / 2;
-        grid-row: 3 / 4;
+    #actionMiniPlate{
+        margin-bottom: 0.5em;
     }
 
-
     #cityInfo {
         grid-column: 1 / 2;
         grid-row: 4 / 5;
diff --git a/hwe/ts/ReservedCommand.vue b/hwe/ts/ReservedCommand.vue
index 81593a8e..abb672dc 100644
--- a/hwe/ts/ReservedCommand.vue
+++ b/hwe/ts/ReservedCommand.vue
@@ -434,8 +434,8 @@ export default defineComponent({
 
     return {
       maxTurn,
-      flippedMaxTurn: 18,
-      viewMaxTurn: 18,
+      flippedMaxTurn: 16,
+      viewMaxTurn: 16,
       maxPushTurn,
       commandList,
       serverNow: formatTime(serverNowObj, "HH:mm:ss"),