Index: lams_admin/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_admin/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_admin/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java =================================================================== diff -u -rb576ec837a4c8f685d38140ac52362fe98acf89e -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java (.../CssTag.java) (revision b576ec837a4c8f685d38140ac52362fe98acf89e) +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java (.../CssTag.java) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -23,13 +23,13 @@ package org.lamsfoundation.lams.web.tag; import java.io.IOException; -import java.util.Iterator; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; import javax.servlet.jsp.JspException; import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.tagext.Tag; import javax.servlet.jsp.tagext.TagSupport; import org.apache.log4j.Logger; @@ -39,104 +39,69 @@ import org.lamsfoundation.lams.web.filter.LocaleFilter; /** - * Output the required css based in the user's details. Will output one or more - * lines. If the user has a theme then exports the default and then the user's - * style sheet. If the user doesn't have a theme then it just exports the - * default. This way, if the user's entry points to a stylesheet that doesn't - * exist, the default one is always available. + * Output the required css based in the user's details. Will output one or more lines. If the user has a theme then + * exports the default and then the user's style sheet. If the user doesn't have a theme then it just exports the + * default. This way, if the user's entry points to a stylesheet that doesn't exist, the default one is always + * available. * - * @jsp.tag name="css" body-content="empty" display-name="User's chosen - * stylesheet" description="Output stylesheet based on the user - * preferences." + * @jsp.tag name="css" body-content="empty" display-name="User's chosen stylesheet" description="Output stylesheet based + * on the user preferences." * * @author Fiona Malikoff */ public class CssTag extends TagSupport { private static final Logger log = Logger.getLogger(CssTag.class); - private static final String IE_STYLESHEET_NAME = "ie-styles"; - private static final String IE_STYLESHEET_NAME_RTL = "ie-styles_rtl"; - private static final String IE7_STYLESHEET_NAME = "ie7-styles"; - private static final String IE7_STYLESHEET_NAME_RTL = "ie7-styles_rtl"; private String localLinkPath = null; private String style = null; private static final String LEARNER_STYLE = "learner"; // expandable - private static final String TABBED_STYLE = "tabbed"; // fixed width private static final String RTL_DIR = "rtl"; // right-to-left direction - private static final String MAIN_STYLE = "main"; // expandable - /** - * - */ public CssTag() { super(); } + @Override public int doStartTag() throws JspException { - HttpSession session = ((HttpServletRequest) this.pageContext.getRequest()).getSession(); - String customStylesheetLink = null; - - boolean rtl = false; - String pageDirection = (String) session.getAttribute(LocaleFilter.DIRECTION); // RTL or LTR (default) - String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL); - serverURL = (serverURL != null ? serverURL.trim() : null); + serverURL = serverURL == null ? null : serverURL.trim(); - try { + if (serverURL != null) { + try { + HttpSession session = ((HttpServletRequest) this.pageContext.getRequest()).getSession(); + String pageDirection = (String) session.getAttribute(LocaleFilter.DIRECTION); // RTL or LTR (default) + boolean rtl = CssTag.RTL_DIR.equalsIgnoreCase(pageDirection); - JspWriter writer = pageContext.getOut(); - if (serverURL != null) { - if (pageDirection != null) - if (pageDirection.toLowerCase().equals(RTL_DIR)) - rtl = true; - List themeList = CSSThemeUtil.getAllUserThemes(); - + String customStylesheetLink = null; for (String theme : themeList) { if (theme != null) { theme = appendStyle(theme, rtl); - if (localLinkPath != null) + if (localLinkPath != null) { customStylesheetLink = generateLocalLink(theme); - else + } else { customStylesheetLink = generateLink(theme, serverURL); + } } if (customStylesheetLink != null) { + JspWriter writer = pageContext.getOut(); writer.println(customStylesheetLink); } } - } else { - log.warn("CSSTag unable to write out CSS entries as the server url is missing from the configuration file."); + } catch (IOException e) { + CssTag.log.error("CssTag unable to write out CSS details due to IOException.", e); + // don't throw a JSPException as we want the system to still function. } - - // Special IE stylesheet for all those IE related formatting issues - String ieStylesheetName = (!rtl) ? IE_STYLESHEET_NAME : IE_STYLESHEET_NAME_RTL; - String ie7StylesheetName = (!rtl) ? IE7_STYLESHEET_NAME : IE7_STYLESHEET_NAME_RTL; - String ieLink = localLinkPath != null ? generateLocalURL(ieStylesheetName) : generateURL(ieStylesheetName, - serverURL); - - writer.println(""); - - String ie7Link = localLinkPath != null ? generateLocalURL(ie7StylesheetName) : generateURL( - ie7StylesheetName, serverURL); - writer.println(""); - - } catch (IOException e) { - log.error("CssTag unable to write out CSS details due to IOException.", e); - // don't throw a JSPException as we want the system to still function. + } else { + CssTag.log.warn( + "CSSTag unable to write out CSS entries as the server url is missing from the configuration file."); } - return SKIP_BODY; + + return Tag.SKIP_BODY; } private String generateLocalLink(String stylesheetName) { @@ -151,22 +116,16 @@ private String appendStyle(String stylesheetName, boolean rtl) { String ssName = stylesheetName; - if (ssName != null && (getStyle() == null || getStyle().equals(LEARNER_STYLE))) { - ssName = (!rtl) ? ssName + "_" + "learner" : ssName + "_" + RTL_DIR + "_" + "learner"; - } else { - ssName = (!rtl) ? ssName : ssName + "_" + RTL_DIR; + if (ssName != null) { + if ((getStyle() == null) || CssTag.LEARNER_STYLE.equalsIgnoreCase(getStyle())) { + ssName = rtl ? ssName + "_" + CssTag.RTL_DIR + "_" + "learner" : ssName + "_" + "learner"; + } else { + ssName = rtl ? ssName + "_" + CssTag.RTL_DIR : ssName; + } } return ssName; } - 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("/")) { return " - + Fisheye: Tag 613f0d0d76eb497ed58d7e6836eda34a245425a9 refers to a dead (removed) revision in file `lams_central/web/css/defaultMainHTML.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 613f0d0d76eb497ed58d7e6836eda34a245425a9 refers to a dead (removed) revision in file `lams_central/web/css/defaultMainHTML_rtl.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 613f0d0d76eb497ed58d7e6836eda34a245425a9 refers to a dead (removed) revision in file `lams_central/web/css/ie-styles.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 613f0d0d76eb497ed58d7e6836eda34a245425a9 refers to a dead (removed) revision in file `lams_central/web/css/ie-styles_rtl.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 613f0d0d76eb497ed58d7e6836eda34a245425a9 refers to a dead (removed) revision in file `lams_central/web/css/ie7-styles.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 613f0d0d76eb497ed58d7e6836eda34a245425a9 refers to a dead (removed) revision in file `lams_central/web/css/ie7-styles_rtl.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_gradebook/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_gradebook/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_gradebook/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_learning/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_learning/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_learning/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_monitoring/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_monitoring/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_monitoring/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_assessment/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -reb7210d9e59ad462f679dde12ea476e2146103ee -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_assessment/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision eb7210d9e59ad462f679dde12ea476e2146103ee) +++ lams_tool_assessment/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_assessment/web/common/tabbedheader.jsp =================================================================== diff -u -r3d1f93045d6b547df27e59a090cfbe618ae273fe -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_assessment/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 3d1f93045d6b547df27e59a090cfbe618ae273fe) +++ lams_tool_assessment/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp =================================================================== diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp (.../overallfeedbacklist.jsp) (revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8) +++ lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp (.../overallfeedbacklist.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -6,7 +6,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_chat/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r08a45e4407f4200f34653a91d402ac4ad2f43f50 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_chat/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 08a45e4407f4200f34653a91d402ac4ad2f43f50) +++ lams_tool_chat/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_chat/web/pages/authoring/addCondition.jsp =================================================================== diff -u -re7539bc4f824fb791811f0a83e95358be947ca29 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_chat/web/pages/authoring/addCondition.jsp (.../addCondition.jsp) (revision e7539bc4f824fb791811f0a83e95358be947ca29) +++ lams_tool_chat/web/pages/authoring/addCondition.jsp (.../addCondition.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -14,7 +14,7 @@ - + Index: lams_tool_daco/web/common/jqueryheader.jsp =================================================================== diff -u -r102a93686f5779e8caf5a693f388edda2e01f05d -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_daco/web/common/jqueryheader.jsp (.../jqueryheader.jsp) (revision 102a93686f5779e8caf5a693f388edda2e01f05d) +++ lams_tool_daco/web/common/jqueryheader.jsp (.../jqueryheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_daco/web/common/tabbedheader.jsp =================================================================== diff -u -r843648563725cffa91af1dfd96dce9682d39b410 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_daco/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 843648563725cffa91af1dfd96dce9682d39b410) +++ lams_tool_daco/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp =================================================================== diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp (.../addcheckbox.jsp) (revision 35a0e719d061c08b52e705135bb2f2126079ed21) +++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp (.../addcheckbox.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_eadventure/web/common/tabbedheader.jsp =================================================================== diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_eadventure/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 7322054ababd8f5387c3424cdd38d99c3ab49e02) +++ lams_tool_eadventure/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp =================================================================== diff -u -rc2ba0dc3e2d99441897de8d185e83c419a416f2d -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp (.../addcondition.jsp) (revision c2ba0dc3e2d99441897de8d185e83c419a416f2d) +++ lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp (.../addcondition.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_forum/web/common/tabbedheader.jsp =================================================================== diff -u -r3db9eadae31a41fdc016dff919d9642ab7b43727 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_forum/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 3db9eadae31a41fdc016dff919d9642ab7b43727) +++ lams_tool_forum/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -19,10 +19,10 @@ - + - + Index: lams_tool_forum/web/jsps/authoring/addCondition.jsp =================================================================== diff -u -r74865706e83891b502e67d75cad229ca6d6ddcd9 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_forum/web/jsps/authoring/addCondition.jsp (.../addCondition.jsp) (revision 74865706e83891b502e67d75cad229ca6d6ddcd9) +++ lams_tool_forum/web/jsps/authoring/addCondition.jsp (.../addCondition.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_forum/web/jsps/authoring/message/create.jsp =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_tool_forum/web/jsps/authoring/message/create.jsp (.../create.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -4,7 +4,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_gmap/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_gmap/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_gmap/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_images/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_images/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_images/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_images/web/common/tabbedheader.jsp =================================================================== diff -u -r26654d6d3622f1dd74cf7b311ead1d0bb238b05f -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_images/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 26654d6d3622f1dd74cf7b311ead1d0bb238b05f) +++ lams_tool_images/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_images/web/pages/authoring/parts/addimage.jsp (.../addimage.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_tool_images/web/pages/authoring/parts/addimage.jsp (.../addimage.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -6,7 +6,7 @@ <%@ include file="/common/header.jsp"%> - + - + Index: lams_tool_imscc/web/common/tabbedheader.jsp =================================================================== diff -u -rf2b535f5f5e5134c69b47e2f813e05009afdbe4d -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_imscc/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision f2b535f5f5e5134c69b47e2f813e05009afdbe4d) +++ lams_tool_imscc/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp =================================================================== diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp (.../addbasiclti.jsp) (revision 35a0e719d061c08b52e705135bb2f2126079ed21) +++ lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp (.../addbasiclti.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp =================================================================== diff -u -r4dba5dfd3c1a3802a3354b772a8449378d1dc3b5 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp (.../addcommoncartridge.jsp) (revision 4dba5dfd3c1a3802a3354b772a8449378d1dc3b5) +++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp (.../addcommoncartridge.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp =================================================================== diff -u -rb0a6e6d35ab909144c15a0d7dcd0cf8909a46ac4 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp (.../selectResources.jsp) (revision b0a6e6d35ab909144c15a0d7dcd0cf8909a46ac4) +++ lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp (.../selectResources.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -9,7 +9,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_kaltura/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_kaltura/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b) +++ lams_tool_kaltura/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_lamc/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_lamc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_lamc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_lamc/web/common/header.jsp =================================================================== diff -u -r3e5b36454b17cee648f9d02e0656e8e99c46e00e -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_lamc/web/common/header.jsp (.../header.jsp) (revision 3e5b36454b17cee648f9d02e0656e8e99c46e00e) +++ lams_tool_lamc/web/common/header.jsp (.../header.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -10,10 +10,10 @@ - + - + Index: lams_tool_laqa/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_laqa/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_laqa/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_laqa/web/authoring/addCondition.jsp =================================================================== diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_laqa/web/authoring/addCondition.jsp (.../addCondition.jsp) (revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59) +++ lams_tool_laqa/web/authoring/addCondition.jsp (.../addCondition.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp =================================================================== diff -u -r14e8c67fbecc09db1e8f1d1c031db8433b7be927 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_laqa/web/authoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision 14e8c67fbecc09db1e8f1d1c031db8433b7be927) +++ lams_tool_laqa/web/authoring/newQuestionBox.jsp (.../newQuestionBox.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -7,7 +7,7 @@ <%@ include file="/common/header.jsp"%> <%@ include file="/includes/jsp/qaWizardCommon.jsp"%> - + Index: lams_tool_laqa/web/common/tabbedheader.jsp =================================================================== diff -u -rcd0b7b82232971e95d54348b03049beb1dfe0ecb -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_laqa/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision cd0b7b82232971e95d54348b03049beb1dfe0ecb) +++ lams_tool_laqa/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -10,10 +10,10 @@ - + - + Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -31,10 +31,10 @@ - + - + Index: lams_tool_larsrc/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_larsrc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_larsrc/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_larsrc/web/common/tabbedheader.jsp =================================================================== diff -u -rd926a01b391e585bd535135a7360205f36cde6e6 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_larsrc/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision d926a01b391e585bd535135a7360205f36cde6e6) +++ lams_tool_larsrc/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp =================================================================== diff -u -r199c9d26d57c7372cfb86f92018ab4c6fb9588dd -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp (.../addfile.jsp) (revision 199c9d26d57c7372cfb86f92018ab4c6fb9588dd) +++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp (.../addfile.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_mindmap/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_mindmap/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_mindmap/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_nb/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_nb/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_nb/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_nb/web/monitoring/monitoring.jsp =================================================================== diff -u -rcdb76dbb596251251a6b98f692775396ecc675f3 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision cdb76dbb596251251a6b98f692775396ecc675f3) +++ lams_tool_nb/web/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -15,7 +15,7 @@ - + <fmt:message key="activity.title" /> Index: lams_tool_notebook/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r08a45e4407f4200f34653a91d402ac4ad2f43f50 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_notebook/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 08a45e4407f4200f34653a91d402ac4ad2f43f50) +++ lams_tool_notebook/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_notebook/web/pages/authoring/addCondition.jsp =================================================================== diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_notebook/web/pages/authoring/addCondition.jsp (.../addCondition.jsp) (revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59) +++ lams_tool_notebook/web/pages/authoring/addCondition.jsp (.../addCondition.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -13,7 +13,7 @@ - + Index: lams_tool_preview/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_preview/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision a93929c9c7f7f0df676412691f2f8f9d44d201a2) +++ lams_tool_preview/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_preview/web/common/tabbedheader.jsp =================================================================== diff -u -ra93929c9c7f7f0df676412691f2f8f9d44d201a2 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_preview/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision a93929c9c7f7f0df676412691f2f8f9d44d201a2) +++ lams_tool_preview/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -4,7 +4,7 @@ - + Index: lams_tool_sbmt/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_sbmt/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_sbmt/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_scratchie/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_scratchie/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) +++ lams_tool_scratchie/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_scratchie/web/common/tabbedheader.jsp =================================================================== diff -u -r6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_scratchie/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 6aaee4b2fe2caa08b0c63a0de11f05042d5a3e18) +++ lams_tool_scratchie/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_scribe/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_scribe/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_scribe/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_spreadsheet/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_spreadsheet/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_spreadsheet/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_spreadsheet/web/common/tabbedheader.jsp =================================================================== diff -u -rfb099c65e1987ef8ff8f8aa4a0d987fd77247750 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_spreadsheet/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision fb099c65e1987ef8ff8f8aa4a0d987fd77247750) +++ lams_tool_spreadsheet/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp =================================================================== diff -u -r2ef18e4c87e2e7929950dbeb990c6715ef16c0c2 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp (.../editmark.jsp) (revision 2ef18e4c87e2e7929950dbeb990c6715ef16c0c2) +++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp (.../editmark.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -4,7 +4,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_survey/web/common/tabbedheader.jsp =================================================================== diff -u -r99a4dfca2b60c6811508769d7021507d5d3fbcef -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_survey/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 99a4dfca2b60c6811508769d7021507d5d3fbcef) +++ lams_tool_survey/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -4,7 +4,7 @@ - + Index: lams_tool_survey/web/pages/authoring/addCondition.jsp =================================================================== diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_survey/web/pages/authoring/addCondition.jsp (.../addCondition.jsp) (revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59) +++ lams_tool_survey/web/pages/authoring/addCondition.jsp (.../addCondition.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -6,7 +6,7 @@ <%@ include file="/common/header.jsp"%> - + <%-- used for surveyitem.js --%> Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp =================================================================== diff -u -r64a34d9311023352b725e08157773e712da497b6 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp (.../addopenquestion.jsp) (revision 64a34d9311023352b725e08157773e712da497b6) +++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp (.../addopenquestion.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -6,7 +6,7 @@ <%@ include file="/common/header.jsp"%> - + <%-- user for surveysurveyitem.js --%> Index: lams_tool_task/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_task/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_tool_task/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_tool_task/web/common/tabbedheader.jsp =================================================================== diff -u -rc142236c124ecebfa9f29ea91c71759c579e1c61 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_task/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision c142236c124ecebfa9f29ea91c71759c579e1c61) +++ lams_tool_task/web/common/tabbedheader.jsp (.../tabbedheader.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ - + Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp =================================================================== diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_task/web/pages/authoring/parts/addcondition.jsp (.../addcondition.jsp) (revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59) +++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp (.../addcondition.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_videorecorder/web/pages/authoring/addCondition.jsp =================================================================== diff -u -r21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_videorecorder/web/pages/authoring/addCondition.jsp (.../addCondition.jsp) (revision 21ce4d0194e8b81e613f4f6e14eb4e8bf53bdf59) +++ lams_tool_videorecorder/web/pages/authoring/addCondition.jsp (.../addCondition.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -13,7 +13,7 @@ - + Index: lams_tool_vote/web/authoring/editNominationBox.jsp =================================================================== diff -u -r64a34d9311023352b725e08157773e712da497b6 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_vote/web/authoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 64a34d9311023352b725e08157773e712da497b6) +++ lams_tool_vote/web/authoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -2,7 +2,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_wookie/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r0bb543134937df6708d57f352dde50c6e1c16735 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_tool_wookie/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 0bb543134937df6708d57f352dde50c6e1c16735) +++ lams_tool_wookie/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - + Index: lams_www/web/WEB-INF/tags/headItems.tag =================================================================== diff -u -r00ae80d4791f903bcb3661537fc7e129c72ad195 -r613f0d0d76eb497ed58d7e6836eda34a245425a9 --- lams_www/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 00ae80d4791f903bcb3661537fc7e129c72ad195) +++ lams_www/web/WEB-INF/tags/headItems.tag (.../headItems.tag) (revision 613f0d0d76eb497ed58d7e6836eda34a245425a9) @@ -41,7 +41,7 @@ - +