Index: lams_admin/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/headItems.tag,v diff -u -r1.6 -r1.6.2.1 --- lams_admin/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:50 -0000 1.6 +++ lams_admin/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:25 -0000 1.6.2.1 @@ -41,7 +41,7 @@ - + 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.21 -r1.21.4.1 --- lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java 17 Aug 2009 00:05:08 -0000 1.21 +++ lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java 10 Feb 2016 10:01:39 -0000 1.21.4.1 @@ -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 1.15.2.3 refers to a dead (removed) revision in file `lams_central/web/css/defaultMainHTML.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.10.2.3 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 1.11.16.1 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 1.7.18.1 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 1.4.16.1 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 1.3.18.1 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 =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.2.2.1 --- lams_gradebook/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:24 -0000 1.2 +++ lams_gradebook/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:51 -0000 1.2.2.1 @@ -41,7 +41,7 @@ - + Index: lams_learning/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/headItems.tag,v diff -u -r1.7 -r1.7.2.1 --- lams_learning/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:03 -0000 1.7 +++ lams_learning/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:27 -0000 1.7.2.1 @@ -41,7 +41,7 @@ - + Index: lams_monitoring/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/headItems.tag,v diff -u -r1.6 -r1.6.2.1 --- lams_monitoring/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:19 -0000 1.6 +++ lams_monitoring/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:42 -0000 1.6.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_assessment/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_assessment/web/WEB-INF/tags/headItems.tag 23 Jul 2009 18:02:57 -0000 1.2 +++ lams_tool_assessment/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:48 -0000 1.2.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_assessment/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/common/tabbedheader.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_assessment/web/common/tabbedheader.jsp 13 Dec 2010 23:43:36 -0000 1.2 +++ lams_tool_assessment/web/common/tabbedheader.jsp 10 Feb 2016 10:01:48 -0000 1.2.2.1 @@ -5,7 +5,7 @@ - + Index: lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp,v diff -u -r1.6 -r1.6.2.1 --- lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp 26 Jul 2013 13:16:55 -0000 1.6 +++ lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp 10 Feb 2016 10:01:48 -0000 1.6.2.1 @@ -6,7 +6,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_chat/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/headItems.tag,v diff -u -r1.13 -r1.13.2.1 Binary files differ Index: lams_tool_chat/web/pages/authoring/addCondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/pages/authoring/addCondition.jsp,v diff -u -r1.5.2.1 -r1.5.2.2 --- lams_tool_chat/web/pages/authoring/addCondition.jsp 17 Apr 2015 16:13:55 -0000 1.5.2.1 +++ lams_tool_chat/web/pages/authoring/addCondition.jsp 10 Feb 2016 10:01:36 -0000 1.5.2.2 @@ -14,7 +14,7 @@ - + Index: lams_tool_daco/web/common/jqueryheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/common/jqueryheader.jsp,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_daco/web/common/jqueryheader.jsp 26 Jan 2016 23:41:06 -0000 1.1.2.2 +++ lams_tool_daco/web/common/jqueryheader.jsp 10 Feb 2016 10:01:44 -0000 1.1.2.3 @@ -5,7 +5,7 @@ - + Index: lams_tool_daco/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/common/tabbedheader.jsp,v diff -u -r1.2 -r1.2.12.1 --- lams_tool_daco/web/common/tabbedheader.jsp 8 Aug 2008 08:10:22 -0000 1.2 +++ lams_tool_daco/web/common/tabbedheader.jsp 10 Feb 2016 10:01:44 -0000 1.2.12.1 @@ -5,7 +5,7 @@ - + Index: lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp,v diff -u -r1.9 -r1.9.2.1 --- lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp 29 Sep 2012 13:57:27 -0000 1.9 +++ lams_tool_daco/web/pages/authoring/parts/addcheckbox.jsp 10 Feb 2016 10:01:44 -0000 1.9.2.1 @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_eadventure/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/common/tabbedheader.jsp,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_eadventure/web/common/tabbedheader.jsp 11 Dec 2011 21:30:35 -0000 1.3 +++ lams_tool_eadventure/web/common/tabbedheader.jsp 10 Feb 2016 10:01:23 -0000 1.3.2.1 @@ -5,7 +5,7 @@ - + Index: lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp,v diff -u -r1.6 -r1.6.2.1 --- lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp 15 Aug 2013 20:20:26 -0000 1.6 +++ lams_tool_eadventure/web/pages/authoring/parts/addcondition.jsp 10 Feb 2016 10:01:23 -0000 1.6.2.1 @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_forum/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/common/tabbedheader.jsp,v diff -u -r1.6 -r1.6.2.1 --- lams_tool_forum/web/common/tabbedheader.jsp 27 Jun 2014 07:26:17 -0000 1.6 +++ lams_tool_forum/web/common/tabbedheader.jsp 10 Feb 2016 10:01:53 -0000 1.6.2.1 @@ -19,10 +19,10 @@ - + - + Index: lams_tool_forum/web/jsps/authoring/addCondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/addCondition.jsp,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_forum/web/jsps/authoring/addCondition.jsp 6 Jul 2012 13:06:39 -0000 1.3 +++ lams_tool_forum/web/jsps/authoring/addCondition.jsp 10 Feb 2016 10:01:53 -0000 1.3.2.1 @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_forum/web/jsps/authoring/message/create.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/authoring/message/create.jsp,v diff -u -r1.39.2.4 -r1.39.2.5 --- lams_tool_forum/web/jsps/authoring/message/create.jsp 9 Feb 2016 18:53:29 -0000 1.39.2.4 +++ lams_tool_forum/web/jsps/authoring/message/create.jsp 10 Feb 2016 10:01:53 -0000 1.39.2.5 @@ -4,7 +4,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_gmap/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_gmap/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:22 -0000 1.2 +++ lams_tool_gmap/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:20 -0000 1.2.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_images/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_images/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:01 -0000 1.2 +++ lams_tool_images/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:52 -0000 1.2.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_images/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/common/tabbedheader.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_images/web/common/tabbedheader.jsp 24 Apr 2014 20:39:10 -0000 1.2 +++ lams_tool_images/web/common/tabbedheader.jsp 10 Feb 2016 10:01:52 -0000 1.2.2.1 @@ -5,7 +5,7 @@ - + Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/parts/addimage.jsp,v diff -u -r1.3.2.5 -r1.3.2.6 --- lams_tool_images/web/pages/authoring/parts/addimage.jsp 9 Feb 2016 18:53:11 -0000 1.3.2.5 +++ lams_tool_images/web/pages/authoring/parts/addimage.jsp 10 Feb 2016 10:01:52 -0000 1.3.2.6 @@ -6,7 +6,7 @@ <%@ include file="/common/header.jsp"%> - + - + Index: lams_tool_imscc/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/common/tabbedheader.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_imscc/web/common/tabbedheader.jsp 7 Jun 2011 20:58:40 -0000 1.2 +++ lams_tool_imscc/web/common/tabbedheader.jsp 10 Feb 2016 10:01:29 -0000 1.2.2.1 @@ -5,7 +5,7 @@ - + Index: lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp 29 Sep 2012 13:57:03 -0000 1.3 +++ lams_tool_imscc/web/pages/authoring/parts/addbasiclti.jsp 10 Feb 2016 10:01:29 -0000 1.3.2.1 @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp 8 Jun 2011 12:31:16 -0000 1.3 +++ lams_tool_imscc/web/pages/authoring/parts/addcommoncartridge.jsp 10 Feb 2016 10:01:29 -0000 1.3.2.1 @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp 27 Mar 2014 21:12:58 -0000 1.5 +++ lams_tool_imscc/web/pages/authoring/parts/selectResources.jsp 10 Feb 2016 10:01:29 -0000 1.5.2.1 @@ -9,7 +9,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_kaltura/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/headItems.tag,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_kaltura/web/WEB-INF/tags/headItems.tag 15 Nov 2012 14:39:27 -0000 1.1 +++ lams_tool_kaltura/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:41 -0000 1.1.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_lamc/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/headItems.tag,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_lamc/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:06 -0000 1.8 +++ lams_tool_lamc/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:32 -0000 1.8.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_lamc/web/common/header.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/common/header.jsp,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_lamc/web/common/header.jsp 16 May 2011 05:11:30 -0000 1.8 +++ lams_tool_lamc/web/common/header.jsp 10 Feb 2016 10:01:32 -0000 1.8.2.1 @@ -10,10 +10,10 @@ - + - + Index: lams_tool_laqa/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/headItems.tag,v diff -u -r1.10 -r1.10.2.1 --- lams_tool_laqa/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:37 -0000 1.10 +++ lams_tool_laqa/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:21 -0000 1.10.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_laqa/web/authoring/addCondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/addCondition.jsp,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_laqa/web/authoring/addCondition.jsp 24 Apr 2015 10:00:51 -0000 1.5.2.2 +++ lams_tool_laqa/web/authoring/addCondition.jsp 10 Feb 2016 10:01:21 -0000 1.5.2.3 @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_laqa/web/authoring/newQuestionBox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/authoring/newQuestionBox.jsp,v diff -u -r1.25.2.5 -r1.25.2.6 --- lams_tool_laqa/web/authoring/newQuestionBox.jsp 3 Jul 2015 16:43:32 -0000 1.25.2.5 +++ lams_tool_laqa/web/authoring/newQuestionBox.jsp 10 Feb 2016 10:01:21 -0000 1.25.2.6 @@ -7,7 +7,7 @@ <%@ include file="/common/header.jsp"%> <%@ include file="/includes/jsp/qaWizardCommon.jsp"%> - + Index: lams_tool_laqa/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/common/tabbedheader.jsp,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_laqa/web/common/tabbedheader.jsp 16 May 2011 03:17:57 -0000 1.4 +++ lams_tool_laqa/web/common/tabbedheader.jsp 10 Feb 2016 10:01:21 -0000 1.4.2.1 @@ -10,10 +10,10 @@ - + - + Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v diff -u -r1.39.2.10 -r1.39.2.11 --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp 9 Feb 2016 18:53:00 -0000 1.39.2.10 +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp 10 Feb 2016 10:01:21 -0000 1.39.2.11 @@ -31,10 +31,10 @@ - + - + Index: lams_tool_larsrc/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/headItems.tag,v diff -u -r1.9 -r1.9.4.1 --- lams_tool_larsrc/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:19:56 -0000 1.9 +++ lams_tool_larsrc/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:37 -0000 1.9.4.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_larsrc/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/common/tabbedheader.jsp,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_larsrc/web/common/tabbedheader.jsp 17 Mar 2014 22:56:02 -0000 1.4 +++ lams_tool_larsrc/web/common/tabbedheader.jsp 10 Feb 2016 10:01:37 -0000 1.4.2.1 @@ -5,7 +5,7 @@ - + Index: lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp,v diff -u -r1.21 -r1.21.2.1 --- lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp 21 Jul 2014 18:19:18 -0000 1.21 +++ lams_tool_larsrc/web/pages/authoring/parts/addfile.jsp 10 Feb 2016 10:01:37 -0000 1.21.2.1 @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_mindmap/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_mindmap/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:19:45 -0000 1.2 +++ lams_tool_mindmap/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:35 -0000 1.2.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_nb/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/headItems.tag,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_nb/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:14 -0000 1.8 +++ lams_tool_nb/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:33 -0000 1.8.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_nb/web/monitoring/monitoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/monitoring/monitoring.jsp,v diff -u -r1.14 -r1.14.2.1 --- lams_tool_nb/web/monitoring/monitoring.jsp 30 Mar 2014 14:19:56 -0000 1.14 +++ lams_tool_nb/web/monitoring/monitoring.jsp 10 Feb 2016 10:01:33 -0000 1.14.2.1 @@ -15,7 +15,7 @@ - + <fmt:message key="activity.title" /> Index: lams_tool_notebook/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/headItems.tag,v diff -u -r1.8 -r1.8.2.1 Binary files differ Index: lams_tool_notebook/web/pages/authoring/addCondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/authoring/addCondition.jsp,v diff -u -r1.6.2.2 -r1.6.2.3 --- lams_tool_notebook/web/pages/authoring/addCondition.jsp 24 Apr 2015 10:00:47 -0000 1.6.2.2 +++ lams_tool_notebook/web/pages/authoring/addCondition.jsp 10 Feb 2016 10:01:55 -0000 1.6.2.3 @@ -13,7 +13,7 @@ - + Index: lams_tool_preview/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/headItems.tag,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_preview/web/WEB-INF/tags/headItems.tag 24 Jul 2015 00:34:29 -0000 1.1 +++ lams_tool_preview/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:28 -0000 1.1.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_preview/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/web/common/tabbedheader.jsp,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_preview/web/common/tabbedheader.jsp 24 Jul 2015 00:34:29 -0000 1.1 +++ lams_tool_preview/web/common/tabbedheader.jsp 10 Feb 2016 10:01:28 -0000 1.1.2.1 @@ -4,7 +4,7 @@ - + Index: lams_tool_sbmt/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/headItems.tag,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_sbmt/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:39 -0000 1.8 +++ lams_tool_sbmt/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:38 -0000 1.8.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_scratchie/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/headItems.tag,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_scratchie/web/WEB-INF/tags/headItems.tag 19 Jul 2012 19:20:11 -0000 1.1 +++ lams_tool_scratchie/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:24 -0000 1.1.4.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_scratchie/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/common/tabbedheader.jsp,v diff -u -r1.1 -r1.1.4.1 --- lams_tool_scratchie/web/common/tabbedheader.jsp 19 Jul 2012 19:20:09 -0000 1.1 +++ lams_tool_scratchie/web/common/tabbedheader.jsp 10 Feb 2016 10:01:24 -0000 1.1.4.1 @@ -5,7 +5,7 @@ - + Index: lams_tool_scribe/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/headItems.tag,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_scribe/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:34 -0000 1.5 +++ lams_tool_scribe/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:31 -0000 1.5.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_spreadsheet/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_spreadsheet/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:53 -0000 1.2 +++ lams_tool_spreadsheet/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:30 -0000 1.2.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_spreadsheet/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/common/tabbedheader.jsp,v diff -u -r1.1.12.1 -r1.1.12.2 --- lams_tool_spreadsheet/web/common/tabbedheader.jsp 30 Oct 2014 18:54:28 -0000 1.1.12.1 +++ lams_tool_spreadsheet/web/common/tabbedheader.jsp 10 Feb 2016 10:01:30 -0000 1.1.12.2 @@ -5,7 +5,7 @@ - + Index: lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp,v diff -u -r1.5.2.5 -r1.5.2.6 --- lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp 9 Feb 2016 18:53:17 -0000 1.5.2.5 +++ lams_tool_spreadsheet/web/pages/monitoring/parts/editmark.jsp 10 Feb 2016 10:01:30 -0000 1.5.2.6 @@ -4,7 +4,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_survey/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/common/tabbedheader.jsp,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_survey/web/common/tabbedheader.jsp 6 Dec 2011 17:21:47 -0000 1.4 +++ lams_tool_survey/web/common/tabbedheader.jsp 10 Feb 2016 10:01:43 -0000 1.4.2.1 @@ -4,7 +4,7 @@ - + Index: lams_tool_survey/web/pages/authoring/addCondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/addCondition.jsp,v diff -u -r1.5.2.3 -r1.5.2.4 --- lams_tool_survey/web/pages/authoring/addCondition.jsp 24 Apr 2015 10:00:52 -0000 1.5.2.3 +++ lams_tool_survey/web/pages/authoring/addCondition.jsp 10 Feb 2016 10:01:43 -0000 1.5.2.4 @@ -6,7 +6,7 @@ <%@ include file="/common/header.jsp"%> - + <%-- used for surveyitem.js --%> Index: lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp,v diff -u -r1.11.2.2 -r1.11.2.3 --- lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp 12 Sep 2014 21:07:25 -0000 1.11.2.2 +++ lams_tool_survey/web/pages/authoring/parts/addopenquestion.jsp 10 Feb 2016 10:01:43 -0000 1.11.2.3 @@ -6,7 +6,7 @@ <%@ include file="/common/header.jsp"%> - + <%-- user for surveysurveyitem.js --%> Index: lams_tool_task/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_task/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:20:11 -0000 1.2 +++ lams_tool_task/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:34 -0000 1.2.2.1 @@ -41,7 +41,7 @@ - + Index: lams_tool_task/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/common/tabbedheader.jsp,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_task/web/common/tabbedheader.jsp 10 May 2011 23:45:57 -0000 1.2 +++ lams_tool_task/web/common/tabbedheader.jsp 10 Feb 2016 10:01:34 -0000 1.2.2.1 @@ -5,7 +5,7 @@ - + Index: lams_tool_task/web/pages/authoring/parts/addcondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/pages/authoring/parts/addcondition.jsp,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_task/web/pages/authoring/parts/addcondition.jsp 24 Apr 2015 10:00:53 -0000 1.5.2.2 +++ lams_tool_task/web/pages/authoring/parts/addcondition.jsp 10 Feb 2016 10:01:34 -0000 1.5.2.3 @@ -5,7 +5,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_videorecorder/web/pages/authoring/addCondition.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/pages/authoring/addCondition.jsp,v diff -u -r1.5.2.2 -r1.5.2.3 --- lams_tool_videorecorder/web/pages/authoring/addCondition.jsp 24 Apr 2015 10:00:46 -0000 1.5.2.2 +++ lams_tool_videorecorder/web/pages/authoring/addCondition.jsp 10 Feb 2016 10:01:26 -0000 1.5.2.3 @@ -13,7 +13,7 @@ - + Index: lams_tool_vote/web/authoring/editNominationBox.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/editNominationBox.jsp,v diff -u -r1.14.2.2 -r1.14.2.3 --- lams_tool_vote/web/authoring/editNominationBox.jsp 12 Sep 2014 21:07:24 -0000 1.14.2.2 +++ lams_tool_vote/web/authoring/editNominationBox.jsp 10 Feb 2016 10:01:46 -0000 1.14.2.3 @@ -2,7 +2,7 @@ <%@ include file="/common/header.jsp"%> - + Index: lams_tool_wookie/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wookie/web/WEB-INF/tags/headItems.tag,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_wookie/web/WEB-INF/tags/headItems.tag 14 Dec 2011 08:32:14 -0000 1.2 +++ lams_tool_wookie/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:22 -0000 1.2.2.1 @@ -41,7 +41,7 @@ - + Index: lams_www/web/WEB-INF/tags/headItems.tag =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/headItems.tag,v diff -u -r1.6 -r1.6.2.1 --- lams_www/web/WEB-INF/tags/headItems.tag 28 Jul 2009 14:19:53 -0000 1.6 +++ lams_www/web/WEB-INF/tags/headItems.tag 10 Feb 2016 10:01:45 -0000 1.6.2.1 @@ -41,7 +41,7 @@ - +