Skip to content

C
check
Commit ed2bc92e by Motohisa Nakano
Options

20121219-3

parent cd8ece9d
Showing with 226 additions and 22 deletions
abvw/common/json/lang/lang-en.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20121218-1)User:",
"txtLoginUser":"(Ver.20121219-3)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......@@ -120,5 +120,8 @@
"txtMemoPaste":"Paste",
"txtMemoClear":"Clear",
"txtMemo":"Memo",
"msgBGMPlayConfirm":"EN:このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？"
"msgBGMPlayConfirm":"EN:このコンテンツはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？",
"msgPWDNeedChange":"EN:パスワード変更が必要ですので、設定変更画面に戻って変更してください。",
"msgBGMPagePlayConfirm":"EN:このページはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？"
}
abvw/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20121218-1)ログイン中：",
"txtLoginUser":"(Ver.20121219-3)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......@@ -120,5 +120,7 @@
"txtMemoPaste":"貼り付け",
"txtMemoClear":"クリア",
"txtMemo":"メモ",
"msgBGMPlayConfirm":"このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？"
"msgBGMPlayConfirm":"このコンテンツはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？",
"msgPWDNeedChange":"パスワード変更が必要ですので、設定変更画面に戻って変更してください。",
"msgBGMPagePlayConfirm":"このページはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？"
}
abvw/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20121218-1)로그인 중:",
"txtLoginUser":"(Ver.20121219-3)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......@@ -120,5 +120,7 @@
"txtMemoPaste":"붙여 넣기",
"txtMemoClear":"클리어",
"txtMemo":"메모",
"msgBGMPlayConfirm":"KO:このコンテンツはBGMが流れるようになっています。BGMを再生してもよろしいですか？"
"msgBGMPlayConfirm":"KO:このコンテンツはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？",
"msgPWDNeedChange":"KO:パスワード変更が必要ですので、設定変更画面に戻って変更してください。",
"msgBGMPagePlayConfirm":"KO:このページはBGMが流れるようになっています。<br/>BGMを再生してもよろしいですか？"
}
abvw/contentsearch.html
......@@ -34,7 +34,7 @@
<script src="./common/js/gotop.js"></script>
<script src="common/js/tab.js"></script>
<script src="./common/js/screenLock.js" type="text/javascript"></script>
<script src="js/SCRCDL0100.js" type="text/javascript"></script>
<script src="js/detail.js" type="text/javascript"></script>
<!-- screen style definition area -->
<style>
......
abvw/css/contentview.css
html{
overflow: hidden;
}
body {
margin: 0;
padding: 0;
......@@ -8,7 +12,7 @@ body {
body #wrapper {
width: 100%;
height: 100%;
position: fixed;
position: absolute;
background-color: #666;
box-shadow: 2px 2px 8px #000 inset;
......@@ -159,7 +163,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
/*CSS for dialog*/
.web_dialog_overlay
{
position: fixed;
position: absolute;
top: 0;
right: 0;
bottom: 0;
......@@ -174,6 +178,25 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
z-index: 101;
display: none;
}
/*CSS for dialog*/
.web_dialog_overlay_loading
{
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: 100%;
margin: 0;
padding: 0;
opacity: .15;
filter: alpha(opacity=15);
-moz-opacity: .15;
z-index: 101;
display: none;
}
.web_dialog
{
padding-top:100px;
......@@ -797,3 +820,9 @@ aside.MemoIndexBox .indexBoxBody_off{
width:60px;
height:60px;
}
#bgmConfirm
{
position: absolute;
display: none;
}
abvw/css/delete_shiori.css
......@@ -63,6 +63,18 @@
margin:-27px 0 0 135px;
cursor: pointer;
}
.sectionDeleteConfirm .deletebtn a.ok_audio {
position:relative;
margin:0 168px 0 0;
cursor: pointer;
}
.sectionDeleteConfirm .deletebtn a.cancel_audio {
position:relative;
margin:-27px 60px 0 135px;
cursor: pointer;
}
.sectionDeleteConfirm .deletebtn a {
width:85px;
height:21px;
......
abvw/history.html
......@@ -33,7 +33,7 @@
<script src="./common/js/gotop.js"></script>
<script src="common/js/tab.js"></script>
<script src="./common/js/screenLock.js" type="text/javascript"></script>
<script src="js/SCRCDL0100.js" type="text/javascript"></script>
<script src="js/detail.js" type="text/javascript"></script>
<!-- screen style definition area -->
<style>
......
abvw/home.html
......@@ -41,7 +41,7 @@
<script src="./common/js/jquery.treeview.edit.js" type="text/javascript"></script>
<script src="./common/js/jquery.treeview.js" type="text/javascript"></script>
<script src="./common/js/screenLock.js" type="text/javascript"></script>
<script src="js/SCRCDL0100.js" type="text/javascript"></script>
<script src="js/detail.js" type="text/javascript"></script>
<!-- screen style definition area -->
......
abvw/js/bookmark.js
......@@ -27,17 +27,22 @@ $(document).ready(function () {
LockScreen();
// Synchronize bookmarks with server
SyncContent();
// Collection all detail of pages
bookmark_collectAllPages();
document.title = i18nText('dspShiori') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen
ClientData.BookmarkScreen(ScreenIds.BookmarkList);
//Check if Force Change password
if(ClientData.requirePasswordChange() != 1){
// Synchronize bookmarks with server
SyncContent();
// Collection all detail of pages
bookmark_collectAllPages();
$("#dspDelete").click(dspDelete_Click);
$("#dspDelete1").click(dspDelete1_Click);
$("#dspCancel").click(dspCancel_Click);
......@@ -69,6 +74,10 @@ $(document).ready(function () {
ClientData.sortOpt_searchDivision(1);
ClientData.sortOpt_sortType(2);
dspTitleNm_Click();
}
else{
checkForceChangePassword();
}
});
/*
......
abvw/js/contentsearch.js
......@@ -50,6 +50,8 @@ $(document).ready(function(){
document.title = i18nText('txtSearchResult') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen ClientData.BookmarkScreen(ScreenIds.ContentSearch);
//Check if Force Change password
if(ClientData.requirePasswordChange() != 1){
//Format text display more record
formatDisplayMoreRecord();
......@@ -113,6 +115,10 @@ $(document).ready(function(){
}
}
});
}else{
//Check if Force Change password
checkForceChangePassword();
}
});
......
abvw/js/contentview.js
......@@ -1025,6 +1025,7 @@ function removeObject(){
ClosePopupText();
}
$("#bgmConfirm").hide();
$("#boxCopyText").hide();
$("#boxSearching").hide();
$("#boxIndex").hide();
......@@ -1045,8 +1046,10 @@ function removeObject(){
$('#playaudio').children().remove();
}
if($('#playaudiopage').children().length > 0){
if (avwUserEnvObj.os != "ipad") {
$('#playaudiopage').children().remove();
}
}
if(avwUserEnvObj.browser == 'firefox'){
srcAudioType0 = '';
......@@ -2539,10 +2542,19 @@ function playAllAudio(){
}
}else{
if(document.getElementById("play_audio_0") != undefined){
if (avwUserEnvObj.os == "ipad") {
//document.getElementById("play_audio_0").load();
}
document.getElementById("play_audio_0").play();
}else if(document.getElementById("play_audio_2") != undefined){
if (avwUserEnvObj.os == "ipad") {
//document.getElementById("play_audio_2").load();
}
document.getElementById("play_audio_2").play();
}else if(document.getElementById("play_audio_1") != undefined){
if (avwUserEnvObj.os == "ipad" ) {
//document.getElementById("play_audio_1").load();
}
document.getElementById("play_audio_1").play();
}
}
......@@ -2596,10 +2608,32 @@ function createAudio(audio,type){
}
if (avwUserEnvObj.os == "ipad") {
document.getElementById("play_audio_0").load();
document.getElementById("play_audio_0").play();
}
}else if(type == "1"){ /* play all page */
if(document.getElementById("play_audio_1") != undefined){
if(ClientData.userOpt_musicMode() == "1"){
if(avwUserEnvObj.browser == 'firefox'){
$('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" loop="true" hidden="true"> </embed>'
);
}else{
document.getElementById("play_audio_1").play();
}
}else{
if(avwUserEnvObj.browser == 'firefox'){
$('#playaudioallpage').html(
' <embed id="play_audio_1" src="' + audio + '&key=' + (new Date()).toIdString() + '" autostart="true" hidden="true"> </embed>'
);
}else{
document.getElementById("play_audio_1").play();
}
}
}else{
TypeAudio1 = type;
srcAudioType1 = audio;
......@@ -2629,8 +2663,26 @@ function createAudio(audio,type){
);
}
}
// Check to play BGM on ipad
if (avwUserEnvObj.os == "ipad") {
// Show confim message to play background music
$("#bgmConfirm_dspCancel").unbind('click');
$("#bgmConfirm_dspCancel").click(function () {
$("#bgmConfirm").hide();
});
$("#bgmConfirm_dspOK").unbind('click');
$("#bgmConfirm_dspOK").click(function () {
document.getElementById('play_audio_1').load();
document.getElementById('play_audio_1').play();
$("#bgmConfirm").hide();
});
$("#bgmConfirm").show();
$("#bgmConfirm").center();
}
}
}
else if(type == "2"){ /* play on page */
if(document.getElementById("play_audio_2") == undefined){
stopAllAudio();
TypeAudio2 = type;
......@@ -2656,11 +2708,29 @@ function createAudio(audio,type){
}else{
$('#playaudiopage').html(
' <audio id="play_audio_2" autoplay ="autoplay">' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() + '" type="audio/mpeg" />' +
' <source src="' + audio + '&key=' + (new Date()).toIdString() +'" type="audio/mpeg" />' +
' </audio>'
);
}
}
// Check to play BGM on ipad
if (avwUserEnvObj.os == "ipad") {
// Show confim message to play background music
$("#bgmConfirm_dspCancel_page").unbind('click');
$("#bgmConfirm_dspCancel_page").click(function () {
$("#bgmConfirm_page").hide();
});
$("#bgmConfirm_dspOK_page").unbind('click');
$("#bgmConfirm_dspOK_page").click(function () {
document.getElementById('play_audio_2').load();
document.getElementById('play_audio_2').play();
$("#bgmConfirm_page").hide();
});
$("#bgmConfirm_page").show();
$("#bgmConfirm_page").center();
}
}
}
}else{
stopAllAudio();
......
abvw/js/header.js
......@@ -9,9 +9,13 @@ $(document).ready(function () {
if (!avwCheckLogin(ScreenIds.Login)) return;
// Set event to prevent leave
//avwSetLogoutNortice();
if(ClientData.requirePasswordChange() != 1 ) {
ToogleLogoutNortice();
}
//Toggle Searchbox
$('input#searchbox-key').click(toggleSearchPanel);
......@@ -418,3 +422,47 @@ function DoBackup() {
$('.toast-item-close').live('click', webLogoutEvent);
});
}
function checkForceChangePassword(){
if(ClientData.BookmarkScreen() != ScreenIds.Setting){
if(ClientData.requirePasswordChange() == 1){
//alert(i18nText('msgPWDNeedChange'));
showErrorScreenForceChangePassword();
}
}
}
function showErrorScreenForceChangePassword(){
var tags = '<div id="avw-auth-error">' +
'<div style="display:table; width:100%; height:100%;">' +
'<div style="display:table-cell; text-align:center; vertical-align:middle;">' +
'<p>'+i18nText('msgPWDNeedChange')+'</p>' +
'<div><button id="avw-unauth-ok">OK</button></div>' +
'</div></div></div>';
$('body').prepend(tags);
$('#avw-auth-error').css( {
'color': '#fff',
'opacity': 1,
'position': 'fixed',
'top': '0',
'left': '0',
'width': $(window).width(),
'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000'
})
// resize error page
$(window).resize(function() {
$('#avw-auth-error').css( {
'width': $(window).width(),
'height': $(window).height()
});
});
$('#avw-unauth-ok').click(function() {
ClientData.BookmarkScreen(ScreenIds.Setting);
avwScreenMove(ScreenIds.Setting);
});
}
abvw/js/history.js
......@@ -50,13 +50,14 @@ $(document).ready(function(){
document.title = i18nText('dspViewHistory') + ' | ' + i18nText('sysAppTitle');
ClientData.BookmarkScreen(ScreenIds.History);
if(ClientData.requirePasswordChange() != 1){
if(ClientData.ReadingContentIds() == null || ClientData.ReadingContentIds() == 'undefined' || ClientData.ReadingContentIds().length == 0){
}else{
syncReadingContent();
}
ClientData.BookmarkScreen(ScreenIds.History);
//remove hover effect when is touch device
removeHoverCss();
......@@ -102,6 +103,11 @@ $(document).ready(function(){
}
}
});
}
else{
//Check if Force Change password
checkForceChangePassword();
}
});
//Call API
......
abvw/js/home.js
......@@ -58,6 +58,8 @@ $(document).ready(function () {
// Set bookmark screen
ClientData.BookmarkScreen(ScreenIds.Home);
//Check if Force Change password
if(ClientData.requirePasswordChange() != 1){
// Register log
RegisterLog();
......@@ -142,6 +144,7 @@ $(document).ready(function () {
$('#dlgSubMenu').hover(subMenuHoverFunction, subMenuHoverOffFunction);
$('body').click(bodyHomeClickFunction);
$('body').bind('touchstart', bodyHomeClickFunction);
$(window).resize(function () {
if ($("#contentDetail").css("display") != "none") {
......@@ -152,6 +155,9 @@ $(document).ready(function () {
}
}
});
}else{
checkForceChangePassword();
}
});
function subMenuHoverFunction(){
......
abvw/js/login.js
......@@ -78,7 +78,7 @@ function saveLoginInfo() {
}
ClientData.userInfo_lastLoginTime(date.jpDateTimeString());
ClientData.requirePasswordChange(requirePasswordChange);
//ClientData.requirePasswordChange(requirePasswordChange);
//ClientData.userInfo_sid(userinfo_sid);
ClientData.userInfo_sid_local(userinfo_sid);
saveServiceUserOption();
......
abvw/js/settings.js
......@@ -19,11 +19,14 @@
$(document).ready(function () {
if (!avwCheckLogin(ScreenIds.Login)) return;
ToogleLogoutNortice();
LockScreen();
document.title = i18nText('dspSetting') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen
ClientData.BookmarkScreen(ScreenIds.Setting);
InitScreen();
$("#dspSave").click(dspSave_Click);
......@@ -81,6 +84,7 @@ $(document).ready(function () {
$("#dspOptRes").css('visibility', '');
}
}
});
/*
......@@ -116,6 +120,8 @@ function IsExistBackupFile() {
// Event success
function avwCmsApi_requirePasswordChange_success(data) {
ClientData.requirePasswordChange(0);
if (data.requirePasswordChange == 1) {
if (ClientData.serviceOpt_force_pw_change_on_login() == 0) { // No need to change password
// Skip this case
......@@ -141,6 +147,7 @@ function avwCmsApi_requirePasswordChange_success(data) {
}
}
else {
//alert('pwdSkipDt=null');
OpenChangePassword();
......@@ -151,6 +158,7 @@ function avwCmsApi_requirePasswordChange_success(data) {
}
else if (ClientData.serviceOpt_force_pw_change_on_login() == 2) { // Force to change password
ClientData.requirePasswordChange(1);
OpenChangePassword();
$("#dspSkip").hide();
......@@ -189,6 +197,7 @@ function avwCmsApi_requirePasswordChange_success(data) {
}
else {
//alert('pwdSkipDt=null');
OpenChangePassword();
$("#dspSkip").show();
......@@ -198,6 +207,7 @@ function avwCmsApi_requirePasswordChange_success(data) {
}
else if (ClientData.serviceOpt_force_pw_change_periodically() == 2) { // Force to change password
ClientData.requirePasswordChange(1);
OpenChangePassword();
$("#dspSkip").hide();
......@@ -311,7 +321,7 @@ function avwCmsApi_getBackupFile_success(data) {
ClientData.isChangedBookmark(false);
ClientData.isChangedMarkingData(false);
ClientData.isChangedMemo(false);
$("#dspOptBk").hide();
// Show message: msgRestoreSuccess
$().toastmessage({ position: 'middle-center' });
$().toastmessage('showToast', {
......@@ -587,6 +597,7 @@ function avwCmsApi_passwordChange_success(data) {
msgError.show();
}
else {
ClientData.requirePasswordChange(0);
msgError.html('');
closeChangePassword();
/* show messages */
......
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