From 609568b95cc310401e3601c85bd92f1b0e97b8cf Mon Sep 17 00:00:00 2001 From: "Eric J. Bowersox" Date: Thu, 19 Apr 2001 04:03:47 +0000 Subject: [PATCH] replaced the "default SIG logo" with a nicer one; fixed the topic scrolling behavior --- INSTALL | 3 +++ .../venice/servlets/format/MenuSIG.java | 2 +- .../venice/servlets/format/SIGProfileData.java | 2 +- .../venice/servlets/format/TopicPosts.java | 10 +++++++--- web/images/default_sig_logo.gif | Bin 731 -> 0 bytes web/images/sig_other.jpg | Bin 0 -> 2813 bytes 6 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 web/images/default_sig_logo.gif create mode 100644 web/images/sig_other.jpg 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 54724f0293c30c40553008b637488132d7994561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 731 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 d2