Skip to content

C
check
Commit 23d466c4 by Masaru Abe
Options

グループ認証関連

parent f68d6c8a
Showing with 637 additions and 44 deletions
abvw/bookmark.html
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
新着メッセージがあります！！！ 新着メッセージがあります！！！
</div> </div>
<div class="cnt_header"> <div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a> <a class="logo" href="javascript:void(0);" onclick="AVWEB.avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_login"> <div class="menu_login">
<ul class="floatL"> <ul class="floatL">
<li class="floatR" id="li-login-username" style="display:none;"> <li class="floatR" id="li-login-username" style="display:none;">
...@@ -99,6 +99,13 @@ ...@@ -99,6 +99,13 @@
</div> </div>
<div class="menu_language"> <div class="menu_language">
<div class="clearfix"> <div class="clearfix">
<ul class="floatL" id="authGroupBox" style="display:none;">
<li id="authGroupName"></li>
<li id="authGroupNameSub">閲覧中</li>
<li id="authGroupButton">戻る</li>
</ul>
<ul class="floatR"> <ul class="floatR">
<li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li> <li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li>
<li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li> <li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li>
......
abvw/common/js/common.js
...@@ -357,7 +357,11 @@ COMMON.Keys = { ...@@ -357,7 +357,11 @@ COMMON.Keys = {
conf_apiResourceDlUrl: 'conf_apiResourceDlUrl', conf_apiResourceDlUrl: 'conf_apiResourceDlUrl',
latitude: 'latitude', latitude: 'latitude',
longitude: 'longitude' longitude: 'longitude',
//ダイハツカスタム　グループ認証コード
authCode: 'authCode',
authGroupName: 'authGroupName',
authGroupId: 'authGroupId'
/* -------------------------------------------------------------------------------- */ /* -------------------------------------------------------------------------------- */
}; };
...@@ -1683,6 +1687,28 @@ var ClientData = { ...@@ -1683,6 +1687,28 @@ var ClientData = {
} else { } else {
return SessionStorageUtils.get(COMMON.Keys.longitude); return SessionStorageUtils.get(COMMON.Keys.longitude);
} }
},
authCode: function(data) {
if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.authCode, data);
} else {
return SessionStorageUtils.get(COMMON.Keys.authCode);
}
},
authGroupName: function(data) {
if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.authGroupName, data);
} else {
return SessionStorageUtils.get(COMMON.Keys.authGroupName);
}
},
authGroupId: function(data) {
if (arguments.length > 0) {
SessionStorageUtils.set(COMMON.Keys.authGroupId, data);
} else {
return SessionStorageUtils.get(COMMON.Keys.authGroupId);
}
} }
}; };
......
abvw/contentsearch.html
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
新着メッセージがあります！！！ 新着メッセージがあります！！！
</div> </div>
<div class="cnt_header"> <div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a> <a class="logo" href="javascript:void(0);" onclick="AVWEB.avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_login"> <div class="menu_login">
<ul class="floatL"> <ul class="floatL">
<li class="floatR" id="li-login-username" style="display:none;"> <li class="floatR" id="li-login-username" style="display:none;">
...@@ -101,6 +101,13 @@ ...@@ -101,6 +101,13 @@
</div> </div>
<div class="menu_language"> <div class="menu_language">
<div class="clearfix"> <div class="clearfix">
<ul class="floatL" id="authGroupBox" style="display:none;">
<li id="authGroupName"></li>
<li id="authGroupNameSub">閲覧中</li>
<li id="authGroupButton">戻る</li>
</ul>
<ul class="floatR"> <ul class="floatR">
<li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li> <li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li>
<li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li> <li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li>
......
abvw/css/layout/header.css
...@@ -255,3 +255,67 @@ a#searchbox-search:active{ ...@@ -255,3 +255,67 @@ a#searchbox-search:active{
margin-top: 20px; margin-top: 20px;
margin-left: 170px; margin-left: 170px;
} }
/* DK */
.cnt_header .menu_language #authGroupBox{
margin: 15px 0 0;
padding: 0;
position: relative;
}
.cnt_header .menu_language #authGroupName{
float: left;
text-align: right;
margin-left: 1px;
padding-left: 1px;
width: 250px;
/*
overflow: hidden;
-o-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
color:#fff;
font-weight:bold;
font-size:15px;
*/
}
.cnt_header .menu_language #authGroupNameSub{
float: left;
text-align: right;
margin-left: 1px;
padding-left: 1px;
overflow: hidden;
width: 50px;
/*
color:#fff;
font-weight:bold;
font-size:15px;
*/
}
.cnt_header .menu_language #authGroupButton{
float: left;
text-align: center;
overflow: hidden;
width: 45px;
margin-left: 5px;
padding-left: 1px;
/*
background: url(./img/common/box_pushmessage.jpg) repeat-x;
border: solid 1px #CCCCCC;
color:#000;
font-weight:normal;
font-size:15px;
cursor: pointer;
cursor: hand;
*/
}
abvw/css/layout/home.css
...@@ -118,3 +118,131 @@ canvas:hover ...@@ -118,3 +118,131 @@ canvas:hover
-ms-filter: none; -ms-filter: none;
} }
/* dk */
/*
#dlgAuthCode .inputAuthCode {
width:200px;
height:25px;
margin:20px auto 0;
}
#dlgAuthCode .inputAuthCode a.ok {
position:relative;
}
#dlgAuthCode .inputAuthCode a.cancel {
position:relative;
}
#dlgAuthCode .inputAuthCode a
{
margin:0 15px;
width: 200px;
height:21px;
-moz-border-radius:6px;
-webkit-border-radius:6px;
border-radius:6px;
display:inline-block;
padding:2px 0;
line-height:21px;
text-decoration:none;
text-align:center;
float:right;
}
#dlgAuthCode .inputAuthCode a:hover {
}
#dlgAuthCode .inputAuthCode a:active {
position:relative;
top:1px;
}
#dlgAuthCode .inputAuthCode a:not(:target) {
filter: none;
-ms-filter: none;
}
#dlgAuthCode .inputAuthCode a:hover:not(:target) {
filter: none;
-ms-filter: none;
}
*/
.sectionAuthCode{
width:400px;
height:250px;
padding:0;
margin:0;
overflow:hidden;
-webkit-border-radius:10px 10px 10px 10px;
-moz-border-radius:10px 10px 10px 10px;
border-radius:10px 10px 10px 10px;
display:none;
z-index:1000;
}
.sectionAuthCode h1{
margin:0 0 38px 0;
padding:0;
height:64px;
line-height:62px;
text-align:center;
letter-spacing: 2px;
}
.sectionAuthCode p{
width:300px;
margin:0 50px;
}
.sectionAuthCode p.notice
{
text-align:center;
margin-top:20px;
}
.sectionAuthCode p.message{
text-align:center;
}
.sectionAuthCode p.errmessage{
margin-top:10px;
text-align:center;
}
.sectionAuthCode .authCodeBtn {
width:280px;
height:25px;
margin:20px auto 0;
}
.sectionAuthCode .authCodeBtn a.ok {
position:relative;
}
.sectionAuthCode .authCodeBtn a.cancel {
position:relative;
}
.sectionAuthCode .authCodeBtn a
{
margin:0 15px;
width: 100px;
height:21px;
-moz-border-radius:6px;
-webkit-border-radius:6px;
border-radius:6px;
display:inline-block;
padding:2px 0;
line-height:21px;
text-decoration:none;
text-align:center;
float:right;
}
.sectionAuthCode .authCodeBtn a:hover {
}
.sectionAuthCode .authCodeBtn a:active {
position:relative;
top:1px;
}
.sectionAuthCode .authCodeBtn a:not(:target) {
filter: none;
-ms-filter: none;
}
.sectionAuthCode .authCodeBtn a:hover:not(:target) {
filter: none;
-ms-filter: none;
}
abvw/css/theme/header.css
...@@ -205,3 +205,37 @@ a#searchbox-search:active{ ...@@ -205,3 +205,37 @@ a#searchbox-search:active{
white-space: nowrap; white-space: nowrap;
} }
/* DK */
.cnt_header .menu_language #authGroupBox{
}
.cnt_header .menu_language #authGroupName{
overflow: hidden;
-o-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
text-overflow: ellipsis;
white-space: nowrap;
color:#fff;
font-weight:bold;
font-size:15px;
}
.cnt_header .menu_language #authGroupNameSub{
color:#fff;
font-weight:bold;
font-size:15px;
}
.cnt_header .menu_language #authGroupButton{
background: url(../../img/common/box_pushmessage.jpg) repeat-x;
border: solid 1px #CCCCCC;
color:#000;
font-weight:normal;
font-size:15px;
cursor: pointer;
cursor: hand;
}
abvw/css/theme/home.css
...@@ -115,3 +115,160 @@ canvas:hover{ ...@@ -115,3 +115,160 @@ canvas:hover{
background-image: url(button_back_on.svg); background-image: url(button_back_on.svg);
} }
/* dk */
/*
#dlgAuthCode .inputAuthCode {
width:290px;
height:25px;
margin:20px auto 0;
}
#dlgAuthCode .inputAuthCode a.ok {
position:relative;
}
#dlgAuthCode .inputAuthCode a.cancel {
position:relative;
}
#dlgAuthCode .inputAuthCode a
{
margin:0 15px;
width: 100px;
height:21px;
-moz-box-shadow:inset 0px 1px 0px 0px #86ACC7;
-webkit-box-shadow:inset 0px 1px 0px 0px #86ACC7;
box-shadow:inset 0px 1px 0px 0px #86ACC7;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #36638B), color-stop(1, #23486F) );
background:-moz-linear-gradient( center top, #36638B 5%, #83c008 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#36638B', endColorstr='#23486F');
background-color:#23486F;
-moz-border-radius:6px;
-webkit-border-radius:6px;
border-radius:6px;
border:1px solid #0C274D;
display:inline-block;
color:#ffffff;
font-family:arial;
font-size:14px;
font-weight:bold;
padding:2px 0;
line-height:21px;
text-decoration:none;
text-align:center;
float:right;
}
#dlgAuthCode .inputAuthCode a:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #23486F), color-stop(1, #36638B) );
background:-moz-linear-gradient( center top, #23486F 5%, #36638B 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
background-color:#36638B;
}
#dlgAuthCode .inputAuthCode a:active {
position:relative;
top:1px;
}
#dlgAuthCode .inputAuthCode a:not(:target) {
filter: none;
-ms-filter: none;
background-image: url(button_back_off.svg);
}
#dlgAuthCode .inputAuthCode a:hover:not(:target) {
filter: none;
-ms-filter: none;
background-image: url(button_back_on.svg);
}
*/
.sectionAuthCode{
border:1px solid #cccccc;
-webkit-box-shadow: 0px 1px 3px 0px #666;
-moz-box-shadow: 0px 1px 3px 0px #666;
box-shadow: 0px 1px 3px 0px #666;
font-family: "メイリオ", "Meiryo", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS P Gothic", "Osaka", Verdana, Arial, Helvetica, sans-serif;
background-color:#fff;
}
.sectionAuthCode h1
{
font-size:19px;
font-weight:bold;
color:#333;
text-shadow: 1px 1px 2px #999;
background-color:#f0f0f0;
-webkit-box-shadow: 0px 1px 3px 0px #999;
-moz-box-shadow: 0px 1px 3px 0px #999;
box-shadow: 0px 1px 3px 0px #999;
font-family: "メイリオ", "Meiryo", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS P Gothic", "Osaka", Verdana, Arial, Helvetica, sans-serif;
}
.sectionAuthCode p{
}
.sectionAuthCode p.notice
{
font-size:13px;
}
.sectionAuthCode p.message
{
font-size:15px;
font-weight:bold;
color:#333;
}
.sectionAuthCode p.errmessage
{
font-size:13px;
font-weight:normal;
color:#F00;
}
.sectionAuthCode .authCodeBtn {
}
.sectionAuthCode .authCodeBtn a.ok {
}
.sectionAuthCode .authCodeBtn a.disabled
{
cursor:default;
color:#9e9e9e;
pointer-events: none;
}
.sectionAuthCode .authCodeBtn a.disabled:hover
{
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #36638B), color-stop(1, #23486F) );
background:-moz-linear-gradient( center top, #36638B 5%, #83c008 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#36638B', endColorstr='#23486F');
background-color:#23486F;
}
.sectionAuthCode .authCodeBtn a.cancel {
}
.sectionAuthCode .authCodeBtn a
{
font-size:14px;
font-weight:bold;
-moz-box-shadow:inset 0px 1px 0px 0px #86ACC7;
-webkit-box-shadow:inset 0px 1px 0px 0px #86ACC7;
box-shadow:inset 0px 1px 0px 0px #86ACC7;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #36638B), color-stop(1, #23486F) );
background:-moz-linear-gradient( center top, #36638B 5%, #83c008 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#36638B', endColorstr='#23486F');
background-color:#23486F;
border:1px solid #0C274D;
color:#ffffff;
font-family:arial;
}
.sectionAuthCode .authCodeBtn a:hover {
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #23486F), color-stop(1, #36638B) );
background:-moz-linear-gradient( center top, #23486F 5%, #36638B 100% );
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#23486F', endColorstr='#36638B');
background-color:#36638B;
}
.sectionAuthCode .authCodeBtn a:active {
}
.sectionAuthCode .authCodeBtn a:not(:target) {
background-image: url(button_back_off.svg);
}
.sectionAuthCode .authCodeBtn a:hover:not(:target) {
background-image: url(button_back_on.svg);
}
abvw/history.html
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
新着メッセージがあります！！！ 新着メッセージがあります！！！
</div> </div>
<div class="cnt_header"> <div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a> <a class="logo" href="javascript:void(0);" onclick="AVWEB.avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_login"> <div class="menu_login">
<ul class="floatL"> <ul class="floatL">
<li class="floatR" id="li-login-username" style="display:none;"> <li class="floatR" id="li-login-username" style="display:none;">
...@@ -104,6 +104,13 @@ ...@@ -104,6 +104,13 @@
</div> </div>
<div class="menu_language"> <div class="menu_language">
<div class="clearfix"> <div class="clearfix">
<ul class="floatL" id="authGroupBox" style="display:none;">
<li id="authGroupName"></li>
<li id="authGroupNameSub">閲覧中</li>
<li id="authGroupButton">戻る</li>
</ul>
<ul class="floatR"> <ul class="floatR">
<li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li> <li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li>
<li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li> <li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li>
......
abvw/home.html
...@@ -96,11 +96,14 @@ ...@@ -96,11 +96,14 @@
<script type="text/javascript" src="./common/js/jquery.powertip.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/jquery.powertip.js?__UPDATEID__"></script>
<script type="text/javascript" src="./common/js/script.js?__UPDATEID__"></script> <script type="text/javascript" src="./common/js/script.js?__UPDATEID__"></script>
<script type="text/javascript"> <script type="text/javascript">
$(function () { $(function () {
//do //do
}); });
</script> </script>
<style type="text/css">
</style>
</head> </head>
...@@ -110,7 +113,7 @@ $(function () { ...@@ -110,7 +113,7 @@ $(function () {
新着メッセージがあります！！！ 新着メッセージがあります！！！
</div> </div>
<div class="cnt_header"> <div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a> <a class="logo" href="javascript:void(0);" onclick="AVWEB.avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_login"> <div class="menu_login">
<ul class="floatL"> <ul class="floatL">
<li class="floatR" id="li-login-username" style="display:none;"> <li class="floatR" id="li-login-username" style="display:none;">
...@@ -122,6 +125,13 @@ $(function () { ...@@ -122,6 +125,13 @@ $(function () {
</div> </div>
<div class="menu_language"> <div class="menu_language">
<div class="clearfix"> <div class="clearfix">
<ul class="floatL" id="authGroupBox" style="display:none;">
<li id="authGroupName"></li>
<li id="authGroupNameSub">閲覧中</li>
<li id="authGroupButton">戻る</li>
</ul>
<ul class="floatR"> <ul class="floatR">
<li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li> <li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li>
<li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li> <li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li>
...@@ -239,6 +249,22 @@ $(function () { ...@@ -239,6 +249,22 @@ $(function () {
</p> </p>
</div> </div>
<section class="sectionAuthCode" id="dlgAuthCode" style="display:none;">
<h1><label>認証コードの確認</label></h1>
<p class="message"><label>ここから先はスタッフ向けコンテンツです。</label></p>
<p class="message"><label>認証コードを入力して下さい。</label></p>
<p class="notice">
<input type="text" id="inputAuthCode" />
</p>
<p class="errmessage" id="authCodeErrorMessage" style="display:none;"><label>登録されていない認証コードです。</label></p>
<p class="authCodeBtn">
<a class="cancel" href="#" id="dlgAuthCode-cancel">キャンセル</a>
<a class="ok" href="#" id="dlgAuthCode-ok" >OK</a>
</p>
</section>
<footer> <footer>
<div class="border"> <div class="border">
<div class="cnt_footer"> <div class="cnt_footer">
......
abvw/js/Limit_Access_Content.js
...@@ -6,7 +6,13 @@ LIMIT_ACCESS_CONTENT.messageLevel = {}; ...@@ -6,7 +6,13 @@ LIMIT_ACCESS_CONTENT.messageLevel = {};
LIMIT_ACCESS_CONTENT.checkLimitContent = function(contentId, funcOk, funcCancel, isNotUnlockScreen) { LIMIT_ACCESS_CONTENT.checkLimitContent = function(contentId, funcOk, funcCancel, isNotUnlockScreen) {
var levelContent = parseInt(LIMIT_ACCESS_CONTENT.messageLevel[contentId].alertMessageLevel); var levelContent = 0;
try {
levelContent = parseInt(LIMIT_ACCESS_CONTENT.messageLevel[contentId].alertMessageLevel);
} catch(e){
//取得できない場合OKにする
levelContent = 0;
}
if (levelContent == 1) { if (levelContent == 1) {
if ($('#limit_level1').length <= 0) { if ($('#limit_level1').length <= 0) {
......
abvw/js/contentview.js
...@@ -2618,7 +2618,8 @@ CONTENTVIEW.downloadResourceById = function(contentId){ ...@@ -2618,7 +2618,8 @@ CONTENTVIEW.downloadResourceById = function(contentId){
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
contentId: contentId, contentId: contentId,
getType: '2', getType: '2',
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
var resourceUrl; var resourceUrl;
...@@ -5557,7 +5558,8 @@ CONTENTVIEW.ready = function(){ ...@@ -5557,7 +5558,8 @@ CONTENTVIEW.ready = function(){
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 1, getType: 1,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
......
abvw/js/contentview_CallApi.js
...@@ -113,7 +113,8 @@ CONTENTVIEW_CALLAPI.webGetPageImageContentSize = function() { ...@@ -113,7 +113,8 @@ CONTENTVIEW_CALLAPI.webGetPageImageContentSize = function() {
var params = { var params = {
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
...@@ -133,7 +134,8 @@ CONTENTVIEW_CALLAPI.webGetContentPageSizeWhen = function(){ ...@@ -133,7 +134,8 @@ CONTENTVIEW_CALLAPI.webGetContentPageSizeWhen = function(){
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 6, getType: 6,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
return AVWEB._callCmsApiWhen( return AVWEB._callCmsApiWhen(
...@@ -176,7 +178,8 @@ CONTENTVIEW_CALLAPI.webGetContentDataWhen = function() { ...@@ -176,7 +178,8 @@ CONTENTVIEW_CALLAPI.webGetContentDataWhen = function() {
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 1, getType: 1,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
return AVWEB._callCmsApiWhen( return AVWEB._callCmsApiWhen(
...@@ -199,7 +202,8 @@ CONTENTVIEW_CALLAPI.getJsonDataPageTitleWhen = function() { ...@@ -199,7 +202,8 @@ CONTENTVIEW_CALLAPI.getJsonDataPageTitleWhen = function() {
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 3, getType: 3,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
return AVWEB._callCmsApiWhen( return AVWEB._callCmsApiWhen(
...@@ -231,7 +235,8 @@ CONTENTVIEW_CALLAPI.getJsonDataType4When = function() { ...@@ -231,7 +235,8 @@ CONTENTVIEW_CALLAPI.getJsonDataType4When = function() {
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 4, getType: 4,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
return AVWEB._callCmsApiWhen( return AVWEB._callCmsApiWhen(
...@@ -254,7 +259,8 @@ CONTENTVIEW_CALLAPI.getJsonDataType5When = function() { ...@@ -254,7 +259,8 @@ CONTENTVIEW_CALLAPI.getJsonDataType5When = function() {
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 5, getType: 5,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
return AVWEB._callCmsApiWhen( return AVWEB._callCmsApiWhen(
...@@ -277,7 +283,8 @@ CONTENTVIEW_CALLAPI.getDataJsonFileWhen = function() { ...@@ -277,7 +283,8 @@ CONTENTVIEW_CALLAPI.getDataJsonFileWhen = function() {
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 2, getType: 2,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
return AVWEB._callCmsApiWhen( return AVWEB._callCmsApiWhen(
...@@ -363,7 +370,8 @@ CONTENTVIEW_CALLAPI.loadDataBookmark = function(lstPageNo) { ...@@ -363,7 +370,8 @@ CONTENTVIEW_CALLAPI.loadDataBookmark = function(lstPageNo) {
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
pageNos: lstPageNo[0], pageNos: lstPageNo[0],
thumbnailFlg: 1, thumbnailFlg: 1,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
...@@ -425,7 +433,8 @@ CONTENTVIEW_CALLAPI.getSearchDataFromJsonWhen = function() { ...@@ -425,7 +433,8 @@ CONTENTVIEW_CALLAPI.getSearchDataFromJsonWhen = function() {
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
thumbnailFlg: 0, thumbnailFlg: 0,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
return AVWEB._callCmsApiWhen( return AVWEB._callCmsApiWhen(
...@@ -450,7 +459,8 @@ CONTENTVIEW_CALLAPI.loadDataSearch = function(lstPageNo) { ...@@ -450,7 +459,8 @@ CONTENTVIEW_CALLAPI.loadDataSearch = function(lstPageNo) {
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
pageNos: lstPageNo[0], pageNos: lstPageNo[0],
thumbnailFlg: 1, thumbnailFlg: 1,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
......
abvw/js/contentview_CreateObjects.js
...@@ -1175,7 +1175,8 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im ...@@ -1175,7 +1175,8 @@ CONTENTVIEW_CREATEOBJECT.moveToContent = function (mediaType, actionType, id, im
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 1, getType: 1,
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), AVWEB.avwCmsApi(ClientData.userInfo_accountPath(),
......
abvw/js/contentview_GetData.js
...@@ -1184,7 +1184,8 @@ CONTENTVIEW_GETDATA.getContentDataForImageType = function(){ ...@@ -1184,7 +1184,8 @@ CONTENTVIEW_GETDATA.getContentDataForImageType = function(){
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
contentId: CONTENTVIEW_GENERAL.contentID, contentId: CONTENTVIEW_GENERAL.contentID,
getType: '1', getType: '1',
isStreaming: ClientData.isStreamingMode() isStreaming: ClientData.isStreamingMode(),
authCode: ClientData.authCode()
}; };
CONTENTVIEW_CALLAPI.abapi('webGetContent', params, 'GET', function (data) { CONTENTVIEW_CALLAPI.abapi('webGetContent', params, 'GET', function (data) {
......
abvw/js/header.js
...@@ -88,8 +88,6 @@ $(document).ready(function () { ...@@ -88,8 +88,6 @@ $(document).ready(function () {
//init push message //init push message
HEADER.initPushMessage(); HEADER.initPushMessage();
//$('*').click(handleHeaderSearchBoxEvent);
if (COMMON.isTouchDevice() == false) { if (COMMON.isTouchDevice() == false) {
$('#searchbox-key').hover(HEADER.searchBoxHoverFunction, HEADER.searchBoxHoverOffFunction); $('#searchbox-key').hover(HEADER.searchBoxHoverFunction, HEADER.searchBoxHoverOffFunction);
...@@ -104,8 +102,40 @@ $(document).ready(function () { ...@@ -104,8 +102,40 @@ $(document).ready(function () {
$('body').click(HEADER.bodyClickFunction); $('body').click(HEADER.bodyClickFunction);
} }
//DKカスタム
if( ClientData.authCode() != "" ){
//グループ名表示
$('#authGroupBox').show();
$('#authGroupName').html(ClientData.authGroupName());
$('#authGroupButton').click(HEADER.authCodeClear);
} else {
$('#authGroupBox').hide();
}
}); });
//グループ認証 戻る
HEADER.authCodeClear = function(){
$('#authGroupBox').hide();
ClientData.authCode("");
ClientData.authGroupName("");
ClientData.authGroupId("");
if( $('#bookshelf').length || $('#list').length ){
AVWEB.avwScreenMove(COMMON.ScreenIds.Home);
} else if( $('#bookmark').length ){
AVWEB.avwScreenMove(COMMON.ScreenIds.BookmarkList);
} else if( $('#history').length ){
AVWEB.avwScreenMove(COMMON.ScreenIds.History);
} else if( $('#user_change').length ){
AVWEB.avwScreenMove(COMMON.ScreenIds.Setting);
} else if( $('#contentsearch').length ){
AVWEB.avwScreenMove(COMMON.ScreenIds.ContentSearch);
}
};
HEADER.searchBoxHoverFunction = function(){ HEADER.searchBoxHoverFunction = function(){
HEADER.isHoverOn = true; HEADER.isHoverOn = true;
}; };
...@@ -167,18 +197,6 @@ HEADER.bodyClickFunction = function(event) { ...@@ -167,18 +197,6 @@ HEADER.bodyClickFunction = function(event) {
HEADER.isHoverOn = false; HEADER.isHoverOn = false;
$('#header-searchbox').hide(); $('#header-searchbox').hide();
} }
// if (currPosX >= $('#header-searchbox').position().left
// && currPosX <= ($('#header-searchbox').position().left + $('#header-searchbox').width())
// && currPosY >= $('#header-searchbox').position().top
// && currPosY <= ($('#header-searchbox').position().top + $('#header-searchbox').height())) {
// HEADER.isHoverOn = true;
// }
// else {
// HEADER.isHoverOn = false;
// }
} }
} }
else { else {
......
abvw/js/history.js
...@@ -130,7 +130,8 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate ...@@ -130,7 +130,8 @@ HISTORY.renderContent = function(id, text, division, type, order, from, to, cate
//recordFrom: from, //recordFrom: from,
//recordTo: to, //recordTo: to,
categoryId: cateid, categoryId: cateid,
groupId: grpid groupId: grpid,
authCode: ClientData.authCode()
}; };
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), 'webContentList', 'POST', params, AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), 'webContentList', 'POST', params,
...@@ -1195,7 +1196,8 @@ HISTORY.IsExistContent = function(strContentId) { ...@@ -1195,7 +1196,8 @@ HISTORY.IsExistContent = function(strContentId) {
var params = { var params = {
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: '1', getType: '1',
contentId: strContentId contentId: strContentId,
authCode: ClientData.authCode()
}; };
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params, AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webGetContent", 'GET', params,
function (data) { function (data) {
...@@ -1428,7 +1430,8 @@ HISTORY.returnContentTitleKana = function(id) { ...@@ -1428,7 +1430,8 @@ HISTORY.returnContentTitleKana = function(id) {
var params = { var params = {
contentId: id, contentId: id,
sid: ClientData.userInfo_sid(), sid: ClientData.userInfo_sid(),
getType: 1 getType: 1,
authCode: ClientData.authCode()
}; };
......
abvw/js/home.js
...@@ -229,8 +229,89 @@ $(document).ready(function () { ...@@ -229,8 +229,89 @@ $(document).ready(function () {
}); });
}); });
/* グループ認証関連 */
$('#dlgAuthCode').hide();
$('#login-username').click(HOME.showDlgAuthCode);
$('#dlgAuthCode-ok').click(HOME.authCodeOkFunction);
$('#dlgAuthCode-cancel').click(HOME.authCodeCancelFunction);
if( ClientData.authCode() != "" ){
//グループ名表示
$('#authGroupBox').show();
$('#authGroupName').html(ClientData.authGroupName());
$('#authGroupButton').click(HOME.authCodeClear);
} else {
$('#authGroupBox').hide();
}
}); });
//グループ認証ここかか
HOME.showDlgAuthCode = function(e){
if( ClientData.authCode() == "" ){
COMMON.lockLayout();
$('#authCodeErrorMessage').hide();
$('#inputAuthCode').val('');
$('#dlgAuthCode').show();
$('#dlgAuthCode').center();
}
};
HOME.authCodeOkFunction = function(e){
var authCode = $('#inputAuthCode').val();
if( authCode == "" ){
return;
}
var params = {
sid: ClientData.userInfo_sid(),
authCode: authCode
};
AVWEB.avwCmsApiSync(ClientData.userInfo_accountPath(), "webAuthCode", 'POST', params,
// Success
function (data) {
if (data.result) {
alert("data.result:"+data.result);
if("ok" == data.result){
//authCode有効
//画面再描画
ClientData.authCode(authCode);
ClientData.authGroupName(data.groupName);
ClientData.authGroupId(data.groupId);
$('#dlgAuthCode').hide();
COMMON.unlockLayout();
AVWEB.avwScreenMove(COMMON.ScreenIds.Home);
} else {
//エラー
$('#authCodeErrorMessage').show();
}
}
},
function (xmlHttpRequest, txtStatus, errorThrown) {
//error
alert("通信エラーが発生しました。");
$('#dlgAuthCode').hide();
COMMON.unlockLayout();
}
);
};
HOME.authCodeCancelFunction = function(e){
$('#dlgAuthCode').hide();
COMMON.unlockLayout();
};
//ここまで
//日比谷カスタム ここから //日比谷カスタム ここから
HOME.dspHibiyaClickFunction = function(){ HOME.dspHibiyaClickFunction = function(){
$( '#dlgAddMemberGroup' ).dialog( 'open' ); $( '#dlgAddMemberGroup' ).dialog( 'open' );
...@@ -971,7 +1052,8 @@ HOME.AddGenre_Callback = function(selectedNode) { ...@@ -971,7 +1052,8 @@ HOME.AddGenre_Callback = function(selectedNode) {
//Get Data from Group Json //Get Data from Group Json
HOME.getDataJsonFileGroup = function() { HOME.getDataJsonFileGroup = function() {
var params = { var params = {
sid: ClientData.userInfo_sid() sid: ClientData.userInfo_sid(),
authCode: ClientData.authCode()
}; };
HOME.abapi('group', params, 'GET', function (data1) { HOME.abapi('group', params, 'GET', function (data1) {
HOME.dataGroup = data1.groupList; HOME.dataGroup = data1.groupList;
...@@ -1615,7 +1697,8 @@ HOME.renderContent = function(id, text, division, type, order, from, to, cateid, ...@@ -1615,7 +1697,8 @@ HOME.renderContent = function(id, text, division, type, order, from, to, cateid,
recordFrom: from, recordFrom: from,
recordTo: to, recordTo: to,
genreId: cateid, genreId: cateid,
groupId: grpid groupId: grpid,
authCode: ClientData.authCode()
}; };
...@@ -2641,3 +2724,4 @@ HOME.showContentView = function(){ ...@@ -2641,3 +2724,4 @@ HOME.showContentView = function(){
}; };
abvw/js/login.js
...@@ -842,6 +842,8 @@ LOGIN.ready = function(){ ...@@ -842,6 +842,8 @@ LOGIN.ready = function(){
//モード初期化 //モード初期化
ClientData.isGetitsMode(false); ClientData.isGetitsMode(false);
ClientData.isStreamingMode(false); ClientData.isStreamingMode(false);
//ダイハツ対応
ClientData.authCode("");
//getitsサーバー設定確認 //getitsサーバー設定確認
if( sysSettings.apiUrl == "" ){ if( sysSettings.apiUrl == "" ){
......
abvw/settings.html
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
新着メッセージがあります！！！ 新着メッセージがあります！！！
</div> </div>
<div class="cnt_header"> <div class="cnt_header">
<a class="logo" href="javascript:void(0);" onclick="avwScreenMove(ScreenIds.Home)"> </a> <a class="logo" href="javascript:void(0);" onclick="AVWEB.avwScreenMove(ScreenIds.Home)"> </a>
<div class="menu_login"> <div class="menu_login">
<ul class="floatL"> <ul class="floatL">
<li class="floatR" id="li-login-username" style="display:none;"> <li class="floatR" id="li-login-username" style="display:none;">
...@@ -76,6 +76,13 @@ ...@@ -76,6 +76,13 @@
</div> </div>
<div class="menu_language"> <div class="menu_language">
<div class="clearfix"> <div class="clearfix">
<ul class="floatL" id="authGroupBox" style="display:none;">
<li id="authGroupName"></li>
<li id="authGroupNameSub">閲覧中</li>
<li id="authGroupButton">戻る</li>
</ul>
<ul class="floatR"> <ul class="floatR">
<li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li> <li class="language" id="language-jp" style="display:none;" ><a href="#"><img src="img/common/flg_jpn.png" width="29" height="20"></a></li>
<li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li> <li class="language" id="language-en" style="display:none;" ><a href="#"><img src="img/common/flg_usa.png" width="29" height="20"></a></li>
...@@ -194,6 +201,8 @@ ...@@ -194,6 +201,8 @@
</p> </p>
</section> </section>
<div id="inc_backup"></div>
<!--
<section class="sectionbackup_logout" id="dlgConfirmBackup1"> <section class="sectionbackup_logout" id="dlgConfirmBackup1">
<h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1> <h1><label class="lang" lang="txtBackupTitle">バックアップ確認</label></h1>
<p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p> <p class="message"><label lang="txtLogoutBkMsg" class="lang">ログアウトする前にバックアップしますか？</label></p>
...@@ -213,6 +222,7 @@ ...@@ -213,6 +222,7 @@
<a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a> <a class="ok lang" href="#" id="dlgConfirmBackup-backup" lang="dspBkOK">バックアップしてログアウト</a>
</p> </p>
</section> </section>
-->
<section class="sectionbackup" id="dlgConfirmBackup"> <section class="sectionbackup" id="dlgConfirmBackup">
<h1><label class="title lang" lang="txtBackupTitle">バックアップ確認</label></h1> <h1><label class="title lang" lang="txtBackupTitle">バックアップ確認</label></h1>
......
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