Skip to content

C
check
Commit 421c9e02 by Vo Duc Thang
Options

10/4 リリース 

※CSS対応
parent e16f9955
Showing with 277 additions and 149 deletions
abvw-preview/common/js/avweb.js
......@@ -276,8 +276,8 @@ $(function () {
// システム設定ファイルの配置先パスの決定
var location = window.location.toString().toLowerCase();
var sysFile = '';
if (location.indexOf('/abvw-preview') < 0) {
sysFile = './abvw-preview/common/json/sys/conf.json';
if (location.indexOf('/abvw') < 0) {
sysFile = './abvw/common/json/sys/conf.json';
} else {
sysFile = './common/json/sys/conf.json';
}
......@@ -351,15 +351,13 @@ function avwCheckLogin(option) {
'<div><button id="avw-unauth-ok">OK</button></div>' +
'</div></div></div>';
$('body').prepend(tags);
$('#avw-auth-error').css({
'color': '#fff',
$('#avw-auth-error').css({
'opacity': 1,
'position': 'fixed',
'top': '0',
'left': '0',
'width': $(window).width(),
'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000'
});
// resize error page
......@@ -569,7 +567,7 @@ function avwGrabContentPageImage(accountPath, params, success, error) {
apiUrl = apiUrl + '/' + apiName + '/';
// 送信パラメータの構築
var requestParams = 'contentId=' + params.contentId + '&sid=' + params.sid + '&pageNo=' + params.pageNo + '&pid=' + params.pid ;
var requestParams = 'contentId=' + params.contentId + '&sid=' + params.sid + '&pageNo=' + params.pageNo + '&pid=' + params.pid;
//apiUrl += '?' + requestParams;
apiUrl += '?' + requestParams + '&isBase64=true';
......
abvw-preview/common/json/lang/lang-en.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20130823)User:",
"txtLoginUser":"(Ver.20131004)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......@@ -147,5 +147,6 @@
"txtContentPWTitle":"Password Confirm",
"txtContentPWMsg":"Please input password to view this content.",
"txtContentWarning":"Waring",
"txtMediaAutoPlayWarning":"Media will be played automatically.",
"txtPreventLink": "プレビューにはこの機能が利用できません"
}
abvw-preview/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20130823)ログイン中：",
"txtLoginUser":"(Ver.20131004)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......@@ -147,5 +147,6 @@
"txtContentPWTitle":"パスワードの確認",
"txtContentPWMsg":"閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"警告",
"txtMediaAutoPlayWarning":"メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません"
}
abvw-preview/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20130823)로그인 중:",
"txtLoginUser":"(Ver.20131004)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......@@ -147,5 +147,6 @@
"txtContentPWTitle":"KO_パスワードの確認",
"txtContentPWMsg":"KO_閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"KO_警告",
"txtMediaAutoPlayWarning":"KO_メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません"
}
abvw-preview/css/layout/viewer.css
......@@ -1328,7 +1328,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
position: absolute;
top: 100%;
width: 0;
height: 0;
height: 0;
}
/* HOVER STYLES */
.pop-up-memo {
......@@ -1665,20 +1665,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
zoom:1;
}
/*------------*/
#viewer #wrapper header .hdRcolumn .closebtn {
height: 25px;
width: 25px;
display: block;
float: right;
margin-top: 18px;
margin-right: 18px;
}
a.closebtn {
}
a.closebtn:hover{
}
.markingToolbar_off_hover
{
......@@ -1697,3 +1684,28 @@ ul#divListBookmark li:hover{}
#powerTip{
z-index: 999 !important;
}
span.error{
}
span.no-item{
}
.dialog-content-music{
}
.imagePreview-one{
}
.picker-choose-on{
}
.picker-choose-off{
}
abvw-preview/css/theme/viewer.css
......@@ -1066,12 +1066,18 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
border-color:#ccd;
font-family: Verdana;
font-size: 10pt;
border-radius: 10px;
border-radius: 10px;
-moz-box-shadow:-3px 3px 3px #777;
-webkit-box-shadow:-3px 3px 3px #777;
box-shadow : -3px 3px 3px #777
}
.popuptext_arrow {
border-style: solid;
border-width: 12px 12px 12px 12px;
border-width: 12px 12px 12px 12px;
border-color: transparent transparent transparent rgb(204, 204, 221) !important;
}
/* HOVER STYLES */
.pop-up-memo {
......@@ -1390,15 +1396,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
}
/*------------*/
#viewer #wrapper header .hdRcolumn .closebtn {
}
a.closebtn {
background: url(../../img/viewer/closebtn_01.png) 0px 0px;
}
a.closebtn:hover{
background-position:0px -25px;
}
.markingToolbar_off_hover
{
background-position: -414px -92px;
......@@ -1409,4 +1407,31 @@ a.closebtn:hover{
}
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
#divListIndex span:hover{color: red; cursor: pointer}
span.error{
color: red;
}
span.no-item{
color:#333333;
font-size:12px;
cursor:default;
text-decoration:none;
}
.dialog-content-music{
background: url(../../img/iPad_music.png) center center no-repeat;
background-color: white;
}
.imagePreview-one{
background-color: black;
}
.picker-choose-on{
border:1px solid #e6e6e6 !important;
}
.picker-choose-off{
border:1px solid #d3d5d6 !important;
}
abvw-preview/js/contentview.js
......@@ -413,7 +413,7 @@ function handleAPIWebContentPage(dataJson, pos) {
' </li>' +
' <li>' +
' <span class="mdltext">' +
' <span style="color:red">' + i18nText('msgShioriDeleted') + '</span>' +
' <span class="error">' + i18nText('msgShioriDeleted') + '</span>' +
' </span>' +
' </li>'
);
......@@ -484,7 +484,7 @@ function handleAPIWebContentPage(dataJson, pos) {
' </li>' +
' <li>' +
' <span class="mdltext">' +
' <span style="color:red">' + i18nText('msgShioriDeleted') + '</span>' +
' <span class="error">' + i18nText('msgShioriDeleted') + '</span>' +
' </span>' +
' </li>'
);
......@@ -2286,8 +2286,11 @@ function handleForContentTypeMusic(resourceUrl){
var $container = $('#dialog');
$container.html('');
//$container.css('position', 'absolute');
$container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
$container.css('background-color', 'white');
//START FIX CSS
//$container.css('background', 'url(./img/iPad_music.png) center center no-repeat');
//$container.css('background-color', 'white');
$container.addClass('dialog-content-music');
//END FIX CSS
//$container.css('background-attachment', 'fixed');
if (ClientData.userOpt_musicMode() == "1") {
......
abvw/common/js/avweb.js
......@@ -351,15 +351,13 @@ function avwCheckLogin(option) {
'<div><button id="avw-unauth-ok">OK</button></div>' +
'</div></div></div>';
$('body').prepend(tags);
$('#avw-auth-error').css({
'color': '#fff',
$('#avw-auth-error').css({
'opacity': 1,
'position': 'fixed',
'top': '0',
'left': '0',
'width': $(window).width(),
'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000'
});
// resize error page
......
abvw/common/json/lang/lang-en.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"Logout",
"txtSearchResult":"Result",
"dspHome":"Home",
"txtLoginUser":"(Ver.20131003)User:",
"txtLoginUser":"(Ver.20131004)User:",
"txtAll":"All",
"txtMkgSize":"Size",
"txtMkgS":"S",
......@@ -146,6 +146,7 @@
"txtNoTransparent":"Opacity",
"txtContentPWTitle":"Password Confirm",
"txtContentPWMsg":"Please input password to view this content.",
"txtContentWarning":"Warning",
"txtMediaAutoPlayWarning":"Media will be played automatically."
"txtContentWarning":"Waring",
"txtMediaAutoPlayWarning":"Media will be played automatically.",
"txtPreventLink": "プレビューにはこの機能が利用できません"
}
abvw/common/json/lang/lang-ja.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"バックアップせずにログアウト",
"txtSearchResult":"検索結果",
"dspHome":"ホーム",
"txtLoginUser":"(Ver.20131003)ログイン中：",
"txtLoginUser":"(Ver.20131004)ログイン中：",
"txtAll":"すべて",
"txtMkgSize":"太さ",
"txtMkgS":"小",
......@@ -147,5 +147,6 @@
"txtContentPWTitle":"パスワードの確認",
"txtContentPWMsg":"閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"警告",
"txtMediaAutoPlayWarning":"メディアは自動再生されます。"
"txtMediaAutoPlayWarning":"メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません"
}
abvw/common/json/lang/lang-ko.json
......@@ -64,7 +64,7 @@
"dspBkCancel":"로그아웃",
"txtSearchResult":"검색 결과",
"dspHome":"홈",
"txtLoginUser":"(Ver.20131003)로그인 중:",
"txtLoginUser":"(Ver.20131004)로그인 중:",
"txtAll":"전체",
"txtMkgSize":"두께",
"txtMkgS":"소",
......@@ -147,5 +147,6 @@
"txtContentPWTitle":"KO_パスワードの確認",
"txtContentPWMsg":"KO_閲覧するにはパスワードの入力が必要です。",
"txtContentWarning":"KO_警告",
"txtMediaAutoPlayWarning":"KO_メディアは自動再生されます。"
"txtMediaAutoPlayWarning":"KO_メディアは自動再生されます。",
"txtPreventLink": "プレビューにはこの機能が利用できません"
}
abvw/css/layout/history.css
......@@ -255,6 +255,12 @@ a:hover
{
display: none;
}
#msgHistoryNotExist
{
text-align:left;
margin-top:20px;
clear:both;
}
.sort-title{
float: left;
......
abvw/css/layout/viewer.css
......@@ -1328,7 +1328,7 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
position: absolute;
top: 100%;
width: 0;
height: 0;
height: 0;
}
/* HOVER STYLES */
.pop-up-memo {
......@@ -1684,3 +1684,28 @@ ul#divListBookmark li:hover{}
#powerTip{
z-index: 999 !important;
}
span.error{
}
span.no-item{
}
.dialog-content-music{
}
.imagePreview-one{
}
.picker-choose-on{
}
.picker-choose-off{
}
abvw/css/theme/common.css
......@@ -41,4 +41,10 @@ p.go_top{
br.clear { }
.floatL { }
.floatR { }
\ No newline at end of file
.floatR { }
#avw-auth-error
{
color: #fff;
background: #ccc;
}
\ No newline at end of file
abvw/css/theme/history.css
......@@ -192,7 +192,11 @@ a:hover
#msgSearchNotExist
{
}
#msgHistoryNotExist
{
color:#f00;
font-size:16px;
}
.sort-title{
font-size: 12px;
color: #333333;
......
abvw/css/theme/list_shiori.css
......@@ -135,6 +135,10 @@ a.delete:hover:not(:target) {
cursor:default;
text-decoration:none;
}
.cnt_section .text label.name
{
color: #2D83DA;
}
.cnt_section .text a.name img
{
}
......
abvw/css/theme/viewer.css
......@@ -1066,12 +1066,18 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
border-color:#ccd;
font-family: Verdana;
font-size: 10pt;
border-radius: 10px;
border-radius: 10px;
-moz-box-shadow:-3px 3px 3px #777;
-webkit-box-shadow:-3px 3px 3px #777;
box-shadow : -3px 3px 3px #777
}
.popuptext_arrow {
border-style: solid;
border-width: 12px 12px 12px 12px;
border-width: 12px 12px 12px 12px;
border-color: transparent transparent transparent rgb(204, 204, 221) !important;
}
/* HOVER STYLES */
.pop-up-memo {
......@@ -1401,4 +1407,31 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
}
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
#divListIndex span:hover{color: red; cursor: pointer}
span.error{
color: red;
}
span.no-item{
color:#333333;
font-size:12px;
cursor:default;
text-decoration:none;
}
.dialog-content-music{
background: url(../../img/iPad_music.png) center center no-repeat;
background-color: white;
}
.imagePreview-one{
background-color: black;
}
.picker-choose-on{
border:1px solid #e6e6e6 !important;
}
.picker-choose-off{
border:1px solid #d3d5d6 !important;
}
abvw/js/bookmark.js
......@@ -581,7 +581,7 @@ function insertRowError(contentid, pageTitle, pageNo) {
newRow += '</span>';
newRow += " <div class='text'>";
newRow += ' <label class="name" style="color: #2D83DA;">' + truncate(pageTitle, 20) + '</label>';
newRow += ' <label class="name">' + truncate(pageTitle, 20) + '</label>';
newRow += ' <div class="info">';
newRow += " <label class='lang name' lang='msgShioriDeleted'>" + i18nText('msgShioriDeleted') + "</label>";
......
abvw/js/contentview_GetData.js
......@@ -11,8 +11,8 @@
/* get Json stored content info */
function getJsonContentInfo() {
avwGrabContentPageImage(ClientData.userInfo_accountPath(),
{ contentId: contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
function (data) {
{ contentId: contentID, sid: ClientData.userInfo_sid(), pageNo: 1 },
function (data) {
pageImages = data;
webGetContentData();
getSearchDataFromJson();
......@@ -22,10 +22,10 @@ function getJsonContentInfo() {
getDataJsonFile();
//webGetPageImageContentSize();
webGetContentPageSize();
},
function (xmlHttpRequest, txtStatus, errorThrown) {
showErrorScreen();
});
},
function (xmlHttpRequest, txtStatus, errorThrown) {
showErrorScreen();
});
};
//END TRB00097 - Editor: Long - Date: 09/30/2013 - Summary : Get All Page size of content
......@@ -848,7 +848,7 @@ function getBookmarklist(pos) {
$("#divListBookmark").show();
$("#divListBookmark").offset({ left: pos[0], top: (pos[1] + $('#bookmarkBoxHdBM').height()) });
}
else {
else {
handleAPIWebContentPage(dataWebContentPage, pos)
}
};
......@@ -858,7 +858,7 @@ function getPageIndexJson(pos) {
if (dataJsonType5.length > 0) {
$('#divListIndex').children().remove();
// $("#divListIndex").dialog({
// $("#divListIndex").dialog({
// show: "blind",
// modal: true,
// width: WIDTH_DIALOG_INDEX,
......@@ -882,7 +882,7 @@ function getPageIndexJson(pos) {
$("#divListIndex").show();
$("#divListIndex").offset({ left: pos[0], top: (pos[1] + $('#indexBoxHdIndex').height()) });
//set data for dialog index
//set data for dialog index
var dataContent = dataJsonType5;
var arrData = new Array();
$.each(dataContent, function (i, value) {
......@@ -912,10 +912,10 @@ function getPageIndexJson(pos) {
$(".treeview, .treeview ul").css('padding', '0px 8px 0');
} else {
$('#divListIndex').children().remove();
$('#divListIndex').append('<span style="color:#333333; font-size:12px; cursor:default; text-decoration:none;">' + i18nText('msgNoIndex') + '</span>');
$('#divListIndex').append('<span class="no-item">' + i18nText('msgNoIndex') + '</span>');
// //show dialog index
// $("#divListIndex").dialog({
// $("#divListIndex").dialog({
// show: "blind",
// modal: true,
// resizable:false,
......@@ -1103,7 +1103,7 @@ function getAllMemoOfPage() {
for (var nIndex = 0; nIndex < memoData.length; nIndex++) {
if (memoData[nIndex].contentid == contentID
&& memoData[nIndex].pageNo == changePageIndex(getPageIndex())) {
&& memoData[nIndex].pageNo == changePageIndex(getPageIndex())) {
/* create object of memo */
var memoObject = null;
......@@ -1115,14 +1115,14 @@ function getAllMemoOfPage() {
memoData[nIndex].posX = widthEachPage - 50;
}
memoObject = new memo(
nIndex,
memoData[nIndex].Text,
memoData[nIndex].posX,
memoData[nIndex].posY,
50,
50,
"img/memo.png"
);
nIndex,
memoData[nIndex].Text,
memoData[nIndex].posX,
memoData[nIndex].posY,
50,
50,
"img/memo.png"
);
memoObjects.push(memoObject);
}
......
abvw/js/contentview_Paint.js
......@@ -144,7 +144,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = "bevel";
context_draw.lineWidth = penSize;
context_draw.strokeStyle = "#" + penColor;
//context_draw.globalAlpha = 1;
//context_draw.globalAlpha = 1;
context_draw.lineTo(coors.x, coors.y);
context_draw.stroke();
}
......@@ -158,24 +158,24 @@ function drawMove(coors, context_draw) {
context_draw.lineTo(coors.x, coors.y);
context_draw.stroke();
context_draw.globalCompositeOperation = 'source-over';*/
//context_draw.globalCompositeOperation = 'destination-out'
//context_draw.globalCompositeOperation = 'destination-out'
context_draw.beginPath();
var halfSize = makerSize / 2;
var quotSize = makerSize / 4;
var ptStart = [
{ x: sx - quotSize, y: sy - halfSize },
{ x: sx + quotSize, y: sy - halfSize },
{ x: sx + quotSize, y: sy + halfSize },
{ x: sx - quotSize, y: sy + halfSize }
];
{ x: sx - quotSize, y: sy - halfSize },
{ x: sx + quotSize, y: sy - halfSize },
{ x: sx + quotSize, y: sy + halfSize },
{ x: sx - quotSize, y: sy + halfSize }
];
var ptEnd = [
{ x: coors.x - quotSize, y: coors.y - halfSize },
{ x: coors.x + quotSize, y: coors.y - halfSize },
{ x: coors.x + quotSize, y: coors.y + halfSize },
{ x: coors.x - quotSize, y: coors.y + halfSize }
];
{ x: coors.x - quotSize, y: coors.y - halfSize },
{ x: coors.x + quotSize, y: coors.y - halfSize },
{ x: coors.x + quotSize, y: coors.y + halfSize },
{ x: coors.x - quotSize, y: coors.y + halfSize }
];
if (sx > coors.x) {
if (sy > coors.y) {
context_draw.globalCompositeOperation = 'destination-out';
......@@ -188,7 +188,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -207,11 +207,11 @@ function drawMove(coors, context_draw) {
context_draw.lineTo(ptStart[2].x, ptStart[2].y);
context_draw.lineTo(ptEnd[2].x, ptEnd[2].y);
context_draw.lineTo(ptEnd[3].x, ptEnd[3].y);
context_draw.lineTo(ptEnd[0].x, ptEnd[0].y);
context_draw.lineTo(ptEnd[0].x, ptEnd[0].y);
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -233,7 +233,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -257,8 +257,8 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -281,7 +281,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -303,7 +303,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -325,7 +325,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -345,7 +345,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -365,7 +365,7 @@ function drawMove(coors, context_draw) {
context_draw.lineJoin = 'bevel';
context_draw.lineCap = 'butt';
context_draw.fillStyle = "#" + makerColor;
context_draw.fill();
context_draw.fill();
context_draw.globalCompositeOperation = 'lighter';
context_draw.closePath();
context_draw.beginPath();
......@@ -437,10 +437,10 @@ function drawPoint(coors, context_draw) {
context_draw.globalCompositeOperation = 'destination-out';
context_draw.lineWidth = makerSize ;
context_draw.lineHeight = makerSize;
context_draw.lineTo(coors.x , coors.y + 0.001);
context_draw.lineTo(coors.x , coors.y + 0.001);
context_draw.lineCap = 'square';
context_draw.strokeStyle = "#" + makerColor;
context_draw.stroke();
context_draw.stroke();
context_draw.globalCompositeOperation = 'lighter';
context_draw.lineCap = "square";
......
abvw/js/contentview_Pen.js
......@@ -168,27 +168,45 @@ function Pen_SetDefaultValue() {
}
Pen_chooseType(typeValue, penColor);
$('#dlgPen .colorpicker[colorId="'+penColor+'"]').css('border','1px solid #e6e6e6');
//START FIXCSS
//$('#dlgPen .colorpicker[colorId="'+penColor+'"]').css('border','1px solid #e6e6e6');
$('#dlgPen .colorpicker[colorId="'+penColor+'"]').addClass('picker-choose-on');
$('#dlgPen .colorpicker[colorId="'+penColor+'"]').removeClass('picker-choose-off');
//END FIXCSS
};
function Pen_colorPickerMouseLeaveFunction() {
$(this).css('border','1px solid white');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').css('border', '1px solid #e6e6e6');
//START FIXCSS
//$(this).css('border','1px solid white');
//$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').css('border','1px solid #e6e6e6');
$(this).addClass('picker-choose-off');
$(this).removeClass('picker-choose-on');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').addClass('picker-choose-on');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').removeClass('picker-choose-off');
//END FIXCSS
};
function Pen_colorPickerMouseEnterFunction() {
$(this).css('border','1px solid #e6e6e6');
//START FIXCSS
//$(this).css('border','1px solid #e6e6e6');
$(this).removeClass('picker-choose-off');
$(this).addClass('picker-choose-on');
//END FIXCSS
var color = $(this).attr('colorId');
Pen_chooseType(pen_Size, color);
};
function Pen_colorPickerClickFunction() {
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').css('border', '1px solid white');
$(this).css('border','1px solid #e6e6e6');
//START FIXCSS
//$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid white');
//$(this).css('border','1px solid #e6e6e6');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').addClass('picker-choose-off');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').removeClass('picker-choose-on');
$(this).addClass('picker-choose-on');
$(this).removeClass('picker-choose-off');
//END FIXCSS
pen_chooseColor = $(this).attr('colorId');
Pen_chooseType(pen_Size, pen_chooseColor);
};
......@@ -266,6 +284,10 @@ function Pen_dspCancel_click() {
function Pen_colorWrapperMouseLeaveFunction() {
Pen_chooseType(pen_Size, pen_chooseColor);
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').css('border', '1px solid #e6e6e6');
//$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').css('border', '1px solid #e6e6e6');
//START FIXCSS
//$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid #e6e6e6');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').addClass('picker-choose-on');
$('#dlgPen .colorpicker[colorId="' + pen_chooseColor + '"]').removeClass('picker-choose-off');
//END FIXCSS
};
abvw/js/contentview_PopupText.js
......@@ -52,41 +52,43 @@ function OpenPopupText(posX, posY, content, dialogDiv, arrowDiv) {
}
}
// Ajust direction [ end ]
//START FIXCSS
switch (direction) {
case 0: left_dialog = left_arrow - dialogDiv.outerWidth();
top_dialog = top_arrow - 20;
arrowDiv.css("border-color", "transparent transparent transparent #ccd");
dialogDiv.css("-moz-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("box-shadow", "-3px 3px 3px #777");
//arrowDiv.css("border-color", "transparent transparent transparent #ccd");
//dialogDiv.css("-moz-box-shadow", "-3px 3px 3px #777");
//dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777");
//dialogDiv.css("box-shadow", "-3px 3px 3px #777");
//arrowDiv.css("border-color", "transparent transparent transparent #ccd");
break;
case 1: left_dialog = left_arrow - dialogDiv.outerWidth();
top_dialog = top_arrow - dialogDiv.height() + 30;
arrowDiv.css("border-color", "transparent transparent transparent #ccd");
dialogDiv.css("-moz-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777");
dialogDiv.css("box-shadow", "-3px 3px 3px #777");
//arrowDiv.css("border-color", "transparent transparent transparent #ccd");
//dialogDiv.css("-moz-box-shadow", "-3px 3px 3px #777");
//dialogDiv.css("-webkit-box-shadow", "-3px 3px 3px #777");
//dialogDiv.css("box-shadow", "-3px 3px 3px #777");
break;
case 2: left_dialog = left_arrow + 24;
top_dialog = top_arrow - 20;
arrowDiv.css("border-color", "transparent #ccd transparent transparent");
dialogDiv.css("-moz-box-shadow", "3px 3px 3px #777");
dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777");
dialogDiv.css("box-shadow", "3px 3px 3px #777");
//arrowDiv.css("border-color", "transparent #ccd transparent transparent");
//dialogDiv.css("-moz-box-shadow", "3px 3px 3px #777");
//dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777");
//dialogDiv.css("box-shadow", "3px 3px 3px #777");
break;
case 3: left_dialog = left_arrow + 24;
top_dialog = top_arrow - dialogDiv.height() + 30;
arrowDiv.css("border-color", "transparent #ccd transparent transparent");
dialogDiv.css("-moz-box-shadow", "3px 3px 3px #777");
dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777");
dialogDiv.css("box-shadow", "3px 3px 3px #777");
//arrowDiv.css("border-color", "transparent #ccd transparent transparent");
//dialogDiv.css("-moz-box-shadow", "3px 3px 3px #777");
//dialogDiv.css("-webkit-box-shadow", "3px 3px 3px #777");
//dialogDiv.css("box-shadow", "3px 3px 3px #777");
break;
}
//END FIXCSS
dialogDiv.css("left", left_dialog + "px");
dialogDiv.css("top", (top_dialog + 10) + "px");
};
......
abvw/js/header.js
......@@ -732,15 +732,13 @@ function showErrorScreenForceChangePassword(){
'<div><button id="avw-unauth-ok">OK</button></div>' +
'</div></div></div>';
$('body').prepend(tags);
$('#avw-auth-error').css( {
'color': '#fff',
$('#avw-auth-error').css( {
'opacity': 1,
'position': 'fixed',
'top': '0',
'left': '0',
'width': $(window).width(),
'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000'
});
// resize error page
......
abvw/js/history.js
......@@ -314,7 +314,7 @@ function handleLanguage(){
$('#control-sort-titlekana-off').css('display','block');
$('#content-grid').html(i18nText('msgHistoryNotExist'));
$('#content-grid').html("<div id='msgHistoryNotExist'>" + i18nText('msgHistoryNotExist') + "</div>");
}else{
$('#control-sort-titlekana').css('display','block');
$('#separate').css('display','block');
......@@ -1586,8 +1586,7 @@ function changeLanguageCallBackFunction(){
function displayResultNoRecord(){
i18nReplaceText();
$('#content-grid').html(i18nText('msgHistoryNotExist'));
$('#content-grid').css({'text-align':'left','margin-top':'20px','clear':'both','font-size':'16px','color':'red'});
$('#content-grid').html("<div id='msgHistoryNotExist'>" + i18nText('msgHistoryNotExist') + "</div>");
$('#control-nextrecord').css('visibility','hidden');
$('.control_sort_on').hide();
$('.control_sort_off').show();
......
abvw/js/home.js
......@@ -1398,17 +1398,6 @@ function readSubmenuFunction_callback(contentId)
//Start Function : No.12 -- Editor : Le Long -- Date : 07/31/2013 -- Summary : Add ContentType to Storage.
};
//Item Mouse Enter Event
function itemMouseEnterEvent() {
$(this).css('background-color', 'gray');
};
//Item Mouse Leave Event
function itemMouseLeaveEvent() {
$(this).css('background-color', 'white');
};
//Handle Back To Top Button
function handleBackToTop() {
......
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