Skip to content

C
check
Commit deb21e90 by Takumi Imai
Options

Merge branch 'feature/1.0_check_web_dev_50312' into 'feature/1.0_check_web_dev' 

Feature/1.0 check web dev 50312

See merge request !40
parents 93bb0513 e89a162e
Showing with 36 additions and 34 deletions
abweb/common/js/constant.js
...@@ -19,7 +19,7 @@ CONSTANT.SORT_TYPE = { ...@@ -19,7 +19,7 @@ CONSTANT.SORT_TYPE = {
CONSTANT.PAGE_NAME = { CONSTANT.PAGE_NAME = {
DASHBOARD: 'dashboard', DASHBOARD: 'dashboard',
OPERATION_LIST: 'operationList', OPERATION_LIST: 'operationList',
FOOTER: 'main-footer.html', FOOTER: 'mainFooter.html',
DEFAULT: 'index.html', DEFAULT: 'index.html',
LOGIN: './login.html', LOGIN: './login.html',
}; };
......
abweb/html/common/header.html
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
</a> </a>
<div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile"> <div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
<h6 class="dropdown-header" id="dspLoginId" ></h6> <h6 class="dropdown-header" id="dspLoginId" ></h6>
<a class="dropdown-item " href="account-setting.html" > <a class="dropdown-item " href="accountSetting.html" >
<img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting"> <img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
<span class="lang" style=" color: #6c757d;" lang="account_setting"></span> <span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
</a> </a>
......
abweb/html/dashboard.html
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/header/header.js"></script> <script type="text/javascript" src="../js/header/header.js"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script> <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script> <script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
......
abweb/html/index.html
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../js/operationList/operationList.js?__UPDATEID__"></script> <script src="../js/operationList/operationList.js?__UPDATEID__"></script>
<script src="../js/dashboardSetting/dashboard-setting.js?__UPDATEID__"></script> <script src="../js/dashboardSetting/dashboardSetting.js?__UPDATEID__"></script>
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script> <script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script> <script src="../js/topPage/topPage.js?__UPDATEID__"></script>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<div></div> <div></div>
<h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang alignCenter_header" data-msg="dashboardHeaderTitle"></h1> <h1 class="fs-10 font-weight-bold mb-0 text-white multi-lang alignCenter_header" data-msg="dashboardHeaderTitle"></h1>
<div class="d-flex align-items-center"> <div class="d-flex align-items-center">
<a href="javascript:CHK.goUrlWithCurrentParams('dashboard-setting.html');" class="nav-link text-white lht-0 p-1 mr-2"> <a href="javascript:CHK.goUrlWithCurrentParams('dashboardSetting.html');" class="nav-link text-white lht-0 p-1 mr-2">
<img class="icon" src="../img/dashboard/icon_dashboard_setting.svg" alt=""> <img class="icon" src="../img/dashboard/icon_dashboard_setting.svg" alt="">
<span class="d-none d-md-inline fs-10 align-middle multi-lang" data-msg="buttonDashboardSetting"></span> <span class="d-none d-md-inline fs-10 align-middle multi-lang" data-msg="buttonDashboardSetting"></span>
</a> </a>
......
abweb/html/pickup.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<!-- main js --> <!-- main js -->
<script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/operationList/operationList.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboardSetting.js"></script>
<script type="text/javascript" src="../js/dashboard/dashboard.js"></script> <script type="text/javascript" src="../js/dashboard/dashboard.js"></script>
<script src="/abweb/common/js/header.js?__UPDATEID__"></script> <script src="/abweb/common/js/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
......
abweb/html/push-message-detail.html → abweb/html/pushMessageDetail.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageDetail/push-message-detail.js"></script> <script type="text/javascript" src="../js/pushMessageDetail/pushMessageDetail.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
......
abweb/html/push-message-list.html → abweb/html/pushMessageList.html
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/header/header.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/pushMessageList/push-message-list.js"></script> <script type="text/javascript" src="../js/pushMessageList/pushMessageList.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
...@@ -37,12 +37,13 @@ ...@@ -37,12 +37,13 @@
<body> <body>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- message list --> <!-- message list -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- message --> <!-- message -->
<ul class="card-list message-list p-0" id="messageList"> <ul class="card-list message-list p-0" id="messageList">
<li class="card mb-2 not-found d-none"> <li class="card mb-2 not-found d-none">
......
abweb/html/send-message.html → abweb/html/sendMessage.html
...@@ -25,10 +25,10 @@ ...@@ -25,10 +25,10 @@
<script src="../common/js/constant.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="../js/operationSelect/operation-select.js"></script> <script type="text/javascript" src="../js/operationSelect/operationSelect.js"></script>
<script type="text/javascript" src="../js/notification-content/notification-content.js"></script> <script type="text/javascript" src="../js/notificationContent/notificationContent.js"></script>
<script type="text/javascript" src="../js/template/template.js"></script> <script type="text/javascript" src="../js/template/template.js"></script>
<script type="text/javascript" src="../js/sendMessage/send-message.js"></script> <script type="text/javascript" src="../js/sendMessage/sendMessage.js"></script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
...@@ -39,12 +39,13 @@ ...@@ -39,12 +39,13 @@
<body> <body>
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- send message --> <!-- send message -->
<main> <main>
<div class="container-wrap"> <div class="container-wrap">
<!-- header -->
<div id="includedHeader"></div>
<div id="includedMainTitle"></div>
<!-- content --> <!-- content -->
<div class="py-2"> <div class="py-2">
<div class="row"> <div class="row">
......
abweb/js/dashboard/dashboard.js
...@@ -174,14 +174,14 @@ DASHBOARD.goPickup = function (pickupId) { ...@@ -174,14 +174,14 @@ DASHBOARD.goPickup = function (pickupId) {
/** Direct to Message list screen */ /** Direct to Message list screen */
DASHBOARD.goMessageList = function () { DASHBOARD.goMessageList = function () {
COMMON.goUrlWithCurrentParams('push-message-list.html', {}); COMMON.goUrlWithCurrentParams('pushMessageList.html', {});
}; };
/** /**
* Direct to send message screen * Direct to send message screen
*/ */
DASHBOARD.goSendMessage = function () { DASHBOARD.goSendMessage = function () {
COMMON.goUrlWithCurrentParams('send-message.html', {}); COMMON.goUrlWithCurrentParams('sendMessage.html', {});
}; };
/** /**
......
abweb/js/notification-content/notification-content.js → abweb/js/notificationContent/notificationContent.js
/** /**
* Operation Select js in operation-select.html * Operation Select js in operationSelect.html
* *
* @since 1.0 check web * @since 1.0 check web
*/ */
......
abweb/js/operationSelect/operation-select.js → abweb/js/operationSelect/operationSelect.js
/** /**
* Operation Select js in operation-select.html * Operation Select js in operationSelect.html
* *
* @since 1.0 check web * @since 1.0 check web
*/ */
......
abweb/js/pdfPrint/pdfPrint.js
...@@ -14,7 +14,7 @@ PP.loadCommon = function() { ...@@ -14,7 +14,7 @@ PP.loadCommon = function() {
I18N.initi18n(); I18N.initi18n();
HEADER.init(); HEADER.init();
}); });
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() { $("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
I18N.initi18n(); I18N.initi18n();
}); });
} }
......
abweb/js/pushMessageDetail/push-message-detail.js → abweb/js/pushMessageDetail/pushMessageDetail.js
...@@ -26,7 +26,7 @@ PushMessageDetail.init = function() { ...@@ -26,7 +26,7 @@ PushMessageDetail.init = function() {
}, },
{ {
titleLang: 'messageListTitle', titleLang: 'messageListTitle',
href: 'push-message-list.html', href: 'pushMessageList.html',
}, },
{ {
titleLang: 'messageDetail', titleLang: 'messageDetail',
......
abweb/js/pushMessageList/push-message-list.js → abweb/js/pushMessageList/pushMessageList.js
/** /**
* Push Message List JS in push-message-list.html * Push Message List JS in pushMessageList.html
* @since cms:1.4.3.2&1.4.3.3 web:1.0 * @since cms:1.4.3.2&1.4.3.3 web:1.0
*/ */
var PushMessageList = {}; var PushMessageList = {};
...@@ -48,7 +48,7 @@ PushMessageList.getMessageList = function (callback) { ...@@ -48,7 +48,7 @@ PushMessageList.getMessageList = function (callback) {
* @param {string} pushMessageId * @param {string} pushMessageId
*/ */
PushMessageList.clickMessage = function(pushMessageId) { PushMessageList.clickMessage = function(pushMessageId) {
COMMON.goUrlWithCurrentParams('push-message-detail.html', {pushMessageId: pushMessageId}); COMMON.goUrlWithCurrentParams('pushMessageDetail.html', {pushMessageId: pushMessageId});
} }
/** /**
......
abweb/js/reportList/reportList.js
...@@ -15,7 +15,7 @@ RL.loadCommon = function() { ...@@ -15,7 +15,7 @@ RL.loadCommon = function() {
I18N.initi18n(); I18N.initi18n();
HEADER.init(); HEADER.init();
}); });
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() { $("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
I18N.initi18n(); I18N.initi18n();
}); });
} }
......
abweb/js/sendMessage/send-message.js → abweb/js/sendMessage/sendMessage.js
/** /**
* Send Message js in send-message.html * Send Message js in sendMessage.html
* *
* @since 1.0 check web * @since 1.0 check web
*/ */
......
abweb/js/setting/settings.js
...@@ -141,7 +141,7 @@ SETTINGS.initScreen = function() { ...@@ -141,7 +141,7 @@ SETTINGS.initScreen = function() {
I18N.initi18n(); I18N.initi18n();
HEADER.init(); HEADER.init();
}); });
$("#includedConfirmModal").load("../html/common/confirm-modal.html", function() { $("#includedConfirmModal").load("../html/common/confirmModal.html", function() {
I18N.initi18n(); I18N.initi18n();
}); });
// Login ID // Login ID
......
abweb/js/template/template.js
...@@ -27,7 +27,7 @@ TEMPLATE.loadHearder = function(elmentId) { ...@@ -27,7 +27,7 @@ TEMPLATE.loadHearder = function(elmentId) {
* @param {*} changeCallback - callback when setting changed * @param {*} changeCallback - callback when setting changed
*/ */
TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) { TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) {
$(elmentId).load("dashboard-setting.html", function() { $(elmentId).load("dashboardSetting.html", function() {
DashboardSetting.init(changeCallback); DashboardSetting.init(changeCallback);
I18N.initi18n(); I18N.initi18n();
}); });
...@@ -35,14 +35,14 @@ TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) { ...@@ -35,14 +35,14 @@ TEMPLATE.loadDashboardSetting = function(elmentId, changeCallback) {
/** Template load confirm model */ /** Template load confirm model */
TEMPLATE.loadConfirmModal = function(elmentId) { TEMPLATE.loadConfirmModal = function(elmentId) {
$(elmentId).load("../html/common/confirm-modal.html", function() { $(elmentId).load("../html/common/confirmModal.html", function() {
I18N.initi18n(); I18N.initi18n();
}); });
} }
/** Template load operation select */ /** Template load operation select */
TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) { TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) {
$(elmentId).load("operation-select.html", function() { $(elmentId).load("operationSelect.html", function() {
OperationSelect.init(selectCallback); OperationSelect.init(selectCallback);
I18N.initi18n(); I18N.initi18n();
}); });
...@@ -59,7 +59,7 @@ TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) { ...@@ -59,7 +59,7 @@ TEMPLATE.loadOperationSelect = function(elmentId, selectCallback) {
/** Template load notification content*/ /** Template load notification content*/
TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) { TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
$(elmentId).load("notification-content.html", function() { $(elmentId).load("notificationContent.html", function() {
NotificationSelect.init(selectCallback); NotificationSelect.init(selectCallback);
I18N.initi18n(); I18N.initi18n();
}); });
...@@ -72,9 +72,9 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) { ...@@ -72,9 +72,9 @@ TEMPLATE.loadNotificationSelect = function(elmentId, selectCallback) {
* @param {Array} navs - array nav items (titleLang, href) * @param {Array} navs - array nav items (titleLang, href)
*/ */
TEMPLATE.loadMainNavsTitle = function(elmentId, titleLang, navs, completeCallback) { TEMPLATE.loadMainNavsTitle = function(elmentId, titleLang, navs, completeCallback) {
var titleHtmlPath = '../common/main-title.html'; var titleHtmlPath = '../common/mainTitle.html';
if (navs) { if (navs) {
titleHtmlPath = '../common/main-nav-title.html'; titleHtmlPath = '../common/mainNavTitle.html';
} }
$(elmentId).load(titleHtmlPath , function(data) { $(elmentId).load(titleHtmlPath , function(data) {
$(elmentId).replaceWith(data); $(elmentId).replaceWith(data);
......
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