Skip to content

C
check
Commit b66af43a by Masaru Abe
Options

日比谷対応

parent d1a5398f
Showing with 224 additions and 25 deletions
abvw/bookmark.html
......@@ -88,7 +88,7 @@
</ul>
</div>
<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>
<div id="accordion" style="display:none;">
<div id="show-push-message"></div>
......
abvw/common/js/common.js
......@@ -2403,6 +2403,24 @@ function SetObjectLog( strContentId, objectLog ){
}
// 前回の１アクションのオブジェクトログの利用時間を設定
function SetObjectLogActionTime( strContentId, objectId, actionTime ){
var arrContentLogs = ClientData.ContentLogData();
for(var nIndex = 0; nIndex < arrContentLogs.length; nIndex++) {
if(arrContentLogs[nIndex].contentid == strContentId) {
if( arrContentLogs[nIndex].objectLogArray.length > 0 ){
if( arrContentLogs[nIndex].objectLogArray[ arrContentLogs[nIndex].objectLogArray.length - 1].objectId == objectId ){
arrContentLogs[nIndex].objectLogArray[ arrContentLogs[nIndex].objectLogArray.length - 1].actionTime = actionTime;
}
}
}
}
ClientData.ContentLogData(arrContentLogs);
}
/*
Register reading log of content to server by calling api
......
abvw/contentsearch.html
......@@ -88,7 +88,7 @@
</ul>
</div>
<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>
<div id="accordion" style="display:none;">
<div id="show-push-message"></div>
......
abvw/css/layout/home.css
......@@ -70,3 +70,49 @@ canvas:hover
}
.sectionhomebookshelf a.name{ }
/* hibiya */
#dlgAddMemberGroup .addMemberGroup {
width:200px;
height:25px;
margin:20px auto 0;
}
#dlgAddMemberGroup .addMemberGroup a.ok {
position:relative;
/*margin:0 98px 0 0;*/
}
#dlgAddMemberGroup .addMemberGroup a.cancel {
position:relative;
/*margin:-27px 0 0 135px;*/
}
#dlgAddMemberGroup .addMemberGroup 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;
}
#dlgAddMemberGroup .addMemberGroup a:hover {
}
#dlgAddMemberGroup .addMemberGroup a:active {
position:relative;
top:1px;
}
#dlgAddMemberGroup .addMemberGroup a:not(:target) {
filter: none;
-ms-filter: none;
}
#dlgAddMemberGroup .addMemberGroup a:hover:not(:target) {
filter: none;
-ms-filter: none;
}
abvw/css/theme/home.css
......@@ -50,3 +50,67 @@ canvas:hover{
}
.sectionhomebookshelf a.name{ color:#2d83da;}
/* hibiya */
#dlgAddMemberGroup .addMemberGroup {
width:290px;
height:25px;
margin:20px auto 0;
}
#dlgAddMemberGroup .addMemberGroup a.ok {
position:relative;
/*margin:0 98px 0 0;*/
}
#dlgAddMemberGroup .addMemberGroup a.cancel {
position:relative;
/*margin:-27px 0 0 135px;*/
}
#dlgAddMemberGroup .addMemberGroup 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;
}
#dlgAddMemberGroup .addMemberGroup 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;
}
#dlgAddMemberGroup .addMemberGroup a:active {
position:relative;
top:1px;
}
#dlgAddMemberGroup .addMemberGroup a:not(:target) {
filter: none;
-ms-filter: none;
background-image: url(button_back_off.svg);
}
#dlgAddMemberGroup .addMemberGroup a:hover:not(:target) {
filter: none;
-ms-filter: none;
background-image: url(button_back_on.svg);
}
abvw/history.html
......@@ -88,7 +88,7 @@
</ul>
</div>
<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>
<div id="accordion" style="display:none;">
<div id="show-push-message"></div>
......
abvw/home.html
......@@ -117,7 +117,7 @@
</header>
<div class="wrapper">
<div id="main" class="hoge">
<div class="tabUnit" >
<div class="tabUnit" style="display:none;" >
<ul class="switchingTab">
<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>
......@@ -229,9 +229,11 @@
</article>
<!-- 日比谷カスタム -->
<div id="dlgAddMemberGroup" title="公開コード">
<div id="dlgAddMemberGroup" title="公開コード" style="display: none;" >
<p>公開コードを入力して下さい。</p>
<p><input type="text" id="txtAddMemberGroupName" value="" /><a class="" href="#" id="btnAddMemberGroupSearch" lang="txtSearch">検索</a></p>
<p class="addMemberGroup">
<input type="text" id="txtAddMemberGroupName" value="" /><a class="ok" href="#" id="btnAddMemberGroupSearch" lang="txtSearch">検索</a>
</p>
</div>
<footer>
......
abvw/js/bookmark.js
......@@ -31,8 +31,6 @@ $(document).ready(function () {
LockScreen();
document.title = i18nText('dspShiori') + ' | ' + i18nText('sysAppTitle');
// Set bookmark screen
......@@ -83,6 +81,12 @@ $(document).ready(function () {
else {
checkForceChangePassword();
}
if (isAnonymousLogin()) {
//プッシュメッセージ隠す
$('#dspPushMessage').hide();
}
});
/*
......
abvw/js/contentsearch.js
......@@ -135,6 +135,12 @@ $(document).ready(function(){
//Check if Force Change password
checkForceChangePassword();
}
if (isAnonymousLogin()) {
//プッシュメッセージ隠す
$('#dspPushMessage').hide();
}
});
......
abvw/js/contentview.js
......@@ -1929,7 +1929,7 @@ var isPendingContentBGM = false;
function changePageWithoutSlide(pageMove) {
//abe コンテンツリンクで移動時
alert("changePageWithoutSlide:" + pageMove);
//alert("changePageWithoutSlide:" + pageMove);
//ページ閲覧ログセット
SetPageLog( contentID, pageMove);
......
abvw/js/contentview_Anket.js
// show dialog anket content
function showAnket(url, fullscreen) {
function showAnket(url, fullscreen, objectId) {
var $container = $('#dialog');
//url = url + "?sid=" + ClientData.userInfo_sid();
......@@ -28,10 +28,20 @@ function showAnket(url, fullscreen) {
+ '<div class="anket-commands" id="anket-commands"><input type="button" value="' + i18nText('txtTransparent') + '" id="btnFullOpacity"/> <input type="button" value="' + i18nText('txtSemiTransparent') + '" id="btnApartOpacity"/> <input type="button" value="' + i18nText('txtNoTransparent') + '" id="btnNoOpacity"/></div><div style="clear:both;"></div>'
);
$('#dialog h1 img').click(function(){
//時間記録
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
SetObjectLogActionTime( contentID, objectId, actionTime );
$container.removeAttr('style');
hideDialog();
});
//時間記録
var dateStart = new Date();
var avwUserEnvObj = new UserEnvironment();
// set overflow for container iframe
......
abvw/js/contentview_CreateObjects.js
......@@ -632,6 +632,11 @@ var htmlLinkButton = function (mediaType, actionType, id, imageUrl, x, y, w, h,
//abe
//alert("htmlLinkButton");
/*stop audio on page */
stopAllAudio();
if (resourceUrl != "") {
//詳細ログ作成
var objectLog = new ObjectLogEntity();
objectLog.contentid = contentID;
......@@ -649,17 +654,13 @@ var htmlLinkButton = function (mediaType, actionType, id, imageUrl, x, y, w, h,
SetObjectLog(contentID, objectLog);
//---
/*stop audio on page */
stopAllAudio();
if (resourceUrl != "") {
showHtml(resourceUrl);
showHtml(resourceUrl, objectId );
showDialog(true);
}
};
};
htmlLinkButton.prototype = new PageObject();
function showHtml(url){
function showHtml(url, objectId ){
//abe
//alert("showHtml");
......@@ -696,9 +697,19 @@ function showHtml(url){
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
$('#dialog h1 img').click(function(){
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
SetObjectLogActionTime( contentID, objectId, actionTime );
$container.removeAttr('style');
hideDialog();
});
var dateStart = new Date();
}
var anket = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, questionNo, replyLimit, fullscreen, saveAs, resourceId, enquete, objectId) {
......@@ -736,7 +747,7 @@ var anket = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible,
isFullScreen = true;
}
showAnket(url, isFullScreen);
showAnket(url, isFullScreen, objectId);
showDialog(true);
};
......@@ -1184,9 +1195,14 @@ var videoType2 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visi
createVideoFulScreen(mediaFile, id);
$("#btnCloseVideo").click(function (e) {
//時間記録
hideDialog();
/*play audio if exist */
playAllAudio();
});
showDialog(true);
......@@ -1237,14 +1253,25 @@ var videoType1 = function (mediaType, actionType, id, imageUrl, x, y, w, h, visi
createVideoFulScreen(mediaFile, id);
$("#btnCloseVideo").click(function (e) {
hideDialog();
//時間記録
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
SetObjectLogActionTime( contentID, objectId, actionTime );
hideDialog();
/* play audio */
playAllAudio();
});
showDialog(true);
}
//時間記録
var dateStart = new Date();
};
};
videoType1.prototype = new PageObject();
......@@ -1348,9 +1375,22 @@ var imagePreview = function (mediaType, actionType, id, imageUrl, x, y, w, h, vi
showImagePreview($('#divImagePreview'), imagePreview);
$("#btnClose").live('click', hideDialog);
$("#btnClose").live('click', function (e) {
//時間記録
var dateEnd = new Date();
var actionTime = dateEnd.subtractBySeconds(dateStart);
//alert("actionTime:" + actionTime);
SetObjectLogActionTime( contentID, objectId, actionTime );
hideDialog();
});
showDialog(true);
//時間記録
var dateStart = new Date();
};
};
imagePreview.prototype = new PageObject();
......
abvw/js/history.js
......@@ -125,6 +125,12 @@ $(document).ready(function(){
//Check if Force Change password
checkForceChangePassword();
}
if (isAnonymousLogin()) {
//プッシュメッセージ隠す
$('#dspPushMessage').hide();
}
});
//Call API
......
abvw/js/home.js
......@@ -199,6 +199,7 @@ $(document).ready(function () {
$('#main').width(660);
} else {
$('.tabUnit').show();
$('.switchingTab .colright').hide();
}
//日比谷対応判定
......@@ -209,6 +210,7 @@ $(document).ready(function () {
jQuery( '#dlgAddMemberGroup' ).dialog( {
autoOpen: false,
modal: true,
width: 350
});
$('#dspHibiya').click(dspHibiyaClickFunction);
$('#btnAddMemberGroupSearch').click(btnAddMemberGroupSearchClickFunction);
......@@ -221,6 +223,7 @@ $(document).ready(function () {
$('#dspPushMessage').hide();
} else {
$('.tabUnit').show();
$('.switchingTab .colright').show();
}
......@@ -234,12 +237,12 @@ $(document).ready(function () {
//}
//日比谷テスト
$( '#dlgAddMemberGroup' ).dialog( {
autoOpen: false,
modal: true,
});
$('#dspHibiya').click(dspHibiyaClickFunction);
$('#btnAddMemberGroupSearch').click(btnAddMemberGroupSearchClickFunction);
//$( '#dlgAddMemberGroup' ).dialog( {
// autoOpen: false,
// modal: true,
//});
//$('#dspHibiya').click(dspHibiyaClickFunction);
//$('#btnAddMemberGroupSearch').click(btnAddMemberGroupSearchClickFunction);
});
......
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