Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
check
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abook_web
check
Commits
3e679a19
Commit
3e679a19
authored
Aug 18, 2018
by
Masaru Abe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#30078 隠しグループ可視透かし表示対応
parent
2f6ddb9a
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
158 additions
and
3 deletions
+158
-3
abvw/common/json/lang/lang-ja.json
+1
-1
abvw/css/layout/viewer.css
+40
-1
abvw/inc_contentview.html
+3
-0
abvw/js/bookmark.js
+2
-0
abvw/js/contentsearch.js
+2
-0
abvw/js/contentview.js
+106
-1
abvw/js/history.js
+2
-0
abvw/js/home.js
+2
-0
No files found.
abvw/common/json/lang/lang-ja.json
View file @
3e679a19
...
@@ -65,7 +65,7 @@
...
@@ -65,7 +65,7 @@
"dspBkCancel"
:
"バックアップせずにログアウト"
,
"dspBkCancel"
:
"バックアップせずにログアウト"
,
"txtSearchResult"
:
"検索結果"
,
"txtSearchResult"
:
"検索結果"
,
"dspHome"
:
"ホーム"
,
"dspHome"
:
"ホーム"
,
"txtLoginUser"
:
"(Ver.20180
510
)ログイン中:"
,
"txtLoginUser"
:
"(Ver.20180
824
)ログイン中:"
,
"txtAll"
:
"すべて"
,
"txtAll"
:
"すべて"
,
"txtMkgSize"
:
"太さ"
,
"txtMkgSize"
:
"太さ"
,
"txtMkgS"
:
"小"
,
"txtMkgS"
:
"小"
,
...
...
abvw/css/layout/viewer.css
View file @
3e679a19
/* CSS Document */
@charset
"utf-8"
;
@charset
"utf-8"
;
...
@@ -85,6 +84,7 @@ body{
...
@@ -85,6 +84,7 @@ body{
height
:
60px
;
height
:
60px
;
overflow
:
hidden
;
overflow
:
hidden
;
position
:
relative
;
position
:
relative
;
z-index
:
9999
;
}
}
.wrapper_header
{
.wrapper_header
{
...
@@ -245,6 +245,7 @@ body{
...
@@ -245,6 +245,7 @@ body{
height
:
60px
;
height
:
60px
;
position
:
fixed
;
position
:
fixed
;
bottom
:
0
;
bottom
:
0
;
z-index
:
9999
;
}
}
.ftinner
{
.ftinner
{
...
@@ -1744,3 +1745,41 @@ span.no-item{
...
@@ -1744,3 +1745,41 @@ span.no-item{
}
}
/* 透かし対応 */
.sukashi_box
{
position
:
absolute
;
width
:
100%
;
height
:
100%
;
background
:
transparent
;
pointer-events
:
none
;
overflow
:
hidden
;
z-index
:
9998
;
}
.sukashi_box
span
{
position
:
absolute
;
width
:
120%
;
padding
:
0.5em
1em
;
margin
:
2em
0
;
background
:
transparent
;
text-align
:
center
;
overflow
:
hidden
;
transform
:
rotate
(
-30deg
);
top
:
-300px
;
/* -150 */
left
:
-50px
;
/* -200 */
pointer-events
:
none
;
}
.sukashi_box
span
p
{
opacity
:
0.3
;
font-family
:
serif
;
font-weight
:
bolder
;
font-size
:
24px
;
color
:
#0089E5
;
text-shadow
:
1px
2px
3px
#808080
;
margin-bottom
:
50px
;
white-space
:
nowrap
;
overflow
:
hidden
;
pointer-events
:
none
;
}
abvw/inc_contentview.html
View file @
3e679a19
...
@@ -2,6 +2,9 @@
...
@@ -2,6 +2,9 @@
<!-- ビューアエリア FROM -->
<!-- ビューアエリア FROM -->
<div
id=
"wrapper"
style=
""
>
<div
id=
"wrapper"
style=
""
>
<!-- 可視透かし表示領域 -->
<div
id=
"sukashi_box"
class=
"sukashi_box"
></div>
<!--Viewer component is added here -->
<!--Viewer component is added here -->
<div
id=
"overlay"
class=
"web_dialog_overlay"
>
</div>
<div
id=
"overlay"
class=
"web_dialog_overlay"
>
</div>
<div
id=
"dialog"
class=
"web_dialog"
>
</div>
<div
id=
"dialog"
class=
"web_dialog"
>
</div>
...
...
abvw/js/bookmark.js
View file @
3e679a19
...
@@ -102,6 +102,8 @@ $(document).ready(function() {
...
@@ -102,6 +102,8 @@ $(document).ready(function() {
$
(
"#viewer"
).
load
(
"./inc_contentview.html?__UPDATEID__"
,
function
(
myData
,
myStatus
,
xhr
)
{
$
(
"#viewer"
).
load
(
"./inc_contentview.html?__UPDATEID__"
,
function
(
myData
,
myStatus
,
xhr
)
{
// 読み込み完了時の処理
// 読み込み完了時の処理
I18N
.
i18nReplaceText
();
I18N
.
i18nReplaceText
();
//透かし表示対応
CONTENTVIEW
.
initSukashi
();
});
});
});
});
...
...
abvw/js/contentsearch.js
View file @
3e679a19
...
@@ -145,6 +145,8 @@ $(document).ready(function() {
...
@@ -145,6 +145,8 @@ $(document).ready(function() {
$
(
"#viewer"
).
load
(
"./inc_contentview.html?__UPDATEID__"
,
function
(
myData
,
myStatus
,
xhr
)
{
$
(
"#viewer"
).
load
(
"./inc_contentview.html?__UPDATEID__"
,
function
(
myData
,
myStatus
,
xhr
)
{
// 読み込み完了時の処理
// 読み込み完了時の処理
I18N
.
i18nReplaceText
();
I18N
.
i18nReplaceText
();
//透かし表示対応
CONTENTVIEW
.
initSukashi
();
});
});
});
});
...
...
abvw/js/contentview.js
View file @
3e679a19
...
@@ -4929,7 +4929,12 @@ CONTENTVIEW.sizingNotFull = function(width, height) {
...
@@ -4929,7 +4929,12 @@ CONTENTVIEW.sizingNotFull = function(width, height) {
.
css
(
'left'
,
-
(
width
+
CONTENTVIEW
.
marginX
));
.
css
(
'left'
,
-
(
width
+
CONTENTVIEW
.
marginX
));
}
}
//透かし対応時の試作 後で消す
//$("#sukashi_box").css('height', height - (CONTENTVIEW.marginY * 2))
//.css('width', width - (CONTENTVIEW.marginX * 2))
// .css('top', CONTENTVIEW.marginY);
$
(
"#draw_canvas"
).
css
(
'cursor'
,
'default'
);
$
(
"#draw_canvas"
).
css
(
'cursor'
,
'default'
);
$
(
"#marker_canvas"
).
css
(
'cursor'
,
'default'
);
$
(
"#marker_canvas"
).
css
(
'cursor'
,
'default'
);
...
@@ -5814,4 +5819,104 @@ CONTENTVIEW.webGetContentApi_funcOk = function(data){
...
@@ -5814,4 +5819,104 @@ CONTENTVIEW.webGetContentApi_funcOk = function(data){
};
};
//隠しグループ表示中は透かし表示
CONTENTVIEW
.
initSukashi
=
function
(){
//透かし表示対応
if
(
ClientData
.
authCode
()
!=
""
)
{
var
loginId
=
ClientData
.
userInfo_userName
();
var
line
=
""
;
//透かし表示文字列(1行分)作成 12個は目分量
for
(
var
i
=
0
;
i
<
12
;
i
++
)
{
line
=
line
+
loginId
+
" "
;
}
var
html
=
"<span>"
;
//透かし列作成 25行は目分量
for
(
var
i
=
0
;
i
<
25
;
i
++
)
{
if
(
i
%
2
==
0
)
{
html
=
html
+
"<p>"
+
line
+
"</p>"
;
}
else
{
html
=
html
+
"<p> "
+
line
+
"</p>"
;
}
}
html
=
html
+
"</span>"
;
$
(
"#sukashi_box"
).
html
(
html
);
$
(
"#sukashi_box"
).
show
();
}
else
{
$
(
"#sukashi_box"
).
html
(
""
);
$
(
"#sukashi_box"
).
hide
();
}
};
//隠しグループ表示中は透かし表示
CONTENTVIEW
.
initSukashi2
=
function
(){
//透かし表示対応
if
(
ClientData
.
authCode
()
!=
""
)
{
var
loginId
=
ClientData
.
userInfo_userName
();
var
line
=
loginId
;
var
line2
=
" "
;
//透かし表示文字列(1行分)作成 12個は目分量
//for (var i = 0; i < 12; i++) {
// line = line + loginId + " ";
// line2 = line2 + "ああああああ" + " ";
//}
var
html
=
"<ul>"
;
//透かし列作成 25行は目分量
for
(
var
i
=
0
;
i
<
50
;
i
++
)
{
if
(
i
%
2
==
0
)
{
html
=
html
+
"<li>"
+
line
+
"</li>"
;
}
else
{
html
=
html
+
"<li>"
+
line2
+
"</li>"
;
}
}
html
=
html
+
"</ul>"
;
$
(
"#sukashi_box"
).
html
(
html
);
$
(
"#sukashi_box"
).
show
();
}
else
{
$
(
"#sukashi_box"
).
html
(
""
);
$
(
"#sukashi_box"
).
hide
();
}
};
//隠しグループ表示中は透かし表示
CONTENTVIEW
.
initSukashi3
=
function
(){
//透かし表示対応
if
(
ClientData
.
authCode
()
!=
""
)
{
var
loginId
=
ClientData
.
userInfo_userName
();
var
line
=
""
;
var
line2
=
""
;
//透かし表示文字列(1行分)作成 12個は目分量
for
(
var
i
=
0
;
i
<
12
;
i
++
)
{
line
=
line
+
loginId
+
" "
;
line2
=
line2
+
"ああああああ"
+
" "
;
}
var
html
=
"<div>"
;
//透かし列作成 25行は目分量
for
(
var
i
=
0
;
i
<
25
;
i
++
)
{
if
(
i
%
2
==
0
)
{
html
=
html
+
"<p>"
+
line
+
"</p>"
;
}
else
{
html
=
html
+
"<p> "
+
line2
+
"</p>"
;
}
}
html
=
html
+
"</div>"
;
$
(
"#sukashi_box"
).
html
(
html
);
$
(
"#sukashi_box"
).
show
();
}
else
{
$
(
"#sukashi_box"
).
html
(
""
);
$
(
"#sukashi_box"
).
hide
();
}
};
abvw/js/history.js
View file @
3e679a19
...
@@ -130,6 +130,8 @@ $(document).ready(function() {
...
@@ -130,6 +130,8 @@ $(document).ready(function() {
$
(
"#viewer"
).
load
(
"./inc_contentview.html?__UPDATEID__"
,
function
(
myData
,
myStatus
,
xhr
)
{
$
(
"#viewer"
).
load
(
"./inc_contentview.html?__UPDATEID__"
,
function
(
myData
,
myStatus
,
xhr
)
{
// 読み込み完了時の処理
// 読み込み完了時の処理
I18N
.
i18nReplaceText
();
I18N
.
i18nReplaceText
();
//透かし表示対応
CONTENTVIEW
.
initSukashi
();
});
});
});
});
...
...
abvw/js/home.js
View file @
3e679a19
...
@@ -280,6 +280,8 @@ $(document).ready(function() {
...
@@ -280,6 +280,8 @@ $(document).ready(function() {
$
(
"#viewer"
).
load
(
"./inc_contentview.html?__UPDATEID__"
,
function
(
myData
,
myStatus
,
xhr
)
{
$
(
"#viewer"
).
load
(
"./inc_contentview.html?__UPDATEID__"
,
function
(
myData
,
myStatus
,
xhr
)
{
// 読み込み完了時の処理
// 読み込み完了時の処理
I18N
.
i18nReplaceText
();
I18N
.
i18nReplaceText
();
//透かし表示対応
CONTENTVIEW
.
initSukashi
();
});
});
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment