Skip to content

C
check
Commit 86419b42 by vietdo
Options

#15763 プッシュ通知が無効ならヘッダの「通知」ボタンを非表示にする

parent bb51b5c2
Showing with 166 additions and 151 deletions
abvw/bookmark.html
......@@ -8,15 +8,15 @@
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__"/>
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__"/>
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
......@@ -33,17 +33,17 @@
<link rel="stylesheet" type="text/css" href="css/theme/accordion.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/limit_access.css?__UPDATEID__" />
<!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?#UPDATEID#" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?#UPDATEID#" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?#UPDATEID#" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
......@@ -53,19 +53,19 @@
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.edit.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/Limit_Access_Content.js?__UPDATEID__"></script>
<script type="text/javascript" src="./js/bookmark.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<style>
html{
-ms-touch-action : none;
touch-action : none ;
}
</style>
</head>
<body id="bookmark" oncontextmenu="return false;">
<header id="header-ws" class="header_ws">
......@@ -96,7 +96,7 @@
</ul>
</div>
<ul class="button">
<li class="floatL" id="dspPushMessage">
<li class="floatL" id="dspPushMessage" style="display:none">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;">
<div id="show-push-message"></div>
......@@ -109,7 +109,7 @@
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
</ul>
</div>
</div>
......@@ -118,15 +118,15 @@
<div id="ws-body" class="wrapper_ws" >
<div id="inc_backup"></div>
<div id="main-ws">
<article id="articleMain" class="articleMain">
<div class="tops" id="sortingDiv">
<span class="lang" lang="txtSort"><!--並び替え--></span>
<ul class="sort shiori-tops" id="menu_sort">
<article id="articleMain" class="articleMain">
<div class="tops" id="sortingDiv">
<span class="lang" lang="txtSort"><!--並び替え--></span>
<ul class="sort shiori-tops" id="menu_sort">
<li class="current"><a class="descending_sort lang" id="dspTitleNm" lang="dspTitleNm"><!--タイトル名--></a><b>|</b></li>
<li><a id="dspTitleNmKn" lang="dspTitleNmKn" class="lang"><!--タイトル名(かな)--></a><b id="dspTitleNmKn_Seperate">|</b></li>
<li><a id="dspPubDt" lang="dspRegDt" class="lang"><!--登録日--></a></li>
</ul>
<a class="delete lang" id="dspDelete" lang="dspDelete"><!--削除--></a>
<a class="delete lang" id="dspDelete" lang="dspDelete"><!--削除--></a>
</div>
<section id="pnlTop" class='top'>
<!--<a class="delete lang" id="dspDelete" lang="dspDelete">削除</a>-->
......@@ -142,11 +142,11 @@
<!-- Delete panel [start]-->
<section class="sectionDeleteConfirm" id="delete_shiori">
<h1 class="lang" lang="txtDeleteConfirmTitle">しおり削除確認</h1>
<p class="message lang" lang="dspShioriDelConf">設定されているしおりを削除しますか？</p>
<p class="message lang" lang="dspShioriDelConf">設定されているしおりを削除しますか？</p>
<p class="deletebtn"><a id="dspConfirmOK" lang="dspOK" class="ok lang">ＯＫ</a><a id="dspCancel" lang="dspCancel" class="cancel lang">キャンセル</a></p>
</section>
<!-- Delete panel [end] -->
<footer>
<div class="border">
<div class="cnt_footer">
......
abvw/contentsearch.html
......@@ -8,15 +8,15 @@
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
......@@ -37,16 +37,16 @@
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
<!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
......@@ -64,14 +64,14 @@
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<style>
html{
-ms-touch-action : none;
touch-action : none ;
}
</style>
</head>
<body id="contentsearch" oncontextmenu="return false;">
<header id="header-ws" class="header_ws">
......@@ -102,7 +102,7 @@
</ul>
</div>
<ul class="button">
<li class="floatL" id="dspPushMessage">
<li class="floatL" id="dspPushMessage" style="display:none">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;">
<div id="show-push-message"></div>
......@@ -115,7 +115,7 @@
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
</ul>
</div>
</div>
......@@ -125,7 +125,7 @@
<div id="inc_backup"></div>
<div id="main-ws">
<article class="articlecontentsearch">
<div class="tops">
<div class="tops">
<div id="main-searchresult">
<span class="lang" lang="txtSearchResult" id="txtSearchResult"><!--検索結果--></span>
<input type="text" id="txtSearchWs" />
......@@ -153,9 +153,9 @@
</li>
</ul>
<p>
<label id="dispPage" class="pageNumControl" style="visibility: hidden"> </label>
<label class="lang pageNumControl" lang="txtRecordNum" style="visibility: hidden"><!--件--></label >
<label class="pageNumControl" style="visibility: hidden">/</label>
<label id="dispPage" class="pageNumControl" style="visibility: hidden"> </label>
<label class="lang pageNumControl" lang="txtRecordNum" style="visibility: hidden"><!--件--></label >
<label class="pageNumControl" style="visibility: hidden">/</label>
<label id="totalPage" class="pageNumControl" style="visibility: hidden"> </label>
<label class="lang pageNumControl" lang="txtRecordTotal" style="visibility: hidden"><!--件 表示--></label>
</p>
......@@ -169,9 +169,9 @@
</section>
</article>
</div>
<div id="inc_detail" ></div>
<footer>
<div class="border">
<div class="cnt_footer">
......@@ -179,7 +179,7 @@
</div>
</div>
</footer>
</div>
<div id="viewer" style="display:none;" >
......
abvw/history.html
......@@ -8,15 +8,15 @@
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<title></title>
<link rel="stylesheet" type="text/css" href="common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.treeview.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/header.css?__UPDATEID__" />
......@@ -41,16 +41,16 @@
<link rel="stylesheet" type="text/css" href="css/theme/share.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.css?__UPDATEID__" id="theme_base" />
<link rel="stylesheet" type="text/css" href="common/js/pickadate/themes/classic.date.css?__UPDATEID__" id="theme_date" />
<!-- CSSビュー -->
<!-- link rel="stylesheet" type="text/css" href="css/reset.css?__UPDATEID__" / -->
<link rel="stylesheet" type="text/css" href="css/layout/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/viewer.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="common/css/jquery.powertip.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/Anket.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/delete_shiori.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
......@@ -67,14 +67,14 @@
<script type="text/javascript" src="./common/js/jquery.treeview.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/detail.js?__UPDATEID__" ></script>
<style>
html{
-ms-touch-action : none;
touch-action : none ;
}
</style>
</head>
<body id="history" oncontextmenu="return false;">
......@@ -106,7 +106,7 @@
</ul>
</div>
<ul class="button">
<li class="floatL" id="dspPushMessage">
<li class="floatL" id="dspPushMessage" style="display:none">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;">
<div id="show-push-message"></div>
......@@ -119,7 +119,7 @@
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
</ul>
</div>
</div>
......@@ -129,11 +129,11 @@
<div id="inc_backup"></div>
<div id="main-ws">
<article class="articlehistory">
<span class="lang sort-title" lang="txtSort"><!--並び替え--></span>
<span class="lang sort-title" lang="txtSort"><!--並び替え--></span>
<div class="tops">
<ul class="sort" id="menu_sort">
<li>
<a id="control-sort-title" class="lang nottouchdevice control_sort_on" lang="dspTitleNm"><!--タイトル名--></a>
<a id="control-sort-title" class="lang nottouchdevice control_sort_on" lang="dspTitleNm"><!--タイトル名--></a>
<a class="lang control_sort_off" lang="dspTitleNm" style="display:none"><!--タイトル名--></a>
<b>|</b>
</li>
......@@ -144,12 +144,12 @@
</li>
<li>
<a id="control-sort-releasedate" class="lang nottouchdevice control_sort_on" lang="txtPubDt" ><!--公開日--></a>
<a class="lang control_sort_off" lang="txtPubDt" style="display:none" ><!--公開日--></a>
<a class="lang control_sort_off" lang="txtPubDt" style="display:none" ><!--公開日--></a>
<b>|</b>
</li>
<li class="current">
<a id="control-sort-viewdate" class="lang nottouchdevice control_sort_on" lang="txtViewDt" ><!--閲覧日--></a>
<a id="off-default" class="lang control_sort_off" lang="txtViewDt" style="display:none" ><!--閲覧日--></a>
<a id="control-sort-viewdate" class="lang nottouchdevice control_sort_on" lang="txtViewDt" ><!--閲覧日--></a>
<a id="off-default" class="lang control_sort_off" lang="txtViewDt" style="display:none" ><!--閲覧日--></a>
</li>
</ul>
<p>
......@@ -163,7 +163,7 @@
</div>
<div id="inc_detail" ></div>
<footer>
<div class="border">
<div class="cnt_footer">
......
abvw/js/header.js
......@@ -824,7 +824,10 @@ HEADER.initPushMessage = function()
// check new push message
if (COMMON.isAnonymousLogin() == false ) {
HEADER.getPushMessageNew();
if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
HEADER.getPushMessageNew();
}
}
};
......@@ -860,6 +863,7 @@ HEADER.getPushMessageNew = function()
// callback get number new message success
HEADER.callbackGetPushMessageNewSuccess = function(data) {
if (data) {
// get current number message in session
var currentMessage = parseInt(ClientData.pushInfo_newMsgNumber());
......@@ -867,7 +871,6 @@ HEADER.callbackGetPushMessageNewSuccess = function(data) {
currentMessage = 0;
}
var totalMessage = currentMessage + data.count;
if ($('#liPushMessage').hasClass('hide')) {
// update new number message to session
ClientData.pushInfo_newMsgNumber(totalMessage);
......@@ -917,6 +920,7 @@ HEADER.getPushMessageList = function() {
"post",
params,
function (data) {
console.log(data);
// reset number message
ClientData.pushInfo_newMsgNumber(0);
// hide number new message
......
abvw/js/history.js
......@@ -99,6 +99,10 @@ $(document).ready(function(){
HEADER.checkForceChangePassword();
}
if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
$('#dspPushMessage').show();
}
if (COMMON.isAnonymousLogin()) {
//プッシュメッセージ隠す
$('#dspPushMessage').hide();
......
abvw/js/home.js
......@@ -150,9 +150,8 @@ $(document).ready(function () {
});
}
}
console.log(ClientData.serviceOpt_apns());
console.log(ClientData.serviceOpt_usable_push_message());
if((ClientData.serviceOpt_apns() == 'Y') && (ClientData.serviceOpt_usable_push_message() == 'Y')) {
if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
$('#dspPushMessage').show();
}
......
abvw/js/settings.js
......@@ -15,6 +15,10 @@ $(document).ready(function () {
// Set bookmark screen
ClientData.BookmarkScreen(COMMON.ScreenIds.Setting);
if((ClientData.serviceOpt_apns() == 'Y') || (ClientData.serviceOpt_usable_push_message() == 'Y')) {
$('#dspPushMessage').show();
}
SETTINGS.initScreen();
$("#dspSave").click(SETTINGS.dspSave_Click);
......@@ -113,7 +117,7 @@ $(document).ready(function () {
/*
event of changing language
*/
function changeLanguageCallBackFunction() {
function changeLanguageCallBackFunction() {
document.title = I18N.i18nText('dspSetting') + ' | ' + I18N.i18nText('sysAppTitle');
};
......@@ -124,7 +128,7 @@ Check backup file exists or not for No.17
SETTINGS.IsExistBackupFile = function(file,type) {
var isExisted = false;
var params = { "sid": ClientData.userInfo_sid(), "filename": file, fileType: type }; //, deviceType: '4'
var params = { "sid": ClientData.userInfo_sid(), "filename": file, fileType: type }; //, deviceType: '4'
// Get list of files
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post", params,
function (data) {
......@@ -153,13 +157,13 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
}
else if (ClientData.serviceOpt_force_pw_change_on_login() == 1) { // Recommend to change password
var pwdSkipDt = ClientData.userInfo_pwdSkipDt();
if (pwdSkipDt) {
// Check 30 days
var currDate = new Date();
var skipDate = new Date(pwdSkipDt);
var numDay = currDate.subtractByDays(skipDate);
if (numDay <= 30) {
// Do not show dialog to change password
}
......@@ -172,7 +176,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
}
}
else {
//alert('pwdSkipDt=null');
SETTINGS.openChangePassword();
......@@ -183,7 +187,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
else if (ClientData.serviceOpt_force_pw_change_on_login() == 2) { // Force to change password
ClientData.requirePasswordChange(1);
SETTINGS.openChangePassword();
$("#dspSkip").hide();
$("#dspCancel").hide();
//$("#dspPwdUpd1").css('margin', $("#dspCancel").css('margin'));
......@@ -191,7 +195,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
$("#txtChangePassComment").css('visibility', 'hidden');
}
}
else if (data.requirePasswordChange == 2) {
......@@ -206,7 +210,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
var currDate = new Date();
var skipDate = new Date(pwdSkipDt);
var numDay = currDate.subtractByDays(skipDate);
if (numDay <= 30) {
// Do not show dialog to change password
}
......@@ -220,7 +224,7 @@ SETTINGS.avwCmsApi_requirePasswordChange_success = function(data) {
}
else {
//alert('pwdSkipDt=null');
SETTINGS.openChangePassword();
$("#dspSkip").show();
......@@ -260,7 +264,7 @@ SETTINGS.dspOptBk_OK_Click = function(e) {
// ----------------------------
// Process backup here
// ----------------------------
// ----------------------------
// Bakup memo/marking/bookmark
// backup data for No.17
......@@ -294,7 +298,7 @@ SETTINGS.dspOptBk_OK_Click = function(e) {
SETTINGS.closeBackup();
});
});
};
// set status button backup and checkbox option
......@@ -313,7 +317,7 @@ SETTINGS.setStatusButtonBackup = function() {
$("#dspOptBk").show();
}
else {
$("#dspOptBk").hide();
}
};
......@@ -415,7 +419,7 @@ SETTINGS.restoreBookmarkData = function()
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post",
{ sid: ClientData.userInfo_sid(), filename: "Bookmark.json" }, // deviceType: '4',
function (data) {
if (data) {
if (data) {
COMMON.getDataBookmark(data);
ClientData.isChangedBookmark(false);
result = true;
......@@ -434,7 +438,7 @@ SETTINGS.restoreBookmarkData = function()
SETTINGS.restoreMemoData = function() {
var result = false;
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post",
{ sid: ClientData.userInfo_sid(), filename: "ContentMemo.json" }, //deviceType: '4',
{ sid: ClientData.userInfo_sid(), filename: "ContentMemo.json" }, //deviceType: '4',
function (data) {
if (data) {
COMMON.getDataMemo(data);
......@@ -452,11 +456,11 @@ SETTINGS.restoreMemoData = function() {
/*
* Call api to restore marking data
*/
SETTINGS.restoreMarkingData = function()
SETTINGS.restoreMarkingData = function()
{
var result = false;
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "getBackupFile", "post",
{ sid: ClientData.userInfo_sid(), filename: "Marking.json" }, // deviceType: '4',
{ sid: ClientData.userInfo_sid(), filename: "Marking.json" }, // deviceType: '4',
function (data) {
if (data) {
COMMON.getDataMarking(data);
......@@ -508,7 +512,7 @@ SETTINGS.dspSave_Click = function(e) {
}
// マーキング（コンテンツを開いた時に表示する）
if ($("#chkOpt003").attr('checked') == 'checked') {
ClientData.userOpt_makingDsp(1);
ClientData.userOpt_makingDsp(1);
}
else {
ClientData.userOpt_makingDsp(0);
......@@ -576,7 +580,7 @@ SETTINGS.dspSave_Click = function(e) {
type: 'success',
sticky: true,
text: I18N.i18nText('msgSaveOk')
});
});
};
......@@ -593,7 +597,7 @@ SETTINGS.dspSkip_Click = function(e) {
SETTINGS.openChangePassword = function() {
//$("#dlgChangePassword").dialog("open");
//$(".ui-dialog-titlebar").hide();
// Clear all input values
$("#txtPwdCur").val('');
$("#txtPwdNew").val('');
......@@ -618,7 +622,7 @@ SETTINGS.dspPwdUpd_Click = function(e) {
$("#dspSkip").hide();
$("#txtChangePassComment").css('visibility', 'hidden');
//$("#dspPwdUpd1").css('margin', '-27px 97px 0 0');
// Show dialog
SETTINGS.openChangePassword();
};
......@@ -666,11 +670,11 @@ SETTINGS.dspOptBk_Click = function(e) {
// set options backup No.17
if (ClientData.userOpt_bkMakingFlag() == 0)
if (ClientData.userOpt_bkMakingFlag() == 0)
{
$("#chkopBkMarking").removeAttr('checked');
}
else
else
{
$("#chkopBkMarking").attr('checked', 'checked');
}
......@@ -690,9 +694,9 @@ SETTINGS.dspOptBk_Click = function(e) {
// check content is changed
if (!ClientData.isChangedBookmark())
if (!ClientData.isChangedBookmark())
{
$('#chkopBkShiori').attr('disabled', 'disabled').removeAttr('checked');
$('#chkopBkShiori').attr('disabled', 'disabled').removeAttr('checked');
}
else {
$('#chkopBkShiori').removeAttr('disabled');
......@@ -703,7 +707,7 @@ SETTINGS.dspOptBk_Click = function(e) {
}
else {
$('#chkopBkMemo').removeAttr('disabled');
}
}
if (!ClientData.isChangedMarkingData()) {
$('#chkopBkMarking').attr('disabled', 'disabled').removeAttr('checked');
}
......@@ -732,7 +736,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
isOK = false;
msgError.html(I18N.i18nText('msgPwdEmpty'));
msgError.show();
}
else {
if (!ValidationUtil.CheckRequiredForText(SETTINGS.getNewPassword())) {
......@@ -784,7 +788,7 @@ SETTINGS.dspPwdUpd1_Click = function(e) {
newPassword: SETTINGS.getNewPassword(),
appId: 4
};
if (isOK) {
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "passwordChange", "GET", params,
......@@ -892,7 +896,7 @@ SETTINGS.getCurrentPassword = function() {
SETTINGS.getNewPassword = function() {
return $("#txtPwdNew").val();
};
// Get input new password
// Get input new password
SETTINGS.getNewPasswordRe = function() {
return $("#txtPwdNewRe").val();
};
......@@ -931,14 +935,14 @@ SETTINGS.initScreen = function() {
$("#chkOpt003").removeAttr('checked');
}
else {
$("#chkOpt003").attr('checked', 'checked');
}
// Show alert when press F5.close tab.broswer
if (ClientData.userOpt_closeOrRefreshAlert() == 0) {
// Show alert when press F5.close tab.broswer
if (ClientData.userOpt_closeOrRefreshAlert() == 0) {
$("#chkOpt005").removeAttr('checked');
}
else {
else {
$("#chkOpt005").attr('checked', 'checked');
}
// 毎回ログアウトの時、バックアップするかどうかは必ず確認する
......
abvw/settings.html
......@@ -8,9 +8,9 @@
<meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1">
<title></title>
<link rel="stylesheet" type="text/css" href="./common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/default.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./common/css/screenLock.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/common.css?__UPDATEID__" />
......@@ -29,26 +29,26 @@
<link rel="stylesheet" type="text/css" href="css/theme/login_validation.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/layout/accordion.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="css/theme/accordion.css?__UPDATEID__" />
<script type="text/javascript" src="./common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/scrolltopcontrol.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.ui.touch-punch.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/jquery.toastmessage.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/avweb.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/i18n.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/common.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/screenLock.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/header.js?__UPDATEID__" ></script>
<script type="text/javascript" src="./js/settings.js?__UPDATEID__" ></script>
<style>
#slidebar-animation{
-ms-touch-action : none;
}
</style>
<!--[if gte IE 9]>
<style type="text/css">
.gradient {
......@@ -86,7 +86,7 @@
</ul>
</div>
<ul class="button">
<li class="floatL">
<li class="floatL" id="dspPushMessage" style="display:none">
<a href="#" id="liPushMessage"><span class="pushMessage"><span class="icon"></span> <span class="lang" lang="txtPushAlert"><!--新着 : --></span><span id="numbermessage"></span><span class="arrow"></span></span></a>
<div id="accordion" style="display:none;">
<div id="show-push-message"></div>
......@@ -99,7 +99,7 @@
<li class="menuIcon" id="dspShiori"><a href="#"><img src="img/common/icon_marker.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspViewHistory"><a href="#"><img src="img/common/icon_watch.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspSetting" style="display:none;"><a href="#"><img src="img/common/icon_setup.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
<li class="menuIcon" id="dspLogout" style="margin-right:0;display:none;"><a href="#"><img src="img/common/icon_logout.png" width="30" height="30"></a></li>
</ul>
</div>
</div>
......@@ -126,7 +126,7 @@
<ul>
<li>
<span class="choice lang" lang="txtOpt001"><!--初期表示--></span>
<label class="firstview"><input type=radio name="firstview" value="bookshelf" id="rdoOpt001" checked="checked" checked/><label for="rdoOpt001" lang="txtHondana" class="lang"><!--本棚--></label></label>
<label class="firstview"><input type=radio name="firstview" value="bookshelf" id="rdoOpt001" checked="checked" checked/><label for="rdoOpt001" lang="txtHondana" class="lang"><!--本棚--></label></label>
<label class="firstview"><input type=radio name="firstview" value="booklist" id="rdoOpt0011"><label for="rdoOpt0011" lang="txtList" class="lang"><!--リスト--></label></label>
</li>
<li><label><input type=checkbox name="repeat" value="repeat" class="chkbx" id="chkOpt002" checked="checked" checked/><label for="chkOpt002" id="txtOpt002" lang="txtOpt002" class="lang"><!--動画、音楽を繰り返し再生する--></label></label></li>
......
login.html
......@@ -14,14 +14,14 @@
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/common.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery-ui.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/common/css/jquery.toastmessage.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/login.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/login_validation.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/login_validation.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/layout/limit_access.css?__UPDATEID__" />
<link rel="stylesheet" type="text/css" href="./abvw/css/theme/limit_access.css?__UPDATEID__" />
<script type="text/javascript" src="./abvw/common/js/jquery-1.8.1.min.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/thickbox.js?__UPDATEID__"></script>
<script type="text/javascript" src="./abvw/common/js/jquery-ui-1.8.23.custom.min.js?__UPDATEID__"></script>
......@@ -48,7 +48,7 @@
//jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に呼ばれる関数
// var pageH = $("#container").height();
// console.log("pageH:" + pageH);
//
//
// $("#fade").css("height", pageH).delay(900).fadeOut(800);
// $("#loader").delay(600).fadeOut(300);
// $("#container").css("display", "block");
......
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