Merge pull request #456 from support-project/feature/issue123_attachfile

Feature/issue123 attachfile
support-project · Sep 8, 2016 · 54736e1 · 54736e1
2 parents 307b1eb + 7dd4ce2
commit 54736e1
Show file tree

Hide file tree

Showing 11 changed files with 99 additions and 32 deletions.
diff --git a/src/main/resources/appresource.properties b/src/main/resources/appresource.properties
@@ -240,6 +240,7 @@ knowledge.view.info.history=History
 knowledge.view.label.show.toc=Show TOC
 knowledge.view.label.copy.url=Clip Page URL
 knowledge.view.label.toc=TOC
+knowledge.view.label.attach=Attach Files
 knowledge.view.msg.toc.empty=TOC item is not found.
 knowledge.view.msg.url.copy=Copied the URL
 knowledge.search.title=Search Knowledge

diff --git a/src/main/resources/appresource_ja.properties b/src/main/resources/appresource_ja.properties
@@ -240,6 +240,7 @@ knowledge.view.info.history=更新履歴
 knowledge.view.label.show.toc=目次を表示
 knowledge.view.label.copy.url=URLをコピー
 knowledge.view.label.toc=目次
+knowledge.view.label.attach=添付ファイル
 knowledge.view.msg.toc.empty=目次になる「見出し」が見つかりません。「見出し」はMarkdownで「#」で開始する行に付きます。
 knowledge.view.msg.url.copy=URLをコピーしました
 knowledge.search.title=ナレッジ検索

diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-attach-files.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-attach-files.jsp
@@ -1,20 +1,70 @@
-<%@page import="org.support.project.common.util.StringUtils"%>
-<%@page import="org.support.project.knowledge.logic.KnowledgeLogic"%>
-<%@page import="org.support.project.web.util.JspUtil"%>
 <%@page pageEncoding="UTF-8" isELIgnored="false" session="false" errorPage="/WEB-INF/views/commons/errors/jsp_error.jsp"%>
+<%@page import="java.util.List"%>
+<%@page import="org.support.project.web.util.JspUtil"%>
+<%@page import="org.support.project.common.util.StringUtils"%>
+<%@page import="org.support.project.knowledge.vo.UploadFile"%>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 
 <% JspUtil jspUtil = new JspUtil(request, pageContext); %>
 
-            <c:forEach var="file" items="${files}">
-                <c:if test="${file.commentNo == 0}">
-                    <div class="downloadfile">
-                        <img src="<%=jspUtil.out("file.thumbnailUrl")%>" /> <a href="<%=jspUtil.out("file.url")%>"> <%=jspUtil.out("file.name")%>
-                        </a>
-                    </div>
-                </c:if>
-            </c:forEach>
+<% int MAX_COUNT = 5; %>
+
+<div class="panel panel-primary">
+    <div class="panel-heading" style="cursor: move;">
+        <h4 class="panel-title">
+            <i class="fa fa-download"></i>&nbsp;<%= jspUtil.label("knowledge.view.label.attach") %> 
+            &nbsp;&nbsp;&nbsp;
+            <%
+                int num = 0;
+                List<UploadFile> attachs = jspUtil.getValue("files", List.class);
+                for (int i = 0; i < attachs.size(); i++) {
+                    UploadFile attach = attachs.get(i);
+                    if (attach.getCommentNo() == null || attach.getCommentNo() == 0) {
+                        num++;
+                    }
+                }
+            %>
+            - [<%= num %>]
+        </h4>
+    </div>
+    <div class="panel-body">
+        <% 
+            int count = 0;
+            String hide = "";
+        %>
+        <c:forEach var="file" items="${files}" >
+            <% count++; %>
+            <c:if test="${file.commentNo == 0}">
+            <%
+                if (count > MAX_COUNT) { 
+                    hide = "hide";
+                }
+            %>
+            <div class="row">
+                <div class="downloadfile <%= hide %>">
+                <div class="col-xs-1">
+                    <a href="<%=jspUtil.out("file.url")%>">
+                    <img src="<%=jspUtil.out("file.thumbnailUrl")%>" width="20"/> 
+                    </a>
+                </div>
+                <div class="col-xs-10">
+                    <a href="<%=jspUtil.out("file.url")%>"> <%=jspUtil.out("file.name")%></a>
+                </div>
+                </div>
+            </div>
+            </c:if>
+        </c:forEach>
+        <% if (count > MAX_COUNT) { %>
+        <div class="text-right">
+        <a id="more_attach">more...</a>
+        <% } %>
+        </div>
+    </div>
+</div>
+
+
+
 
 
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-menu-buttons.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-menu-buttons.jsp
@@ -81,5 +81,3 @@
                 </a>
             </div>
 
-            <div id="panel_target"></div>
-
diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-toc.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/partials/partials-view-toc.jsp
@@ -5,6 +5,9 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 
 <% JspUtil jspUtil = new JspUtil(request, pageContext); %>
+    <%-- 目次のダイアログ表示場所
+    <div id="panel_target"></div>
+    --%>
 
     <div class="panel panel-success" id="ipop">
       <div class="panel-heading" style="cursor: move;" id="ipop_title">

diff --git a/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp b/src/main/webapp/WEB-INF/views/open/knowledge/view.jsp
@@ -22,6 +22,7 @@
 
 <c:param name="PARAM_CONTENT">
     <div class="row" id="content_head">
+        <%-- 左上のヘッダー部分 --%>
         <div class="col-sm-8">
             <h4 class="title"><%=jspUtil.out("title", JspUtil.ESCAPE_CLEAR)%></h4>
             <div style="margin-top: 10px;">
@@ -36,22 +37,27 @@
             <jsp:include page="partials/partials-view-stock.jsp"></jsp:include>
             <%-- 公開区分 --%>
             <jsp:include page="partials/partials-view-public-flag.jsp"></jsp:include>
-            <%-- 添付ファイル --%>
-            <jsp:include page="partials/partials-view-attach-files.jsp"></jsp:include>
-
         </div>
 
-        <%-- 公開区分やイイネ件数など --%>
+        <%-- 右上のボタン部分 --%>
         <div class="col-sm-4">
+            <%-- 公開区分やイイネ件数など --%>
             <jsp:include page="partials/partials-view-menu-buttons.jsp"></jsp:include>
+            <%-- 目次 --%>
+            <jsp:include page="partials/partials-view-toc.jsp"></jsp:include>
         </div>
     </div>
 
-    <%-- ナレッジ表示 --%>
+    <%-- ナレッジ表示（メインのコンテンツ部分） --%>
     <div class="row" id="content_main">
-        <div class="col-sm-12">
+        <div class="col-sm-8">
+            <%-- メインのコンテンツ --%>
             <jsp:include page="partials/partials-view-main-contents.jsp"></jsp:include>
         </div>
+        <div class="col-sm-4">
+            <%-- 添付ファイル --%>
+            <jsp:include page="partials/partials-view-attach-files.jsp"></jsp:include>
+        </div>
     </div>
 
     <%-- コメント表示 --%>
@@ -67,8 +73,6 @@
     <%-- Emoji --%>
     <jsp:include page="../../open/emoji/cheatsheet.jsp"></jsp:include>
 
-    <%-- 目次 --%>
-    <jsp:include page="partials/partials-view-toc.jsp"></jsp:include>
 
 </c:param>
 

diff --git a/src/main/webapp/css/knowledge-view.css b/src/main/webapp/css/knowledge-view.css
@@ -43,7 +43,7 @@
 	width: 48%;
 }
 .downloadfile {
-	margin-top: 5px;
+	margin-top: 2px;
 }
 
 /*============================================================
@@ -146,7 +146,7 @@ Comments
 /*    height: 300px; */
     position: absolute;
     display: none;
-    z-index: 0;
+    z-index: 100000;
 }
 
 .toc-h {

diff --git a/src/main/webapp/css/slide.css b/src/main/webapp/css/slide.css
@@ -1,6 +1,6 @@
 /* Slideshow container */
 .slideshow-area {
-    width: 70%;
+    width: 100%;
     position: relative;
     background-color: black;
     border: 10px solid black;

diff --git a/src/main/webapp/js/knowledge-view-attachfile.js b/src/main/webapp/js/knowledge-view-attachfile.js
@@ -64,6 +64,14 @@ $(document).ready(function() {
             $.notify('アップロードに失敗しました', 'warn');
         }
     }).prop('disabled', !$.support.fileInput).parent().addClass($.support.fileInput ? undefined : 'disabled');
+
+    $('#more_attach').click(function() {
+        $('.downloadfile').each(function() {
+            $(this).removeClass('hide');
+            $('#more_attach').addClass('hide');
+        });
+    });
+
 });
 
 

diff --git a/src/main/webapp/js/knowledge-view-toc.js b/src/main/webapp/js/knowledge-view-toc.js
@@ -57,9 +57,11 @@ var showAgenda = function() {
         // if (wy < 0) wy = 0;
 
         // ターゲットの場所に表示
-        var target = $('#panel_target');
-        wx = target.offset().left;
-        wy = target.offset().top;
+//        var target = $('#panel_target');
+//        wx = target.offset().left;
+//        wy = target.offset().top;
+        wx = 0;
+        wy = 0;
 
         // ポップアップウインドウを表示する。
         $('#ipop').css({

diff --git a/src/main/webapp/js/slide.js b/src/main/webapp/js/slide.js
@@ -8,18 +8,18 @@ var showSlide = function() {
         if (fileNo) {
             var slideId = 'slide-' + fileNo;
             indexMap[slideId] = 1;
-            console.log(fileNo);
+            //console.log(fileNo);
             $.ajax({
                 type : 'GET',
                 url : url + fileNo,
                 success : function(data, dataType) {
-                    console.log(data);
+                    //console.log(data);
                     if (data.files && data.files.length > 0) {
                         var slidehtml = '<div class="slideshow-area">';
                         slidehtml += '<div class="slideshow-container">';
                         for (var i = 0; i < data.files.length; i++) {
                             slidehtml += '<div class="mySlides fade in">';
-                            slidehtml += '<img src="' + _CONTEXT + '/open.file/slide/' + fileNo + '/';
+                            slidehtml += '<img src="' + _CONTEXT + '/open.file/slide/' + data.fileNo + '/';
                             slidehtml += data.files[i] + '" alt="slide-' + i + '" style="width:100%" />';
                             slidehtml += '</div>';
                         }
@@ -30,7 +30,7 @@ var showSlide = function() {
                         slidehtml += '</div>';
                         slidehtml += '<div style="text-align:center">';
                         slidehtml += '<div class="numbertext"><span class="current">1</span> / ' + data.files.length + '</div>';
-                        if (data.files.length < 30) {
+                        if (data.files.length < 60) {
                             for (var i = 0; i < data.files.length; i++) {
                                 slidehtml += '<span class="dot" onclick="currentSlide(' + (i+1) + ', \'' + slideId + '\')"></span> ';
                             }
@@ -58,7 +58,7 @@ function currentSlide(n, slideId) {
 
 function showSlides(n, slideId) {
     var slideIndex = indexMap[slideId];
-    console.log(slideIndex);
+    //console.log(slideIndex);
     var i;
     var slideArea = document.getElementById(slideId);
     var slides = slideArea.getElementsByClassName("mySlides");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -81,5 +81,3 @@
		</a>
		</div>

		<div id="panel_target"></div>