Skip to content

I
iwl-live
Commit 2ef6c9e8 authored by Antonio.Suerte's avatar Antonio.Suerte
Browse files
Options

Timezone (UI)

parent 0190fb92
Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 5 deletions
css/user.css
View file @ 2ef6c9e8
......@@ -2186,7 +2186,49 @@ article div.article-heading{
.show_less:hover{
text-shadow: 2px 2px 6px rgba(0, 51, 102, 0.611764705882353);;
}
/* merchant list */
.merchant_cont{
position: relative;
}
.merchant_cont li{
position: relative;
}
.merchant_cont li a img{
/*width: 100%;
max-width: 500px;*/
/*min-height: 125px;*/
width: 100%;
/* max-width: 500px; */
/* min-height: 70px; */
height: 70px;
}
@media (max-width: 1230px){
/*.merchant_img{
min-height: 125px;
}
.link_cont{
min-height: 133px !important;
padding: 55px !important;
}*/
}
.merchant_cont .link_cont{
/*min-height: 150px;*/
/*min-height: 74px;
width: 100%;
border: solid gray 1px;
margin: auto;
padding: 25px;
text-align: center;*/
min-height: 70px;
height: ;
/* position: relative; */
/* width: 100%; */
border: solid gray 1px;
display: flex;
justify-content: center;
align-items: center;
}
/* with new tag*/
.iwl-tag{
......@@ -2251,6 +2293,10 @@ article div.article-heading{
max-width: 70px;
z-index: 9999;
}
/*.link_cont{
min-height: 109px !important;
padding: 40px !important;
}*/
}
/* parent div */
......@@ -2399,3 +2445,49 @@ div#loginAPI table td {
display: table;
clear: both;
}
/* pagination */
.iwl-pagination a {
color: black;
float: left;
padding: 8px 16px;
text-decoration: none;
}
.iwl-pagination a.active {
background-color: #036;
color: white;
}
.iwl-pagination{
margin: auto;
width: 45%;
}
@media (max-width: 435px){
.iwl-pagination{
margin: auto;
width: 77%;
}
}
/* timezone display*/
.time_cont{
position: absolute;
z-index: 999;
right: 0;
background: #003368;
bottom: 0px;
padding: 2px 8px;
}
@media (max-width: 435px){
.time_cont{
position: fixed;
}
}
.time_cont p{
color: white;
font-family: Raleway, 'Noto Sans', sans-serif;
font-size: 12px;
margin: 0px;
}
\ No newline at end of file
en/template/base_nav.php
View file @ 2ef6c9e8
......@@ -71,4 +71,10 @@ $header -> action();
<input type="hidden" id="user_id" value="<?php $header -> echoMail(); ?>" name="user_id" />
<?php $header -> echoUnreadNews();?>
</header>
<div class="time_cont">
<p>
<input type="hidden" value="<?=SYSTEM_TIMEZONE?>" id="ui_st_timezone_name"/>
<span id="ui_st_timezone"></span>
</p>
</div>
<!-- /ナビゲーション -->
id/template/base_nav.php
View file @ 2ef6c9e8
......@@ -69,4 +69,10 @@ $header -> action();
</div>
<?php $header -> echoUnreadNews();?>
</header>
<div class="time_cont">
<p>
<input type="hidden" value="<?=SYSTEM_TIMEZONE?>" id="ui_st_timezone_name"/>
<span id="ui_st_timezone"></span>
</p>
</div>
<!-- /ナビゲーション -->
ja/template/base_nav.php
View file @ 2ef6c9e8
......@@ -60,4 +60,10 @@ $header -> action();
<input type="hidden" id="user_id" value="<?php $header -> echoMail(); ?>" name="user_id" />
<?php $header -> echoUnreadNews();?>
</header>
<div class="time_cont">
<p>
<input type="hidden" value="<?=SYSTEM_TIMEZONE?>" id="ui_st_timezone_name"/>
<span id="ui_st_timezone"></span>
</p>
</div>
<!-- /ナビゲーション -->
js/common.js
View file @ 2ef6c9e8
......@@ -77,8 +77,24 @@ var menu = $('#navbar'),
$(function() {
$('.toggle-menu').click(function(){
$('aside ul').toggle();
});
});
})
let timeZoneHiddenInput = document.querySelector("#ui_st_timezone_name");
if(timeZoneHiddenInput !== null){
let currentTimeSpanner = document.querySelector("#ui_st_timezone");
let systemTimeZone = timeZoneHiddenInput.value;
setInterval(function(){
let currentDate = new Date();
let dateString = currentDate.toLocaleString("ja-JP", {
"timeZone" : systemTimeZone
});
currentTimeSpanner.innerHTML = `${dateString} GMT +9`;
}, 1000)
}
})
/**
......
sc/template/base_nav.php
View file @ 2ef6c9e8
......@@ -60,4 +60,10 @@ $header -> action();
<input type="hidden" id="user_id" value="<?php $header -> echoMail(); ?>" name="user_id" />
<?php $header -> echoUnreadNews();?>
</header>
<div class="time_cont">
<p>
<input type="hidden" value="<?=SYSTEM_TIMEZONE?>" id="ui_st_timezone_name"/>
<span id="ui_st_timezone"></span>
</p>
</div>
<!-- /ナビゲーション -->
system/lib/config.php
View file @ 2ef6c9e8
......@@ -36,6 +36,7 @@ define('CONFIGRATION_FILE_PATH', LIBRARIES . CONFIGRATION_FILE_NAME); // 設
define('CREDENTIALS_FILE_PATH', LIBRARIES . CREDENTIALS_FILE_NAME); // 設定ファイルのファイルパス
define('SYSTEM_DOCUMENT', SYSTEM_TEMPLATE_PATH . 'documents/'); // ドキュメント群のルート
define('SYSTEM_TIMEZONE', 'Asia/Tokyo'); // デフォルトのタイムゾーン
define('SYSTEM_DOCUMENT_DOPOSIT', SYSTEM_PATH . 'documents/deposit/'); // 入金アップロードファイル
define('SYSTEM_DOCUMENT_DOPOSIT_ERROR', SYSTEM_PATH . 'documents/deposit/error/'); // 入金アップロードエラーファイル
......@@ -86,7 +87,8 @@ if(count($uri) >= 2 && $isAdmin==FALSE) {
define('MAIL_TEMPLATES', SYSTEM_PATH . 'documents/mail_template/'); // メールテンプレート
}
date_default_timezone_set(SYSTEM_TIMEZONE);
set_time_limit(0);
//-----------------------------------------------------------------------//
// コアファイル群インクルード
//-----------------------------------------------------------------------//
......
system/lib/core/control_keys.php
View file @ 2ef6c9e8
......@@ -283,8 +283,7 @@ define('VAL_STR_FLAT3_PRINT','flatprint');
define('VAL_STR_FLAT3_MAILSEND','flatsend');
define('VAL_STR_FLAT3_KYC','flat3_kyc');
define('TYPE_NOTICE_NOT_UNLIMITED', 'notice_unlimit');
date_default_timezone_set('Asia/Tokyo');
set_time_limit(0);
//SDpay test
define("VAL_SDPAY_URL","https://wd.sdsystem.hk/webapi/customer.asmx?WSDL");
define("VAL_SDPAY_KEY1","xBrtAdmjlac=");
......
tc/template/base_nav.php
View file @ 2ef6c9e8
......@@ -59,4 +59,10 @@ $header -> action();
<input type="hidden" id="user_id" value="<?php $header -> echoMail(); ?>" name="user_id" />
<?php $header -> echoUnreadNews();?>
</header>
<div class="time_cont">
<p>
<input type="hidden" value="<?=SYSTEM_TIMEZONE?>" id="ui_st_timezone_name"/>
<span id="ui_st_timezone"></span>
</p>
</div>
<!-- /ナビゲーション -->
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment