Merge branch 'feature/1.6.2_doutor' of…

Merge branch 'feature/1.6.2_doutor' of ssh://git@gitlab.agentec.jp/abook_web/web-viewer.git into feature/1.6.2_doutor

Merge branch 'feature/1.6.2_doutor' of…
Merge branch 'feature/1.6.2_doutor' of ssh://git@gitlab.agentec.jp/abook_web/web-viewer.git into feature/1.6.2_doutor
53c16ecd · Masaru Abe · 04e50e29 · 119583b1 · 53c16ecd · 53c16ecd
Commit 53c16ecd authored Apr 24, 2015 by Masaru Abe
Showing with 18 additions and 13 deletions

abvw/css/theme/bookshelf.css
+5 -6

abvw/css/theme/history.css
+3 -2

abvw/css/theme/list_shiori.css
+6 -0

abvw/home.html
+1 -1

abvw/js/bookmark.js
+1 -1

abvw/js/history.js
+0 -1

abvw/js/home.js
+2 -2

No files found.
--- a/abvw/css/theme/bookshelf.css
+++ b/abvw/css/theme/bookshelf.css
@@ -56,16 +56,15 @@ section.sectionhomebookshelf .cnt_section_bookshelf:hover{
 }
 .sectionhomebookshelf a.name{
    color: #333333;
-    font-size: 18px;
-    text-decoration: none;
    font-size: 12px;
+    text-decoration: none;
+
 }
 .sectionhomebookshelf a.name div.content-title{
-	width: 60px;
-    white-space: nowrap;
-    overflow: hidden;
+	width:150px;
+    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{ }

--- a/abvw/css/theme/history.css
+++ b/abvw/css/theme/history.css
@@ -86,11 +86,12 @@ section.sectionhistory .cnt_section_list:hover{
 }
 .cnt_section_list .text a.name{
 	color: #37648C;
-	font-size: 16px;
+	font-size: 18px;
+	font-size: 12px;
 }

 .cnt_section_list .text a div.test1{
-	width: 600px;
+	width: 400px;
    white-space: nowrap;
    overflow: hidden;
    text-overflow: ellipsis;

--- a/abvw/css/theme/list_shiori.css
+++ b/abvw/css/theme/list_shiori.css
@@ -140,6 +140,12 @@ section.sectionBookmark .cnt_section:hover{
 	cursor:default;
 	text-decoration:none;
 }
+.cnt_section .text a.name div.pageTitle{
+	width:400px;
+    white-space: nowrap; /* 改行を半角スペースに置き換える */
+    overflow: hidden; /* はみだした部分を削除する */
+    text-overflow: ellipsis;
+}
 .cnt_section .text label.name
 {
    color: #2D83DA;

--- a/abvw/home.html
+++ b/abvw/home.html
@@ -81,7 +81,7 @@

 </head>

-<body id="bookshelf" oncontextmenu="return true">
+<body id="bookshelf" oncontextmenu="return false">
 <header id="header-ws" class="header_ws">
 	<div class="notification-pushmessage" style="display:none;">
 		<!--新着メッセージがあります！！！-->

--- a/abvw/js/bookmark.js
+++ b/abvw/js/bookmark.js
@@ -671,7 +671,7 @@ BOOKMARK.insertRow = function(contentid, pageThumbnail, pageTitle, pageText, pag
    newRow +='</a>';

    newRow +='<div class="text">';
-    newRow += '<a class="name" href="#">' + COMMON.truncate(pageTitle, 20) + '</a>';
+    newRow += '<a class="name" href="#">' +'<div class ="pageTitle" >'+ pageTitle +'</div>'+ '</a>';

    newRow +='<div class="info">';
    newRow += '<ul class="date">';

--- a/abvw/js/history.js
+++ b/abvw/js/history.js
@@ -1018,7 +1018,6 @@ HISTORY.titleClickFunction = function(e){
    	HISTORY.home_isMove = false;
        return;
    }
-
 	var contentid = $(this).attr('contentid');
 	// Get image of selected image
 	var base64String = HISTORY.returnThumbnail(contentid);

--- a/abvw/js/home.js
+++ b/abvw/js/home.js
@@ -1660,9 +1660,9 @@ HOME.renderContent = function(id, text, division, type, order, from, to, cateid,
 					+ '	    <img id="loadingIcon' + post.contentId + '" src="./img/data_loading.gif" height="25px" width="25px" style="padding: 86px; "/>'
 					+ '	</div>'
 					+ ' <a id="title' + post.contentId + '" class="name dialog lang" lang="lblTitle" contentid="' + post.contentId + '">'
-					+ '   <img src="' + HEADER.getIconTypeContent(post.contentType)+'" width="20" height="20">'
+					+ ' <img src="' + HEADER.getIconTypeContent(post.contentType)+'" width="20" height="20">'
 //					+     COMMON.truncate(COMMON.htmlEncode(post.contentTitle), 20)
-					+ ' <div class="content-title">'+post.contentTitle+"..."+'</div>'
+					+ ' <div class="content-title" style="float:right;text-indent:0px">'+post.contentTitle+'</div>'
 					+ ' </a>'
 					+ '</section>'
            	);