Skip to content

C
check
Commit 4eebf66c by vietdo
Options

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

parent cc7214ac
Showing with 128 additions and 78 deletions
abvw/css/history.css
.articlehistory{
.articlehistory{
width:858px;
border:1px solid #ccc;
padding:10px 20px 0 22px;
......@@ -19,9 +19,9 @@
vertical-align:middle;
}
.tops a.btn_blue,.tops a.btn_gray
.tops a.btn_blue,.tops a.btn_gray
{
float:left;
text-align:center;
display:table-cell;
......@@ -32,7 +32,7 @@
text-decoration:none;
margin-right:10px;
color:#fff;
-moz-box-shadow: inset 0px 1px 0px 0px #86ACC7;
-webkit-box-shadow: inset 0px 1px 0px 0px #86ACC7;
box-shadow: inset 0px 1px 0px 0px #86ACC7;
......@@ -49,9 +49,9 @@
font-family: arial;
font-size: 15px;
font-weight: bold;
padding: 2px 15px;
text-decoration: none;
/* [disabled]text-shadow:1px 1px 0px #a2d613; */
margin-left: 5px;
......@@ -83,20 +83,20 @@
.tops ul{ float:left; margin:0; padding:0;}
.tops ul li{ display:inline;}
.tops ul li a{
font-size:12px;
float:left;
.tops ul li a{
font-size:12px;
float:left;
color:rgb(45,131,218);
text-decoration:none;
margin-right:5px;
text-decoration:none;
margin-right:5px;
margin-left:5px;
}
.tops ul li span{
font-size:12px;
float:left;
color:#333333;
text-decoration:none;
margin-right:5px;
.tops ul li span{
font-size:12px;
float:left;
color:#333333;
text-decoration:none;
margin-right:5px;
margin-left:5px;
}
.tops ul li a.nottouchdevice:hover{ text-decoration:underline;}
......@@ -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;
......@@ -283,7 +283,7 @@
}
#main-searchresult span
{
float: left;
float: left;
margin-right: 15px;
}
#main-searchresult input
......
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
......@@ -9,7 +9,7 @@
-moz-box-shadow: 0px 1px 3px 0px #666;
box-shadow: 0px 1px 3px 0px #666;
font-family: "メイリオ", "Meiryo", "ヒラギノ角ゴ Pro W3", "Hiragino Kaku Gothic Pro", "ＭＳ Ｐゴシック", "MS P Gothic", "Osaka", Verdana, Arial, Helvetica, sans-serif;
background-color:#fff;
background-color:#fff;
}
.closebtn {
background: url(../../img/login/close.png) 0 0 no-repeat;
......@@ -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;
......@@ -187,6 +193,6 @@
.sectiondetailnopdf #book_list ul .page,.sectiondetailnopdf #book_list ul .text{ }
.sectiondetailnopdf #book_list ul+ul { border-top:1px dotted #CCC; }
.sectiondetailnopdf #book_data .read_btn {
.sectiondetailnopdf #book_data .read_btn {
/*margin:30px 0 0 80px;*/
}
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;
COMMON.LockScreen();
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;
}
COMMON.LockScreen();
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
COMMON.LockScreen();
if(ClientData.serviceOpt_encryption() != 'Y') {
COMMON.LockScreen();
}
//START TRB00094 - Editor : Long - Date : 09/26/2013 - Summary : Setting log
CONTENTVIEW.StartTimerUpdateLog();
......
abvw/js/contentview_PopupText.js
......@@ -5,7 +5,7 @@ var CONTENTVIEW_POPUPTEXT = {};
///ShowDialog
///direction: arrow value: 0: top right
/// 1: bottom right
/// 2: top left
/// 2: top left
/// 3: bottom left
CONTENTVIEW_POPUPTEXT.OpenPopupText = function(posX, posY, content, dialogDiv, arrowDiv) {
CONTENTVIEW_POPUPTEXT.popuptext_dialogDiv = dialogDiv;
......@@ -54,16 +54,16 @@ CONTENTVIEW_POPUPTEXT.OpenPopupText = function(posX, posY, content, dialogDiv, a
// Ajust direction [ end ]
//START FIXCSS
switch (direction) {
case 0: left_dialog = left_arrow - dialogDiv.outerWidth();
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");
break;
case 1: left_dialog = left_arrow - dialogDiv.outerWidth();
case 1: left_dialog = left_arrow - dialogDiv.outerWidth();
top_dialog = top_arrow - dialogDiv.height() + 30;
//arrowDiv.css("border-color", "transparent transparent transparent #ccd");
......@@ -79,7 +79,7 @@ CONTENTVIEW_POPUPTEXT.OpenPopupText = function(posX, posY, content, dialogDiv, a
//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;
case 3: left_dialog = left_arrow + 24;
top_dialog = top_arrow - dialogDiv.height() + 30;
//arrowDiv.css("border-color", "transparent #ccd transparent transparent");
......
abvw/js/detail.js
......@@ -27,7 +27,7 @@ DETAIL.openContentDetail = function() {
else {
$('#sectionContentDetail').removeClass().addClass('sectiondetail');
}
DETAIL.displayData = {
contentID: "",
contentTitle: "",
......@@ -44,7 +44,7 @@ DETAIL.openContentDetail = function() {
// Clear display info
$("#imgContentThumbnail").attr('src', "img/data_loading.gif");
DETAIL.resetLoadingImageSize();
$("#txtContentTitle").text('');
$("#txtPubDt2_Dsp").text('');
$("#txtContentDetail").text('');
......@@ -53,12 +53,12 @@ DETAIL.openContentDetail = function() {
$("#contentDetailClose").click(DETAIL.contentDetailClose_Click);
$("#contentdetail_dspRead").unbind("click");
$("#contentdetail_dspRead").click(DETAIL.contentdetail_dspRead_Click);
//if( ClientData.serviceOpt_content_share() != '2'){
//$("#contentdetail_dspShare").click(SHARE.openContentShare);
$("#contentdetail_dspShare").hide();
//}
COMMON.lockLayout();
$("#contentDetail").css('z-index', 101);
$("#sectionContentDetail").show();
......@@ -70,14 +70,14 @@ DETAIL.openContentDetail = function() {
// Get contentid, thumbnail from list screen
DETAIL.displayData.contentID = ClientData.contentInfo_contentId();
DETAIL.displayData.contentThumbnail = ClientData.contentInfo_contentThumbnail();
DETAIL.displayData.contentThumbnail = ClientData.contentInfo_contentThumbnail();
var params = {
sid: ClientData.userInfo_sid(),
getType: '1',
contentId: DETAIL.displayData.contentID
};
// Get content detail
AVWEB.avwCmsApi(ClientData.userInfo_accountPath(), "webGetContent", "GET", params,
function (data) {
......@@ -92,7 +92,7 @@ DETAIL.openContentDetail = function() {
}
}
DETAIL.displayData.deliveryDate = COMMON.convertToDate(data.contentData.deliveryStartDate);
//Start Function : No.12 -- Editor : Viet Nguyen -- Date : 08/01/2013 -- Summary : Create new function to return content type of content.
if(!COMMON.isPdfContent(contentType)){
DETAIL.showContentNotPDF(DETAIL.displayData);
......@@ -113,9 +113,9 @@ DETAIL.openContentDetail = function() {
null
);
}
//End Function : No.12 -- Editor : Viet Nguyen -- Date : 08/01/2013 -- Summary : Create new function to return content type of content.
},
null
);
......@@ -162,7 +162,7 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) {
//Store Content id that user has read
if (ClientData.ReadingContentIds().length > 0) {
contentIdArray = ClientData.ReadingContentIds();
for (var nIndex = 0; nIndex < contentIdArray.length; nIndex++) {
if (contentIdArray[nIndex].contentid == outputId) {
checkflag = true;
......@@ -176,7 +176,7 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) {
checkflag = false;
}
}
if (!checkflag) {
contentIdArray.push({ contentid: outputId, viewdate: outputDate, originviewdate: date });
}
......@@ -184,24 +184,24 @@ DETAIL.contentdetail_dspRead_Click_callback = function(outputId) {
else {
contentIdArray.push({ contentid: outputId, viewdate: outputDate, originviewdate: date });
}
//Renew ReadingContentID
var newArray = [];
ClientData.ReadingContentIds(newArray);
//Set data for readingcontentid
ClientData.ReadingContentIds(contentIdArray);
//Set ResouceVersion for content
COMMON.setResourceVersionData(outputId);
//Set MetaVersion for content
COMMON.setMetaVersionData(outputId);
// Redirect to screen: contentview
// Redirect to screen: contentview
//$('body,html').animate({ scrollTop: 0 }, 0);
ClientData.IsRefresh(false);
if (ClientData.contentInfo_contentType() == COMMON.ContentTypeKeys.Type_Others) {
// Get content detail
HEADER.downloadResourceById(ClientData.contentInfo_contentId());
......@@ -238,7 +238,7 @@ DETAIL.showContentNotPDF = function(displayData) {
$("#txtContentDetail").text(displayData.contentDetail);
//$("#txtContentTitle").text(COMMON.truncate(displayData.contentTitle, 20));
$("#txtContentTitle").text(displayData.contentTitle);
//コンテンツ共有
if( displayData.contentShare == '1' ){
SHARE.contentId = displayData.contentID;
......@@ -247,9 +247,9 @@ DETAIL.showContentNotPDF = function(displayData) {
$("#contentdetail_dspShare").unbind("click");
$("#contentdetail_dspShare").click(SHARE.openContentShare);
}
var tempContentType = ClientData.contentInfo_contentType();
if(displayData.contentThumbnail == '' || displayData.contentThumbnail == null || displayData.contentThumbnail == 'undefined'){
if(!COMMON.isPdfContent(tempContentType)){
var src = HEADER.getThumbnailForOtherType(contentType);
......@@ -260,7 +260,7 @@ DETAIL.showContentNotPDF = function(displayData) {
//}else{
//contentThumbnail = contentThumbnail;
}
var imgTemp = new Image();
$("#imgContentThumbnail").attr("src", displayData.contentThumbnail);
imgTemp.onload = function () {
......@@ -278,12 +278,12 @@ DETAIL.showContentNotPDF = function(displayData) {
$("#imgContentThumbnail").attr('width', '');
$("#imgContentThumbnail").removeAttr('width');
$("#imgContentThumbnail").attr('height', '120');
$("#imgContentThumbnail").css('padding-top', "12px");
}
};
imgTemp.src = displayData.contentThumbnail;
};
......@@ -293,8 +293,8 @@ 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' ){
SHARE.contentId = displayData.contentID;
......@@ -303,7 +303,7 @@ DETAIL.showContent = function(displayData) {
$("#contentdetail_dspShare").unbind("click");
$("#contentdetail_dspShare").click(SHARE.openContentShare);
}
$("#imgContentThumbnail").attr("src", displayData.contentThumbnail);
var imgTemp = new Image();
......@@ -327,9 +327,9 @@ DETAIL.showContent = function(displayData) {
}
};
imgTemp.src = displayData.contentThumbnail;
//resizeThumbnailContentDetail(contentThumbnail, 120, 160);
// Show pages
for (var nIndex = 0; nIndex < displayData.pages.length; nIndex++) {
......@@ -348,14 +348,14 @@ DETAIL.insertRow = function(pageThumbnail, pageText, pageNo) {
$('#book_list').append(newRow);
I18N.i18nReplaceText();
//Resize Image
var imgTemp = new Image();
imgTemp.onload = function(){
if(imgTemp.width > imgTemp.height) {
$("li.list_img img").attr('height', '');
$("li.list_img img").removeAttr('height');
$("li.list_img img").attr('width', '90');
......@@ -366,7 +366,7 @@ DETAIL.insertRow = function(pageThumbnail, pageText, pageNo) {
$("li.list_img img").attr('height', '90');
}
};
imgTemp.src = pageThumbnail;
};
......
abvw/js/history.js
......@@ -32,7 +32,9 @@ $(document).ready(function(){
return;
}
COMMON.LockScreen();
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
COMMON.LockScreen();
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();
COMMON.LockScreen();
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