Skip to content

C
check
Commit 9f909922 by Vo Duc Thang
Options

#9158：アンケート表示実装の仕様対応など

parent 7ca6b4aa
Showing with 147 additions and 39 deletions
abvw/bookmark.html
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
<li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li> <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <div id="header-searchbox">
<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/> <input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked="checked" /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>
<input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/> <input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/>
<input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/> <input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/>
<a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a> <a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a>
......
abvw/common/json/lang/lang-en.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"Logout", "dspBkCancel":"Logout",
"txtSearchResult":"Result", "txtSearchResult":"Result",
"dspHome":"Home", "dspHome":"Home",
"txtLoginUser":"(Ver.20130828)User:", "txtLoginUser":"(Ver.20130830)User:",
"txtAll":"All", "txtAll":"All",
"txtMkgSize":"Size", "txtMkgSize":"Size",
"txtMkgS":"S", "txtMkgS":"S",
......
abvw/common/json/lang/lang-ja.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト", "dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果", "txtSearchResult":"検索結果",
"dspHome":"ホーム", "dspHome":"ホーム",
"txtLoginUser":"(Ver.20130828)ログイン中：", "txtLoginUser":"(Ver.20130830)ログイン中：",
"txtAll":"すべて", "txtAll":"すべて",
"txtMkgSize":"太さ", "txtMkgSize":"太さ",
"txtMkgS":"小", "txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃", "dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과", "txtSearchResult":"검색 결과",
"dspHome":"홈", "dspHome":"홈",
"txtLoginUser":"(Ver.20130828)로그인 중:", "txtLoginUser":"(Ver.20130830)로그인 중:",
"txtAll":"전체", "txtAll":"전체",
"txtMkgSize":"두께", "txtMkgSize":"두께",
"txtMkgS":"소", "txtMkgS":"소",
......
abvw/contentsearch.html
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li> <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <div id="header-searchbox">
<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/> <input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked="checked" /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>
<input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/> <input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/>
<input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/> <input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/>
<a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a> <a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a>
......
abvw/contentview.html
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<meta http-equiv="Cache-Control" content="no-store"> <meta http-equiv="Cache-Control" content="no-store">
<meta http-equiv="Cache-Control" content="no-cache"> <meta http-equiv="Cache-Control" content="no-cache">
<meta http-equiv="Expires" content="-1"> <meta http-equiv="Expires" content="-1">
<meta name="viewport" content="">
<title> </title> <title> </title>
<link rel="stylesheet" type="text/css" href="./common/css/default.css" /> <link rel="stylesheet" type="text/css" href="./common/css/default.css" />
...@@ -66,7 +67,9 @@ ...@@ -66,7 +67,9 @@
<style> <style>
html{ html{
-ms-touch-action : none; -ms-touch-action : none;
} }
</style> </style>
</head> </head>
......
abvw/history.html
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li> <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <div id="header-searchbox">
<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/> <input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked="checked" /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>
<input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/> <input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/>
<input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/> <input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/>
<a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a> <a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a>
......
abvw/home.html
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li> <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <div id="header-searchbox">
<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/> <input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked="checked" /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>
<input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/> <input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/>
<input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/> <input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/>
<a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a> <a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a>
......
abvw/js/contentview.js
...@@ -2274,20 +2274,54 @@ function downloadResourceById(contentId){ ...@@ -2274,20 +2274,54 @@ function downloadResourceById(contentId){
return resourceUrl; return resourceUrl;
}; };
$("document").ready(function () { //Start : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
function setViewportForWin8(){
//$('html').bind('touchmove', function(event){event.stopPropagation()}, false); if (window.navigator.msPointerEnabled) {
//$('html').bind('touchstart', function(event){event.stopPropagation()}, false); //Landscape
//$('html').bind('touchend', function(event){event.stopPropagation()}, false); if($(window).width() > $(window).height()){
//Start Function : No.20
var msViewportStyle = document.createElement("style");
msViewportStyle.appendChild(
document.createTextNode("@-ms-viewport{width: device-width;!important}")
);
document.getElementsByTagName("head")[0].appendChild(msViewportStyle);
}
//Portrait
else{
var msViewportStyle = document.createElement("style");
msViewportStyle.appendChild(
document.createTextNode("@-ms-viewport{width: device-height;!important}")
);
document.getElementsByTagName("head")[0].appendChild(msViewportStyle);
}
}
};
//End : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
//Start : TRB00022 - Editor : Long - Date : 08/28/2013 - Summary : For ipad rotate handling.
function setViewportForTouchDevice(maximumScale){
if (isTouchDevice()) {
if(avwUserEnvObj.os == 'ipad'){
var viewportmeta = document.querySelector('meta[name="viewport"]');
if (viewportmeta) {
viewportmeta.content = 'minimum-scale=0.75, maximum-scale=' + maximumScale;
}
}
}
};
//End : TRB00022 - Editor : Long - Date : 08/28/2013 - Summary : For ipad rotate handling.
//End Function : No.20 $("document").ready(function () {
/* check login */ /* check login */
if (!avwCheckLogin(ScreenIds.Login)) return; if (!avwCheckLogin(ScreenIds.Login)) return;
// Set event to prevent leave // Set event to prevent leave
ToogleLogoutNortice(); ToogleLogoutNortice();
if (avwUserEnvObj.os == 'ipad') { if (avwUserEnvObj.os == 'ipad') {
//Start : TRB00022 - Editor : Long - Date : 08/28/2013 - Summary : For ipad rotate handling.
setViewportForTouchDevice();
//End : TRB00022 - Editor : Long - Date : 08/28/2013 - Summary : For ipad rotate handling.
if (ClientData.IsRefresh() == true) { if (ClientData.IsRefresh() == true) {
//Get content Type //Get content Type
...@@ -3168,13 +3202,17 @@ function setDefaultEvent() { ...@@ -3168,13 +3202,17 @@ function setDefaultEvent() {
document.getElementById('main').addEventListener('touchmove', onTouchmove, false); document.getElementById('main').addEventListener('touchmove', onTouchmove, false);
document.getElementById('main').addEventListener('touchend', onTouchend, false); document.getElementById('main').addEventListener('touchend', onTouchend, false);
//Start : TRB00016 - Editor : Long - Date : 29/08/2013 - Summary : Fix for ipad move all page when move page
document.getElementById('canvasWrapper').addEventListener('touchstart', function(event){event.preventDefault();}, false); document.getElementById('canvasWrapper').addEventListener('touchstart', function(event){event.preventDefault();}, false);
document.getElementById('canvasWrapper').addEventListener('touchmove', function(event){event.preventDefault();}, false); document.getElementById('canvasWrapper').addEventListener('touchmove', function(event){event.preventDefault();}, false);
document.getElementById('canvasWrapper').addEventListener('touchend', function(event){event.preventDefault();}, false); document.getElementById('canvasWrapper').addEventListener('touchend', function(event){event.preventDefault();}, false);
//End : TRB00016 - Editor : Long - Date : 29/08/2013 - Summary : Fix for ipad move all page when move pages
//document.getElementById('wrapper').addEventListener('touchstart', function(event){event.preventDefault();}, false); //document.getElementById('wrapper').addEventListener('touchstart', function(event){event.preventDefault();}, false);
//document.getElementById('wrapper').addEventListener('touchmove', function(event){event.preventDefault();}, false); //document.getElementById('wrapper').addEventListener('touchmove', function(event){event.preventDefault();}, false);
//document.getElementById('wrapper').addEventListener('touchend', function(event){event.preventDefault();}, false); //document.getElementById('wrapper').addEventListener('touchend', function(event){event.preventDefault();}, false);
} }
$('#main').mouseout(function (event) { $('#main').mouseout(function (event) {
......
abvw/js/contentview_CreateObjects.js
...@@ -545,23 +545,24 @@ function showHtml(url){ ...@@ -545,23 +545,24 @@ function showHtml(url){
hideDialog(); hideDialog();
}); });
} }
var anket = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, resourceUrl, questionNo, replyLimit, fullscreen, saveAs, objectId) { var anket = function (mediaType, actionType, id, imageUrl, x, y, w, h, visible, resourceUrl, questionNo, replyLimit, fullscreen, saveAs, objectId) {
this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null); this.setup(mediaType, actionType, id, imageUrl, x, y, w, h, visible, null, null);
this.action = function () { this.action = function () {
/*stop audio on page */ /*stop audio on page */
stopAllAudio(); stopAllAudio();
if (resourceUrl != "") { var url = getURLPageImage("webEnqueteReply/init") + "/?abObjectId="+objectId + "&sid=" + ClientData.userInfo_sid();
resourceUrl = resourceUrl + "?abObjectId=" + objectId + "&sid=" + ClientData.userInfo_sid();
var isFullScreen = false; var isFullScreen = false;
if(parseInt(fullscreen) == 1){ if(parseInt(fullscreen) == 1){
isFullScreen = true; isFullScreen = true;
} }
showAnket(resourceUrl, isFullScreen); showAnket(url, isFullScreen);
showDialog(true); showDialog(true);
}
}; };
}; };
anket.prototype = new PageObject(); anket.prototype = new PageObject();
......
abvw/js/contentview_GetData.js
...@@ -1014,21 +1014,73 @@ function getContentInfoTypeImage(){ ...@@ -1014,21 +1014,73 @@ function getContentInfoTypeImage(){
$('#lblSlider').text('/ ' + 1); $('#lblSlider').text('/ ' + 1);
//Start: TRB00019 - Editor : Long - Date : 28/08/2013 - Summary : Fix for android resize
/* window resize event */ /* window resize event */
$(window).resize(function () { $(window).resize(function () {
if (isTouchDevice() == true) {
if (avwUserEnvObj.os == "android") {
var tempRatio = document.documentElement.clientWidth / window.innerWidth;
if (tempRatio <= 1) {
// Adjust position for toolbar and footer bar
var top = window.innerHeight - $("#footer_toolbar_1").height();
$("#wrapper").css("width", window.innerWidth);
$("#wrapper").css("height", window.innerHeight);
$("#footer_toolbar_1").css("top", top + "px");
$("#footer_toolbar_2").css("top", top + "px");
}
else {
var top = $(window).height() - $("#footer_toolbar_1").height();
$("#wrapper").css("width", $(window).width());
$("#wrapper").css("height", $(window).height());
$("#footer_toolbar_1").css("top", top + "px");
$("#footer_toolbar_2").css("top", top + "px");
}
}
}
resizeScreen(); resizeScreen();
isChangeSizeScreen = false; isChangeSizeScreen = false;
/* change position dialog */ /* change position dialog */
changePosDialog(); changePosDialog();
/* close dialog popuptext */ /* close dialog popuptext */
closeDialogResize(); closeDialogResize();
});
});
/*init Image Bookmark */
initImageBookmark();
/* init image had draw */
initDisplayMarking();
/* check status */
checkStatusImageMarking();
trackTransforms(context_main);
if (isTouchDevice() == true) {
if (avwUserEnvObj.os == "android") {
standardRatio = document.documentElement.clientWidth / window.innerWidth;
startDetectZoom({ time: 500,
callbackFunction: function (oldRatio, newRatio, oldW, oldH, newW, newH) {
currentRatio = newRatio;
}
});
var top = window.innerHeight - $("#footer_toolbar_1").height();
$("#wrapper").css("width", window.innerWidth);
$("#wrapper").css("height", window.innerHeight);
$("#footer_toolbar_1").css("top", top + "px");
$("#footer_toolbar_2").css("top", top + "px");
sizingScreen();
}
}
}; };
//End: TRB00019 - Editor : Long - Date : 28/08/2013 - Summary : Fix for android resize
resourceImage.src = resourceUrl; resourceImage.src = resourceUrl;
}; };
......
abvw/js/contentview_InitObjects.js
...@@ -249,10 +249,16 @@ function initPage() { ...@@ -249,10 +249,16 @@ function initPage() {
disableAllControl(); disableAllControl();
/* window resize event */ /* window resize event */
$(window).resize(function () { $(window).resize(function () {
sizingScreen();
//Start : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
setViewportForWin8();
//End : TRB00015 - Editor : Long - Date : 08/28/2013 - Summary : For win 8 rotate handling.
sizingScreen();
/* close dialog popuptext */ /* close dialog popuptext */
closeDialogResize(); closeDialogResize();
}); });
$(document).ajaxComplete(function () { $(document).ajaxComplete(function () {
...@@ -310,7 +316,7 @@ function initPage() { ...@@ -310,7 +316,7 @@ function initPage() {
} }
/* window resize event */ /* window resize event */
$(window).resize(function () { $(window).resize(function () {
if (isTouchDevice() == true) { if (isTouchDevice() == true) {
if (avwUserEnvObj.os == "android") { if (avwUserEnvObj.os == "android") {
......
abvw/js/header.js
...@@ -86,7 +86,6 @@ $(document).ready(function () { ...@@ -86,7 +86,6 @@ $(document).ready(function () {
$('#searchbox-body-header').click(headerSearchBodyClickFunction); $('#searchbox-body-header').click(headerSearchBodyClickFunction);
//init push message //init push message
initPushMessage(); initPushMessage();
...@@ -158,7 +157,7 @@ function bodyClickFunction(event) { ...@@ -158,7 +157,7 @@ function bodyClickFunction(event) {
&& currPosY >= $('#header-searchbox').position().top && currPosY >= $('#header-searchbox').position().top
&& currPosY <= ($('#header-searchbox').position().top + $('#header-searchbox').height())) { && currPosY <= ($('#header-searchbox').position().top + $('#header-searchbox').height())) {
isHoverOn = true; isHoverOn = true;
} }
else { else {
...@@ -211,8 +210,17 @@ function headerSearchKeyDownEventFunction(e){ ...@@ -211,8 +210,17 @@ function headerSearchKeyDownEventFunction(e){
//Toggle Search Panel Click function //Toggle Search Panel Click function
function toggleSearchPanel(){ function toggleSearchPanel(){
if ($("div#header-searchbox").is(":hidden")) { if ($("div#header-searchbox").is(":hidden")) {
$('div#header-searchbox').slideDown('slow');
// show radio options
$('div#header-searchbox').slideDown('slow');
// set default option search
if ($('#header-searchbox input:checked').length == 0) {
// set option default is searchbox content
$('#searchbox-content').attr('checked', 'checked');
}
} else { } else {
$('div#header-searchbox').hide(); $('div#header-searchbox').hide();
} }
......
abvw/settings.html
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
<li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li> <li class="manual_link"><a id="manual" href="../usermanual.html" target="_manual">Manual</a></li>
<li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li> <li style="padding-left:0;"><input id="searchbox-key" type="text" placeholder="キーワードを入力してください"></li>
<div id="header-searchbox"> <div id="header-searchbox">
<input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/> <input type="radio" id="searchbox-content" name="searchbox-searchtype" value="1" checked="checked" /><span id="searchbox-content-header" class="lang" lang="txtCtnNm">コンテンツ名</span><br/>
<input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/> <input type="radio" id="searchbox-tag" name="searchbox-searchtype" value="2" /><span class="lang" id="searchbox-tag-header" lang="txtTag">タグ</span><br/>
<input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/> <input type="radio" id="searchbox-body" name="searchbox-searchtype" value="3" /><span class="lang" id="searchbox-body-header" lang="txtContTxt">本文</span><br/>
<a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a> <a class="blue lang" href="#" id="searchbox-search" lang="txtSearch">検索</a>
......
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