devsam/core
3
6
Fork 1
Code Issues 60 Pull Requests Releases 1 Wiki Activity

misc: 갱신/로비로 버튼 위치 이동

Browse Source
This commit is contained in:
Hide_D
2021-12-04 00:10:41 +09:00
parent 932afec74a
commit c02bc26799
3 changed files with 90 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/index.php
+75 -65
View File
@@ -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) {
hwe/scss/main.scss
+13 -12
View File
@@ -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;
hwe/ts/ReservedCommand.vue
+2 -2
View File
@@ -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"),