/PhotoAlbum/trunk/src/ak/photoalbum/logic/IndexEntry.java |
---|
14,6 → 14,7 |
private boolean isDir; |
private int width; |
private int height; |
private int page; |
public IndexEntry() |
{ |
130,9 → 131,19 |
this.height = height; |
} |
public int getPage() |
{ |
return page; |
} |
public void setPage(int page) |
{ |
this.page = page; |
} |
public String toString() |
{ |
return super.toString() + ": " + file + " - " + path + " - " + title + "/" + subtitle |
+ " (" + comment + ") " + width + "x" + height; |
+ " (" + comment + ") " + width + "x" + height + ", page " + page; |
} |
} |
/PhotoAlbum/trunk/src/ak/photoalbum/logic/Logic.java |
---|
172,6 → 172,9 |
throw new FileNotFoundException("[" + file.getCanonicalPath() |
+ "] not found in [" + dir.getCanonicalPath() + "]"); |
// calc page number in index |
index.setPage(pos / branch.getColumns() / branch.getRows()); |
branch.getMetaInfos().clear(); // FIXME make this more intelligent |
setEntryInfo(branch, page, file, false); |
setEntryInfo(branch, current, file, true); |
/PhotoAlbum/trunk/webapp/index.jsp |
---|
136,7 → 136,7 |
<logic:present name="top" property="path"> |
<tr> |
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td> |
<td width="183" class="ImagePaneRow"><a href="index.do?branch=<bean:write name="indexForm" property="branch" />&path=<bean:write name="top" property="path" />" |
<td width="183" class="ImagePaneRow"><a href="index.do?branch=<bean:write name="indexForm" property="branch" />&path=<bean:write name="top" property="path" />&page=<bean:write name="top" property="page" />" |
class="ImagePaneRow"><img |
src="res/FolderUp.gif" border="0" align="absmiddle" style="margin-right: 5px;"/>Up one level</a></td> |
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td> |
/PhotoAlbum/trunk/webapp/page.jsp |
---|
24,7 → 24,7 |
<tr> |
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td> |
<td width="183" class="ImagePaneRow"><a |
href="index.do?branch=<bean:write name="pathForm" property="branch" />&path=<bean:write name="index" property="path" />" class="ImagePaneRow"><img |
href="index.do?branch=<bean:write name="pathForm" property="branch" />&path=<bean:write name="index" property="path" />&page=<bean:write name="index" property="page" />" class="ImagePaneRow"><img |
src="res/FolderUp.gif" border="0" align="absmiddle" |
style="margin-right: 5px;"/>Back to index page</a></td> |
<td width="1" class="ImagePaneFrame"><img src="res/1x1.gif" width="1" height="1"/></td> |