Index: lams_central/conf/xdoclet/taglib-tag.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/xdoclet/taglib-tag.xml,v
diff -u -r1.5 -r1.6
--- lams_central/conf/xdoclet/taglib-tag.xml	9 Jun 2006 08:26:04 -0000	1.5
+++ lams_central/conf/xdoclet/taglib-tag.xml	6 Jul 2006 04:44:20 -0000	1.6
@@ -209,4 +209,9 @@
    	<tag-file>
        <name>Passon</name>
        <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
\ No newline at end of file
+   	</tag-file>  
+	<tag-file>
+	    <name>ExportPortOutput</name>
+		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
+   	</tag-file>  
+   	
\ No newline at end of file
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.8 -r1.9
--- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	27 Jun 2006 05:59:22 -0000	1.8
+++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java	6 Jul 2006 04:44:20 -0000	1.9
@@ -53,7 +53,7 @@
 
 	private static final Logger log = Logger.getLogger(CssTag.class);
 	private static final String IE_STYLESHEET_NAME = "ie-styles";
-	private boolean generateLocalLink = false; 
+	private String localLinkPath = null; 
 	
 	/**
 	 * 
@@ -80,7 +80,7 @@
 				{
 					String theme = (String)i.next();
 					if ( theme != null) {
-						if (generateLocalLink)
+						if (localLinkPath != null)
 							customStylesheetLink = generateLocalLink(theme,serverURL);
 						else	
 							customStylesheetLink = generateLink(theme,serverURL);
@@ -96,7 +96,7 @@
 			}
 			
 			// Special IE stylesheet for all those IE related formatting issues
-			String ieLink = generateLocalLink ? generateLocalLink(IE_STYLESHEET_NAME,serverURL) : generateLink(IE_STYLESHEET_NAME,serverURL);
+			String ieLink = localLinkPath != null ? generateLocalLink(IE_STYLESHEET_NAME,serverURL) : generateLink(IE_STYLESHEET_NAME,serverURL);
 			writer.println("<!--[if IE]>");
 			writer.println("<style type=\"text/css\">");
 			writer.println("@import url("+ieLink+");");
@@ -111,7 +111,7 @@
 	}
 
 	private String generateLocalLink(String stylesheetName, String serverURL) {
-		return "<link href=\"../" + stylesheetName + ".css\" rel=\"stylesheet\" type=\"text/css\">";
+		return "<link href=\""+localLinkPath+"css/"+stylesheetName + ".css\" rel=\"stylesheet\" type=\"text/css\">";
 	}
 	
 	private String generateLink(String stylesheetName, String serverURL)
@@ -128,21 +128,20 @@
 	}
 	
 	/**
-	 * @jsp.attribute required="false" rtexprvalue="true" description="Should the css link be a local file link? Useful for export portfolio. Valid values true or false."
+	 * @jsp.attribute required="false" rtexprvalue="true" 
+	 * description="Should the css link be a local file link? If so, what is the path back to the 'root'. For tools' export portfolio pages, this should be set to \"../\""
 	 * 
 	 * @return Returns the property.
 	 */
-	public String getLocalLink()
+	public String getLocalLinkPath()
 	{
-		return generateLocalLink ? Boolean.TRUE.toString() : Boolean.FALSE.toString();
+		return localLinkPath;
 	}
 
-	public void setLocalLink(String localLink)
+	public void setLocalLinkPath(String localLinkPath)
 	{
-		if (Boolean.parseBoolean(localLink))
-			this.generateLocalLink = true;
-		else
-			this.generateLocalLink = false;
+		this.localLinkPath = localLinkPath;
 	}
-	
+
+
 }
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/lams.tld,v
diff -u -r1.20 -r1.21
--- lams_central/web/WEB-INF/lams.tld	22 Jun 2006 02:31:08 -0000	1.20
+++ lams_central/web/WEB-INF/lams.tld	6 Jul 2006 04:44:20 -0000	1.21
@@ -85,7 +85,7 @@
 
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
-         <name>localLink</name>
+         <name>localLinkPath</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
@@ -306,5 +306,9 @@
        <name>Passon</name>
        <path>/WEB-INF/tags/Passon.tag</path>
    	</tag-file>  
+	<tag-file>
+	    <name>ExportPortOutput</name>
+		<path>/WEB-INF/tags/ExportPortOutput.tag</path>
+   	</tag-file>  
 
 </taglib>
Index: lams_central/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/web.xml,v
diff -u -r1.21 -r1.22
--- lams_central/web/WEB-INF/web.xml	20 Jun 2006 07:23:48 -0000	1.21
+++ lams_central/web/WEB-INF/web.xml	6 Jul 2006 04:44:20 -0000	1.22
@@ -90,12 +90,6 @@
    </servlet>
 
  <servlet>
-	<servlet-name>context</servlet-name>
-	<servlet-class>org.springframework.web.context.ContextLoaderServlet</servlet-class>
-	<load-on-startup>1</load-on-startup>
-</servlet>
-
-<servlet>
     <servlet-name>action</servlet-name>
     <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
     <init-param>
Index: lams_central/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.14 -r1.15
--- lams_central/web/WEB-INF/struts/struts-config.xml	21 Jun 2006 12:08:15 -0000	1.14
+++ lams_central/web/WEB-INF/struts/struts-config.xml	6 Jul 2006 04:44:20 -0000	1.15
@@ -82,6 +82,18 @@
       />
     </action>
     <action
+      path="/profile"
+      type="org.lamsfoundation.lams.web.ProfileAction"
+      unknown="false"
+      validate="true"
+    >
+      <forward
+        name="profile"
+        path="/profile.jsp"
+        redirect="false"
+      />
+    </action>
+    <action
       path="/home"
       type="org.lamsfoundation.lams.web.HomeAction"
       parameter="method"
Index: lams_central/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.4 -r1.5
--- lams_central/web/WEB-INF/tags/headItems.tag	27 Jun 2006 06:27:28 -0000	1.4
+++ lams_central/web/WEB-INF/tags/headItems.tag	6 Jul 2006 04:44:21 -0000	1.5
@@ -45,12 +45,6 @@
 <meta http-equiv="content-type" content="text/html; charset=UTF-8">
 
 <lams:css />
-<!--[if IE]>
-<style type="text/css">
-@import url(${lams}/css/ie-styles.css);
-</style>
-<![endif]-->
-
 <link href="${lams}css/fckeditor_style.css" rel="stylesheet" type="text/css">
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_lamc/web/css/tool_custom.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/css/tool_custom.css'.
Fisheye: No comparison available.  Pass `N' to diff?