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

토너먼트 하이라이트와 토너먼트 액티브를 따로 변수로 저장

Browse Source
This commit is contained in:
sars
2022-03-16 23:10:54 -07:00
parent 6782f2f01f
commit c6cbae145e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hwe/func_template.php
+1 -1
View File
@@ -168,7 +168,7 @@ function commandButton(array $opts = [])
$showSecret = false; $showSecret = false;
$permission = checkSecretPermission($me); $permission = checkSecretPermission($me);
$btnClassForTournament = $opts['btnClass']; $btnClassForTournament = $opts['btnClass'];
if ($opts['isTournamentActive']) { if ($opts['isTournamentApplicationOpen']) {
if ($btnClassForTournament != 'dropdown-item') { if ($btnClassForTournament != 'dropdown-item') {
$btnClassForTournament = 'toolbarButton2'; $btnClassForTournament = 'toolbarButton2';
} }
hwe/index.php
+4 -3
View File
@@ -88,7 +88,8 @@ $serverName = UniqueConst::$serverName;
$serverCnt = $gameStor->server_cnt; $serverCnt = $gameStor->server_cnt;
$auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction'); $auctionCount = $db->queryFirstField('SELECT count(`no`) FROM auction');
$isTournamentActive = $gameStor->tournament == 1; $isTournamentActive = $gameStor->tournament > 0;
$isTournamentApplicationOpen = $gameStor->tournament == 1;
$isBettingActive = $gameStor->tournament == 6; $isBettingActive = $gameStor->tournament == 6;
$myNationStatic = getNationStaticInfo($generalObj->getNationID()); $myNationStatic = getNationStaticInfo($generalObj->getNationID());
@@ -257,7 +258,7 @@ if (!$otherTextInfo) {
<div id="nation-position"><?php myNationInfo($generalObj); ?></div> <div id="nation-position"><?php myNationInfo($generalObj); ?></div>
<div id="general-position"><?php generalInfo($generalObj); ?></div> <div id="general-position"><?php generalInfo($generalObj); ?></div>
<div id="generalCommandButton" class="row gx-0"> <div id="generalCommandButton" class="row gx-0">
<div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentActive' => $isTournamentActive, 'isBettingActive' => $isBettingActive]) ?></div> <div class="buttonPlate bg2"><?= commandButton(['btnClass' => 'btn btn-sammo-nation', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?></div>
</div> </div>
</div> </div>
</div> </div>
@@ -357,7 +358,7 @@ if (!$otherTextInfo) {
국가 메뉴 국가 메뉴
</div> </div>
<ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems"> <ul class="dropdown-menu" aria-labelledby="navbarNation" id="navbarNationItems">
<?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentActive' => $isTournamentActive, 'isBettingActive' => $isBettingActive]) ?> <?= commandButton(['btnBegin' => '<li>', 'btnEnd' => '</li>', 'btnClass' => 'dropdown-item', 'isTournamentApplicationOpen' => $isTournamentApplicationOpen, 'isBettingActive' => $isBettingActive]) ?>
</ul> </ul>
</li> </li>
<li class="nav-item dropup"> <li class="nav-item dropup">