knut/album
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://odb/home/gitroot/album

Browse source
This commit is contained in:
Erik Forkalsrud 2009-01-17 15:31:47 -08:00
commit e08d11448e
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/org/forkalsrud/album/web/AlbumServlet.java
View file

@ -94,6 +94,7 @@ public class AlbumServlet
try { try {
res.setContentType("text/html"); res.setContentType("text/html");
req.setAttribute("entry", entry); req.setAttribute("entry", entry);
req.setAttribute("thmb", new Integer(640));
RequestDispatcher rd = req.getRequestDispatcher("/WEB-INF/velocity/photo.vm"); RequestDispatcher rd = req.getRequestDispatcher("/WEB-INF/velocity/photo.vm");
rd.forward(req, res); rd.forward(req, res);
} catch (Exception ex) { } catch (Exception ex) {

5
webapp/WEB-INF/velocity.properties Normal file
View file

@ -0,0 +1,5 @@
velocimacro.permissions.allow.inline=true
velocimacro.permissions.allow.inline.to.replace.global=false
velocimacro.permissions.allow.inline.local.scope=true
velocimacro.context.localscope=false
velocimacro.library.autoreload=true

1
webapp/WEB-INF/velocity/photo.vm
View file

@ -53,7 +53,6 @@
<hr/> <hr/>
#if($entry.isFile()) #if($entry.isFile())
#set($thmb = 480)
#set($dim = $entry.thumbnail.size.scaled($thmb)) #set($dim = $entry.thumbnail.size.scaled($thmb))
#set($thpath = $mapper.map(${entry.thumbnail.getPath()})) #set($thpath = $mapper.map(${entry.thumbnail.getPath()}))
#set($enpath = $mapper.map(${entry.getPath()})) #set($enpath = $mapper.map(${entry.getPath()}))