Skip to content

C
check
Commit 0d9c2c98 by Takumi Imai
Options

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

parents 49dc81bd 43194926
Showing with 116 additions and 34 deletions
abweb/common/css/appCommon/app.css
......@@ -6609,7 +6609,7 @@ pre code {
overflow-y: scroll
}
.container,.container-fluid,.container-lg,.container-md,.container-sm,.container-xl {
.container-wrap,.container-wrap-fluid,.container-wrap-lg,.container-wrap-md,.container-wrap-sm,.container-wrap-xl {
width: 100%;
padding-right: 15px;
padding-left: 15px;
......@@ -6618,25 +6618,25 @@ pre code {
}
@media (min-width: 576px) {
.container,.container-sm {
.container-wrap,.container-wrap-sm {
max-width:540px
}
}
@media (min-width: 768px) {
.container,.container-md,.container-sm {
.container-wrap,.container-wrap-md,.container-wrap-sm {
max-width:720px
}
}
@media (min-width: 992px) {
.container,.container-lg,.container-md,.container-sm {
.container-wrap,.container-wrap-lg,.container-wrap-md,.container-wrap-sm {
max-width:960px
}
}
@media (min-width: 1200px) {
.container,.container-lg,.container-md,.container-sm,.container-xl {
.container-wrap,.container-wrap-lg,.container-wrap-md,.container-wrap-sm,.container-wrap-xl {
max-width:1140px
}
}
......@@ -10430,7 +10430,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
padding: .5rem 1rem
}
.navbar,.navbar .container,.navbar .container-fluid,.navbar .container-lg,.navbar .container-md,.navbar .container-sm,.navbar .container-xl {
.navbar,.navbar .container-wrap,.navbar .container-wrap-fluid,.navbar .container-wrap-lg,.navbar .container-wrap-md,.navbar .container-wrap-sm,.navbar .container-wrap-xl {
display: flex;
flex-wrap: wrap;
align-items: center;
......@@ -10512,7 +10512,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
}
@media (max-width: 575.98px) {
.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl {
.navbar-expand-sm>.container-wrap,.navbar-expand-sm>.container-wrap-fluid,.navbar-expand-sm>.container-wrap-lg,.navbar-expand-sm>.container-wrap-md,.navbar-expand-sm>.container-wrap-sm,.navbar-expand-sm>.container-wrap-xl {
padding-right:0;
padding-left: 0
}
......@@ -10537,7 +10537,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
padding-left: .5rem
}
.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl {
.navbar-expand-sm>.container-wrap,.navbar-expand-sm>.container-wrap-fluid,.navbar-expand-sm>.container-wrap-lg,.navbar-expand-sm>.container-wrap-md,.navbar-expand-sm>.container-wrap-sm,.navbar-expand-sm>.container-wrap-xl {
flex-wrap: nowrap
}
......@@ -10556,7 +10556,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
}
@media (max-width: 767.98px) {
.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl {
.navbar-expand-md>.container-wrap,.navbar-expand-md>.container-wrap-fluid,.navbar-expand-md>.container-wrap-lg,.navbar-expand-md>.container-wrap-md,.navbar-expand-md>.container-wrap-sm,.navbar-expand-md>.container-wrap-xl {
padding-right:0;
padding-left: 0
}
......@@ -10581,7 +10581,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
padding-left: .5rem
}
.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl {
.navbar-expand-md>.container-wrap,.navbar-expand-md>.container-wrap-fluid,.navbar-expand-md>.container-wrap-lg,.navbar-expand-md>.container-wrap-md,.navbar-expand-md>.container-wrap-sm,.navbar-expand-md>.container-wrap-xl {
flex-wrap: nowrap
}
......@@ -10600,7 +10600,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
}
@media (max-width: 991.98px) {
.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl {
.navbar-expand-lg>.container-wrap,.navbar-expand-lg>.container-wrap-fluid,.navbar-expand-lg>.container-wrap-lg,.navbar-expand-lg>.container-wrap-md,.navbar-expand-lg>.container-wrap-sm,.navbar-expand-lg>.container-wrap-xl {
padding-right:0;
padding-left: 0
}
......@@ -10625,7 +10625,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
padding-left: .5rem
}
.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl {
.navbar-expand-lg>.container-wrap,.navbar-expand-lg>.container-wrap-fluid,.navbar-expand-lg>.container-wrap-lg,.navbar-expand-lg>.container-wrap-md,.navbar-expand-lg>.container-wrap-sm,.navbar-expand-lg>.container-wrap-xl {
flex-wrap: nowrap
}
......@@ -10644,7 +10644,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
}
@media (max-width: 1199.98px) {
.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl {
.navbar-expand-xl>.container-wrap,.navbar-expand-xl>.container-wrap-fluid,.navbar-expand-xl>.container-wrap-lg,.navbar-expand-xl>.container-wrap-md,.navbar-expand-xl>.container-wrap-sm,.navbar-expand-xl>.container-wrap-xl {
padding-right:0;
padding-left: 0
}
......@@ -10669,7 +10669,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
padding-left: .5rem
}
.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl {
.navbar-expand-xl>.container-wrap,.navbar-expand-xl>.container-wrap-fluid,.navbar-expand-xl>.container-wrap-lg,.navbar-expand-xl>.container-wrap-md,.navbar-expand-xl>.container-wrap-sm,.navbar-expand-xl>.container-wrap-xl {
flex-wrap: nowrap
}
......@@ -10692,7 +10692,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
justify-content: flex-start
}
.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl {
.navbar-expand>.container-wrap,.navbar-expand>.container-wrap-fluid,.navbar-expand>.container-wrap-lg,.navbar-expand>.container-wrap-md,.navbar-expand>.container-wrap-sm,.navbar-expand>.container-wrap-xl {
padding-right: 0;
padding-left: 0
}
......@@ -10710,7 +10710,7 @@ input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-
padding-left: .5rem
}
.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl {
.navbar-expand>.container-wrap,.navbar-expand>.container-wrap-fluid,.navbar-expand>.container-wrap-lg,.navbar-expand>.container-wrap-md,.navbar-expand>.container-wrap-sm,.navbar-expand>.container-wrap-xl {
flex-wrap: nowrap
}
......@@ -16643,7 +16643,7 @@ a.text-white:focus,a.text-white:hover {
size: a3
}
.container,body {
.container-wrap,body {
min-width: 992px!important
}
......
abweb/common/json/sys/conf.json
{
"apiUrl" : "http://localhost:8080/acms/{0}/abvapi",
"checkApiUrl" : "http://localhost:8080/acms/{0}/checkapi/web/",
"apiLoginUrl" : "http://localhost:8080/acms/nuabvapi",
"apiResourceDlUrl" : "http://localhost:8080/acms/{0}/dl",
"1apiUrl" : "https://chatdev2.agentec.jp/acms/{0}/abvapi",
"1checkApiUrl" : "https://chatdev2.agentec.jp/acms/{0}/checkapi/web/",
"1apiLoginUrl" : "https://chatdev2.agentec.jp/acms/nuabvapi",
"1apiResourceDlUrl" : "https://chatdev2.agentec.jp/acms/{0}/dl",
"1apiUrl" : "http://localhost:8080/acms/{0}/abvapi",
"1checkApiUrl" : "http://localhost:8080/acms/{0}/checkapi/web/",
"1apiLoginUrl" : "http://localhost:8080/acms/nuabvapi",
"1apiResourceDlUrl" : "http://localhost:8080/acms/{0}/dl",
"apiUrl" : "https://chatdev2.agentec.jp/acms/{0}/abvapi",
"checkApiUrl" : "https://chatdev2.agentec.jp/acms/{0}/checkapi/web/",
"apiLoginUrl" : "https://chatdev2.agentec.jp/acms/nuabvapi",
"apiResourceDlUrl" : "https://chatdev2.agentec.jp/acms/{0}/dl",
"bookShelfCount" : 15,
"bookListCount" : 15,
"screenlockTimeDefault" : 30,
......
abweb/html/account-Setting.html
......@@ -32,7 +32,7 @@
<!-- account setting -->
<main id="main">
<div class="container">
<div class="container-wrap">
<!-- title -->
<h1 class="fs-14 font-weight-bold pt-4 pb-3 mb-0 lang" lang="account_setting">アカウント設定</h1>
......
abweb/html/common/header.html
<header>
<nav class="navbar navbar-dark shadow-sm px-sm-auto px-0">
<div class="container">
<div class="container-wrap">
<a href="dashboard.html" class="navbar-brand">
<img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
</a>
......
abweb/html/index.html
......@@ -21,10 +21,10 @@
<script src="../common/js/constant.js?__UPDATEID__"></script>
<script src="../common/js/common.js?__UPDATEID__"></script>
<script src="../js/operationList/operationList.js?__UPDATEID__"></script>
<script src="/abweb/js/dashboardSetting/dashboard-setting.js?__UPDATEID__"></script>
<script src="../js/dashboardSetting/dashboard-setting.js?__UPDATEID__"></script>
<script src="../js/dashboard/dashboard.js?__UPDATEID__"></script>
<script src="/abweb/common/js/header.js?__UPDATEID__"></script>
<script src="/abweb/js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../common/js/header.js?__UPDATEID__"></script>
<script src="../js/topPage/topPage.js?__UPDATEID__"></script>
<script src="../common/js/app.js?__UPDATEID__" defer></script>
<script src="https://cdn.jsdelivr.net/npm/gasparesganga-jquery-loading-overlay@2.1.7/dist/loadingoverlay.min.js"></script>
......
abweb/html/reportList.html
......@@ -36,7 +36,7 @@
<!-- report list -->
<main>
<div class="container">
<div class="container-wrap">
<!-- breadcrumb -->
<nav aria-label="breadcrumb">
<ol class="breadcrumb px-0 mb-0">
......@@ -55,7 +55,7 @@
</main>
<!-- ↓↓↓　ここから共通HTML　↓↓↓ -->
<div class="container-fluid mb-5" id="task-list"></div>
<div class="container-wrap mb-5" id="task-list"></div>
<!-- confirm -->
<!-- confirm -->
......
abweb/js/header/header.js
// header function js
/**
* 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 = {};
......@@ -8,6 +13,21 @@ HEADER.init = function() {
$("#btnLogout").click(HEADER.logoutFunction);
};
/** Direct home page setting */
HEADER.goToHomePage = function (pageId) {
DashboardSetting.getSettingData(function (settings) {
if(settings.dashboardHome == 1)
{
HEADER.goDashboard();
}
else
{
HEADER.goOperationList();
}
});
}
HEADER.logoutFunction = function() {
console.log("clicked logout");
$("#msgModel").text(I18N.i18nText('msgLogoutConfirm'));
......@@ -47,3 +67,66 @@ HEADER.processLogout = function() {
});
}
/**
* Go page of operationList
*/
HEADER.goOperationList = function () {
$('#footer').load(CONSTANT.PAGE_NAME.FOOTER, function () {
sessionStorage.activeTab = CONSTANT.PAGE_TAB.OPERATION_LIST;
HEADER.activeInitBottomNav('operationListBottomNav');
TOP.showPage(CONSTANT.PAGE_NAME.OPERATION_LIST);
});
};
/**
* 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');
}
};
abweb/js/operationList/operationList.js
......@@ -506,7 +506,6 @@ OL.resetSearch = function () {
OL.sendOperation = function (operationId, operationType, reportType, enableAddReport) {
//save operation logs. needed for sorting
OL.saveOperationReadingLog(operationId, operationType, reportType);
//Transition to the report form or operation list screen
sessionStorage.OL_operationId = operationId;
COMMON.avwScreenMove("reportList.html");
......
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