diff --git a/etc/template.css b/etc/template.css index 55a86b2..8282e0d 100644 --- a/etc/template.css +++ b/etc/template.css @@ -12,7 +12,7 @@ A.tbar:visited { color: ${color.top.link}; } .lbar { font-family: ${font}, sans-serif; background: ${color.left.background}; - color: ${color.left.foreground}; font-size: 12pt; + color: ${color.left.foreground}; font-size: 11pt; } A.lbar { color: ${color.left.link}; } @@ -41,7 +41,7 @@ color: ${color.sidebox.top.foreground}; font-size: 14pt; } .sidebox { font-family: ${font}, sans-serif; background: ${color.sidebox.background}; - color: ${color.sidebox.foreground}; font-size: 12pt; + color: ${color.sidebox.foreground}; font-size: 11pt; } A.sidebox { color: ${color.sidebox.link}; } diff --git a/src/com/silverwrist/venice/servlets/format/SideBoxConferences.java b/src/com/silverwrist/venice/servlets/format/SideBoxConferences.java index 32901cf..a7df366 100644 --- a/src/com/silverwrist/venice/servlets/format/SideBoxConferences.java +++ b/src/com/silverwrist/venice/servlets/format/SideBoxConferences.java @@ -71,7 +71,10 @@ public class SideBoxConferences implements ContentRender, ColorSelectors public void renderHere(Writer out, RenderData rdat) throws IOException { - String hilite = rdat.getStdColor(SIDEBOX_CONTENT_LINK); + String norm_font = rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2); + String hilite = rdat.getStdFontTag(SIDEBOX_CONTENT_LINK,2); + String purple_ball = rdat.getFullImagePath("purple-ball.gif"); + String new_image = rdat.getFullImagePath("tag_new.gif"); if (hotlist.size()>0) { // display the list of conferences out.write("\n"); @@ -81,17 +84,14 @@ public class SideBoxConferences implements ContentRender, ColorSelectors ConferenceHotlistEntry hle = (ConferenceHotlistEntry)(it.next()); ConferenceContext conf = hle.getConference(); String href = "confdisp?sig=" + conf.getEnclosingSIG().getSIGID() + "&conf=" + conf.getConfID(); - out.write("\n\n\n\n"); } // end while @@ -100,14 +100,13 @@ public class SideBoxConferences implements ContentRender, ColorSelectors } // end if else - out.write(rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2) - + "You have no conferences in your hotlist.\n"); + out.write(norm_font + "You have no conferences in your hotlist.\n"); if (uc.isLoggedIn()) { // write the link at the end - out.write("

" + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,1) + "[ Manage ]"); + out.write("

" + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,1) + "[ " + + rdat.getStdFontTag(SIDEBOX_CONTENT_LINK,1) + "Manage ]"); } // end if diff --git a/src/com/silverwrist/venice/servlets/format/SideBoxSIGs.java b/src/com/silverwrist/venice/servlets/format/SideBoxSIGs.java index 3f015cc..8fe9485 100644 --- a/src/com/silverwrist/venice/servlets/format/SideBoxSIGs.java +++ b/src/com/silverwrist/venice/servlets/format/SideBoxSIGs.java @@ -73,20 +73,26 @@ public class SideBoxSIGs implements ContentRender, ColorSelectors { if (sig_list.size()>0) { // display the list of available SIGs + String purple_ball = rdat.getFullImagePath("purple-ball.gif"); + String link_font = rdat.getStdFontTag(SIDEBOX_CONTENT_LINK,2); + String host_image = null; out.write("

\n\"*\"\n" - + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,2) + "" - + StringUtil.encodeHTML(conf.getName()) + " (" + + norm_font + "" + + hilite + StringUtil.encodeHTML(conf.getName()) + " (" + StringUtil.encodeHTML(conf.getEnclosingSIG().getName()) + ")\n"); if (conf.anyUnread()) out.write(" \"New!\"\n"); + + new_image + "\" ALT=\"New!\" BORDER=0 WIDTH=40 HEIGHT=20>\n"); out.write("
\n"); Iterator it = sig_list.iterator(); while (it.hasNext()) { // display the names of the SIGs one by one SIGContext sig = (SIGContext)(it.next()); - out.write("\n\n\n\n"); } // end while @@ -100,12 +106,12 @@ public class SideBoxSIGs implements ContentRender, ColorSelectors if (uc.isLoggedIn()) { // write the two links at the end - String hilite = rdat.getStdColor(SIDEBOX_CONTENT_LINK); - out.write("

" + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,1) + "[ Manage | Create New ]"); + String hilite = rdat.getStdFontTag(SIDEBOX_CONTENT_LINK,1); + out.write("

" + rdat.getStdFontTag(SIDEBOX_CONTENT_FOREGROUND,1) + "[ " + hilite + + "Manage | " + hilite + + "Create New ]"); } // end if diff --git a/src/com/silverwrist/venice/servlets/format/menus/LeftMenuItem.java b/src/com/silverwrist/venice/servlets/format/menus/LeftMenuItem.java index 713fe97..01d491e 100644 --- a/src/com/silverwrist/venice/servlets/format/menus/LeftMenuItem.java +++ b/src/com/silverwrist/venice/servlets/format/menus/LeftMenuItem.java @@ -72,7 +72,7 @@ abstract class LeftMenuItem implements ComponentRender, ColorSelectors buf.append(""); else { // write the tag - buf.append(""; + String header_link_hilite = rdat.getStdFontTag(ColorSelectors.TITLE_LINK,3); String stdfont = rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,2); String leftfont = rdat.getStdFontTag(ColorSelectors.LEFT_FOREGROUND,2); String smallfont = rdat.getStdFontTag(ColorSelectors.CONTENT_FOREGROUND,1); @@ -55,9 +55,9 @@

\n\"*\"\n" - + "" - + rdat.getStdFontTag(SIDEBOX_CONTENT_LINK,2) + "" + StringUtil.encodeHTML(sig.getName()) - + "\n"); + + "" + link_font + "" + StringUtil.encodeHTML(sig.getName()) + "\n"); if (sig.isAdmin()) - out.write(" \"Host!\"\n"); + { // write the "Host!" image at the end + if (host_image==null) + host_image = rdat.getFullImagePath("tag_host.gif"); + out.write(" \"Host!\"\n"); + + } // end if + out.write("
<%= header_font %> <% if (rdat.useHTMLComments()) { %><% } %> - "><%= header_link_hilite %>Front Page

- <%= header_link_hilite %>Help |  - "><%= header_link_hilite %>Find + "><%= header_link_hilite %>Front Page

+ <%= header_link_hilite %>Help |  + "><%= header_link_hilite %>Find

@@ -75,9 +75,9 @@ partial_tgt = "account?tgt=" + URLEncoder.encode(basedat.getLocation()) + "&cmd="; foo = rdat.getEncodedServletPath(partial_tgt + "L"); %> -  - <%= header_link_hilite %>Log Out +  - <%= header_link_hilite %>Log Out <% foo = rdat.getEncodedServletPath(partial_tgt + "P"); %> -  | <%= header_link_hilite %>Profile +  | <%= header_link_hilite %>Profile <% } // end if %> <% } else { %> You are not logged in @@ -86,9 +86,9 @@ partial_tgt = "account?tgt=" + URLEncoder.encode(basedat.getLocation()) + "&cmd="; foo = rdat.getEncodedServletPath(partial_tgt + "L"); %> -  - <%= header_link_hilite %>Log In +  - <%= header_link_hilite %>Log In <% foo = rdat.getEncodedServletPath(partial_tgt + "C"); %> -  | <%= header_link_hilite %>Create Account +  | <%= header_link_hilite %>Create Account <% } // end if %> <% } // end if %>