diff --git a/INSTALL b/INSTALL index f006063..d5bd530 100644 --- a/INSTALL +++ b/INSTALL @@ -25,6 +25,9 @@ Software requirements: * Apache Jakarta Servlet API, version 3.2, available from http://jakarta.apache.org. * Apache Tomcat version 3.2.1, available from http://jakarta.apache.org. + If you plan on using Apache-Tomcat integration, get at least 3.2.2b3, as + otherwise there will be a problem with file uploads (Bug#526 in the Apache + Jakarta Bug Database). It is recommended that you install JAXP, JSSE, JavaMail, JAF, and LOG4J by copying or symbolically linking their JAR files to the /jre/lib/ext diff --git a/src/com/silverwrist/venice/servlets/format/MenuSIG.java b/src/com/silverwrist/venice/servlets/format/MenuSIG.java index 566163d..cfa2af6 100644 --- a/src/com/silverwrist/venice/servlets/format/MenuSIG.java +++ b/src/com/silverwrist/venice/servlets/format/MenuSIG.java @@ -40,7 +40,7 @@ public class MenuSIG implements ComponentRender image_url = ci.getPhotoURL(); if (StringUtil.isStringEmpty(image_url)) { // just hit the default - image_url = "default_sig_logo.gif"; + image_url = "sig_other.jpg"; image_url_needs_fixup = true; } // end if diff --git a/src/com/silverwrist/venice/servlets/format/SIGProfileData.java b/src/com/silverwrist/venice/servlets/format/SIGProfileData.java index 47967f0..75ce8ad 100644 --- a/src/com/silverwrist/venice/servlets/format/SIGProfileData.java +++ b/src/com/silverwrist/venice/servlets/format/SIGProfileData.java @@ -113,7 +113,7 @@ public class SIGProfileData implements JSPRender { String tmp = ci.getPhotoURL(); if (StringUtil.isStringEmpty(tmp)) - tmp = rdat.getFullImagePath("default_sig_logo.gif"); + tmp = rdat.getFullImagePath("sig_other.jpg"); return tmp; } // end getSIGLogoURL diff --git a/src/com/silverwrist/venice/servlets/format/TopicPosts.java b/src/com/silverwrist/venice/servlets/format/TopicPosts.java index 031e342..e69ad56 100644 --- a/src/com/silverwrist/venice/servlets/format/TopicPosts.java +++ b/src/com/silverwrist/venice/servlets/format/TopicPosts.java @@ -317,7 +317,7 @@ public class TopicPosts implements JSPRender public String getScrollUpLocator() { int new_first = first - engine.getNumPostsPerPage(); - int new_last = last - 1; + int new_last = first - 1; if (new_first<0) { // normalize so we start at 0 new_last += (-new_first); @@ -333,14 +333,18 @@ public class TopicPosts implements JSPRender public boolean canScrollDown() { - return ((topic.getTotalMessages() - (1 + last))>=engine.getNumPostsPerPage()); + return ((topic.getTotalMessages() - (1 + last))>0); } // end canScrollDown public String getScrollDownLocator() { + int new_last = last + engine.getNumPostsPerPage(); + int my_last = topic.getTotalMessages() - 1; + if (new_last>my_last) + new_last = my_last; // normalize so we end at the last post StringBuffer buf = new StringBuffer("p1="); - buf.append(last+1).append("&p2=").append(last+engine.getNumPostsPerPage()); + buf.append(last+1).append("&p2=").append(new_last); return buf.toString(); } // end getScrollDownLocator diff --git a/web/images/default_sig_logo.gif b/web/images/default_sig_logo.gif deleted file mode 100644 index 54724f0..0000000 Binary files a/web/images/default_sig_logo.gif and /dev/null differ diff --git a/web/images/sig_other.jpg b/web/images/sig_other.jpg new file mode 100644 index 0000000..132630f Binary files /dev/null and b/web/images/sig_other.jpg differ