Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java,v
diff -u -r1.9 -r1.10
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	6 Jul 2006 04:44:20 -0000	1.9
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	11 Aug 2006 07:40:42 -0000	1.10
@@ -81,7 +81,7 @@
 					String theme = (String)i.next();
 					if ( theme != null) {
 						if (localLinkPath != null)
-							customStylesheetLink = generateLocalLink(theme,serverURL);
+							customStylesheetLink = generateLocalLink(theme);
 						else	
 							customStylesheetLink = generateLink(theme,serverURL);
 					}
@@ -96,7 +96,7 @@
 			}
 			
 			// Special IE stylesheet for all those IE related formatting issues
-			String ieLink = localLinkPath != null ? generateLocalLink(IE_STYLESHEET_NAME,serverURL) : generateLink(IE_STYLESHEET_NAME,serverURL);
+			String ieLink = localLinkPath != null ? generateLocalURL(IE_STYLESHEET_NAME) : generateURL(IE_STYLESHEET_NAME,serverURL);
 			writer.println("<!--[if IE]>");
 			writer.println("<style type=\"text/css\">");
 			writer.println("@import url("+ieLink+");");
@@ -110,10 +110,22 @@
     	return SKIP_BODY;
 	}
 
-	private String generateLocalLink(String stylesheetName, String serverURL) {
-		return "<link href=\""+localLinkPath+"css/"+stylesheetName + ".css\" rel=\"stylesheet\" type=\"text/css\">";
+	private String generateLocalLink(String stylesheetName) {
+		if ( localLinkPath.endsWith("/") ) {
+			return "<link href=\""+localLinkPath+"css/"+stylesheetName + ".css\" rel=\"stylesheet\" type=\"text/css\">";
+		} else { 
+			return "<link href=\""+localLinkPath+"/css/"+stylesheetName + ".css\" rel=\"stylesheet\" type=\"text/css\">";
+		}
 	}
 	
+	private String generateLocalURL(String stylesheetName) {
+		if ( localLinkPath.endsWith("/") ) {
+			return "\""+localLinkPath+"css/"+stylesheetName + ".css\"";
+		} else { 
+			return "\""+localLinkPath+"/css/"+stylesheetName + ".css\"";
+		}
+	}
+
 	private String generateLink(String stylesheetName, String serverURL)
 	{
 		if ( serverURL.endsWith("/") ) {
@@ -123,6 +135,15 @@
 		}
 	}
 
+	private String generateURL(String stylesheetName, String serverURL)
+	{
+		if ( serverURL.endsWith("/") ) {
+			return "\""+serverURL+"css/"+stylesheetName+".css\"";
+		} else {
+			return "\""+serverURL+"/css/"+stylesheetName+".css\"";
+		}
+	}
+
 	public int doEndTag() {
 		return EVAL_PAGE;
 	}