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

Don't forget about the captions.

Browse source
This commit is contained in:
Knut Forkalsrud 2011-11-30 01:10:08 -08:00
parent ecc482528d
commit a85b81e21f
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
photos/album.properties
View file

@ -3,3 +3,4 @@ file.IMG_0139.JPG.hidden=false
file.fra_jakt.jpg.caption: Lorem ipsum "dolor sit amet", consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. file.fra_jakt.jpg.caption: Lorem ipsum "dolor sit amet", consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
dir.portraits.hidden=false dir.portraits.hidden=false
sort=date desc sort=date desc
file.salmon.avi.caption: Videos can have captions too.

6
src/main/webapp/WEB-INF/velocity/dynamic.vm
View file

@ -110,8 +110,12 @@ $D(function() {
+ " <span class=\"name\">" + entry.name + "</span><br/>\n" + " <span class=\"name\">" + entry.name + "</span><br/>\n"
+ " <div class=\"imgborder\"><a class=\"ss\" id=\"ent" + idx + "\" href=\"${base}" + entry.path + "?size=" + picSize + "\" title=\"" + entry.name + "\">" + " <div class=\"imgborder\"><a class=\"ss\" id=\"ent" + idx + "\" href=\"${base}" + entry.path + "?size=" + picSize + "\" title=\"" + entry.name + "\">"
+ "<img class=\"picture\" src=\"${base}" + (entry.type == "movie" ? entry.path + ".frame" : entry.path) + "?size=" + thmb + "\" border=\"0\" width=\"" + dim.w + "\" height=\"" + dim.h + "\"/></a></div>\n" + "<img class=\"picture\" src=\"${base}" + (entry.type == "movie" ? entry.path + ".frame" : entry.path) + "?size=" + thmb + "\" border=\"0\" width=\"" + dim.w + "\" height=\"" + dim.h + "\"/></a></div>\n"
+ "<p id=\"" + entry.name + "\" class=\"caption\"></p>\n"
+ "</div>\n"); + "</div>\n");
var captionP = $("<p id=\"" + entry.name + "\" class=\"caption\"></p>\n");
captionP.text(entry.caption);
captionP.appendTo(gridDiv);
gridDiv.appendTo('body'); gridDiv.appendTo('body');
var element = gridDiv.filter("a.ss"); var element = gridDiv.filter("a.ss");