From b3a370fc116128c13f9390096eecdb66d2ceff80 Mon Sep 17 00:00:00 2001 From: Erik Forkalsrud Date: Sat, 19 Nov 2011 14:42:23 -0800 Subject: [PATCH] make "dynamic.html" the default behavior --- .../forkalsrud/album/web/AlbumServlet.java | 3 +- src/main/webapp/WEB-INF/velocity/dynamic.vm | 208 ++++++++++++++++++ src/main/webapp/dynamic.html | 24 +- 3 files changed, 224 insertions(+), 11 deletions(-) create mode 100644 src/main/webapp/WEB-INF/velocity/dynamic.vm diff --git a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java index e0993fa..89ce305 100644 --- a/src/main/java/org/forkalsrud/album/web/AlbumServlet.java +++ b/src/main/java/org/forkalsrud/album/web/AlbumServlet.java @@ -288,7 +288,8 @@ public class AlbumServlet req.setAttribute("entry", entry); req.setAttribute("thmb", new Integer(250)); req.setAttribute("full", new Integer(800)); - RequestDispatcher rd = req.getRequestDispatcher("/WEB-INF/velocity/photo.vm"); + req.setAttribute("D", "$"); + RequestDispatcher rd = req.getRequestDispatcher("/WEB-INF/velocity/dynamic.vm"); rd.forward(req, res); } catch (Exception e) { throw new RuntimeException("sadness", e); diff --git a/src/main/webapp/WEB-INF/velocity/dynamic.vm b/src/main/webapp/WEB-INF/velocity/dynamic.vm new file mode 100644 index 0000000..40f86bc --- /dev/null +++ b/src/main/webapp/WEB-INF/velocity/dynamic.vm @@ -0,0 +1,208 @@ + + + + + + $entry.name + + + + + + + + + + + + + + + +
+#macro(navlink $entry)${base}$mapper.map(${entry.getPath()}).#if($entry.isFile())photo#{else}album#end#end +#macro(navbutton $entry $direction)#if($entry)#else#end#end +

#navbutton(${entry.prev()} "left")#navbutton(${entry.parent()} "up")#navbutton(${entry.next()} "right") $entry.name

+
+ + diff --git a/src/main/webapp/dynamic.html b/src/main/webapp/dynamic.html index 55e5fb3..c0eafab 100644 --- a/src/main/webapp/dynamic.html +++ b/src/main/webapp/dynamic.html @@ -75,15 +75,15 @@ #fancybox-left, #fancybox-right { bottom: 30px; } - -