ziver/zallery
1
0
Fork 0
Code Pull requests Releases Activity

Added links

Browse source
This commit is contained in:
Ziver Koc 2018-08-15 11:46:44 +02:00
parent 2c75feddfe
commit 43c26ed063
2 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
WebContent/page_gallery.jsp
View file

@ -25,7 +25,9 @@
<div class="grid folder-grid"> <div class="grid folder-grid">
<c:forEach items="${subFolders}" var="subFolder"> <c:forEach items="${subFolders}" var="subFolder">
<div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4"> <div class="grid-item folder-thumb col-md-2 col-sm-3 col-xs-4">
<img class="img-responsive" src="${subFolder.getName()}" alt="${subFolder.getName()}" /> <a href="?folder=${subFolder.id}">
<img class="img-responsive" src="" alt="${subFolder.name}" />
</a>
</div> </div>
</c:forEach> </c:forEach>
</div> </div>
@ -36,7 +38,7 @@
<div class="grid image-grid"> <div class="grid image-grid">
<c:forEach items="${media}" var="item"> <c:forEach items="${media}" var="item">
<div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12"> <div class="grid-item photo-thumb col-md-3 col-sm-6 col-xs-12">
<img class="img-responsive" src="${item.getUrl()}"/> <img class="img-responsive" src="${ContentServlet.getMediaUrl(item, Media.Size.SMALL)}"/>
</div> </div>
</c:forEach> </c:forEach>
</div> </div>

17
src/zall/page/ContentServlet.java
View file

@ -13,13 +13,13 @@ import javax.servlet.http.HttpServletResponse;
import org.apache.commons.fileupload.util.Streams; import org.apache.commons.fileupload.util.Streams;
import zall.Zallery;
import zall.ZalleryServlet; import zall.ZalleryServlet;
import zall.bean.Image; import zall.bean.Image;
import zall.bean.Media; import zall.bean.Media;
import zall.bean.Video; import zall.bean.Video;
import zall.manager.ResourceManager; import zall.manager.ResourceManager;
import zutil.db.DBConnection; import zutil.db.DBConnection;
import zutil.io.file.FileUtil;
import static zall.page.ContentServlet.URI_IMAGE; import static zall.page.ContentServlet.URI_IMAGE;
import static zall.page.ContentServlet.URI_VIDEO; import static zall.page.ContentServlet.URI_VIDEO;
@ -76,4 +76,19 @@ public class ContentServlet extends ZalleryServlet {
response.setStatus(404); response.setStatus(404);
} }
} }
/**
* @return a URL for a specific media file where its data can be retrieved.
*/
public static String getMediaUrl(Media media, Media.Size size) {
return getMediaUrl(media, size, false);
}
/**
* @return a URL for a specific media file where its data can be retrieved.
*/
public static String getMediaUrl(Media media, Media.Size size, boolean download) {
return Zallery.WEBSITE_URL + "/" + media.getType().toString().toLowerCase() +
"?id=" + media.getId() + "&size=" + size.toString().toLowerCase() +
(download ? "&download" : "");
}
} }