Skip to content

C
check
Commit 1379d2c6 by NGUYEN THI MY DUYEN
Options

update index.html

parent faa0e2e7
Showing with 138 additions and 81 deletions
abweb/common/css/newdash/app.css
...@@ -20689,7 +20689,7 @@ button { ...@@ -20689,7 +20689,7 @@ button {
.type-icon .report:before{ .type-icon .report:before{
content: ''; content: '';
background-image: url("../common/img/type_icon_report.svg"); background-image: url("../../../common/img/type_icon_report.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20699,7 +20699,7 @@ button { ...@@ -20699,7 +20699,7 @@ button {
} }
.type-icon .questionary:before{ .type-icon .questionary:before{
content: ''; content: '';
background-image: url("../common/img/type_icon_questionary.svg"); background-image: url("../../../common/img/type_icon_questionary.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20709,7 +20709,7 @@ button { ...@@ -20709,7 +20709,7 @@ button {
} }
.type-icon .inspection:before{ .type-icon .inspection:before{
content: ''; content: '';
background-image: url("../common/img/type_icon_inspection.svg"); background-image: url("../../../common/img/type_icon_inspection.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
...@@ -20719,7 +20719,7 @@ button { ...@@ -20719,7 +20719,7 @@ button {
} }
.type-icon .proccess:before{ .type-icon .proccess:before{
content: ''; content: '';
background-image: url("../common/img/type_icon_proccess.svg"); background-image: url("../../../common/img/type_icon_proccess.svg");
background-size: contain; background-size: contain;
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
......
abweb/common/img/type_icon_questionary.svg deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?><svg id="_レイヤー_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 119.14 125"><defs><style>.cls-1{fill:#a5d6a7;}</style></defs><g id="_レイヤー_1-2"><g><path class="cls-1" d="M48.17,121.12H9.29c-2.48,0-4.65-.93-6.5-2.79-1.86-1.86-2.79-4.03-2.79-6.5V21.68c0-2.48,.8-4.65,2.4-6.5,1.6-1.86,2.97-2.79,4.1-2.79h31.29c.72-3.61,2.5-6.58,5.34-8.91C45.97,1.16,49.25,0,52.97,0c3.72,0,7,1.16,9.83,3.48,2.84,2.32,4.62,5.29,5.34,8.91h31.29c2.48,0,4.65,.93,6.5,2.79,1.86,1.86,2.79,4.03,2.79,6.5v31.44h-9.29V21.68h-16.42v10.84c0,2.58-.9,4.78-2.71,6.58-1.81,1.81-4,2.71-6.58,2.71H35c-2.58,0-4.78-.9-6.58-2.71-1.81-1.81-2.71-4-2.71-6.58v-10.84H9.29V111.82H48.17v9.29Zm-13.4-55.34l16.51-16.51c.45-.45,.98-.67,1.59-.64,.61,.03,1.14,.27,1.59,.72s.68,1,.68,1.63-.23,1.17-.68,1.63l-18.1,18.1c-.45,.45-.98,.68-1.59,.68s-1.14-.23-1.59-.68l-8.94-8.94c-.45-.45-.67-1-.64-1.63,.03-.63,.27-1.17,.72-1.63,.45-.45,1-.68,1.63-.68,.63,0,1.17,.23,1.63,.68l7.2,7.27Zm0,26l16.51-16.51c.45-.45,.98-.67,1.59-.64,.61,.03,1.14,.27,1.59,.72s.68,1,.68,1.63-.23,1.17-.68,1.63l-18.1,18.1c-.45,.45-.98,.68-1.59,.68s-1.14-.23-1.59-.68l-8.94-8.94c-.45-.45-.67-1-.64-1.63,.03-.63,.27-1.17,.72-1.63,.45-.45,1-.68,1.63-.68,.63,0,1.17,.23,1.63,.68l7.2,7.27ZM55.76,21.06c1.76,0,3.23-.59,4.41-1.78,1.19-1.19,1.78-2.66,1.78-4.41s-.59-3.23-1.78-4.41c-1.19-1.19-2.66-1.78-4.41-1.78s-3.23,.59-4.41,1.78c-1.19,1.19-1.78,2.66-1.78,4.41s.59,3.23,1.78,4.41c1.19,1.19,2.66,1.78,4.41,1.78Z"/><g><path class="cls-1" d="M113.09,82.66l-11.61-11.61,4.74-4.74c.87-.87,2.02-1.31,3.43-1.31s2.56,.44,3.43,1.31l4.74,4.74c.87,.87,1.31,2.02,1.31,3.43s-.44,2.56-1.31,3.43l-4.74,4.74Z"/><path class="cls-1" d="M59.14,122.55v-7.19c0-.65,.11-1.25,.33-1.8,.22-.54,.6-1.09,1.14-1.63l33.84-33.84,11.61,11.61-33.84,33.84c-.54,.54-1.09,.93-1.63,1.14-.54,.22-1.14,.33-1.8,.33h-7.19c-.65,0-1.23-.25-1.72-.74-.49-.49-.74-1.06-.74-1.72Z"/></g></g></g></svg>
\ No newline at end of file
abweb/common/js/header.js 0 → 100644
/**
* header js for index.
* ※Code is written mainly for dashboard and operationList.
*
* @since cms:1.4.3.2&1.4.3.3 web:1.0
*/
var HEADER = {};
/** Direct home page setting */
HEADER.goToHomePage = function (pageId) {
DashboardSetting.getSettingData(function (settings) {
if(settings.dashboardHome == 1)
{
HEADER.goDashboard();
}
else
{
HEADER.goOperationList();
}
});
}
/**
* Go page of operationList
*/
HEADER.goOperationList = function () {
OL.init();
};
/**
* Go page of dashboard
*/
HEADER.goDashboard = function () {
COMMON.avwScreenMove("dashboard.html");
};
/**
* Initialize with any navigation
*
* @param {String} bottomNav
*/
HEADER.activeInitBottomNav = function (bottomNav) {
HEADER.inactiveAllBottomNav();
HEADER.activeBottomNav(bottomNav);
};
/**
* change inactive all footer bottom
*/
HEADER.inactiveAllBottomNav = function () {
let navs = document.getElementsByClassName('bottom-nav');
for (i = 0; i < navs.length; i++) {
navs[i].className = navs[i].className.replace('text-primary', 'text-secondary');
let img = navs[i].querySelector('img');
if (img && img.getAttribute('data-inactive-src')) {
img.src = img.getAttribute('data-inactive-src');
}
}
};
/**
* Change specific footer bottom to active.
*
* @param {String} bottomNavId
*/
HEADER.activeBottomNav = function (bottomNavId) {
let elm = $('#' + bottomNavId);
if (typeof elm !== 'object') {
console.log('HEADER.activeBottomNav:elm !== object:' + bottomNavId);
return;
}
elm.removeClass('text-secondary');
elm.addClass('text-primary');
let img = elm.find('img')[0];
if (img && img.getAttribute('data-src')) {
img.src = img.getAttribute('data-src');
}
};
\ No newline at end of file
abweb/html/index.html
...@@ -3,34 +3,36 @@ ...@@ -3,34 +3,36 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<title calss="multi-lang" data-msg="operationListTitle"></title>
<meta name="robots" content="index, follow">
<meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1"> <meta name="viewport" content="width=device-width,minimum-scale=1,initial-scale=1">
<meta name="description" content="A Book Check"> <!-- favicons -->
<link href="../common/img/favicon.ico" rel="icon">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/header.css"> <link href="../common/img/apple-touch-icon.png" rel="apple-touch-icon">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/footer.css"> <!-- main css -->
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/style.css"> <link rel="stylesheet" type="text/css" href="../common/css/newdash/app.css">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/app.css"> <link rel="stylesheet" type="text/css" href="../common/css/newdash/header.css">
<link rel="stylesheet" type="text/css" href="../common/css/appCommon/fontawesome_relative_path.css"> <link rel="stylesheet" type="text/css" href="../common/css/newdash/style.css">
<!-- vender css -->
<script src="../common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script> <link rel="stylesheet" type="text/css" href="../common/css/newdash/fontawesome_relative_path.css">
<script src="../common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<!-- <script src="../common/js/web/common.js?__UPDATEID__"></script> <script type="text/javascript" src="/abweb/common/js/jquery/jquery-3.6.0.min.js?__UPDATEID__"></script>
<script src="../common/js/web/avweb.js?__UPDATEID__"></script> --> <script type="text/javascript" src="/abweb/common/js/jquery/jquery-ui.min.js?__UPDATEID__"></script>
<script src="../common/js/constant.js?__UPDATEID__"></script> <script type="text/javascript" src="/abweb/common/js/web/i18n.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../js/operationList/operationList.js?__UPDATEID__"></script> <script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script> <script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../js/dashboardSetting/check-dashboard-setting.js?__UPDATEID__"></script> <script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<script src="../common/js/footer.js?__UPDATEID__"></script> <script type="text/javascript" src="../js/dashboardSetting/dashboard-setting.js"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></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/topPage/topPage.js"></script>
<script type="text/javascript" src="../js/operationList/operationList.js"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
</head> </head>
<body onload="TOP.init();" style="position: relative; margin-top: 53px;">
<body> <body>
<!-- header --> <!-- header -->
...@@ -75,59 +77,33 @@ ...@@ -75,59 +77,33 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group p-2 mb-0">
<label>終了日</label>
<div class="input-group date" id="datetimepicker2" data-target-input="nearest">
<input type="text" name="end" class="form-control form-control-sm datetimepicker-input" data-target="#datetimepicker2" placeholder="選択" id="searchEndDate">
<div class="input-group-append" data-target="#datetimepicker2" data-toggle="datetimepicker">
<div class="input-group-text py-1 px-2">
<img src="../common/img/icon_calendar.svg" alt="カレンダー" class="calendar-icon">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="mask hide"></div>
<!--ソート--> </div>
<div class="col-4 col-md-5 col-lg-6 text-right"> <div class="dropdown">
<a href="#" class="text-decoration-none py-2 lht-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-120, 0"> <a href="#" class="mx-1" id="dropdown-term" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" data-offset="-120, 0">
<img class="icon" src="../img/operationList/icon_swap.svg"> <img class="serarch-icon" src="../common/img/icon_swap.svg" alt="並び替え" data-toggle="tooltip" data-placement="bottom" title="並び替え">
<span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelSort"></span> </a>
</a> <div class="dropdown-menu dropdown-menu-right sort" data-animation="true" aria-labelledby="dropdownMenuButton">
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton"> <a class="dropdown-item" href="#" data-sort="0" onclick="OL.changeSortType(this);">作業名順</a>
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortName" data-sort="0" onclick="OL.changeSortType(this);"></a> <a class="dropdown-item active" href="#" data-sort="1" id="defaultSort" onclick="OL.changeSortType(this);">新しい順</a>
<a class="dropdown-item sort-type active multi-lang" data-msg="labelSortNew" data-sort="1" id="defaultSort" onclick="OL.changeSortType(this);"></a> <a class="dropdown-item" href="#" data-sort="2" onclick="OL.changeSortType(this);">古い順</a>
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortOld" data-sort="2" onclick="OL.changeSortType(this);"></a> <a class="dropdown-item" href="#" data-sort="4" onclick="OL.changeSortType(this);">閲覧日順</a>
<a class="dropdown-item sort-type multi-lang" data-msg="labelSortOpen" data-sort="4" onclick="OL.changeSortType(this);"></a>
</div>
<a href="javascript:OL.resetSearch();" class="text-decoration-none py-2 lht-0 d-inline-block ml-3">
<img class="icon" src="../img/operationList/icon_clear.svg">
<span class="d-none d-md-inline text-dark fs-10 align-middle multi-lang" data-msg="labelReset" lnag="labelReset"></span>
</a>
</div> </div>
</div> </div>
</nav> <a href="javascript:OL.resetSearch();" class="mx-1">
<img class="serarch-icon" src="../common/img/icon_close.svg" alt="クリア" data-toggle="tooltip" data-placement="bottom" title="検索条件をクリア">
<!--一覧表示-->
<section>
<table class="table">
<thead>
<tr>
<th class="multi-lang" data-msg="headerItemName"></th>
<th class="d-none d-md-table-cell multi-lang" data-msg="headerStartDate"></th>
<th class="d-none d-md-table-cell multi-lang" data-msg="headerEndDate"></th>
</tr>
</thead>
<tbody id="operationTable">
</tbody>
</table>
</section>
</main>
</section>
</section>
<section id="dashboard" class="page-content" style="display: none;">
<header>
<nav class="navbar navbar-dark bg-primary position-fixed fixed-top w-100">
<div></div>
<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">
<a href="javascript:CHK.goUrlWithCurrentParams('dashboard-setting.html');" class="nav-link text-white lht-0 p-1 mr-2">
<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>
</a> </a>
</div> </div>
</nav> </nav>
...@@ -176,10 +152,9 @@ ...@@ -176,10 +152,9 @@
<!--ローディング--> <!--ローディング-->
<div id="check_loading" style="display:none; position: relative; overflow:hidden;"> <div id="check_loading" style="display:none; position: relative; overflow:hidden;">
<p id="checkLoadingMessage"></p> <p id="checkLoadingMessage"></p>
<div id="checkLoadingImage"><img src='${check}images/transferLoading.gif' /></div> <div id="checkLoadingImage"><img src='######' /></div>
</div> </div>
</body> </body>
</html> </html>
\ No newline at end of file
abweb/js/topPage/topPage.js
...@@ -16,6 +16,8 @@ $(document).ready(function () { ...@@ -16,6 +16,8 @@ $(document).ready(function () {
//setting msg of html //setting msg of html
COMMON.updateLang(); COMMON.updateLang();
TOP.init();
}); });
/** /**
...@@ -23,7 +25,7 @@ $(document).ready(function () { ...@@ -23,7 +25,7 @@ $(document).ready(function () {
*/ */
TOP.init = function () { TOP.init = function () {
COMMON.showLoading(); COMMON.showLoading();
FOOTER.initFooter(); //app should get data after initFooter HEADER.goToHomePage(); //app should get data after initFooter
COMMON.closeLoading(); COMMON.closeLoading();
}; };
......
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