Skip to content

C
check
Commit 3f8dd190 by Vo Duc Thang
Options

9/26 リリース

parent ba8996da
Showing with 90 additions and 46 deletions
abvw/bookmark.html
......@@ -69,7 +69,7 @@
<div class="menu_language">
<div class="clearfix">
<ul class="floatL">
<li class="floatR">
<li class="floatR" id="li-login-username" style="display:none;">
<label class="lang" lang="txtLoginUser">こんにちは</label>
<label id="login-username"> </label>
</li>
......
abvw/common/json/lang/lang-en.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20130925)User:",
"txtLoginUser":"(Ver.20130926)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......
abvw/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20130925)ログイン中：",
"txtLoginUser":"(Ver.20130926)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20130925)로그인 중:",
"txtLoginUser":"(Ver.20130926)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......
abvw/css/theme/viewer.css
......@@ -1396,6 +1396,10 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
{
background-position: -414px -92px;
}
#control_screen_2{
background-color: #898989;
opacity: 0.75;
}
ul#divSearchResult li:hover{ background:#f4f4f4;cursor:pointer;}
ul#divListBookmark li:hover{background:#f4f4f4;cursor:pointer;}
#divListIndex span:hover{color: red; cursor: pointer}
\ No newline at end of file
abvw/history.html
......@@ -69,7 +69,7 @@
<div class="menu_language">
<div class="clearfix">
<ul class="floatL">
<li class="floatR">
<li class="floatR" id="li-login-username" style="display:none;">
<label class="lang" lang="txtLoginUser">こんにちは</label>
<label id="login-username"> </label>
</li>
......
abvw/home.html
......@@ -80,7 +80,7 @@
<div class="menu_language">
<div class="clearfix">
<ul class="floatL">
<li class="floatR">
<li class="floatR" id="li-login-username" style="display:none;">
<label class="lang" lang="txtLoginUser">こんにちは</label>
<label id="login-username"> </label>
</li>
......
abvw/js/contentview.js
......@@ -2125,6 +2125,7 @@ function displayOverlayForSpecifyContentType(){
$("#footer_toolbar_2").css("top", top + "px");
sizingScreen();
}
}
/* window resize event */
......@@ -2152,8 +2153,11 @@ function displayOverlayForSpecifyContentType(){
}
}
}
//Start : TRB00082 - Editor : Long - Date : 09/25/2013 - Summary : For win 8 rotate handling.
setViewportForWin8();
//End : TRB00082 - Editor : Long - Date : 09/25/2013 - Summary : For win 8 rotate handling.
resizeScreen();
isChangeSizeScreen = false;
/* change position dialog */
......@@ -2174,19 +2178,13 @@ function handleForContentTypeVideo(resourceUrl){
$container.html('');
if (ClientData.userOpt_musicMode() == "1") {
$container.html(
'<h1>'
+ '</h1>'
+ '<video id="content_video" autoplay="true" loop="true" preload="auto" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
$container.html('<video id="content_video" autoplay="true" loop="true" preload="auto" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>'
);
}
else {
$container.html(
'<h1>'
+ '</h1>'
+ '<video id="content_video" autoplay="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
$container.html('<video id="content_video" autoplay="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>'
);
......@@ -2251,19 +2249,13 @@ function handleForContentTypeMusic(resourceUrl){
//$container.css('background-attachment', 'fixed');
if (ClientData.userOpt_musicMode() == "1") {
$container.html(
'<h1>'
+ '</h1>'
+ '<audio autoplay="true" loop="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
$container.html('<audio autoplay="true" loop="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>'
);
}
else {
$container.html(
'<h1>'
+ '</h1>'
+ '<audio autoplay="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
$container.html('<audio autoplay="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>'
);
......@@ -2302,12 +2294,20 @@ function handleForContentTypeHTML(resourceUrl){
$container.css('left','0%');
$container.css('width','100%');
$container.css('background-color','white');
$container.html('<h1 ></h1>'
+ '<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%; height: 95%; ">'
+ '</iframe>'
);
$container.show();
//START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
if(avwUserEnvObj.os == "ipad"){
$container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%;"></iframe>');
$container.css('overflow', 'scroll');
$container.css('-webkit-overflow-scrolling', 'touch');
}
else{
$container.html('<iframe src="'+ resourceUrl +'" style="position: absolute; width: 100%; height: 100%; "> </iframe>');
}
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
$container.show();
};
//Check type of content
......@@ -2410,6 +2410,10 @@ function fullScreenForNotPdfType(){
var w = $("#wrapper").width();
var h = $("#wrapper").height();
if(contentType == ContentTypeKeys.Type_Video){
$('#content_video').removeAttr('controls');
}
var $container = $('#dialog');
$('#header_toolbar').hide();
......@@ -2436,6 +2440,9 @@ function originalScreenForNotPdfType(){
$('#control_screen_2').hide();
$('#header_toolbar').show();
var $container = $('#dialog');
$container.removeAttr('style');
......@@ -2445,13 +2452,19 @@ function originalScreenForNotPdfType(){
}
else if(contentType == ContentTypeKeys.Type_Html){
$container.css('left','0%');
$container.css('position','absolute');
//$container.css('height','100%');
$container.css('width','100%');
$container.css('background-color', 'white');
$container.css('overflow', 'scroll');
$container.css('-webkit-overflow-scrolling', 'touch');
}
//START TRB00068
if (avwUserEnvObj.os == "ipad") {
if(contentType == ContentTypeKeys.Type_Video){
$('#content_video').attr('controls', 'controls');
if(isShowVideoContent){
$container.show();
}
......@@ -3453,8 +3466,13 @@ function setDefaultEvent() {
//document.getElementById('wrapper').addEventListener('touchstart', 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);
//START TRB00075 - Editor: Long - Date - 24/09/2013 - Summary : Fix for prevent moving page when display dialog
document.getElementById('overlay').addEventListener('touchstart', function(event){event.preventDefault(); return false;}, false);
document.getElementById('overlay').addEventListener('touchmove', function(event){event.preventDefault(); return false;}, false);
document.getElementById('overlay').addEventListener('touchend', function(event){event.preventDefault(); return false;}, false);
//END TRB00075 - Editor: Long - Date - 24/09/2013 - Summary : Fix for prevent moving page when display dialog
}
$('#main').mouseout(function (event) {
......
abvw/js/contentview_CreateObjects.js
......@@ -568,16 +568,34 @@ function showHtml(url){
var $container = $('#dialog');
$container.html('');
$container.attr('style', 'background-color: white; width:100%; left:0% !important');
$container.attr('style', 'background-color: white; width:100%; left:0% !important');
//START TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
if(avwUserEnvObj.os == "ipad"){
$container.html(
'<h1>'
+ '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>'
+ '</h1>'
+ '<div id="html-wrap" style="height: 95%; position: absolute; width: 100%;">'
+ '<iframe src="'+ url +'" style="position: absolute; width: 100%; height: 100%; ">'
+ '</iframe>'
+ '</div>'
);
$('#html-wrap').css('overflow', 'scroll');
$('#html-wrap').css('-webkit-overflow-scrolling', 'touch');
}
else{
$container.html(
'<h1>'
+ '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>'
+ '</h1>'
+ '<iframe src="'+ url +'" style="position: absolute; width: 100%; height: 95%; ">'
+ '</iframe>'
);
}
//END TRB00076 - EDITOR : Long - Date : 09/24/2013 - Summary : Fix for scrolling on ipad
$container.html(
'<h1>'
+ '<img src="img/viewer/x.png" style="margin:3px 3px 0px 21px" id="btnClose" class="align_right" ></img>'
+ '</h1>'
+ '<iframe src="'+ url +'" style="position: absolute; width: 100%; height: 95%; ">'
+ '</iframe>'
);
$('#dialog h1 img').click(function(){
$container.removeAttr('style');
hideDialog();
......
abvw/js/contentview_Events.js
......@@ -460,7 +460,7 @@ function createLockLayout(opt){
if(opt == true){
if(!$('#locking').size()){
var $html = $('<div id="locking" style="z-index: 100; position: absolute; height: 100%; width: 100%; "></div>');
var $html = $('<div id="locking" style="z-index: 100; position: absolute; height: 100%; width: 100%; background: white; opacity: 0 "></div>');
$('#wrapper').append($html);
$html.show();
......
abvw/js/contentview_GetData.js
......@@ -231,10 +231,13 @@ function getMediaType1(iValueObj) {
/*get Image Preview */
var dataResourceImage = iValueObj.action.preview;
var dataImageFromResource = [];
for (var nIndex = 0; nIndex < dataResourceImage.length; nIndex++) {
dataImageFromResource.push(getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(dataResourceImage[nIndex]));
}
//START TRB00077 - Editor : Long - Date: 09/24/2013- Summary : Display image preview no image
if(dataResourceImage){
for (var nIndex = 0; nIndex < dataResourceImage.length; nIndex++) {
dataImageFromResource.push(getURL("webResourceDownload") + "/?sid=" + ClientData.userInfo_sid() + "&resourceName=" + removeExt(dataResourceImage[nIndex]));
}
}
//END TRB00077 - Editor : Long - Date: 09/24/2013- Summary : Display image preview no image
pageObject['imagePreview'] = dataImageFromResource;
......
abvw/settings.html
......@@ -77,7 +77,7 @@
<div class="menu_language">
<div class="clearfix">
<ul class="floatL">
<li class="floatR">
<li class="floatR" id="li-login-username" style="display:none;">
<label class="lang" lang="txtLoginUser">こんにちは</label>
<label id="login-username"> </label>
</li>
......
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