Skip to content

C
check
Commit 421c9e02 by Vo Duc Thang
Options

10/4 リリース 

※CSS対応
parent e16f9955
Showing with 268 additions and 557 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';
}
......@@ -352,14 +352,12 @@ function avwCheckLogin(option) {
'</div></div></div>';
$('body').prepend(tags);
$('#avw-auth-error').css({
'color': '#fff',
'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
......@@ -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
......@@ -1067,11 +1067,17 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
font-family: Verdana;
font-size: 10pt;
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-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;
......@@ -1410,3 +1408,30 @@ 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}
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-preview/js/contentview_ImagePreview.js
......@@ -44,13 +44,16 @@ function showImagePreview(targetId, imgList) {
+ '</div>');
var mainImg = $('#slideWrapper');
//START FIXCSS
var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')',
'background-repeat': 'no-repeat',
'background-size': 'contain',
'background-position': 'center',
'background-color': 'black'
'background-position': 'center'
};
mainImg.addClass('imagePreview-one');
//END FIXCSS
mainImg.css(cssObj);
......
abvw/common/js/avweb.js
......@@ -352,14 +352,12 @@ function avwCheckLogin(option) {
'</div></div></div>';
$('body').prepend(tags);
$('#avw-auth-error').css({
'color': '#fff',
'opacity': 1,
'position': 'fixed',
'top': '0',
'left': '0',
'width': $(window).width(),
'height': $(window).height(),
'background': '#ccc',
'zIndex': '10000'
});
// resize error page
......
abvw/common/js/slideshow.js deleted 100644 → 0
/// <reference path="common.js" />
/*====Variable====*/
var slideshowImgFrom = 0;
var slideshowImgTo = 4;
var slideshowImageCollection = [];
var slideshowClickFlg = false;
var slideshowInitFlg = true;
var slideshowSelectedIndex = 0;
//0: next - 1: prev
var slideshowControlToggleFlg = 0;
var totalRecord;
var slideshowSelectFirstIndex = 0;
var slideshowSelectLastIndex = 4;
var slideshowMainCurrIndex = 0;
/*==========================================*/
function refreshSlideShowValue(){
slideshowImgFrom = 0;
slideshowImgTo = 4;
slideshowImageCollection = [];
slideshowClickFlg = false;
slideshowInitFlg = true;
slideshowSelectedIndex = 0;
//0: next - 1: prev
slideshowControlToggleFlg = 0;
totalRecord;
slideshowSelectFirstIndex = 0;
slideshowSelectLastIndex = 4;
slideshowMainCurrIndex = 0;
};
//Show Image Preview
function showImagePreview(targetId, imgList) {
refreshSlideShowValue();
//Check if imageList is not null
if (imgList != null && imgList != 'undefined' && imgList.length > 0) {
slideshowImageCollection = setImageSource(imgList);
//Check if targetId is not null
if (targetId != null && targetId != 'undefined') {
if (slideshowImageCollection.length == 1) {
targetId.html('');
targetId.append('<div id="slideWrapper">'
+ '</div>');
var mainImg = $('#slideWrapper');
var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')',
'background-repeat': 'no-repeat',
'background-size': 'contain',
'background-position': 'center',
'background-color': 'black'
};
mainImg.css(cssObj);
mainImg.parent().css('padding-top', '0px');
} else {
renderSlideShowBackground(targetId);
renderSelectImage();
renderMainImage(0);
handleImagePreviewEvent();
}
}
}
else {
renderSlideShowBackground(targetId);
$('.main-control').css('visibility', 'hidden');
$('.slideshow-control').css('visibility', 'hidden');
}
optimizeSizeImagePreview();
};
//Set image source for slide show
function setImageSource(source){
var oldSource = source;
var newSource = [];
for(var nIndex = 0; nIndex < oldSource.length; nIndex++){
newSource.push({index : nIndex, image : oldSource[nIndex], thumbnail : oldSource[nIndex]});
}
return newSource;
};
//render background to show image preview
function renderSlideShowBackground(targetId){
var targetDiv = targetId;
targetDiv.html('');
targetDiv.append('<div id="slideWrapper">'
+' <div class="gallery-image" id="gallery-image">'
+' <div class="main-control" id="main-control-prev"> </div>'
+' <div id="main-img" id="mainThumbnail"><div class="mainThumbnail"></div></div>'
+' <div class="main-control" id="main-control-next"> </div>'
+' </div>'
+' <div class="gallery-thumb">'
+' <div id="control-prev" class="slideshow-control"><img src="././img/arrow-left.gif"></div>'
+' <div id="selector-img">'
+' </div>'
+' <div id="control-next" class="slideshow-control"><img src="././img/arrow-right.gif"></div>'
+' </div>'
+'</div>'
);
$(window).resize(function () {
optimizeSizeImagePreview();
});
//handleImagePreviewEvent();
};
function optimizeSizeImagePreview() {
var maxW = "798";
var ratio = 1.566;
var maxH = maxW / ratio;
if ($("#dialog").width() < maxW || $("#dialog").height() < maxH) {
if ($("#dialog").width() < maxW) {
$("#dialog").css('width', maxW + 'px');
$("#dialog").css('height', maxH + 'px');
}
if ($("#dialog").height() < maxH) {
$("#dialog").css('height', maxH + 'px');
$("#dialog").css('width', maxW + 'px');
}
}
else {
$("#dialog").css('width', maxW + 'px');
$("#dialog").css('height', maxH + 'px');
}
$("#dialog").center();
};
//render select image
function renderSelectImage(){
var selectImg = $('#selector-img');
$.each(slideshowImageCollection, function(i, image){
if(slideshowImgFrom <= i && i <= slideshowImgTo){
selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:block; background-image : url('+image.thumbnail+')"></div>');
}
else{
selectImg.append('<div class="thumbnail" imageId="'+ image.index +'" style="display:none; background-image : url('+image.thumbnail+')"></div>');
}
});
};
//Handle Image Preview Event
function handleImagePreviewEvent(){
$('#control-next').click(imageSelectNextFunction);
$('#control-prev').click(imageSelectPrevFunction);
$('#main-control-next').click(imageMainSelectNextFunction);
$('#main-control-prev').click(imageMainSelectPrevFunction);
$('.thumbnail').click(selectImgClickFunction);
$('.thumbnail').mouseenter(selectImgMouseEnterFunction);
$('.thumbnail').mouseleave(selectImgMouseLeaveFunction);
$('.main-control').css('opacity','0');
$('#main-control-next').mouseleave(mainControlNextMouseLeaveFunction);
$('#main-control-prev').mouseleave(mainControlPrevMouseLeaveFunction);
if (isTouchDevice() == false) {
//$('.main-control').mouseenter(mainControlMouseEnterFunction);
$('#main-control-next').mouseenter(mainControlNextMouseEnterFunction);
$('#main-control-prev').mouseenter(mainControlPrevMouseEnterFunction);
}
//$('.main-control').mouseleave(mainControlMouseLeaveFunction);
$('.thumbnail:first').css('box-shadow','0px 7px 7px #555');
handleDispNextPrevButton();
};
function mainControlNextMouseEnterFunction(){
$(this).css('opacity','0.5');
};
function mainControlNextMouseLeaveFunction(){
$(this).css('opacity','0');
};
function mainControlPrevMouseEnterFunction(){
$(this).css('opacity','0.5');
};
function mainControlPrevMouseLeaveFunction(){
$(this).css('opacity','0');
};
//Image Preview next icon function
function imageSelectNextFunction(){
if(slideshowSelectLastIndex < slideshowImageCollection.length - 1){
$('#selector-img div:eq('+slideshowSelectFirstIndex+')').animate({width: 'hide'},
{step: function(now, fx){
$('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width: 'show'});
}
}
);
slideshowSelectFirstIndex = slideshowSelectFirstIndex + 1;
slideshowSelectLastIndex = slideshowSelectLastIndex + 1;
handleDispNextPrevButton();
}
};
//Image preview prev icon function
function imageSelectPrevFunction(){
var fixedIndex = slideshowSelectFirstIndex - 1;
if(slideshowSelectFirstIndex > 0){
$('#selector-img div:eq('+fixedIndex+')').animate({width: 'show'});
$('#selector-img div:eq('+slideshowSelectLastIndex+')').animate({width:'hide'});
slideshowSelectFirstIndex = slideshowSelectFirstIndex - 1;
slideshowSelectLastIndex = slideshowSelectLastIndex - 1;
handleDispNextPrevButton();
}
};
var slideshow_isTransaction = false;
//Main Image next icon function
function imageMainSelectNextFunction() {
if (isTouchDevice() == true) {
$('#main-control-next').css('opacity', '0.5');
}
if (slideshow_isTransaction == false) {
slideshow_isTransaction = true;
var fixedIndex = eval(slideshowMainCurrIndex) + 1;
if (slideshowMainCurrIndex < slideshowImageCollection.length - 1) {
$('#main-img div').animate(
{ "left": "-=100%" },
{
/*duration: "slow",*/
complete: function () {
$('#main-img div').hide();
renderMainImage(fixedIndex);
$('#main-img div').css('left', '+=300%');
$('#main-img div').show();
$('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' });
});
slideshowMainCurrIndex = eval(slideshowMainCurrIndex) + 1;
syncImageMainWithSelectImage();
handleDispNextPrevButton();
}
}
);
}
}
};
//Main Image prev icon function
function imageMainSelectPrevFunction() {
if (isTouchDevice() == true) {
$('#main-control-prev').css('opacity', '0.5');
}
if (slideshow_isTransaction == false) {
slideshow_isTransaction = true;
var fixedIndex = eval(slideshowMainCurrIndex) - 1;
if (slideshowMainCurrIndex > 0) {
$('#main-img div').animate(
{ "left": "+=100%" },
{
duration: "medium",
complete: function () {
$('#main-img div').hide();
renderMainImage(fixedIndex);
$('#main-img div').css('left', '-=300%');
$('#main-img div').show();
$('<img/>').attr('src', slideshowImageCollection[fixedIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' });
});
slideshowMainCurrIndex = eval(slideshowMainCurrIndex) - 1;
syncImageMainWithSelectImage();
handleDispNextPrevButton();
}
}
);
}
}
};
//Selector Image click function
function selectImgClickFunction() {
if (slideshow_isTransaction == false) {
slideshow_isTransaction = true;
var imgIndex = $(this).attr('imageId');
if (imgIndex > slideshowMainCurrIndex) {
$('#main-img div').animate(
{ "left": "-=100%" },
{
duration: "medium",
complete: function () {
$('#main-img div').css('display', 'none');
renderMainImage(imgIndex);
$('#main-img div').css('left', '+=300%');
$('#main-img div').css('display', 'block');
$('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' });
});
slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton();
}
}
);
}
else if (imgIndex < slideshowMainCurrIndex) {
$('#main-img div').animate(
{ "left": "+=100%" },
{
duration: "medium",
complete: function () {
$('#main-img div').css('display', 'none');
renderMainImage(imgIndex);
$('#main-img div').css('left', '-=300%');
$('#main-img div').css('display', 'block');
$('<img/>').attr('src', slideshowImageCollection[imgIndex].thumbnail).load(function () {
$('#main-img div').animate({ left: '0%' });
});
slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton();
}
}
);
}
else {
slideshow_isTransaction = false;
slideshowMainCurrIndex = imgIndex;
handleDispNextPrevButton();
}
$('.thumbnail').css('box-shadow', '');
$(this).css('box-shadow', '0px 7px 7px #555');
slideshowClickFlg = true;
}
};
//Render Main Image
function renderMainImage(i) {
var mainImg = $('#main-img div');
mainImg.css('background-image', 'url(' + slideshowImageCollection[i].thumbnail + ')');
slideshow_isTransaction = false;
if (isTouchDevice() == true) {
$('#main-control-next').css('opacity', '0');
$('#main-control-prev').css('opacity', '0');
}
};
function selectImgMouseLeaveFunction(){
if(!slideshowClickFlg){
$('this').css('box-shadow','');
slideshowClickFlg = false;
}
else{
//slideshowClickFlg = false;
}
};
function selectImgMouseEnterFunction(){
$('.thumbnail').css('box-shadow','');
$(this).css('box-shadow','0px 7px 7px #555');
};
//Main control mouse leave function
function mainControlMouseLeaveFunction(){
$('.main-control').css('opacity','0');
};
//Main control mouse enter function
function mainControlMouseEnterFunction(){
$('.main-control').css('opacity','0.5');
};
//Sync Main Image with select Image
function syncImageMainWithSelectImage(){
var thumbImg = $('.thumbnail[imageId="'+ slideshowMainCurrIndex +'"]');
if(thumbImg.is(':hidden')){
if(slideshowMainCurrIndex > slideshowSelectLastIndex){
imageSelectNextFunction();
}
else if(slideshowMainCurrIndex < slideshowSelectFirstIndex){
imageSelectPrevFunction();
}
}
$('.thumbnail').css('box-shadow','');
thumbImg.css('box-shadow','0px 7px 7px #555');
};
//Handle display button control
function handleDispNextPrevButton(){
if(slideshowSelectFirstIndex > 0){
$('#control-prev').css('visibility','visible');
}
else{
$('#control-prev').css('visibility','hidden');
}
if(slideshowSelectLastIndex < (eval(slideshowImageCollection.length) - 1)){
$('#control-next').css('visibility','visible');
}
else{
$('#control-next').css('visibility','hidden');
}
if(slideshowMainCurrIndex > 0){
$('#main-control-prev').css('visibility','visible');
}
else{
$('#main-control-prev').css('visibility','hidden');
}
if(slideshowMainCurrIndex < (eval(slideshowImageCollection.length) - 1)){
$('#main-control-next').css('visibility','visible');
}
else{
$('#main-control-next').css('visibility','hidden');
}
};
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
......@@ -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
......@@ -42,3 +42,9 @@ br.clear { }
.floatL { }
.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
......@@ -1067,11 +1067,17 @@ div .ui-slider-range, .ui-widget-header, .ui-slider-range-max {
font-family: Verdana;
font-size: 10pt;
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-color: transparent transparent transparent rgb(204, 204, 221) !important;
}
/* HOVER STYLES */
.pop-up-memo {
......@@ -1402,3 +1408,30 @@ 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}
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.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>'
);
......@@ -2283,8 +2283,12 @@ function handleForContentTypeMusic(resourceUrl){
//Create Dialog overlay
var $container = $('#dialog');
$container.html('');
$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
if (ClientData.userOpt_musicMode() == "1") {
$container.html('<audio autoplay="true" loop="true" controls="controls" style="position: absolute; width: 100%; bottom: 1%;">'
......
abvw/js/contentview_GetData.js
......@@ -912,7 +912,7 @@ 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({
......
abvw/js/contentview_ImagePreview.js
......@@ -44,13 +44,16 @@ function showImagePreview(targetId, imgList) {
+ '</div>');
var mainImg = $('#slideWrapper');
//START FIXCSS
var cssObj = { 'background-image': 'url(' + slideshowImageCollection[0].thumbnail + ')',
'background-repeat': 'no-repeat',
'background-size': 'contain',
'background-position': 'center',
'background-color': 'black'
'background-position': 'center'
};
mainImg.addClass('imagePreview-one');
//END FIXCSS
mainImg.css(cssObj);
......
abvw/js/contentview_Maker.js
......@@ -155,24 +155,44 @@ function Maker_SetDefaultValue() {
$("#maker-size-small").focus();
}
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').css('border','1px solid #e6e6e6');
//START FIXCSS
//$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').css('border','1px solid #e6e6e6');
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').addClass('picker-choose-on');
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').removeClass('picker-choose-off');
//END FIXCSS
Maker_chooseType(maker_Size, makerColor);
};
function Maker_colorPickerMouseLeaveFunction() {
$(this).css('border','1px solid white');
$('#dlgMaker .colorpicker[colorId="' + maker_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');
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').addClass('picker-choose-on');
$('#dlgMaker .colorpicker[colorId="'+makerColor+'"]').removeClass('picker-choose-off');
//END FIXCSS
};
function Maker_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');
Maker_chooseType(maker_Size, color);
};
function Maker_colorPickerClickFunction() {
$('#dlgMaker .colorpicker[colorId="' + maker_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');
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').addClass('picker-choose-off');
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').removeClass('picker-choose-on');
$(this).addClass('picker-choose-on');
$(this).removeClass('picker-choose-off');
//END FIXCSS
maker_chooseColor = $(this).attr('colorId');
Maker_chooseType(maker_Size, maker_chooseColor);
};
......@@ -261,8 +281,11 @@ function Maker_dspCancel_click() {
function Maker_colorWrapperMouseLeaveFunction() {
Maker_chooseType(maker_Size, maker_chooseColor);
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid #e6e6e6');
//START FIXCSS
//$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').css('border', '1px solid #e6e6e6');
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').addClass('picker-choose-on');
$('#dlgMaker .colorpicker[colorId="' + maker_chooseColor + '"]').removeClass('picker-choose-off');
//END FIXCSS
};
/// ===============================================================================================
......
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
......@@ -733,14 +733,12 @@ function showErrorScreenForceChangePassword(){
'</div></div></div>';
$('body').prepend(tags);
$('#avw-auth-error').css( {
'color': '#fff',
'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