git://wamblee.org
/
photos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrected page numbering.
[photos]
/
src
/
main
/
java
/
org
/
wamblee
/
photos
/
wicket
/
AlbumPanel.java
diff --git
a/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
b/src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
index 71ea87c1a1c0f2edb028f9efca06a570e8a2ddc6..0b9666d900a9fbd67112c783e7cfa976f0ca5af2 100644
(file)
--- a/
src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
+++ b/
src/main/java/org/wamblee/photos/wicket/AlbumPanel.java
@@
-169,7
+169,7
@@
public class AlbumPanel extends Panel {
RepeatingView pageLinks = new RepeatingView("pageLinks");
add(pageLinks);
Album album = getAlbum();
RepeatingView pageLinks = new RepeatingView("pageLinks");
add(pageLinks);
Album album = getAlbum();
- for (int i = 0; i <
album.size(
) / MAX_ROWS / MAX_COLUMNS; i++) {
+ for (int i = 0; i <
(album.size() + MAX_ROWS * MAX_COLUMNS - 1
) / MAX_ROWS / MAX_COLUMNS; i++) {
final int istart = i * MAX_ROWS * MAX_COLUMNS;
Link pageLink = new Link("pageLink") {
{
final int istart = i * MAX_ROWS * MAX_COLUMNS;
Link pageLink = new Link("pageLink") {
{
@@
-186,7
+186,7
@@
public class AlbumPanel extends Panel {
setResponsePage(HomePage.class, pars);
}
};
setResponsePage(HomePage.class, pars);
}
};
- pageLink.add(new Label("label",
i
+ ""));
+ pageLink.add(new Label("label",
(i + 1)
+ ""));
pageLinks.add(pageLink);
WebMarkupContainer container = new WebMarkupContainer(pageLinks.newChildId());
container.add(pageLink);
pageLinks.add(pageLink);
WebMarkupContainer container = new WebMarkupContainer(pageLinks.newChildId());
container.add(pageLink);
@@
-247,8
+247,10
@@
public class AlbumPanel extends Panel {
// upload panel
if (path.equals("/")) {
add(new WebMarkupContainer("uploadPanel"));
// upload panel
if (path.equals("/")) {
add(new WebMarkupContainer("uploadPanel"));
+ add(new WebMarkupContainer("createFolderPanel"));
} else {
add(new UploadPanel("uploadPanel", path));
} else {
add(new UploadPanel("uploadPanel", path));
+ add(new CreateFolderPanel("createFolderPanel", path));
}
}
}
}