Skip to content

C
check
Commit 4eebf66c by vietdo
Options

#16037 Web版　リスト表示でコンテンツ名の表示文字数が少ない

parent cc7214ac
Showing with 64 additions and 14 deletions
abvw/css/history.css
......@@ -147,10 +147,10 @@
margin: 0 0 0 35px;
width:400px;
}
.cnt_section_list .text a.name{
/*.cnt_section_list .text a.name{
color: #37648C;
font-size: 16px;
}
}*/
.cnt_section_list .text a.name img
{
float:left;
......
abvw/css/theme/bookshelf.css
......@@ -60,6 +60,13 @@ section.sectionhomebookshelf .cnt_section_bookshelf:hover{
text-decoration: none;
font-size: 12px;
}
.sectionhomebookshelf a.name div.content-title{
width: 60px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.cnt_section_bookshelf a.name:hover{ text-decoration:underline; color:#2d83da;}
.cnt_section_bookshelf .text ul.date{ }
.cnt_section_bookshelf .text ul.date li{ color:#333333; font-size:11px;}
......
abvw/css/theme/history.css
......@@ -88,6 +88,14 @@ section.sectionhistory .cnt_section_list:hover{
color: #37648C;
font-size: 16px;
}
.cnt_section_list .text a div.test1{
width: 600px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.cnt_section_list .text a.name img
{
}
......
abvw/css/theme/list_shirori_detail.css
......@@ -30,9 +30,15 @@
}
.sectiondetail #book_data ul li {
}
.sectiondetail #book_data ul .title {
.sectiondetail #book_data ul li.title {
font-size:18px;
line-height:1.3em;
width: 200px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
-o-text-overflow: ellipsis;
}
.sectiondetail #book_data ul .date {
font-size:12px;
......
abvw/history.html
......@@ -76,7 +76,7 @@
</style>
</head>
<body id="history" oncontextmenu="return false;">
<body id="history" oncontextmenu="return true">
<header id="header-ws" class="header_ws">
<div class="notification-pushmessage" style="display:none;">
......
abvw/js/bookmark.js
......@@ -23,7 +23,9 @@ $(document).ready(function () {
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)) return;
if(ClientData.serviceOpt_encryption() != 'Y') {
COMMON.LockScreen();
}
document.title = I18N.i18nText('dspShiori') + ' | ' + I18N.i18nText('sysAppTitle');
......
abvw/js/contentsearch.js
......@@ -31,7 +31,9 @@ $(document).ready(function(){
return;
}
if(ClientData.serviceOpt_encryption() != 'Y') {
COMMON.LockScreen();
}
document.title = I18N.i18nText('txtSearchResult') + ' | ' + I18N.i18nText('sysAppTitle');
......
abvw/js/contentview.js
......@@ -5666,6 +5666,7 @@ CONTENTVIEW.ready = function(){
if (ClientData.IsRefresh() == true) {
//Check if is pdf content
if(CONTENTVIEW.isMediaAndHTMLContent()){
CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType();
document.title = data.contentData.contentName + ' | ' + I18N.i18nText('sysAppTitle');
}
......
abvw/js/contentview_CallApi.js
......@@ -58,6 +58,7 @@ CONTENTVIEW_CALLAPI.getJsonContentInfoDone = function(doneFunc){
CONTENTVIEW_CALLAPI.getJsonDataType5Done(data5[0]);
}
if(data6){
console.log(data6[0]);
CONTENTVIEW_CALLAPI.getDataJsonFileDone(data6[0]);
}
if(data7){
......
abvw/js/contentview_CreateObjects.js
......@@ -1001,21 +1001,28 @@ CONTENTVIEW_CREATEOBJECT.exam = function (mediaType, actionType, id, imageUrl, x
objectLog.locationWidth = w;
COMMON.SetObjectLog(CONTENTVIEW_GENERAL.contentID, objectLog);
//---
/*stop audio on page */
CONTENTVIEW.stopAllAudio();
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "/?abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId();
var isShowResult, isSendResult;
if(showResult == 1){
isShowResult = true;
} else {
isShowResult = false;
}
if(sendResult == 1){
isSendResult = true;
} else {
isSendResult = false;
}
var url = CONTENTVIEW_GETDATA.getURLPageImage("webEnqueteReply/init") + "/?abObjectId="+objectId + "&sid=" + CONTENTVIEW.getSessionId()+"&isShowResult="+isShowResult+"&isSendResult="+isSendResult;
if(ClientData.isStreamingMode()){
//ストリーミング
url = url + "&isStreaming=true";
}
var isFullScreen = false;
if(parseInt(fullscreen) == 1){
isFullScreen = true;
}
CONTENTVIEW_EXAM.showExam(url, isFullScreen, objectId);
CONTENTVIEW_GENERAL.showDialog(true);
......
abvw/js/contentview_InitObjects.js
......@@ -544,7 +544,6 @@ CONTENTVIEW_INITOBJECT.isHasPageBGM = function(){
//END TRB00069
CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
//$('#divImageLoading').css('display', 'block');
/* init footer toolbar */
......@@ -555,7 +554,9 @@ CONTENTVIEW_INITOBJECT.initPageMediaAndHtmlType = function(){
CONTENTVIEW_INITOBJECT.initDisplayToolbarDevice();
// Lock screen
if(ClientData.serviceOpt_encryption() != 'Y') {
COMMON.LockScreen();
}
//START TRB00094 - Editor : Long - Date : 09/26/2013 - Summary : Setting log
CONTENTVIEW.StartTimerUpdateLog();
......
abvw/js/detail.js
......@@ -293,7 +293,7 @@ DETAIL.showContentNotPDF = function(displayData) {
DETAIL.showContent = function(displayData) {
$("#txtPubDt2_Dsp").text(displayData.deliveryDate.jpDateString() + " " + displayData.deliveryDate.jpShortTimeString());
$("#txtContentDetail").text(displayData.contentDetail);
$("#txtContentTitle").text(COMMON.truncate(displayData.contentTitle, 20));
$("#txtContentTitle").text(displayData.contentTitle);
//コンテンツ共有
if( displayData.contentShare == '1' ){
......
abvw/js/history.js
......@@ -32,7 +32,9 @@ $(document).ready(function(){
return;
}
if(ClientData.serviceOpt_encryption() != 'Y') {
COMMON.LockScreen();
}
document.title = I18N.i18nText('dspViewHistory') + ' | ' + I18N.i18nText('sysAppTitle');
......@@ -1377,7 +1379,8 @@ HISTORY.renderContentAfterSort = function(contentSortArr){
+ ' <div class="text">'
+ ' <a id="title' + post.contentid + '" class="name dialog" contentid="' + post.contentid + '">'
+ ' <img class="listIcon" src="' + HEADER.getIconTypeContent(post.contenttype)+'" width="20" height="20">'
+ COMMON.truncate(COMMON.htmlEncode(post.contenttitle), 20)
// + COMMON.truncate(COMMON.htmlEncode(post.contenttitle), 20)
+ ' <div class="test1">'+post.contenttitle+'</div>'
+ ' </a>'
+ ' <div class="info">'
+ ' <ul class="date">'
......
abvw/js/home.js
......@@ -86,7 +86,9 @@ $(document).ready(function () {
HOME.getDataJsonFileGroup();
// Lock screen is here, because of in getDataJsonFileGroup() called click to expand speified nodes of treeview
if(ClientData.serviceOpt_encryption() != 'Y') {
COMMON.LockScreen();
}
//Change display type to bookshelf type
$('#control-bookshelf-type').click(HOME.changeDispBookShelfFunction);
......@@ -1657,9 +1659,10 @@ HOME.renderContent = function(id, text, division, type, order, from, to, cateid,
+ ' </div>'
+ ' <img id="loadingIcon' + post.contentId + '" src="./img/data_loading.gif" height="25px" width="25px" style="padding: 86px; "/>'
+ ' </div>'
+ ' <a id="title' + post.contentId + '" class="dialog name lang" lang="lblTitle" contentid="' + post.contentId + '">'
+ ' <a id="title' + post.contentId + '" class="name dialog lang" lang="lblTitle" contentid="' + post.contentId + '">'
+ ' <img src="' + HEADER.getIconTypeContent(post.contentType)+'" width="20" height="20">'
+ COMMON.truncate(COMMON.htmlEncode(post.contentTitle), 20)
// + COMMON.truncate(COMMON.htmlEncode(post.contentTitle), 20)
+ ' <div class="content-title">'+post.contentTitle+"..."+'</div>'
+ ' </a>'
+ '</section>'
);
......
abvw/js/settings.js
......@@ -8,7 +8,9 @@ $(document).ready(function () {
if (!AVWEB.avwCheckLogin(COMMON.ScreenIds.Login)) return;
COMMON.ToogleLogoutNortice();
if(ClientData.serviceOpt_encryption() != 'Y') {
COMMON.LockScreen();
}
document.title = I18N.i18nText('dspSetting') + ' | ' + I18N.i18nText('sysAppTitle');
......
login.html
......@@ -95,6 +95,13 @@
<p class="memory"><input type="checkbox" id="chkRemember" /><label class="lang" lang="txtLoginPwdRbr" for="chkRemember"><!--アカウントパスとログインIDを記憶する--></label></p>
<a class="loginbtn lang" id="btnLogin" lang="dspLogin"><!--ログイン--></a>
</section>
<section id="formlogindoutor" style="display:none;">
<table width="440" border="0" cellspacing="0">
<tr>
<th width="100%" >ポータルサイトからログインしてください</th>
</tr>
</table>
</section>
</article>
</div>
</div>
......
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