Skip to content

C
check
Commit b80957f4 by Vo Duc Thang
Options

9/20 リリース

parent 0b1b7d46
Showing with 181 additions and 63 deletions
abvw/common/json/lang/lang-en.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20130918)User:",
"txtLoginUser":"(Ver.20130920)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......
abvw/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20130918)ログイン中：",
"txtLoginUser":"(Ver.20130920)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......
abvw/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20130918)로그인 중:",
"txtLoginUser":"(Ver.20130920)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......
abvw/css/layout/list_shiori.css
......@@ -150,7 +150,7 @@ a.delete:hover:not(:target) {
margin-right:5px;
}
.cnt_section .text a.name:hover{ text-decoration:none; }
.cnt_section .text ul.date{ margin-top: 0px; }
.cnt_section .text ul.date{ margin-top: 0px; height:40px;}
.cnt_section .text ul.date li{
}
/*---*/
......@@ -161,7 +161,13 @@ a.delete:hover:not(:target) {
.cnt_section .text ul.pic{
float: left;
margin-top: 20px;
width:85%;
}
.cnt_section .text ul.pic li.pageno
{
float:right;
}
.cnt_section .text ul.pic li{
float: left;
margin-left: 17px;
......
abvw/css/layout/viewer.css
......@@ -1680,3 +1680,7 @@ ul#divListBookmark li:hover{}
right:20px;
display:none
}
#powerTip{
z-index: 999 !important;
}
abvw/js/bookmark.js
......@@ -20,6 +20,10 @@
//var TotalThread = 0;
var contentTypes = {};
var contentName = {};
var pathImgContentNone = './img/page-none.png';
// Init function of page
$(document).ready(function () {
......@@ -318,17 +322,19 @@ function ShowBookmark() {
}
}
}
}
}
if (pageDetail) {
// If bookmark does not exist
if (pageDetail.existed == true) {
// Show normal
UpdateBookmark(contentid, pageDetail.pageNo, contentTitle, contentTitleKana);
insertRow(contentid, "data:image/jpeg;base64," + pageDetail.pageThumbnail, htmlEncode(contentTitle),
var pageThumbnail = (pageDetail.pageThumbnail != pathImgContentNone) ? ("data:image/jpeg;base64," + pageDetail.pageThumbnail) : pathImgContentNone;
insertRow(contentid, pageThumbnail, htmlEncode(contentTitle),
pageDetail.pageText, pageDetail.pageNo, hasMemo, hasMarking, nIndex, contentType);
}
else {
else {
// Not existed -> Show error
insertRowError(contentid, htmlEncode(contentTitle), pageDetail.pageNo);
}
......@@ -685,11 +691,11 @@ function insertRow(contentid, pageThumbnail, pageTitle, pageText, pageNo, hasMem
newRow += '<a class="name" href="#">' + truncate(pageTitle, 20) + '</a>';
newRow +='<div class="info">';
newRow +='<ul class="date">';
newRow += '<ul class="date">';
var contentText = htmlEncode(getLines(pageText, 3));
newRow += '<li><label id="Label1">' + truncate(contentText, 70) + '</label></li>';
newRow += '<li><label id="Label1">' + truncate(contentText, 60) + '</label></li>';
// newRow +='<li>公開日:2012/09/14</li>';
// newRow += '<li>閲覧日:2012/09/18</li>';
......@@ -741,6 +747,10 @@ function insertRow(contentid, pageThumbnail, pageTitle, pageText, pageNo, hasMem
newRow += '<li><a href="#">' + imgMarkingHide + '</a></li>';
}
newRow += '<li class="pageno"><label id="Label2" class="lang" lang="txtPage">' + i18nText('txtPage') + '</label><label id="Label3">' + pageNo + '</label></li>';
//newRow +='<li><a href="#"><img class="sticker" src="img/list/icon_sticker.png"></a></li>';
//newRow +='<li><a href="#"><img class="pen" src="img/list/icon_pen.png"></a></li>';
......@@ -798,7 +808,6 @@ var collection_contents = [];
Get all detail pages of content in bookmark
*/
function bookmark_collectAllPages() {
var arrBookMarks = ClientData.BookMarkData();
for (var nIndex = 0; nIndex < collection_contents.length; nIndex++) {
......@@ -817,30 +826,50 @@ function bookmark_collectAllPages() {
// Join pages to request to server
var strPageNos = buildPageNos(collection_contents[nIndex].pages);
// Call api to get all details of pages 1 time
// Call api to get all details of pages 1 time
avwCmsApiSync(ClientData.userInfo_accountPath(), "webContentPage", "GET",
{ contentId: contentid, sid: ClientData.userInfo_sid(), pageNos: strPageNos, thumbnailFlg: 1 },
function (data) {
collection_contents[nIndex].contentTitle = data.contentTitle;
collection_contents[nIndex].contentTitleKana = data.contentTitleKana;
for (var nIndex2 = 0; nIndex2 < collection_contents[nIndex].pages.length; nIndex2++) {
var comparePageNo = collection_contents[nIndex].pages[nIndex2].pageNo;
for (var nIndex3 = 0; nIndex3 < data.pages.length; nIndex3++) {
if (comparePageNo == data.pages[nIndex2].pageNo) {
if (data.pages[nIndex2] && comparePageNo == data.pages[nIndex2].pageNo) {
// Set flag to determine page existed
collection_contents[nIndex].pages[nIndex2].existed = true;
// Store detail of page
collection_contents[nIndex].pages[nIndex2].pageText = data.pages[nIndex2].pageText;
collection_contents[nIndex].pages[nIndex2].pageThumbnail = data.pages[nIndex2].pageThumbnail;
}
else if (contentTypes[contentid] == "none" && data.pages.length > 0) {
collection_contents[nIndex].pages[nIndex2].existed = true;
// Store detail of page
collection_contents[nIndex].pages[nIndex2].pageText = ''; //data.pages[0].pageText;
collection_contents[nIndex].pages[nIndex2].pageThumbnail = pathImgContentNone; //data.pages[nIndex2].pageThumbnail;
}
}
}
}
},
null
function () { // when server response error
if (contentTypes[contentid] == "none") {
collection_contents[nIndex].contentTitle = contentName[contentid];
for (var nIndex2 = 0; nIndex2 < collection_contents[nIndex].pages.length; nIndex2++) {
collection_contents[nIndex].pages[nIndex2].existed = true;
collection_contents[nIndex].pages[nIndex2].pageThumbnail = pathImgContentNone;
collection_contents[nIndex].pages[nIndex2].pageText = '';
}
}
}
);
}
};
/*
......@@ -1011,6 +1040,9 @@ function IsExistContent(strContentId) {
result["isExisted"] = isExisted;
result["contentType"] = contentType;
// save content type
contentTypes[strContentId] = contentType;
contentName[strContentId] = data.contentData.contentName;
// save alert message level
messageLevel[strContentId] = { alertMessageLevel: data.contentData.alertMessageLevel, alertMessage: data.contentData.alertMessage };
......
abvw/js/contentsearch.js
......@@ -39,10 +39,10 @@ var contentTypeArr = [];
var ThumbnailForOtherType = {
Thumbnail_ImageType : 'img/image_type.png',
Thumbnail_VideoType : 'img/iPad_video.png',
Thumbnail_MusicType : 'img/iPad_music.png',
Thumbnail_OthersType : 'img/NoFile_Type.jpg',
Thumbnail_NoFileType : 'img/page-none.png',
Thumbnail_HtmlType : 'img/htmltype.png'
Thumbnail_MusicType : 'img/thumb_default_sound.png',
Thumbnail_OthersType : 'img/thumb_default_other.png',
Thumbnail_NoFileType : 'img/thumb_default_none.png',
Thumbnail_HtmlType : 'img/thumb_default_html.png'
};
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Create new Array for function No.12.
var contentIdArray = [];
......
abvw/js/contentview.js
......@@ -1961,11 +1961,17 @@ function changePageWithoutSlide(pageMove) {
//Start FUnciton: No.4 - Editor : Long - Date : 08/12/2013 - Summary : Handle jump from bookmark page
if(pageMove > 0){
//START TRB00056 - Editor: Long - Date: 09/19/2013 - Summary :
prevContent.pageIndex = getPageIndex();
//END TRB00056 - Editor: Long - Date: 09/19/2013 - Summary :
getPrevPageObjectsByPageIndex(pageObjectsData, pageMove - 1);
renderPrevPage();
}
if(pageMove < totalPage - 1){
//START TRB00056
nextContent.pageIndex = getPageIndex();
//END TRB00056
getNextPageObjectsByPageIndex(pageObjectsData, pageMove + 1);
renderNextPage();
}
......@@ -2008,11 +2014,20 @@ function changePageWithoutSlide(pageMove) {
//Start FUnciton: No.4 - Editor : Long - Date : 08/12/2013 - Summary : Handle jump from bookmark page
if(pageMove > 0){
//START TRB00056 - Editor: Long - Date: 09/19/2013 - Summary :
prevContent.pageIndex = getPageIndex();
//END TRB00056 - Editor: Long - Date: 09/19/2013 - Summary :
getPrevPageObjectsByPageIndex(pageObjectsData, pageMove - 1);
renderPrevPage();
}
if(pageMove < totalPage - 1){
//START TRB00056
nextContent.pageIndex = getPageIndex();
//END TRB00056
getNextPageObjectsByPageIndex(pageObjectsData, pageMove + 1);
renderNextPage();
}
......@@ -2086,16 +2101,28 @@ function handleForContentTypeVideo(resourceUrl){
//Create Dialog overlay
var $container = $('#dialog');
$container.html('');
$container.html('');
if (ClientData.userOpt_musicMode() == "1") {
$container.html(
'<h1>'
+ '</h1>'
+ '<video loop="true" controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>'
);
}
else {
$container.html(
'<h1>'
+ '</h1>'
+ '<video controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>'
);
}
$container.html(
'<h1>'
+ '</h1>'
+ '<video controls style="position: absolute; width: 100%; height: 90%; bottom: 1% ">'
+ ' <source src="' + resourceUrl + '" type="video/mp4"> '
+ '</video>'
);
$container.show();
};
......@@ -2109,14 +2136,27 @@ function handleForContentTypeMusic(resourceUrl){
$container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
$container.css('background-color', 'white');
//$container.css('background-attachment', 'fixed');
$container.html(
'<h1>'
+ '</h1>'
+ '<audio controls style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>'
);
if (ClientData.userOpt_musicMode() == "1") {
$container.html(
'<h1>'
+ '</h1>'
+ '<audio loop="true" controls style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>'
);
}
else {
$container.html(
'<h1>'
+ '</h1>'
+ '<audio controls style="position: absolute; width: 100%; bottom: 1%;">'
+ ' <source src="' + resourceUrl + '" type="audio/mpeg"> '
+ '</audio>'
);
}
if(avwUserEnvObj.browser == 'firefox'){
$container.find('audio').css('height', '30px');
}
......@@ -2376,6 +2416,10 @@ $("document").ready(function () {
//Check if is pdf content
if(isMediaAndHTMLContent()){
initPageMediaAndHtmlType();
//START TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type
document.title = data.contentData.contentName + ' | ' + i18nText('sysAppTitle');
//END TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type
}
else{
initPage();
......@@ -2391,6 +2435,10 @@ $("document").ready(function () {
//Check if is pdf content
if(isMediaAndHTMLContent()){
initPageMediaAndHtmlType();
//START TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type
document.title = data.contentData.contentName + ' | ' + i18nText('sysAppTitle');
//END TRB00059 - EDITOR: Long - Date : 09/19/2013 - Summary : Add title for media and html type
}
else{
initPage();
......@@ -2903,7 +2951,7 @@ ContentPage.prototype.drawPage = function (context, opt) {
if(totalPage > 1){
if(opt != 0 && opt != null){
$('#divImageLoading').css('display', 'none');
}
}
}
else{
$('#divImageLoading').css('display', 'none');
......@@ -2916,6 +2964,7 @@ ContentPage.prototype.drawPage = function (context, opt) {
/* set pos video */
zoomVideo();
}
}
}
}
......@@ -2928,7 +2977,7 @@ ContentPage.prototype.drawPage = function (context, opt) {
if(totalPage > 1){
if(opt != 0 && opt != null){
isLoadingObject = false;
}
}
}
else{
isLoadingObject = false;
......@@ -2967,7 +3016,7 @@ ContentPage.prototype.drawPage = function (context, opt) {
if(totalPage > 1){
if(opt != 0 && opt != null){
$('#divImageLoading').css('display', 'none');
}
}
}
else{
$('#divImageLoading').css('display', 'none');
......
abvw/js/contentview_CreateObjects.js
......@@ -216,7 +216,15 @@ PageObject.prototype.drawPageObject = function (context, opt) {
var y = this.y;
var w = this.width;
var h = this.height;
var tempUrl = this.imageUrl;
var isUsedTempImg = false;
//START TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
if(mediaType == '6' && tempUrl == 'img/iPad_video.png'){
isUsedTempImg = true;
}
//END TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
if (mediaType == '5') {
nCountObjectLoad++;
context.strokeStyle = "black";
......@@ -233,6 +241,7 @@ PageObject.prototype.drawPageObject = function (context, opt) {
img.onload = function () {
nCountObjectLoad++;
/* create object store value image */
var objTemp = [];
objTemp.mediaType = mediaType;
......@@ -262,7 +271,8 @@ PageObject.prototype.drawPageObject = function (context, opt) {
}
}
} else if (mediaType == '3') {/* audio */
}
else if (mediaType == '3') {/* audio */
img.width = 50;
img.height = 50;
......@@ -270,7 +280,19 @@ PageObject.prototype.drawPageObject = function (context, opt) {
context.drawImage(img, x + (w/2 - img.width/2), y + (h/2 - img.height/ 2), img.width, img.height);
//END TRB00035 - Editor : Long - Date: 09/17/2013 - Summary : Fix for draw audio object at center
} else {
}
else if(mediaType == '6' && isUsedTempImg){
img.width = 50;
img.height = 50;
//START TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
context.drawImage(img, x + (w/2 - img.width/2), y + (h/2 - img.height/ 2), img.width, img.height);
isUsedTempImg = false;
//END TRB00046 - Editor : Long - Date: 09/19/2013 - Summary : Fix for draw video object at center
}
else {
context.drawImage(img, x, y, w, h);
}
......@@ -287,7 +309,7 @@ PageObject.prototype.drawPageObject = function (context, opt) {
if(totalPage > 1){
if(opt != 0 && opt != null){
isLoadingObject = false;
}
}
}
else{
isLoadingObject = false;
......@@ -373,7 +395,7 @@ PageObject.prototype.drawPageObject = function (context, opt) {
if(totalPage > 1){
if(opt != 0 && opt != null){
enableButtonMarking();
}
}
}
else{
enableButtonMarking();
......@@ -389,7 +411,7 @@ PageObject.prototype.drawPageObject = function (context, opt) {
if(totalPage > 1){
if(opt != 0 && opt != null){
enableAllControl();
}
}
}
else{
enableAllControl();
......@@ -411,13 +433,12 @@ PageObject.prototype.drawPageObject = function (context, opt) {
}
else{
$('#divImageLoading').css('display', 'none');
}
}
}
else{
$('#divImageLoading').css('display', 'none');
}
//End Func
/* set pos video */
zoomVideo();
}
......@@ -1616,7 +1637,8 @@ function createAudio(audio, type) {
document.getElementById("play_audio_0").play();
}
} else if (type == "1") { /* play all page */
}
else if (type == "1") { /* play all page */
if (document.getElementById("play_audio_1") != undefined) {
if (ClientData.userOpt_musicMode() == "1") {
......
abvw/js/contentview_Memo.js
......@@ -90,6 +90,9 @@ function MemoDelFunction(){
/* draw again */
drawCanvas();
//START TRB00054 - EDITOR : Long - Date : 09/19/2013 - Summary : Fix for remove loading icon when del memo
drawCanvas(1);
//END TRB00054 - EDITOR : Long - Date : 09/19/2013 - Summary : Fix for remove loading icon when del memo
/* enable controls after finish copy */
enableControlsCopyMemo();
......
abvw/js/header.js
......@@ -890,12 +890,14 @@ function getDateCreatePushMessage(data) {
function showListPushMessage(data)
{
$('#show-push-message').html('');
for (var i = 0; i < data.messageList.length && i <= (data.recordTo - data.recordFrom); i++) {
var message = '<div class="newmsg">';
message += '<h5 class="postItem"><a href="#">' + truncate(data.messageList[i].messageDetail, 30) + '</a></h5>';
message += '<p>' + data.messageList[i].messageDetail.replace(/\n/g, '<br/>') + '<span class="date">' +getDateCreatePushMessage(data.messageList[i].messageSendDate)+ '</span></p></div>';
$('#show-push-message').append(message);
for (var i = 0; i < data.messageList.length && i <= (data.recordTo - data.recordFrom); i++)
{
var titleMessage = truncate(data.messageList[i].messageDetail, 30).replace(/</g, '&lt;').replace(/>/g, '&gt;');
var detailMessage = data.messageList[i].messageDetail.replace(/\n/g, '<br/>').replace(/</g, '&lt;').replace(/>/g, '&gt;');
var message = '<div class="newmsg">';
message += '<h5 class="postItem"><a href="#">' + titleMessage + '</a></h5>';
message += '<p>' + detailMessage + '<span class="date">' + getDateCreatePushMessage(data.messageList[i].messageSendDate) + '</span></p></div>';
$('#show-push-message').append(message);
}
// hide all detail message
......
abvw/js/history.js
......@@ -42,10 +42,10 @@ var contentTypeArr = [];
var ThumbnailForOtherType = {
Thumbnail_ImageType : 'img/image_type.png',
Thumbnail_VideoType : 'img/iPad_video.png',
Thumbnail_MusicType : 'img/iPad_music.png',
Thumbnail_OthersType : 'img/NoFile_Type.jpg',
Thumbnail_NoFileType : 'img/page-none.png',
Thumbnail_HtmlType : 'img/htmltype.png'
Thumbnail_MusicType : 'img/thumb_default_sound.png',
Thumbnail_OthersType : 'img/thumb_default_other.png',
Thumbnail_NoFileType : 'img/thumb_default_none.png',
Thumbnail_HtmlType : 'img/thumb_default_html.png'
};
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Create new Array for function No.12.
var contentIdArray = [];
......
abvw/js/home.js
......@@ -40,10 +40,10 @@ var contentTypeArr = [];
var ThumbnailForOtherType = {
Thumbnail_ImageType : 'img/image_type.png',
Thumbnail_VideoType : 'img/iPad_video.png',
Thumbnail_MusicType : 'img/iPad_music.png',
Thumbnail_OthersType : 'img/NoFile_Type.jpg',
Thumbnail_NoFileType : 'img/page-none.png',
Thumbnail_HtmlType : 'img/htmltype.png'
Thumbnail_MusicType : 'img/thumb_default_sound.png',
Thumbnail_OthersType : 'img/thumb_default_other.png',
Thumbnail_NoFileType : 'img/thumb_default_none.png',
Thumbnail_HtmlType : 'img/thumb_default_html.png'
};
//End Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Create new Array for function No.12.
......
abvw/settings.html
......@@ -53,7 +53,7 @@
<script src="./js/settings.js" type="text/javascript"></script>
<style>
html{
#slidebar-animation{
-ms-touch-action : none;
}
</style>
......
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