Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
98db55b3
Commit
98db55b3
authored
Feb 06, 2014
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
カタログと日比谷カスタム対応
parent
71ca8284
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
558 additions
and
219 deletions
+558
-219
abvw/common/js/common.js
+146
-16
abvw/common/json/lang/lang-ja.json
+1
-1
abvw/home.html
+16
-11
abvw/js/contentview.js
+47
-19
abvw/js/contentview_CreateObjects.js
+0
-0
abvw/js/contentview_Events.js
+20
-0
abvw/js/contentview_GetData.js
+33
-3
abvw/js/contentview_InitObjects.js
+4
-0
abvw/js/home.js
+131
-21
abvw/js/login.js
+87
-64
index.html
+8
-8
login.html
+65
-76
No files found.
abvw/common/js/common.js
View file @
98db55b3
/// <reference path="avweb.js" />
/// <reference path="avweb.js" />
/// <reference path="screenLock.js" />
/// <reference path="screenLock.js" />
/// <reference path="common.js" />
/// <reference path="common.js" />
/// <reference path="i18n.js" />
/// <reference path="i18n.js" />
/// <reference path="jquery-1.8.1.min.js" />
/// <reference path="jquery-1.8.1.min.js" />
/// <reference path="jquery-ui-1.8.23.custom.min.js" />
/// <reference path="jquery-ui-1.8.23.custom.min.js" />
/// <reference path="jquery.toastmessage.js" />
/// <reference path="jquery.toastmessage.js" />
/// <reference path="pageViewer.js" />
/// <reference path="pageViewer.js" />
/// <reference path="uuid.js" />
/// <reference path="uuid.js" />
// =============================================================================================
// =============================================================================================
// Constants [start]
// Constants [start]
// =============================================================================================
// =============================================================================================
...
@@ -54,7 +45,6 @@ var Consts = {
...
@@ -54,7 +45,6 @@ var Consts = {
// Lock screen timer
// Lock screen timer
ConstLockScreenTime
:
1800000
ConstLockScreenTime
:
1800000
};
};
/*Content Type Keys*/
/*Content Type Keys*/
...
@@ -189,6 +179,15 @@ var Keys = {
...
@@ -189,6 +179,15 @@ var Keys = {
serviceOpt_web_screen_lock
:
'web_screen_lock'
,
serviceOpt_web_screen_lock
:
'web_screen_lock'
,
// Session :事業者オプション(serviceOpt)_スクリーンロック待ち時間:Interger
// Session :事業者オプション(serviceOpt)_スクリーンロック待ち時間:Interger
serviceOpt_web_screen_lock_wait
:
'web_screen_lock_wait'
,
serviceOpt_web_screen_lock_wait
:
'web_screen_lock_wait'
,
// Session :事業者オプション(serviceOpt)_GPS使用可:Char(Y:可能, N:不可)
serviceOpt_catalog_edition
:
'usable_readinglog_gps'
,
// Session :事業者オプション(serviceOpt)_詳細ログ使用可:Char(Y:可能, N:不可)
serviceOpt_catalog_edition
:
'usable_readinglog_object'
,
// Session :事業者オプション(serviceOpt)_カタログエディション:Char(Y:可能, N:不可)
serviceOpt_catalog_edition
:
'catalog_edition'
,
// Session :事業者オプション(serviceOpt)_日比谷カスタム:Char(Y:可能, N:不可)
serviceOpt_catalog_edition
:
'hibiyakadan_catalog'
,
// Session :共通(common)_コンテンツID:Integer
// Session :共通(common)_コンテンツID:Integer
common_contentId
:
'common_contentId'
,
common_contentId
:
'common_contentId'
,
// Local :共通(common)_コンテンツID:Integer
// Local :共通(common)_コンテンツID:Integer
...
@@ -322,8 +321,6 @@ var Keys = {
...
@@ -322,8 +321,6 @@ var Keys = {
// Local :ユーザオプション(userOpt)_アニメーション時間:Float
// Local :ユーザオプション(userOpt)_アニメーション時間:Float
userOpt_pageTransitionPeriod
:
'userOpt_pageTransitionPeriod'
userOpt_pageTransitionPeriod
:
'userOpt_pageTransitionPeriod'
/* -------------------------------------------------------------------------------- */
/* -------------------------------------------------------------------------------- */
};
};
...
@@ -371,7 +368,20 @@ function LogEntity() {
...
@@ -371,7 +368,20 @@ function LogEntity() {
this
.
readingEndDate
=
null
;
this
.
readingEndDate
=
null
;
this
.
readingTime
=
0
;
this
.
readingTime
=
0
;
this
.
deviceTypeId
=
4
;
this
.
deviceTypeId
=
4
;
//ページログ配列
this
.
pageLogArray
=
[];
//詳細ログ配列
this
.
objectLogArray
=
[];
};
};
// Entity for PageLog
function
PageLogEntity
(){
this
.
contentid
=
""
;
this
.
pageNo
=
1
;
this
.
readingStartDate
=
new
Date
();
this
.
readingEndDate
=
null
;
this
.
readingTime
=
0
;
};
// No.17 Phase 2: do not use this function
// No.17 Phase 2: do not use this function
// Build memo/marking/bookmark to base64string
// Build memo/marking/bookmark to base64string
...
@@ -1288,6 +1298,39 @@ var ClientData = {
...
@@ -1288,6 +1298,39 @@ var ClientData = {
// }
// }
//},
//},
// Session :事業者オプション(serviceOpt)_GPS使用可:Char(Y:可能, N:不可)
serviceOpt_usable_readinglog_gps
:
function
(
data
)
{
if
(
arguments
.
length
>
0
)
{
SessionStorageUtils
.
set
(
Keys
.
serviceOpt_usable_readinglog_gps
,
data
);
}
else
{
return
SessionStorageUtils
.
get
(
Keys
.
serviceOpt_usable_readinglog_gps
);
}
},
// Session :事業者オプション(serviceOpt)_詳細ログ使用可:Char(Y:可能, N:不可)
serviceOpt_usable_readinglog_object
:
function
(
data
)
{
if
(
arguments
.
length
>
0
)
{
SessionStorageUtils
.
set
(
Keys
.
serviceOpt_usable_readinglog_object
,
data
);
}
else
{
return
SessionStorageUtils
.
get
(
Keys
.
serviceOpt_usable_readinglog_object
);
}
},
// Session :事業者オプション(serviceOpt)_カタログエディション:Char(Y:可能, N:不可)
serviceOpt_catalog_edition
:
function
(
data
)
{
if
(
arguments
.
length
>
0
)
{
SessionStorageUtils
.
set
(
Keys
.
serviceOpt_catalog_edition
,
data
);
}
else
{
return
SessionStorageUtils
.
get
(
Keys
.
serviceOpt_catalog_edition
);
}
},
// Session :事業者オプション(serviceOpt)_日比谷対応:Char(Y:可能, N:不可)
serviceOpt_hibiyakadan_catalog
:
function
(
data
)
{
if
(
arguments
.
length
>
0
)
{
SessionStorageUtils
.
set
(
Keys
.
serviceOpt_hibiyakadan_catalog
,
data
);
}
else
{
return
SessionStorageUtils
.
get
(
Keys
.
serviceOpt_hibiyakadan_catalog
);
}
},
// Session :共通(common)_コンテンツID:Integer
// Session :共通(common)_コンテンツID:Integer
common_contentId
:
function
(
data
)
{
common_contentId
:
function
(
data
)
{
if
(
arguments
.
length
>
0
)
{
if
(
arguments
.
length
>
0
)
{
...
@@ -2241,6 +2284,9 @@ function unlockFunction(inputPass) {
...
@@ -2241,6 +2284,9 @@ function unlockFunction(inputPass) {
Set starting log for reading content
Set starting log for reading content
*/
*/
function
SetStartLog
(
strContentId
)
{
function
SetStartLog
(
strContentId
)
{
//abe pageLogもセット
var
isFound
=
false
;
var
isFound
=
false
;
var
arrContentLogs
=
ClientData
.
ContentLogData
();
var
arrContentLogs
=
ClientData
.
ContentLogData
();
...
@@ -2271,6 +2317,11 @@ function SetStartLog(strContentId) {
...
@@ -2271,6 +2317,11 @@ function SetStartLog(strContentId) {
// Reading time
// Reading time
log
.
readingTime
=
log
.
readingEndDate
.
subtractBySeconds
(
log
.
readingStartDate
);
log
.
readingTime
=
log
.
readingEndDate
.
subtractBySeconds
(
log
.
readingStartDate
);
//PageLog 1ページ目セット(1レコードは必須)
var
pageLog
=
new
PageLogEntity
();
pageLog
.
contentid
=
strContentId
;
log
.
pageLogArray
.
push
(
pageLog
);
// Add to storage
// Add to storage
arrContentLogs
.
push
(
log
);
arrContentLogs
.
push
(
log
);
}
}
...
@@ -2281,7 +2332,10 @@ function SetStartLog(strContentId) {
...
@@ -2281,7 +2332,10 @@ function SetStartLog(strContentId) {
// Set ending log for reading content
// Set ending log for reading content
function
SetEndLog
(
strContentId
)
{
function
SetEndLog
(
strContentId
)
{
var
log
=
new
LogEntity
();
//abe pageLogもセット
//var log = new LogEntity(); 無駄?
var
arrContentLogs
=
ClientData
.
ContentLogData
();
var
arrContentLogs
=
ClientData
.
ContentLogData
();
for
(
var
nIndex
=
0
;
nIndex
<
arrContentLogs
.
length
;
nIndex
++
)
{
for
(
var
nIndex
=
0
;
nIndex
<
arrContentLogs
.
length
;
nIndex
++
)
{
...
@@ -2293,11 +2347,31 @@ function SetEndLog(strContentId) {
...
@@ -2293,11 +2347,31 @@ function SetEndLog(strContentId) {
// Calculate to seconds
// Calculate to seconds
arrContentLogs
[
nIndex
].
readingTime
=
dateEnd
.
subtractBySeconds
(
dateStart
);
arrContentLogs
[
nIndex
].
readingTime
=
dateEnd
.
subtractBySeconds
(
dateStart
);
}
}
}
}
ClientData
.
ContentLogData
(
arrContentLogs
);
ClientData
.
ContentLogData
(
arrContentLogs
);
};
};
function
SetPageLog
(
strContentId
,
strPageNo
){
var
arrContentLogs
=
ClientData
.
ContentLogData
();
for
(
var
nIndex
=
0
;
nIndex
<
arrContentLogs
.
length
;
nIndex
++
)
{
if
(
arrContentLogs
[
nIndex
].
contentid
==
strContentId
)
{
//PageLog追加
var
pageLog
=
new
PageLogEntity
();
pageLog
.
contentid
=
strContentId
;
pageLog
.
pageNo
=
strPageNo
+
1
;
//0始まりのページ番号
arrContentLogs
[
nIndex
].
pageLogArray
.
push
(
pageLog
);
}
}
ClientData
.
ContentLogData
(
arrContentLogs
);
}
/*
/*
Register reading log of content to server by calling api
Register reading log of content to server by calling api
*/
*/
...
@@ -2309,16 +2383,72 @@ function RegisterLog() {
...
@@ -2309,16 +2383,72 @@ function RegisterLog() {
var
dateEnd
=
new
Date
(
arrContentLogs
[
nIndex
].
readingEndDate
);
var
dateEnd
=
new
Date
(
arrContentLogs
[
nIndex
].
readingEndDate
);
var
dateStart
=
new
Date
(
arrContentLogs
[
nIndex
].
readingStartDate
);
var
dateStart
=
new
Date
(
arrContentLogs
[
nIndex
].
readingStartDate
);
//ページログJSONデータの作成
var
pageLogArray
=
arrContentLogs
[
nIndex
].
pageLogArray
;
var
lines
=
[];
if
(
pageLogArray
.
length
>
0
){
//終了時間と閲覧時間の設定
var
pageLogStart
;
var
pageLogEnd
;
//2レコード目からチェック
for
(
var
nIndex2
=
1
;
nIndex2
<
pageLogArray
.
length
;
nIndex2
++
)
{
//一つ前のログの終了日時を次のレコードの開始日時でセット
if
(
pageLogArray
[
nIndex2
-
1
].
readingEndDate
==
null
){
pageLogArray
[
nIndex2
-
1
].
readingEndDate
=
pageLogArray
[
nIndex2
].
readingStartDate
;
}
pageLogStart
=
new
Date
(
pageLogArray
[
nIndex2
-
1
].
readingStartDate
);
pageLogEnd
=
new
Date
(
pageLogArray
[
nIndex2
-
1
].
readingEndDate
);
//時間差から閲覧秒セット
pageLogArray
[
nIndex2
-
1
].
readingTime
=
pageLogEnd
.
subtractBySeconds
(
pageLogStart
);
}
//最終レコードの処理
if
(
pageLogArray
[
pageLogArray
.
length
-
1
].
readingEndDate
==
null
){
pageLogArray
[
pageLogArray
.
length
-
1
].
readingEndDate
=
new
Date
();
}
pageLogStart
=
new
Date
(
pageLogArray
[
pageLogArray
.
length
-
1
].
readingStartDate
);
pageLogEnd
=
new
Date
(
pageLogArray
[
pageLogArray
.
length
-
1
].
readingEndDate
);
//時間差から閲覧秒セット
pageLogArray
[
pageLogArray
.
length
-
1
].
readingTime
=
pageLogEnd
.
subtractBySeconds
(
pageLogStart
);
//JSONデータ作成
for
(
var
nIndex2
=
0
;
nIndex2
<
pageLogArray
.
length
;
nIndex2
++
)
{
pageLogStart
=
new
Date
(
pageLogArray
[
nIndex2
].
readingStartDate
);
pageLogEnd
=
new
Date
(
pageLogArray
[
nIndex2
].
readingEndDate
);
//3秒以上なら記録する
if
(
pageLogArray
[
nIndex2
].
readingTime
>
2
){
var
line
=
[];
line
.
push
(
pageLogArray
[
nIndex2
].
pageNo
);
line
.
push
(
pageLogStart
.
jpDateTimeString1
());
line
.
push
(
pageLogEnd
.
jpDateTimeString1
());
line
.
push
(
pageLogArray
[
nIndex2
].
readingTime
);
lines
.
push
(
line
);
//alert("PageLog Line:" + JSON.stringify( line ) );
}
}
//alert("PageLog Lines:" + JSON.stringify( lines ) );
}
var
pageLogJson
=
""
;
if
(
lines
.
length
>
0
){
pageLogJson
=
"{ header:[
\"
pageNo
\"
,
\"
readingStartDate
\"
,
\"
readingEndDate
\"
,
\"
readingTime
\"
],lines:"
;
pageLogJson
=
pageLogJson
+
JSON
.
stringify
(
lines
);
pageLogJson
=
pageLogJson
+
"}"
;
//alert("JSON:" + pageLogJson);
}
var
params
=
{
var
params
=
{
sid
:
ClientData
.
userInfo_sid
(),
sid
:
ClientData
.
userInfo_sid
(),
contentId
:
arrContentLogs
[
nIndex
].
contentid
,
contentId
:
arrContentLogs
[
nIndex
].
contentid
,
readingStartDate
:
dateStart
.
jpDateTimeString1
(),
readingStartDate
:
dateStart
.
jpDateTimeString1
(),
readingEndDate
:
dateEnd
.
jpDateTimeString1
(),
readingEndDate
:
dateEnd
.
jpDateTimeString1
(),
readingTime
:
arrContentLogs
[
nIndex
].
readingTime
,
readingTime
:
arrContentLogs
[
nIndex
].
readingTime
,
deviceTypeId
:
4
deviceTypeId
:
4
,
pageLog
:
pageLogJson
};
};
avwCmsApiSync
(
ClientData
.
userInfo_accountPath
(),
"contentReadingLog"
,
'
ge
t'
,
params
,
avwCmsApiSync
(
ClientData
.
userInfo_accountPath
(),
"contentReadingLog"
,
'
pos
t'
,
params
,
null
,
null
,
function
(
xhr
,
b
,
c
)
{
function
(
xhr
,
b
,
c
)
{
if
(
xhr
.
status
!=
0
)
{
if
(
xhr
.
status
!=
0
)
{
...
...
abvw/common/json/lang/lang-ja.json
View file @
98db55b3
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
"txtPwdCurr"
:
"現在パスワード"
,
"txtPwdCurr"
:
"現在パスワード"
,
"txtPwdNew"
:
"変更パスワード"
,
"txtPwdNew"
:
"変更パスワード"
,
"txtPwdNewRe"
:
"(再)変更パスワード"
,
"txtPwdNewRe"
:
"(再)変更パスワード"
,
"txtPwdRemind"
:
"※スキップを選択すると、30日
以内にこのメッセージが表示されせん
"
,
"txtPwdRemind"
:
"※スキップを選択すると、30日
経過するまでこのメッセージが表示されません。
"
,
"txtSearch"
:
"検索"
,
"txtSearch"
:
"検索"
,
"dspShiori"
:
"しおり"
,
"dspShiori"
:
"しおり"
,
"dspSetting"
:
"設定変更"
,
"dspSetting"
:
"設定変更"
,
...
...
abvw/home.html
View file @
98db55b3
...
@@ -14,8 +14,8 @@
...
@@ -14,8 +14,8 @@
<link
href=
"./common/css/default.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"./common/css/default.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"./common/css/screenLock.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"./common/css/screenLock.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./common/css/jquery.treeview.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./common/css/jquery.treeview.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./common/css/screen.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./common/css/screen.css"
/>
<link
href=
"css/layout/common.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/layout/common.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/theme/common.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/theme/common.css"
rel=
"stylesheet"
type=
"text/css"
/>
...
@@ -32,10 +32,6 @@
...
@@ -32,10 +32,6 @@
<link
href=
"css/layout/list.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/layout/list.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/theme/list.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/theme/list.css"
rel=
"stylesheet"
type=
"text/css"
/>
<!-- <link href="css/backup.css" rel="stylesheet" type="text/css" />
<link href="css/restore.css" rel="stylesheet" type="text/css" />-->
<link
href=
"css/layout/backup.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/layout/backup.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/theme/backup.css"
rel=
"stylesheet"
type=
"text/css"
/>
<link
href=
"css/theme/backup.css"
rel=
"stylesheet"
type=
"text/css"
/>
...
@@ -60,13 +56,13 @@
...
@@ -60,13 +56,13 @@
<script
src=
"./js/home.js"
></script>
<script
src=
"./js/home.js"
></script>
<script
src=
"./js/header.js"
></script>
<script
src=
"./js/header.js"
></script>
<script
src=
"./common/js/scrolltopcontrol.js"
></script>
<script
src=
"./common/js/scrolltopcontrol.js"
></script>
<script
src=
"common/js/tab.js"
></script>
<script
src=
"
./
common/js/tab.js"
></script>
<script
src=
"./common/js/jquery.cookie.js"
type=
"text/javascript"
></script>
<script
src=
"./common/js/jquery.cookie.js"
type=
"text/javascript"
></script>
<script
src=
"./common/js/jquery.cookie.js"
type=
"text/javascript"
></script>
<script
src=
"./common/js/jquery.cookie.js"
type=
"text/javascript"
></script>
<script
src=
"./common/js/jquery.treeview.edit.js"
type=
"text/javascript"
></script>
<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/jquery.treeview.js"
type=
"text/javascript"
></script>
<script
src=
"./common/js/screenLock.js"
type=
"text/javascript"
></script>
<script
src=
"./common/js/screenLock.js"
type=
"text/javascript"
></script>
<script
src=
"js/detail.js"
type=
"text/javascript"
></script>
<script
src=
"
./
js/detail.js"
type=
"text/javascript"
></script>
</head>
</head>
...
@@ -99,7 +95,7 @@
...
@@ -99,7 +95,7 @@
</ul>
</ul>
</div>
</div>
<ul
class=
"button"
>
<ul
class=
"button"
>
<li
class=
"floatL"
>
<li
class=
"floatL"
id=
"dspPushMessage"
>
<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>
<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=
"accordion"
style=
"display:none;"
>
<div
id=
"show-push-message"
></div>
<div
id=
"show-push-message"
></div>
...
@@ -112,14 +108,16 @@
...
@@ -112,14 +108,16 @@
<li
class=
"menuIcon"
id=
"dspShiori"
><a
href=
"#"
><img
src=
"img/common/icon_marker.png"
width=
"30"
height=
"30"
></a></li>
<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=
"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=
"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>
<li
class=
"menuIcon"
id=
"dspHibiya"
style=
"display:none;"
><a
href=
"#"
><img
src=
"img/common/icon_setup.png"
width=
"30"
height=
"30"
></a></li>
</ul>
</ul>
</div>
</div>
</div>
</div>
</header>
</header>
<div
class=
"wrapper"
>
<div
class=
"wrapper"
>
<div
id=
"main"
class=
"hoge"
>
<div
id=
"main"
class=
"hoge"
>
<div
class=
"tabUnit"
>
<div
class=
"tabUnit"
>
<ul
class=
"switchingTab"
>
<ul
class=
"switchingTab"
>
<li
class=
"colleft"
><a
href=
"#list_0"
class=
"current"
id=
"lnkbtnGenre"
>
</a></li>
<li
class=
"colleft"
><a
href=
"#list_0"
class=
"current"
id=
"lnkbtnGenre"
>
</a></li>
<li
class=
"colright"
style=
"display:none;"
><a
href=
"#list_1"
id=
"lnkbtnGroup"
>
</a></li>
<li
class=
"colright"
style=
"display:none;"
><a
href=
"#list_1"
id=
"lnkbtnGroup"
>
</a></li>
...
@@ -229,6 +227,13 @@
...
@@ -229,6 +227,13 @@
<div
id=
"book_list"
></div>
<div
id=
"book_list"
></div>
</section>
</section>
</article>
</article>
<!-- 日比谷カスタム -->
<div
id=
"dlgAddMemberGroup"
title=
"公開コード"
>
<p>
公開コードを入力して下さい。
</p>
<p><input
type=
"text"
id=
"txtAddMemberGroupName"
value=
""
/><a
class=
""
href=
"#"
id=
"btnAddMemberGroupSearch"
lang=
"txtSearch"
>
検索
</a></p>
</div>
<footer>
<footer>
<div
class=
"border"
>
<div
class=
"border"
>
<div
class=
"cnt_footer"
>
<div
class=
"cnt_footer"
>
...
...
abvw/js/contentview.js
View file @
98db55b3
This diff is collapsed.
Click to expand it.
abvw/js/contentview_CreateObjects.js
View file @
98db55b3
This diff is collapsed.
Click to expand it.
abvw/js/contentview_Events.js
View file @
98db55b3
...
@@ -302,6 +302,11 @@ function clickSearchDetail() {
...
@@ -302,6 +302,11 @@ function clickSearchDetail() {
function
nextPage_click
()
{
function
nextPage_click
()
{
if
(
getContent
().
hasNextPage
())
{
if
(
getContent
().
hasNextPage
())
{
//abe
alert
(
"nextPage_click:"
+
contentID
);
SetPageLog
(
contentID
,
getPageIndex
()
+
1
);
playBGMOfContent
();
playBGMOfContent
();
playBGMOfPage
(
getPageIndex
()
+
1
);
playBGMOfPage
(
getPageIndex
()
+
1
);
...
@@ -323,6 +328,11 @@ function nextPage_click() {
...
@@ -323,6 +328,11 @@ function nextPage_click() {
function
prevPage_click
()
{
function
prevPage_click
()
{
if
(
getContent
().
hasPreviousPage
())
{
if
(
getContent
().
hasPreviousPage
())
{
//abe
alert
(
"prevPage_click:"
+
contentID
);
SetPageLog
(
contentID
,
getPageIndex
()
-
1
);
playBGMOfContent
();
playBGMOfContent
();
playBGMOfPage
(
getPageIndex
()
-
1
);
playBGMOfPage
(
getPageIndex
()
-
1
);
...
@@ -347,6 +357,11 @@ function firstPage_click() {
...
@@ -347,6 +357,11 @@ function firstPage_click() {
prevPage_click
();
prevPage_click
();
}
}
else
{
else
{
//abe
alert
(
"firstPage_click:"
+
contentID
);
SetPageLog
(
contentID
,
0
);
playBGMOfContent
();
playBGMOfContent
();
playBGMOfPage
(
0
);
playBGMOfPage
(
0
);
...
@@ -413,6 +428,11 @@ function lastPage_click() {
...
@@ -413,6 +428,11 @@ function lastPage_click() {
nextPage_click
();
nextPage_click
();
}
}
else
{
else
{
//abe
alert
(
"lastPage_click:"
+
contentID
);
SetPageLog
(
contentID
,
totalPage
-
1
);
playBGMOfContent
();
playBGMOfContent
();
playBGMOfPage
(
totalPage
-
1
);
playBGMOfPage
(
totalPage
-
1
);
...
...
abvw/js/contentview_GetData.js
View file @
98db55b3
...
@@ -143,6 +143,10 @@ function getMediaType1(iValueObj) {
...
@@ -143,6 +143,10 @@ function getMediaType1(iValueObj) {
pageObject
[
'width'
]
=
iValueObj
.
location
.
width
;
pageObject
[
'width'
]
=
iValueObj
.
location
.
width
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'id'
]
=
"MediaType1_"
+
iValueObj
.
action
.
actionType
;
pageObject
[
'id'
]
=
"MediaType1_"
+
iValueObj
.
action
.
actionType
;
//詳細ログ用
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
if
(
iValueObj
.
action
.
actionType
==
0
)
{
if
(
iValueObj
.
action
.
actionType
==
0
)
{
/*get mediaInfo */
/*get mediaInfo */
if
(
iValueObj
.
mediaInfo
)
{
if
(
iValueObj
.
mediaInfo
)
{
...
@@ -345,7 +349,7 @@ function getMediaType1(iValueObj) {
...
@@ -345,7 +349,7 @@ function getMediaType1(iValueObj) {
pageObject
[
"replyLimit"
]
=
iValueObj
.
action
.
replyLimit
;
pageObject
[
"replyLimit"
]
=
iValueObj
.
action
.
replyLimit
;
pageObject
[
"fullScreen"
]
=
iValueObj
.
action
.
fullScreen
;
pageObject
[
"fullScreen"
]
=
iValueObj
.
action
.
fullScreen
;
pageObject
[
"saveAs"
]
=
iValueObj
.
action
.
saveAs
;
pageObject
[
"saveAs"
]
=
iValueObj
.
action
.
saveAs
;
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
//
pageObject["objectId"] = iValueObj.action.objectId;
}
}
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
//End Function : No.9 - Editor : Long - Date: 08/16/2013 - Summary :
return
pageObject
;
return
pageObject
;
...
@@ -390,6 +394,9 @@ function getMediaType2(iValueObj) {
...
@@ -390,6 +394,9 @@ function getMediaType2(iValueObj) {
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'visible'
]
=
true
;
pageObject
[
'visible'
]
=
true
;
//詳細ログ用
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
return
pageObject
;
return
pageObject
;
};
};
...
@@ -430,6 +437,9 @@ function getMediaType3(iValueObj) {
...
@@ -430,6 +437,9 @@ function getMediaType3(iValueObj) {
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'visible'
]
=
true
;
pageObject
[
'visible'
]
=
true
;
//詳細ログ用
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
return
pageObject
;
return
pageObject
;
};
};
...
@@ -471,6 +481,9 @@ function getMediaType4(iValueObj) {
...
@@ -471,6 +481,9 @@ function getMediaType4(iValueObj) {
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'visible'
]
=
true
;
pageObject
[
'visible'
]
=
true
;
//詳細ログ用(使わない)
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
return
pageObject
;
return
pageObject
;
};
};
...
@@ -500,6 +513,9 @@ function getMediaType5(iValueObj) {
...
@@ -500,6 +513,9 @@ function getMediaType5(iValueObj) {
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'visible'
]
=
true
;
pageObject
[
'visible'
]
=
true
;
//詳細ログ用(使わない)
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
return
pageObject
;
return
pageObject
;
};
};
...
@@ -562,6 +578,9 @@ function getMediaType6(iValueObj) {
...
@@ -562,6 +578,9 @@ function getMediaType6(iValueObj) {
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'visible'
]
=
true
;
pageObject
[
'visible'
]
=
true
;
//詳細ログ用
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
return
pageObject
;
return
pageObject
;
};
};
...
@@ -597,6 +616,9 @@ function getMediaType7(iValueObj) {
...
@@ -597,6 +616,9 @@ function getMediaType7(iValueObj) {
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'visible'
]
=
true
;
pageObject
[
'visible'
]
=
true
;
//詳細ログ用(使わない)
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
return
pageObject
;
return
pageObject
;
};
};
...
@@ -647,6 +669,9 @@ function getMediaType8(iValueObj) {
...
@@ -647,6 +669,9 @@ function getMediaType8(iValueObj) {
pageObject
[
'3dview'
]
=
_3dViewObject
;
pageObject
[
'3dview'
]
=
_3dViewObject
;
}
}
//詳細ログ用
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
return
pageObject
;
return
pageObject
;
};
};
...
@@ -665,7 +690,8 @@ function getMediaType9(iValueObj) {
...
@@ -665,7 +690,8 @@ function getMediaType9(iValueObj) {
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'visible'
]
=
true
;
pageObject
[
'visible'
]
=
true
;
//詳細ログ用
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
if
(
iValueObj
.
action
.
actionType
==
11
){
if
(
iValueObj
.
action
.
actionType
==
11
){
var
resourceId
=
iValueObj
.
mediaInfo
.
resourceId
;
var
resourceId
=
iValueObj
.
mediaInfo
.
resourceId
;
...
@@ -706,7 +732,8 @@ function getMediaType11(iValueObj) {
...
@@ -706,7 +732,8 @@ function getMediaType11(iValueObj) {
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'height'
]
=
iValueObj
.
location
.
height
;
pageObject
[
'visible'
]
=
true
;
pageObject
[
'visible'
]
=
true
;
//詳細ログ用
pageObject
[
"objectId"
]
=
iValueObj
.
action
.
objectId
;
if
(
iValueObj
.
action
.
actionType
==
12
){
if
(
iValueObj
.
action
.
actionType
==
12
){
var
resourceId
=
iValueObj
.
mediaInfo
.
resourceId
;
var
resourceId
=
iValueObj
.
mediaInfo
.
resourceId
;
...
@@ -1457,6 +1484,9 @@ function assignCurrentContentPage(nav){
...
@@ -1457,6 +1484,9 @@ function assignCurrentContentPage(nav){
}
}
//abe
//alert("assignCurrentContentPage:" + content.currentPage);
};
};
//Correct Canvas Position
//Correct Canvas Position
...
...
abvw/js/contentview_InitObjects.js
View file @
98db55b3
...
@@ -128,6 +128,10 @@ function setLoadingSize(){
...
@@ -128,6 +128,10 @@ function setLoadingSize(){
};
};
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
function
initPage
()
{
function
initPage
()
{
//abe
//alert("initPage");
//START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
//START : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
setLoadingSize
();
setLoadingSize
();
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
//END : TRB00034 - DATE : 09/11/2013 - Editor : Long - Summary : Fix for center loading image
...
...
abvw/js/home.js
View file @
98db55b3
/// <reference path="../common/js/avweb.js" />
/// <reference path="../common/js/avweb.js" />
/// <reference path="../common/js/screenLock.js" />
/// <reference path="../common/js/screenLock.js" />
/// <reference path="../common/js/common.js" />
/// <reference path="../common/js/common.js" />
/// <reference path="../common/js/i18n.js" />
/// <reference path="../common/js/i18n.js" />
/// <reference path="../common/js/jquery-1.8.1.min.js" />
/// <reference path="../common/js/jquery-1.8.1.min.js" />
/// <reference path="../common/js/jquery-ui-1.8.23.custom.min.js" />
/// <reference path="../common/js/jquery-ui-1.8.23.custom.min.js" />
/// <reference path="../common/js/jquery.toastmessage.js" />
/// <reference path="../common/js/jquery.toastmessage.js" />
/// <reference path="../common/js/pageViewer.js" />
/// <reference path="../common/js/pageViewer.js" />
/// <reference path="header.js" />
/// <reference path="header.js" />
//Start Declare Variables
//Start Declare Variables
...
@@ -60,6 +52,10 @@ var isSubMenuHoverOn = false;
...
@@ -60,6 +52,10 @@ var isSubMenuHoverOn = false;
var
home_isMove
=
false
;
var
home_isMove
=
false
;
var
isShowBookShelf
=
null
;
var
isShowBookShelf
=
null
;
var
showNextRecordClickNumber
=
1
;
var
showNextRecordClickNumber
=
1
;
//名前空間用のオブジェクトを用意する
var
home
=
{};
//==========================================================
//==========================================================
$
(
document
).
ready
(
function
()
{
$
(
document
).
ready
(
function
()
{
...
@@ -69,7 +65,6 @@ $(document).ready(function () {
...
@@ -69,7 +65,6 @@ $(document).ready(function () {
document
.
title
=
i18nText
(
'dspHome'
)
+
' | '
+
i18nText
(
'sysAppTitle'
);
document
.
title
=
i18nText
(
'dspHome'
)
+
' | '
+
i18nText
(
'sysAppTitle'
);
// Set bookmark screen
// Set bookmark screen
ClientData
.
BookmarkScreen
(
ScreenIds
.
Home
);
ClientData
.
BookmarkScreen
(
ScreenIds
.
Home
);
...
@@ -197,20 +192,135 @@ $(document).ready(function () {
...
@@ -197,20 +192,135 @@ $(document).ready(function () {
// hide tab group with user anonymous
// hide tab group with user anonymous
if
(
isAnonymousLogin
())
{
if
(
isAnonymousLogin
())
{
$
(
'.switchingTab .colright'
).
hide
();
//カタログエディション対応判定
if
(
ClientData
.
serviceOpt_catalog_edition
()
==
'Y'
){
$
(
'.tabUnit'
).
hide
();
}
else
{
$
(
'.switchingTab .colright'
).
hide
();
}
//日比谷対応判定
if
(
ClientData
.
serviceOpt_hibiyakadan_catalog
()
==
'Y'
){
$
(
'#dspHibiya'
).
show
();
//日比谷テスト
jQuery
(
'#dlgAddMemberGroup'
).
dialog
(
{
autoOpen
:
false
,
modal
:
true
,
});
$
(
'#dspHibiya'
).
click
(
dspHibiyaClickFunction
);
$
(
'#btnAddMemberGroupSearch'
).
click
(
btnAddMemberGroupSearchClickFunction
);
}
else
{
$
(
'#dspHibiya'
).
hide
();
}
//プッシュメッセージ隠す
$
(
'#dspPushMessage'
).
hide
();
}
else
{
$
(
'.switchingTab .colright'
).
show
();
}
// set scroll for tree view with IE9 on win7
var
ua
=
window
.
navigator
.
userAgent
.
toLowerCase
();
if
(
/msie 9.0/
.
test
(
ua
)
&&
/windows nt 6.1/
.
test
(
ua
)
&&
!
/tablet/
.
test
(
ua
))
{
$
(
'.tab_bg_color'
).
css
({
"overflow-x"
:
"scroll"
});
}
//if (isIE9()) {
// $('.tab_bg_color').css({ "overflow-x": "scroll" });
//}
//日比谷テスト
$
(
'#dlgAddMemberGroup'
).
dialog
(
{
autoOpen
:
false
,
modal
:
true
,
});
$
(
'#dspHibiya'
).
click
(
dspHibiyaClickFunction
);
$
(
'#btnAddMemberGroupSearch'
).
click
(
btnAddMemberGroupSearchClickFunction
);
});
//日比谷カスタム ここから
function
dspHibiyaClickFunction
(){
$
(
'#dlgAddMemberGroup'
).
dialog
(
'open'
);
}
function
btnAddMemberGroupSearchClickFunction
(){
var
addGroupName
=
$
(
'#txtAddMemberGroupName'
).
val
();
if
(
addGroupName
==
""
){
return
;
}
var
groupIds
=
getAddMemberGroupId
(
addGroupName
);
if
(
groupIds
==
""
){
alert
(
"公開コードの判定に失敗しました。"
);
return
;
}
$
(
'#dlgAddMemberGroup'
).
dialog
(
'close'
);
ClientData
.
searchCond_groupId
(
groupIds
);
//画面再描画開始
var
recordFrom
=
0
;
var
recordTo
=
0
;
if
(
isShowBookShelf
)
{
recordFrom
=
DEFAULT_DISP_NUMBER_RECORD_FROM
;
recordTo
=
returnNumberDispRecordForBookShelf
();
}
else
if
(
!
isShowBookShelf
)
{
recordFrom
=
DEFAULT_DISP_NUMBER_RECORD_FROM
;
recordTo
=
returnNumberDispRecordForList
();
}
else
{
recordFrom
=
DEFAULT_DISP_NUMBER_RECORD_FROM
;
recordTo
=
returnNumberDispRecordForBookShelf
();
}
}
else
$
(
'.switchingTab .colright'
).
show
();
// set scroll for tree view with IE9 on win7
var
id
=
ClientData
.
userInfo_sid
();
var
ua
=
window
.
navigator
.
userAgent
.
toLowerCase
();
var
searchText
=
ClientData
.
searchCond_searchText
();
if
(
/msie 9.0/
.
test
(
ua
)
&&
/windows nt 6.1/
.
test
(
ua
)
&&
!
/tablet/
.
test
(
ua
))
{
var
searchDivision
=
ClientData
.
searchCond_searchDivision
();
$
(
'.tab_bg_color'
).
css
({
"overflow-x"
:
"scroll"
});
var
sortType
=
ClientData
.
searchCond_sortType
();
}
var
sortOrder
=
ClientData
.
searchCond_sortOrder
();
// if (isIE9()) {
//ClientData.searchCond_groupId('');
// $('.tab_bg_color').css({ "overflow-x": "scroll" });
ClientData
.
searchCond_genreId
(
''
);
// }
var
groupId
=
ClientData
.
searchCond_groupId
();
var
genreId
=
ClientData
.
searchCond_genreId
();
//refresh gridview
refreshGrid
();
resetShowNextRecordCount
();
handleSortDisp
();
renderContent
(
id
,
searchText
,
searchDivision
,
sortType
,
sortOrder
,
recordFrom
,
recordTo
,
genreId
,
groupId
);
}
function
getAddMemberGroupId
(
strGroupName
)
{
var
groupIds
=
""
;
var
params
=
{
sid
:
ClientData
.
userInfo_sid
(),
groupName
:
strGroupName
};
avwCmsApiSync
(
ClientData
.
userInfo_accountPath
(),
"addMemberGroup"
,
'POST'
,
params
,
// Success
function
(
data
)
{
if
(
data
.
groupIds
)
{
groupIds
=
data
.
groupIds
;
}
},
function
(
xmlHttpRequest
,
txtStatus
,
errorThrown
)
{
//
}
);
return
groupIds
;
};
//--日比谷カスタム ここまで
});
var
allowTimerCloseSubMenu
=
true
;
var
allowTimerCloseSubMenu
=
true
;
var
timer_subMenu
;
var
timer_subMenu
;
function
startTimerCloseMenu
()
{
function
startTimerCloseMenu
()
{
...
@@ -2117,7 +2227,7 @@ function checkContentMarkingMemoOption(contentId) {
...
@@ -2117,7 +2227,7 @@ function checkContentMarkingMemoOption(contentId) {
function
checkUserHasReadContent
(
contId
,
resourceVer
,
metaVer
)
{
function
checkUserHasReadContent
(
contId
,
resourceVer
,
metaVer
)
{
var
imgThumb
=
new
Image
();
var
imgThumb
=
new
Image
();
//imgThumb.src = returnThumbnail(contId);
//imgThumb.src = returnThumbnail(contId);
var
imgIconNew
=
new
Image
();
var
imgIconNew
=
new
Image
();
//imgIconNew.src = DEFAULT_IMG_CONTENT_NEW;
//imgIconNew.src = DEFAULT_IMG_CONTENT_NEW;
...
...
abvw/js/login.js
View file @
98db55b3
/// <reference path="../common/js/avweb.js" />
/// <reference path="../common/js/avweb.js" />
/// <reference path="../common/js/screenLock.js" />
/// <reference path="../common/js/screenLock.js" />
/// <reference path="../common/js/common.js" />
/// <reference path="../common/js/common.js" />
/// <reference path="../common/js/i18n.js" />
/// <reference path="../common/js/i18n.js" />
/// <reference path="../common/js/jquery-1.8.1.min.js" />
/// <reference path="../common/js/jquery-1.8.1.min.js" />
/// <reference path="../common/js/jquery-ui-1.8.23.custom.min.js" />
/// <reference path="../common/js/jquery-ui-1.8.23.custom.min.js" />
/// <reference path="../common/js/jquery.toastmessage.js" />
/// <reference path="../common/js/jquery.toastmessage.js" />
/// <reference path="../common/js/pageViewer.js" />
/// <reference path="../common/js/pageViewer.js" />
var
requirePasswordChange
;
var
requirePasswordChange
;
...
@@ -29,6 +22,9 @@ var login_errorMessage = "";
...
@@ -29,6 +22,9 @@ var login_errorMessage = "";
var
timeWaitSplashScreen
=
2000
;
// wait splash screen 2 second
var
timeWaitSplashScreen
=
2000
;
// wait splash screen 2 second
//名前空間用のオブジェクトを用意する
var
login
=
{};
//Load login Info
//Load login Info
function
loadLoginInfo
()
{
function
loadLoginInfo
()
{
...
@@ -94,8 +90,6 @@ function saveLoginInfo() {
...
@@ -94,8 +90,6 @@ function saveLoginInfo() {
}
}
ClientData
.
userInfo_lastLoginTime
(
date
.
jpDateTimeString
());
ClientData
.
userInfo_lastLoginTime
(
date
.
jpDateTimeString
());
//ClientData.requirePasswordChange(requirePasswordChange);
//ClientData.userInfo_sid(userinfo_sid);
ClientData
.
userInfo_sid_local
(
userinfo_sid
);
ClientData
.
userInfo_sid_local
(
userinfo_sid
);
saveServiceUserOption
();
saveServiceUserOption
();
...
@@ -145,15 +139,6 @@ function checkDialogValidation() {
...
@@ -145,15 +139,6 @@ function checkDialogValidation() {
msgError
.
html
(
i18nText
(
'msgPwdEmpty'
));
msgError
.
html
(
i18nText
(
'msgPwdEmpty'
));
msgError
.
attr
(
'lang'
,
'msgPwdEmpty'
);
msgError
.
attr
(
'lang'
,
'msgPwdEmpty'
);
msgError
.
show
();
msgError
.
show
();
/* show error messages */
//$().toastmessage({ position: 'middle-center' });
//$().toastmessage('showToast', {
// type: 'error',
// sticky: true,
// text: i18nText('msgPwdEmpty')
//});
return
false
;
return
false
;
}
}
else
if
(
!
ValidationUtil
.
CheckRequiredForText
(
newPass
))
{
else
if
(
!
ValidationUtil
.
CheckRequiredForText
(
newPass
))
{
...
@@ -161,28 +146,8 @@ function checkDialogValidation() {
...
@@ -161,28 +146,8 @@ function checkDialogValidation() {
msgError
.
html
(
i18nText
(
'msgPwdEmpty'
));
msgError
.
html
(
i18nText
(
'msgPwdEmpty'
));
msgError
.
attr
(
'lang'
,
'msgPwdEmpty'
);
msgError
.
attr
(
'lang'
,
'msgPwdEmpty'
);
msgError
.
show
();
msgError
.
show
();
/* show error messages */
//$().toastmessage({ position: 'middle-center' });
//$().toastmessage('showToast', {
// type: 'error',
// sticky: true,
// text: i18nText('msgPwdEmpty')
//});
return
false
;
return
false
;
}
}
// else if (!ValidationUtil.CheckRequiredForText(confirmPass)) {
// //msgError.html(i18nText('msgPwdEmpty'));
// //msgError.show();
// /* show error messages */
// $().toastmessage({ position: 'middle-center' });
// $().toastmessage('showToast', {
// type: 'error',
// sticky: true,
// text: i18nText('msgPwdEmpty')
// });
// return false;
// }
else
else
{
{
if
(
newPass
!=
confirmPass
){
if
(
newPass
!=
confirmPass
){
...
@@ -190,13 +155,6 @@ function checkDialogValidation() {
...
@@ -190,13 +155,6 @@ function checkDialogValidation() {
msgError
.
html
(
i18nText
(
'msgPwdNotMatch'
));
msgError
.
html
(
i18nText
(
'msgPwdNotMatch'
));
msgError
.
attr
(
'lang'
,
'msgPwdNotMatch'
);
msgError
.
attr
(
'lang'
,
'msgPwdNotMatch'
);
msgError
.
show
();
msgError
.
show
();
/* show error messages */
// $().toastmessage({ position: 'middle-center' });
// $().toastmessage('showToast', {
// type: 'error',
// sticky: true,
// text: i18nText('msgPwdNotMatch')
//});
return
false
;
return
false
;
}
}
else
{
else
{
...
@@ -241,17 +199,11 @@ function processLogin() {
...
@@ -241,17 +199,11 @@ function processLogin() {
// Save retrieved info
// Save retrieved info
saveLoginInfo
();
saveLoginInfo
();
// data.requirePasswordChange = 1;
// force_pw_change_on_login = 2;
// set number new push message to 0
// set number new push message to 0
ClientData
.
pushInfo_newMsgNumber
(
0
);
ClientData
.
pushInfo_newMsgNumber
(
0
);
$
(
'#main-error-message'
).
css
(
'display'
,
'none'
);
$
(
'#main-error-message'
).
css
(
'display'
,
'none'
);
if
(
data
.
requirePasswordChange
==
0
)
{
if
(
data
.
requirePasswordChange
==
0
)
{
ClientData
.
userInfo_sid
(
ClientData
.
userInfo_sid_local
());
ClientData
.
userInfo_sid
(
ClientData
.
userInfo_sid_local
());
avwScreenMove
(
"abvw/"
+
ScreenIds
.
Home
);
avwScreenMove
(
"abvw/"
+
ScreenIds
.
Home
);
...
@@ -647,11 +599,34 @@ function initLoginAnonymousUser() {
...
@@ -647,11 +599,34 @@ function initLoginAnonymousUser() {
$
.
each
(
data
.
serviceOptionList
,
function
(
i
,
option
)
{
$
.
each
(
data
.
serviceOptionList
,
function
(
i
,
option
)
{
if
(
option
.
serviceName
==
'marking'
)
{
if
(
option
.
serviceName
==
'marking'
)
{
ClientData
.
serviceOpt_marking
(
option
.
value
);
ClientData
.
serviceOpt_marking
(
option
.
value
);
}
else
if
(
option
.
serviceName
==
'catalog_edition'
)
{
ClientData
.
serviceOpt_catalog_edition
(
option
.
value
);
}
else
if
(
option
.
serviceName
==
'hibiyakadan_catalog'
)
{
ClientData
.
serviceOpt_hibiyakadan_catalog
(
option
.
value
);
}
}
});
});
// hide splash screen then move to home page
// hide splash screen then move to home page
$
(
'#anonymous'
).
fadeOut
(
'slow'
,
'swing'
,
function
()
{
$
(
'#anonymous'
).
fadeOut
(
'slow'
,
'swing'
,
function
()
{
avwScreenMove
(
"abvw/"
+
ScreenIds
.
Home
);
//avwScreenMove("abvw/" + ScreenIds.Home);
//カタログエディション対応判定
if
(
ClientData
.
serviceOpt_catalog_edition
()
==
'Y'
){
//引数パラメータがあれば取得
var
paramContentID
=
login
.
getUrlParams
(
'cid'
);
//カタログ対応
if
(
paramContentID
!=
''
){
//OpenUrlでコンテンツ開く
login
.
showContentViewByOpenUrl
(
paramContentID
);
}
else
{
//ホームへ移動
avwScreenMove
(
"abvw/"
+
ScreenIds
.
Home
);
}
}
else
{
//ホームへ移動
avwScreenMove
(
"abvw/"
+
ScreenIds
.
Home
);
}
});
});
}
}
else
{
else
{
...
@@ -675,15 +650,64 @@ function initLoginAnonymousUser() {
...
@@ -675,15 +650,64 @@ function initLoginAnonymousUser() {
showMessageErrorLoginAnonymous
(
i18nText
(
'msgAnonymousLoginErr2'
));
showMessageErrorLoginAnonymous
(
i18nText
(
'msgAnonymousLoginErr2'
));
}
}
});
});
};
};
function
showMessageErrorLoginAnonymous
(
errorMessage
)
{
$
().
toastmessage
({
position
:
'middle-center'
});
$
().
toastmessage
(
'showToast'
,
{
type
:
'error'
,
sticky
:
true
,
text
:
errorMessage
});
$
(
'.toast-position-middle-center'
).
css
(
'width'
,
'400px'
);
};
login
.
showContentViewByOpenUrl
=
function
(
strContentId
)
{
var
contentType
=
''
;
var
result
=
[];
var
params
=
{
sid
:
ClientData
.
userInfo_sid
(),
getType
:
'1'
,
contentId
:
strContentId
};
avwCmsApiSync
(
ClientData
.
userInfo_accountPath
(),
"webGetContent"
,
'GET'
,
params
,
function
(
data
)
{
//コンテンツIDセット
ClientData
.
contentInfo_contentId
(
strContentId
);
//コンテツタイプ判定
contentType
=
data
.
contentData
.
contentType
;
if
(
contentType
==
ContentTypeKeys
.
Type_Others
){
//Download content
downloadResourceById
(
strContentId
);
// redraw content remove new icon
//drawEditImage(contentId); 不要
}
else
{
//Go to Conten view page
avwScreenMove
(
"abvw/"
+
ScreenIds
.
ContentView
);
}
},
function
(
xmlHttpRequest
,
txtStatus
,
errorThrown
)
{
//見つからないかエラーなのでホームに移動
avwScreenMove
(
"abvw/"
+
ScreenIds
.
Home
);
}
);
};
//Get param url
login
.
getUrlParams
=
function
(
name
){
name
=
name
.
replace
(
/
[\[]
/
,
"
\\\
["
).
replace
(
/
[\]]
/
,
"
\\\
]"
);
var
regexS
=
"[
\\
?&]"
+
name
+
"=([^&#]*)"
;
var
regex
=
new
RegExp
(
regexS
);
var
results
=
regex
.
exec
(
window
.
location
.
href
);
if
(
results
==
null
){
return
""
;
}
else
{
return
results
[
1
];
}
};
function
showMessageErrorLoginAnonymous
(
errorMessage
)
{
$
().
toastmessage
({
position
:
'middle-center'
});
$
().
toastmessage
(
'showToast'
,
{
type
:
'error'
,
sticky
:
true
,
text
:
errorMessage
});
$
(
'.toast-position-middle-center'
).
css
(
'width'
,
'400px'
);
};
\ No newline at end of file
index.html
View file @
98db55b3
<!DOCTYPE html>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<html
xmlns=
"http://www.w3.org/1999/xhtml"
>
<head>
<head>
<meta
charset=
"UTF-8"
/>
<meta
charset=
"utf-8"
>
<title></title>
<title></title>
</head>
</head>
<body>
<body>
<div
style=
"text-align: center"
>
<div
style=
"text-align: center"
>
<a
href=
"login.html"
>
ログイン - login
</a><br
/>
<a
href=
"login.html"
>
ログイン - login
</a><br
/>
</div>
</div>
</body>
</body>
</html>
</html>
login.html
View file @
98db55b3
...
@@ -2,9 +2,6 @@
...
@@ -2,9 +2,6 @@
<html
xmlns=
"http://www.w3.org/1999/xhtml"
>
<html
xmlns=
"http://www.w3.org/1999/xhtml"
>
<head>
<head>
<!--<script type='text/javascript' src='http://code.jquery.com/jquery-latest.min.js'></script>
<script type="text/javascript" src="js/thickbox.js"></script>-->
<meta
charset=
"utf-8"
>
<meta
charset=
"utf-8"
>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=9,chrome=1"
/>
<meta
http-equiv=
"X-UA-Compatible"
content=
"IE=9,chrome=1"
/>
...
@@ -18,25 +15,17 @@
...
@@ -18,25 +15,17 @@
<link
type=
"text/css"
rel=
"stylesheet"
href=
"./abvw/css/layout/common.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"./abvw/css/layout/common.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"./abvw/css/theme/common.css"
/>
<link
type=
"text/css"
rel=
"stylesheet"
href=
"./abvw/css/theme/common.css"
/>
<!-- <link type="text/css" rel="stylesheet" href="./abvw/css/layout/footer.css" />
<link type="text/css" rel="stylesheet" href="./abvw/css/theme/footer.css" />-->
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/common/css/jquery-ui.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/common/css/jquery-ui.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/common/css/jquery.toastmessage.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/common/css/jquery.toastmessage.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/css/layout/login.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/css/layout/login.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/css/theme/login.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/css/theme/login.css"
/>
<!--
<link rel="stylesheet" type="text/css" href="./abvw/css/login.css" />-->
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/css/layout/login_validation.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/css/layout/login_validation.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/css/theme/login_validation.css"
/>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"./abvw/css/theme/login_validation.css"
/>
<script
src=
"./abvw/common/js/jquery-1.8.1.min.js"
></script>
<script
src=
"./abvw/common/js/jquery-1.8.1.min.js"
></script>
<!--<script src="./abvw/common/js/jquery-latest.js"></script>-->
<script
src=
"./abvw/common/js/thickbox.js"
></script>
<script
src=
"./abvw/common/js/thickbox.js"
></script>
<script
src=
"./abvw/common/js/jquery-ui-1.8.23.custom.min.js"
></script>
<script
src=
"./abvw/common/js/jquery-ui-1.8.23.custom.min.js"
></script>
<script
src=
"./abvw/common/js/jquery.toastmessage.js"
></script>
<script
src=
"./abvw/common/js/jquery.toastmessage.js"
></script>
<script
src=
"./abvw/common/js/screenLock.js"
type=
"text/javascript"
></script>
<script
src=
"./abvw/common/js/screenLock.js"
type=
"text/javascript"
></script>
...
@@ -53,86 +42,86 @@
...
@@ -53,86 +42,86 @@
</style>
</style>
<![endif]-->
<![endif]-->
<!-- <script type="text/javascript">
<!-- <script type="text/javascript">
$('head').append(
'<style type="text/css">#container { display: none; } #fade, #loader { display: block; }</style>'
$('head').append(
'<style type="text/css">#container { display: none; } #fade, #loader { display: block; }</style>'
);
);
jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に呼ばれる関数
jQuery.event.add(window,"load",function() { // 全ての読み込み完了後に呼ばれる関数
var pageH = $("#container").height();
var pageH = $("#container").height();
$("#fade").css("height", pageH).delay(900).fadeOut(800);
$("#fade").css("height", pageH).delay(900).fadeOut(800);
$("#loader").delay(600).fadeOut(300);
$("#loader").delay(600).fadeOut(300);
$("#container").css("display", "block");
$("#container").css("display", "block");
});
});
</script>-->
</script>-->
</head>
</head>
<body
id=
"login"
>
<body
id=
"login"
>
<div
id=
"anonymous"
>
<div
id=
"anonymous"
>
<img
src=
"./abvw/img/login/logo_login.png"
width=
"166"
height=
"150"
class=
"clearboth"
/>
<img
src=
"./abvw/img/login/logo_login.png"
width=
"166"
height=
"150"
class=
"clearboth"
/>
</div>
</div>
<div
id=
"normalUser"
>
<div
id=
"normalUser"
>
<div
id=
"loader"
><img
src=
"./abvw/img/login/loading_icon.gif"
width=
"200"
height=
"200"
></div>
<div
id=
"loader"
><img
src=
"./abvw/img/login/loading_icon.gif"
width=
"200"
height=
"200"
></div>
<div
id=
"fade"
></div>
<div
id=
"fade"
></div>
<div
class=
"wrapper"
>
<div
class=
"wrapper"
>
<div
id=
"main"
>
<div
id=
"main"
>
<ul
class=
"floatR"
id=
"menu-language"
><li
class=
"language"
><a
id=
"language-ja"
><img
src=
"./abvw/img/common/flg_jpn.png"
width=
"29"
height=
"20"
></a></li><li
class=
"language"
><a
id=
"language-en"
><img
src=
"./abvw/img/common/flg_usa.png"
width=
"29"
height=
"20"
></a></li><li
class=
"language"
><a
id=
"language-ko"
><img
src=
"./abvw/img/common/flg_kor.png"
width=
"29"
height=
"20"
></a></li></ul>
<ul
class=
"floatR"
id=
"menu-language"
><li
class=
"language"
><a
id=
"language-ja"
><img
src=
"./abvw/img/common/flg_jpn.png"
width=
"29"
height=
"20"
></a></li><li
class=
"language"
><a
id=
"language-en"
><img
src=
"./abvw/img/common/flg_usa.png"
width=
"29"
height=
"20"
></a></li><li
class=
"language"
><a
id=
"language-ko"
><img
src=
"./abvw/img/common/flg_kor.png"
width=
"29"
height=
"20"
></a></li></ul>
<article>
<article>
<img
src=
"./abvw/img/login/logo_login.png"
width=
"166"
height=
"150"
class=
"clearboth"
id=
"logologin"
>
<img
src=
"./abvw/img/login/logo_login.png"
width=
"166"
height=
"150"
class=
"clearboth"
id=
"logologin"
>
<section
id=
"formlogin"
>
<section
id=
"formlogin"
>
<table
width=
"440"
border=
"0"
cellspacing=
"0"
>
<table
width=
"440"
border=
"0"
cellspacing=
"0"
>
<tr>
<tr>
<th
width=
"33%"
class=
"lang"
lang=
"txtLoginAccPath"
>
アカウントパス
</th>
<th
width=
"33%"
class=
"lang"
lang=
"txtLoginAccPath"
>
アカウントパス
</th>
<td
width=
"67%"
><input
type=
"text"
id=
"txtAccPath"
maxlength=
"60"
/></td>
<td
width=
"67%"
><input
type=
"text"
id=
"txtAccPath"
maxlength=
"60"
/></td>
</tr>
</tr>
<tr>
<tr>
<th
class=
"lang"
lang=
"txtLoginId"
>
ログインID
</th>
<th
class=
"lang"
lang=
"txtLoginId"
>
ログインID
</th>
<td><input
type=
"text"
id=
"txtAccId"
maxlength=
"54"
/></td>
<td><input
type=
"text"
id=
"txtAccId"
maxlength=
"54"
/></td>
</tr>
</tr>
<tr>
<tr>
<th
class=
"lang"
lang=
"txtLoginPwd"
>
パスワード
</th>
<th
class=
"lang"
lang=
"txtLoginPwd"
>
パスワード
</th>
<td><input
type=
"password"
id=
"txtPassword"
/></td>
<td><input
type=
"password"
id=
"txtPassword"
/></td>
</tr>
</tr>
</table>
</table>
<p
class=
"error lang"
id=
"main-error-message"
style=
"display:none;"
>
パスワードまたはIDに誤りがあります
</p>
<p
class=
"error lang"
id=
"main-error-message"
style=
"display:none;"
>
パスワードまたはIDに誤りがあります
</p>
<p
class=
"memory"
><input
type=
"checkbox"
id=
"chkRemember"
/><label
class=
"lang"
lang=
"txtLoginPwdRbr"
for=
"chkRemember"
>
アカウントパスとログインIDを記憶する
</label></p>
<p
class=
"memory"
><input
type=
"checkbox"
id=
"chkRemember"
/><label
class=
"lang"
lang=
"txtLoginPwdRbr"
for=
"chkRemember"
>
アカウントパスとログインIDを記憶する
</label></p>
<a
class=
"loginbtn lang"
id=
"btnLogin"
lang=
"dspLogin"
>
ログイン
</a>
<a
class=
"loginbtn lang"
id=
"btnLogin"
lang=
"dspLogin"
>
ログイン
</a>
</section>
</section>
</article>
</article>
</div>
</div>
</div>
</div>
<footer>
<div
class=
"border"
>
<footer>
<div
class=
"cnt_footer"
>
<div
class=
"border"
>
COPYRIGHT
©
2013 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
<div
class=
"cnt_footer"
>
</div>
COPYRIGHT
©
2013 AGENTEC Co., Ltd. ALL RIGHTS RESERVED.
</div>
</div>
</footer>
</div>
</footer>
</div>
</div>
<section
id=
"main-password-change"
class=
"sectionchangepassword"
>
<section
id=
"main-password-change"
class=
"sectionchangepassword"
>
<h1
class=
"title lang"
lang=
"msgChangePassword"
>
パスワードを変更してください。
</h1>
<h1
class=
"title lang"
lang=
"msgChangePassword"
>
パスワードを変更してください。
</h1>
<span
id=
"dialog-error-message"
class=
"alertTxtDialog lang"
></span>
<span
id=
"dialog-error-message"
class=
"alertTxtDialog lang"
></span>
<dl>
<dl>
<dt
class=
"lang"
lang=
"txtPwdCurr"
>
旧パスワード:
</dt>
<dt
class=
"lang"
lang=
"txtPwdCurr"
>
旧パスワード:
</dt>
<dd><input
type=
"password"
id=
"txtCurrentPass"
/></dd>
<dd><input
type=
"password"
id=
"txtCurrentPass"
/></dd>
</dl>
</dl>
<dl>
<dl>
<dt
class=
"lang"
lang=
"txtPwdNew"
>
旧パスワード:
</dt>
<dt
class=
"lang"
lang=
"txtPwdNew"
>
旧パスワード:
</dt>
<dd><input
type=
"password"
id=
"txtNewPass"
/></dd>
<dd><input
type=
"password"
id=
"txtNewPass"
/></dd>
</dl>
</dl>
<dl>
<dl>
<dt
class=
"lang"
lang=
"txtPwdNewRe"
>
新パスワード(確認):
</dt>
<dt
class=
"lang"
lang=
"txtPwdNewRe"
>
新パスワード(確認):
</dt>
<dd><input
type=
"password"
id=
"txtConfirmNew"
/></dd>
<dd><input
type=
"password"
id=
"txtConfirmNew"
/></dd>
</dl>
</dl>
<p
class=
"lang"
lang=
"txtPwdRemind"
id=
"txtPwdRemind"
>
※スキップを選択すると、30日間このメッセージは表示されません
</p>
<p
class=
"lang"
lang=
"txtPwdRemind"
id=
"txtPwdRemind"
>
※スキップを選択すると、30日間このメッセージは表示されません
</p>
<p
class=
"loginbtn"
>
<p
class=
"loginbtn"
>
<a
class=
"skip lang"
id=
"btnSkip"
lang=
"dspSkip"
>
スキップ
</a>
<a
class=
"skip lang"
id=
"btnSkip"
lang=
"dspSkip"
>
スキップ
</a>
<a
class=
"change lang"
id=
"btnChange"
lang=
"dspChange"
>
変更
</a>
<a
class=
"change lang"
id=
"btnChange"
lang=
"dspChange"
>
変更
</a>
</p>
</p>
</section>
</section>
</body>
</body>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment