Index: lams_admin/conf/xdoclet/struts-forms.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v diff -u -r1.42 -r1.43 --- lams_admin/conf/xdoclet/struts-forms.xml 29 Jul 2013 12:16:06 -0000 1.42 +++ lams_admin/conf/xdoclet/struts-forms.xml 3 Sep 2013 10:55:52 -0000 1.43 @@ -49,7 +49,6 @@ - Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java,v diff -u -r1.17 -r1.18 --- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 20 Nov 2012 13:41:59 -0000 1.17 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java 3 Sep 2013 10:55:52 -0000 1.18 @@ -582,7 +582,6 @@ user.setTimeZone(user.getTimeZone()); user.setTutorialsDisabled(false); user.setFirstLogin(true); - user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE)); return (hasError ? null : user); } Index: lams_admin/web/user.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v diff -u -r1.28 -r1.29 --- lams_admin/web/user.jsp 1 Oct 2010 21:01:25 -0000 1.28 +++ lams_admin/web/user.jsp 3 Sep 2013 10:55:52 -0000 1.29 @@ -1,5 +1,4 @@ <%@ include file="/taglibs.jsp"%> -<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> @@ -118,25 +117,8 @@ : - + - <%=Configuration.get(ConfigurationKeys.FLASH_ENABLE)%> - - - - : - - - - - - - - - - - - : Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_admin/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_admin/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:07 -0000 1.2 +++ lams_admin/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:52 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Index: lams_build/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_build/build.xml,v diff -u -r1.114 -r1.115 --- lams_build/build.xml 17 Dec 2012 12:08:38 -0000 1.114 +++ lams_build/build.xml 3 Sep 2013 10:55:23 -0000 1.115 @@ -97,6 +97,7 @@ + @@ -122,6 +123,7 @@ + Index: lams_build/lib/lams/lams-central.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-central.jar,v diff -u -r1.72 -r1.73 Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.382 -r1.383 Binary files differ Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ar_JO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ca_ES_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/cs_CZ_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/cy_GB_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/da_DK_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/de_DE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.20 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/el_GR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.15 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/en_AU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.15 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/en_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.14 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/es_ES_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/es_MX_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.12 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/fr_FR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/hu_HU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/it_IT_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.10 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ja_JP_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ko_KR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/mi_NZ_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ms_MY_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/nl_BE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.15 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/no_NO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/pl_PL_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/pt_BR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/ru_RU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/sl_SI_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/sv_SE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/tr_TR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/vi_VN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/zh_CN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/learner/zh_TW_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ar_JO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/cy_GB_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/da_DK_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/de_DE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.19 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/el_GR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.16 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/en_AU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.15 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/en_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.9 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/es_ES_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/fr_FR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/hu_HU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/it_IT_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ja_JP_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ko_KR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/mi_NZ_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ms_MY_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/nl_BE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.11 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/no_NO_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/pl_PL_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/pt_BR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/ru_RU_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/sv_SE_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/tr_TR_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/vi_VN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/zh_CN_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_central/conf/flashxml/lams/wizard/zh_TW_dictionary.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v diff -u -r1.123 -r1.124 --- lams_central/conf/language/lams/ApplicationResources.properties 9 Aug 2013 09:37:30 -0000 1.123 +++ lams_central/conf/language/lams/ApplicationResources.properties 3 Sep 2013 10:55:33 -0000 1.124 @@ -192,7 +192,6 @@ label.show.groups =Show Groups label.forgot.password =Forgot your password? button.select.importfile =Select File To Import -label.enable.flash =Enable Flash for Learner Window label.yes =Yes label.no =No label.ok =OK Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v diff -u -r1.53 -r1.54 --- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 8 Aug 2013 11:51:12 -0000 1.53 +++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java 3 Sep 2013 10:55:33 -0000 1.54 @@ -87,7 +87,6 @@ * * @struts:action path="/home" validate="false" parameter="method" * @struts:action-forward name="sysadmin" path="/sysadmin.jsp" - * @struts:action-forward name="learner" path="/learner.jsp" * @struts:action-forward name="lessonIntro" path="/lessonIntro.jsp" * @struts:action-forward name="author" path="/author.jsp" * @struts:action-forward name="addLesson" path="/addLesson.jsp" @@ -184,26 +183,30 @@ return displayMessage(mapping, req, "error.lesson.not.accessible.for.learners"); } + String learnerURL = Configuration.get(ConfigurationKeys.SERVER_URL) + "learning/main.jsp"; + if (mode != null) { - req.setAttribute(AttributeNames.PARAM_MODE, mode); + learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_MODE, mode); } - req.setAttribute(AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, - lesson.getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable() : Boolean.TRUE); - req.setAttribute(AttributeNames.PARAM_PRESENCE_ENABLED, lesson.getLearnerPresenceAvailable()); - req.setAttribute(AttributeNames.PARAM_PRESENCE_IM_ENABLED, lesson.getLearnerImAvailable()); - req.setAttribute(AttributeNames.PARAM_TITLE, lesson.getLessonName()); + learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_EXPORT_PORTFOLIO_ENABLED, String + .valueOf(lesson.getLearnerExportAvailable() != null ? lesson.getLearnerExportAvailable() + : Boolean.TRUE)); + learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_PRESENCE_ENABLED, + String.valueOf(lesson.getLearnerPresenceAvailable())); + learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_PRESENCE_IM_ENABLED, + String.valueOf(lesson.getLearnerImAvailable())); + learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_TITLE, lesson.getLessonName()); /* Date Format for Chat room append */ DateFormat sfm = new SimpleDateFormat("yyyyMMdd_HHmmss"); - req.setAttribute(AttributeNames.PARAM_CREATE_DATE_TIME, sfm.format(lesson.getCreateDateTime())); + learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_CREATE_DATE_TIME, + sfm.format(lesson.getCreateDateTime())); + learnerURL = WebUtil.appendParameterToURL(learnerURL, AttributeNames.PARAM_LESSON_ID, String.valueOf(lessonId)); - String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); - req.setAttribute("serverUrl", serverUrl); - req.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId); - // show lesson intro page if required if (lesson.isEnableLessonIntro()) { + req.setAttribute("learnerURL", learnerURL); req.setAttribute("lesson", lesson); req.setAttribute("displayDesignImage", lesson.isDisplayDesignImage()); req.setAttribute("isMonitor", lesson.getLessonClass().isStaffMember(getRealUser(user))); @@ -223,9 +226,9 @@ } return mapping.findForward("lessonIntro"); } else { - return mapping.findForward("learner"); + res.sendRedirect(learnerURL); + return null; } - } } catch (Exception e) { Fisheye: Tag 1.7 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/tag/GenerateIDTag.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/tag/LearnerFlashEnabledTag.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/editprofile.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v diff -u -r1.22 -r1.23 --- lams_central/web/editprofile.jsp 30 Dec 2011 08:29:37 -0000 1.22 +++ lams_central/web/editprofile.jsp 3 Sep 2013 10:55:33 -0000 1.23 @@ -18,7 +18,6 @@

-<%=Configuration.get(ConfigurationKeys.FLASH_ENABLE)%> <%=Configuration.get(ConfigurationKeys.PROFILE_EDIT_ENABLE)%> <%=Configuration.get(ConfigurationKeys.PROFILE_PARTIAL_EDIT_ENABLE)%> @@ -110,21 +109,6 @@ : - - - - : - - - - - - - - - - - : Fisheye: Tag 1.25 refers to a dead (removed) revision in file `lams_central/web/learner.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/lessonIntro.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/lessonIntro.jsp,v diff -u -r1.6 -r1.7 --- lams_central/web/lessonIntro.jsp 11 Dec 2012 11:29:44 -0000 1.6 +++ lams_central/web/lessonIntro.jsp 3 Sep 2013 10:55:33 -0000 1.7 @@ -7,7 +7,6 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-html" prefix="html" %> -mode=${mode}&portfolioEnabled=${portfolioEnabled}&presenceEnabledPatch=${presenceEnabledPatch}&presenceImEnabled=${presenceImEnabled}&title=${title}&createDateTime=${createDateTime}&serverUrl=${serverUrl}&lessonID=${lessonID} @@ -39,7 +38,7 @@ @@ -61,7 +60,7 @@
- +
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_central/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 18:20:45 -0000 1.2 +++ lams_central/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:33 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -461,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - +
- Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -512,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml,v diff -u -r1.34 -r1.35 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml 1 Oct 2010 20:36:29 -0000 1.34 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml 3 Sep 2013 10:55:36 -0000 1.35 @@ -292,19 +292,6 @@ length="255" - - - - @hibernate.property - column="enable_flash" - length="1" - - Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040019.sql =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040019.sql,v diff -u Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java,v diff -u -r1.29 -r1.30 --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 18 Jul 2013 14:33:33 -0000 1.29 +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java 3 Sep 2013 10:55:36 -0000 1.30 @@ -305,7 +305,6 @@ user.setCreateDate(new Date()); user.setDisabledFlag(false); user.setLocale(LanguageUtil.getSupportedLocale(userData[13], userData[12])); - user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE)); user.setFlashTheme(service.getDefaultFlashTheme()); user.setHtmlTheme(service.getDefaultHtmlTheme()); service.save(user); Index: lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java,v diff -u -r1.1 -r1.2 --- lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java 2 Aug 2012 14:07:47 -0000 1.1 +++ lams_common/src/java/org/lamsfoundation/lams/signup/service/SignupService.java 3 Sep 2013 10:55:36 -0000 1.2 @@ -38,7 +38,6 @@ user.setAuthenticationMethod(getAuthenticationMethod(AuthenticationMethod.DB)); user.setLocale(getDefaultLocale()); user.setCreateDate(new Date()); - user.setEnableFlash(true); userManagementService.save(user); // add to org Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java,v diff -u -r1.49 -r1.50 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 25 Dec 2012 12:38:35 -0000 1.49 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java 3 Sep 2013 10:55:36 -0000 1.50 @@ -151,9 +151,6 @@ private Boolean changePassword; /** persistent field */ - private Boolean enableFlash; - - /** persistent field */ private String lamsCommunityToken; /** persistent field */ @@ -170,9 +167,9 @@ /** persistent field - for Pedagogical Planner */ private Set recentlyModifiedLearningDesigns = new LinkedHashSet(); - + private Date modifiedDate; - + /** persistent field */ private String openidURL; @@ -447,6 +444,7 @@ return new EqualsBuilder().append(this.getUserId(), castOther.getUserId()).isEquals(); } + @Override public int compareTo(Object user) { User u = (User) user; return login.compareTo(u.getLogin()); @@ -479,17 +477,17 @@ TimeZone timeZone = TimeZone.getTimeZone(getTimeZone()); - Set tutorialPages = pagesWithDisabledTutorials == null || pagesWithDisabledTutorials.isEmpty() ? null + Set tutorialPages = (pagesWithDisabledTutorials == null) || pagesWithDisabledTutorials.isEmpty() ? null : pagesWithDisabledTutorials; return new UserDTO(userId, firstName, lastName, login, languageIsoCode, countryIsoCode, direction, email, new CSSThemeBriefDTO(flashTheme), new CSSThemeBriefDTO(htmlTheme), // TimeZone.getTimeZone("Australia/Sydney"), - timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, enableFlash, - lamsCommunityToken, lamsCommunityUsername, - (tutorialsDisabled == null ? false : true), // assume tutorials enabled if not set - tutorialPages, - (firstLogin == null ? true : false) // assume no firstLogin value means they haven't logged in + timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, lamsCommunityToken, + lamsCommunityUsername, (tutorialsDisabled == null ? false : true), // assume tutorials enabled if not + // set + tutorialPages, (firstLogin == null ? true : false) // assume no firstLogin value means they haven't + // logged in ); } @@ -578,14 +576,6 @@ this.changePassword = changePassword; } - public Boolean getEnableFlash() { - return enableFlash; - } - - public void setEnableFlash(Boolean enableFlash) { - this.enableFlash = enableFlash; - } - public String getLamsCommunityToken() { return lamsCommunityToken; } @@ -646,21 +636,19 @@ } public Date getModifiedDate() { - return modifiedDate; + return modifiedDate; } public void setModifiedDate(Date modifiedDate) { - this.modifiedDate = modifiedDate; + this.modifiedDate = modifiedDate; } public String getOpenidURL() { - return openidURL; - } + return openidURL; + } - public void setOpenidURL(String openidURL) { - this.openidURL = openidURL; - } - - + public void setOpenidURL(String openidURL) { + this.openidURL = openidURL; + } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java,v diff -u -r1.22 -r1.23 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java 20 Aug 2009 04:37:19 -0000 1.22 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java 3 Sep 2013 10:55:36 -0000 1.23 @@ -47,7 +47,6 @@ private CSSThemeBriefDTO htmlTheme; private TimeZone timeZone; private Integer authenticationMethodId; - private Boolean enableFlash; private String lamsCommunityToken; private String lamsCommunityUsername; private Boolean loggedIntoLamsCommunity; @@ -58,7 +57,7 @@ public UserDTO(Integer userID, String firstName, String lastName, String login, String localeLanguage, String localeCountry, String direction, String email, CSSThemeBriefDTO flashTheme, CSSThemeBriefDTO htmlTheme, TimeZone timezone, Integer authenticationMethodId, String fckLanguageMapping, - Boolean enableFlash, String lamsCommunityToken, String lamsCommunityUsername, Boolean tutorialsDisabled, + String lamsCommunityToken, String lamsCommunityUsername, Boolean tutorialsDisabled, Set pagesWithDisabledTutorials, Boolean firstLogin) { this.userID = userID; this.firstName = firstName; @@ -73,7 +72,6 @@ timeZone = timezone; this.authenticationMethodId = authenticationMethodId; this.fckLanguageMapping = fckLanguageMapping; - this.enableFlash = enableFlash; this.lamsCommunityToken = lamsCommunityToken; this.lamsCommunityUsername = lamsCommunityUsername; this.tutorialsDisabled = tutorialsDisabled; @@ -86,7 +84,7 @@ */ @Override public boolean equals(Object o) { - if (o != null && o.getClass() == this.getClass()) { + if ((o != null) && (o.getClass() == this.getClass())) { return ((UserDTO) o).userID == userID; } else { return false; @@ -175,30 +173,23 @@ @Override public String toString() { - return new ToStringBuilder(this).append("userID", getUserID()).append("firstName", getFirstName()).append( - "lastName", getLastName()).append("login", getLogin()).append("localeLanguage", getLocaleLanguage()) - .append("localeCountry", getLocaleCountry()).append("direction", getDirection()).append("email", - getEmail()).append("flashTheme", getFlashTheme()).append("htmlTheme", getHtmlTheme()).append( - "timeZone", getTimeZone()).append("authenticationMethodId", getAuthenticationMethodId()) - .append("fckLanguageMapping", getFckLanguageMapping()).append("enableFlash", getEnableFlash()).append( - "lamsCommunityUser", this.getLamsCommunityUsername()).append("lamsCommunityToken", - this.getLamsCommunityToken()).append("loggedIntoLamsCommunity", - "" + this.getLoggedIntoLamsCommunity()) + return new ToStringBuilder(this).append("userID", getUserID()).append("firstName", getFirstName()) + .append("lastName", getLastName()).append("login", getLogin()) + .append("localeLanguage", getLocaleLanguage()).append("localeCountry", getLocaleCountry()) + .append("direction", getDirection()).append("email", getEmail()).append("flashTheme", getFlashTheme()) + .append("htmlTheme", getHtmlTheme()).append("timeZone", getTimeZone()) + .append("authenticationMethodId", getAuthenticationMethodId()) + .append("fckLanguageMapping", getFckLanguageMapping()) + .append("lamsCommunityUser", this.getLamsCommunityUsername()) + .append("lamsCommunityToken", this.getLamsCommunityToken()) + .append("loggedIntoLamsCommunity", "" + this.getLoggedIntoLamsCommunity()) .append("tutorialsDisabled", "" + getTutorialsDisabled()).toString(); } public String getFckLanguageMapping() { return fckLanguageMapping; } - public Boolean getEnableFlash() { - return enableFlash; - } - - public void setEnableFlash(Boolean enableFlash) { - this.enableFlash = enableFlash; - } - public String getLamsCommunityToken() { return lamsCommunityToken; } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java,v diff -u -r1.21 -r1.22 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java 6 Dec 2011 21:10:04 -0000 1.21 +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java 3 Sep 2013 10:55:36 -0000 1.22 @@ -151,7 +151,6 @@ user.setMobilePhone(map.get("mobile")); user.setAuthenticationMethod((AuthenticationMethod) service.findById(AuthenticationMethod.class, AuthenticationMethod.LDAP)); - user.setEnableFlash(Configuration.getAsBoolean(ConfigurationKeys.FLASH_ENABLE)); user.setFlashTheme(service.getDefaultFlashTheme()); user.setHtmlTheme(service.getDefaultHtmlTheme()); user.setDisabledFlag(getDisabledBoolean(attrs)); Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v diff -u -r1.50 -r1.51 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 29 Jul 2013 12:15:42 -0000 1.50 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 3 Sep 2013 10:55:36 -0000 1.51 @@ -142,8 +142,6 @@ public static String ALLOW_EDIT_ON_FLY = "AllowLiveEdit"; public static String SHOW_ALL_MY_LESSON_LINK = "ShowAllMyLessonLink"; - - public static String FORCE_MOBILE_DEV_TO_USE_FLASHLESS = "ForceMobileDevToUseFlashless"; public static String LDAP_PROVISIONING_ENABLED = "LDAPProvisioningEnabled"; @@ -234,9 +232,6 @@ public static String CUSTOM_TAB_TITLE = "CustomTabTitle"; - /** Disable Flash altogether for the learner interface (LDEV-1005) */ - public static String FLASH_ENABLE = "EnableFlash"; - /** * Configurable screen sizes for authoring, monitor, learner and admin * (LDEV-1598) Index: lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag,v diff -u -r1.8 -r1.9 --- lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag 6 Jul 2012 15:38:59 -0000 1.8 +++ lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag 3 Sep 2013 10:56:06 -0000 1.9 @@ -83,7 +83,11 @@ } } function doSubmit_Form_Only() { - document.getElementById("${formID}").submit(); + var form = document.getElementById("${formID}"); + //invoke onsubmit event if it's available, submit form afterwards + if (form.onsubmit == null || (form.onsubmit != null) && form.onsubmit()) { + form.submit(); + } } function doCancel() { if(confirm("")){ @@ -102,7 +106,7 @@ doAjaxCall(clearSessionUrl); } else { if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) { - window.location.href = notifyCloseURL; + window.location.href = notifyCloseURL + '&action=' + nextAction; } else if (window.parent.opener == null){ doAjaxCall(notifyCloseURL); } else { Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/CKEditor.tag,v diff -u -r1.12 -r1.13 --- lams_gradebook/web/WEB-INF/tags/CKEditor.tag 26 Dec 2011 11:40:32 -0000 1.12 +++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag 3 Sep 2013 10:56:06 -0000 1.13 @@ -53,6 +53,9 @@ CKEDITOR.basePath = "${ckEditorBasePath}"; + var editor = CKEDITOR.instances["${id}"]; + if (editor) { editor.destroy(true); } + var instance = CKEDITOR.replace( "${id}", { width : "${width}", height : "${height}", Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_gradebook/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_gradebook/web/WEB-INF/tags/TextSearch.tag =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/TextSearch.tag,v diff -u -r1.1 -r1.2 --- lams_gradebook/web/WEB-INF/tags/TextSearch.tag 9 Apr 2009 04:55:54 -0000 1.1 +++ lams_gradebook/web/WEB-INF/tags/TextSearch.tag 3 Sep 2013 10:56:06 -0000 1.2 @@ -133,4 +133,4 @@ - + \ No newline at end of file Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.1 -r1.2 --- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld 30 Jul 2012 18:45:35 -0000 1.1 +++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:56:06 -0000 1.2 @@ -11,6 +11,10 @@ LAMSTags + + org.lamsfoundation.lams.web.SessionListener + + Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/ @@ -24,23 +28,47 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID + Help tag + Help tag - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag + help + org.lamsfoundation.lams.web.tag.HelpTag empty - Output a random number for the learner and passon flash movies to communicate directly. - id + Help tag + module false true + + Help tag + toolSignature + false + true + + + + Help tag + page + false + + true + + + + Help tag + style + false + + true + + + @@ -143,61 +171,6 @@ - Help tag - Help tag - - - help - org.lamsfoundation.lams.web.tag.HelpTag - empty - - - Help tag - module - false - - true - - - - Help tag - toolSignature - false - - true - - - - Help tag - page - false - - true - - - - Help tag - style - false - - true - - - - - - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -300,6 +273,11 @@ true + index + false + true + + indexed false true @@ -452,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -503,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Index: lams_learning/conf/xdoclet/servlet-mappings.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/xdoclet/servlet-mappings.xml,v diff -u -r1.7 -r1.8 --- lams_learning/conf/xdoclet/servlet-mappings.xml 12 Jul 2006 04:16:59 -0000 1.7 +++ lams_learning/conf/xdoclet/servlet-mappings.xml 3 Sep 2013 10:55:50 -0000 1.8 @@ -1,3 +1,5 @@ + + action *.do Index: lams_learning/web/lessonComplete.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/lessonComplete.jsp,v diff -u -r1.21 -r1.22 --- lams_learning/web/lessonComplete.jsp 25 Jan 2012 18:00:34 -0000 1.21 +++ lams_learning/web/lessonComplete.jsp 3 Sep 2013 10:55:48 -0000 1.22 @@ -27,13 +27,8 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> - - - - -

Index: lams_learning/web/loadToolActivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/loadToolActivity.jsp,v diff -u -r1.26 -r1.27 --- lams_learning/web/loadToolActivity.jsp 22 Apr 2011 22:17:24 -0000 1.26 +++ lams_learning/web/loadToolActivity.jsp 3 Sep 2013 10:55:49 -0000 1.27 @@ -38,12 +38,6 @@ String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; %> - - - - - -
@@ -67,17 +61,11 @@ //--> - - -

- - -
Fisheye: Tag 1.19 refers to a dead (removed) revision in file `lams_learning/web/mainflash.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.18 refers to a dead (removed) revision in file `lams_learning/web/mainnoflash.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/web/optionsActivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v diff -u -r1.36 -r1.37 --- lams_learning/web/optionsActivity.jsp 12 Aug 2013 23:02:59 -0000 1.36 +++ lams_learning/web/optionsActivity.jsp 3 Sep 2013 10:55:48 -0000 1.37 @@ -1,13 +1,5 @@ <%@ include file="/common/taglibs.jsp"%> - - - - - - - <% if (request.getAttribute("activity") instanceof org.lamsfoundation.lams.learningdesign.OptionsWithSequencesActivity) { request.setAttribute("isOptionsWithSequencesActivity", "true"); Index: lams_learning/web/previewDefineLater.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/Attic/previewDefineLater.jsp,v diff -u -r1.10 -r1.11 --- lams_learning/web/previewDefineLater.jsp 25 Jun 2008 06:40:23 -0000 1.10 +++ lams_learning/web/previewDefineLater.jsp 3 Sep 2013 10:55:48 -0000 1.11 @@ -26,14 +26,6 @@ <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> - - - - - - - -

Fisheye: Tag 1.8 refers to a dead (removed) revision in file `lams_learning/web/progress.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_learning/web/progressBroken.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_learning/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:39 -0000 1.2 +++ lams_learning/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:50 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_learning/web/common/progressOutput.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_learning/web/css/mainflash.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_learning/web/mobile/lessonComplete.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/mobile/lessonComplete.jsp,v diff -u -r1.1 -r1.2 --- lams_learning/web/mobile/lessonComplete.jsp 27 Feb 2013 14:02:46 -0000 1.1 +++ lams_learning/web/mobile/lessonComplete.jsp 3 Sep 2013 10:55:50 -0000 1.2 @@ -26,19 +26,13 @@ <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> -

 

- - - - -

Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v diff -u -r1.102 -r1.103 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 30 Aug 2013 12:20:28 -0000 1.102 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 3 Sep 2013 10:55:59 -0000 1.103 @@ -36,7 +36,6 @@ import org.lamsfoundation.lams.learningdesign.GroupingActivity; import org.lamsfoundation.lams.learningdesign.ScheduleGateActivity; import org.lamsfoundation.lams.learningdesign.ToolActivity; -import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.LessonServiceException; @@ -449,19 +448,21 @@ * @throws IOException */ public String getLearningDesignDetails(Long lessonID) throws IOException; - + /** - * This method is called when the user clicks the 'Contribute' tab in the monitoring enviornment. It returns a list - * of activities "in the order" they have to be performed and with additional information as to what kind of - * contribution (Define later content, Moderation, Contribution, Permission for gate activity, Chosen Grouing etc.) - * is reuired from the user(teacher/staff). + * This method returns the progress information of all learners in a given Lesson. * * @param lessonID - * The lesson_id of the Lesson for which the information has to be fetched. - * @return String The required information in WDDX format + * The lesson_id of the Lesson whose progress information is required + * @param learnerID + * The learner_id of the class learner whose progress information is required If null, provide all + * learner's progress information. + * @param userID + * The user id of the user requesting the progress details + * @return String The requested information in wddx format * @throws IOException */ - public String getAllContributeActivities(Long lessonID) throws IOException, LearningDesignProcessorException; + public String getAllCompletedActivities(Long lessonID, Long learnerID, Integer userID) throws IOException; public List getAllContributeActivityDTO(Long lessonID); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.183 -r1.184 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 30 Aug 2013 12:20:28 -0000 1.183 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 3 Sep 2013 10:55:59 -0000 1.184 @@ -2005,6 +2005,61 @@ } /** + * (non-Javadoc) + * + * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllLearnersProgress(java.lang.Long, + * java.lang.Integer) + */ + public String getAllLearnersProgress(Long lessonID, Integer userID, Boolean completedDataOnly) throws IOException { + Lesson lesson = lessonDAO.getLesson(lessonID); + FlashMessage flashMessage; + + if (lesson != null) { + checkOwnerOrStaffMember(userID, lesson, "get all learners progress"); + Vector progressData = new Vector(); + Iterator iterator = lesson.getLearnerProgresses().iterator(); + while (iterator.hasNext()) { + LearnerProgress learnerProgress = (LearnerProgress) iterator.next(); + if (!completedDataOnly) { + progressData.add(learnerProgress.getLearnerProgressData()); + } else { + progressData.add(learnerProgress.getLearnerProgressCompletedData()); + } + } + flashMessage = (!completedDataOnly) ? new FlashMessage("getAllLearnersProgress", progressData) + : new FlashMessage("getAllCompletedActivities", progressData); + } else { + flashMessage = new FlashMessage("getAllLearnersProgress", messageService.getMessage("NO.SUCH.LESSON", + new Object[] { lessonID }), FlashMessage.ERROR); + } + return flashMessage.serializeMessage(); + } + + public String getAllCompletedActivities(Long lessonID, Long learnerID, Integer userID) throws IOException { + Lesson lesson = lessonDAO.getLesson(lessonID); + FlashMessage flashMessage; + + if (lesson != null) { + checkOwnerOrStaffMember(userID, lesson, "get all learners progress"); + Vector progressData = new Vector(); + + if (learnerID != null) { + LearnerProgress learnerProgress = learnerService.getProgress(new Integer(learnerID.intValue()), + lessonID); + progressData.add(learnerProgress.getLearnerProgressCompletedData()); + flashMessage = new FlashMessage("getAllCompletedActivities", progressData); + } else { + return getAllLearnersProgress(lessonID, userID, true); + } + + } else { + flashMessage = new FlashMessage("getAllCompletedActivities", messageService.getMessage("NO.SUCH.LESSON", + new Object[] { lessonID }), FlashMessage.ERROR); + } + return flashMessage.serializeMessage(); + } + + /** * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getActivityById(Long, Class) */ public Activity getActivityById(Long activityId, Class clasz) { @@ -2030,27 +2085,6 @@ return (GroupingActivity) activity; } - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getAllContributeActivities(java.lang.Long) - */ - public String getAllContributeActivities(Long lessonID) throws IOException, LearningDesignProcessorException { - Lesson lesson = lessonDAO.getLesson(lessonID); - FlashMessage flashMessage; - if (lesson != null) { - ContributeActivitiesProcessor processor = new ContributeActivitiesProcessor(lesson.getLearningDesign(), - lessonID, activityDAO, lamsCoreToolService); - processor.parseLearningDesign(); - Vector activities = processor.getMainActivityList(); - flashMessage = new FlashMessage("getAllContributeActivities", activities); - } else { - flashMessage = new FlashMessage("getAllContributeActivities", messageService.getMessage("NO.SUCH.LESSON", - new Object[] { lessonID }), FlashMessage.ERROR); - } - return flashMessage.serializeMessage(); - } - public List getAllContributeActivityDTO(Long lessonID) { List result = null; Lesson lesson = lessonDAO.getLesson(lessonID); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.100 -r1.101 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 30 Aug 2013 12:20:28 -0000 1.100 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 3 Sep 2013 10:55:59 -0000 1.101 @@ -728,32 +728,6 @@ + messageService.getMessage(languageCollection.get(i)) + ""; } - Integer orgId = WebUtil.readIntParam(request, "orgId", true); - if (module.equals("wizard") && (orgId != null)) { - - Organisation organisation = monitoringService.getOrganisation(orgId); - - int count = 0; - Set organisationLessons = new TreeSet(new LessonComparator()); - organisationLessons.addAll(organisation.getLessons()); - for (Lesson lesson : organisationLessons) { - if (!Lesson.REMOVED_STATE.equals(lesson.getLessonStateId()) - && !Lesson.FINISHED_STATE.equals(lesson.getLessonStateId())) { - languageOutput += "" + "" + lesson.getLessonName() - + "" + "" + lesson.getLessonId() + "" + ""; - } - } - - // // sort lessons - // TreeSet lessons = new TreeSet(new TimezoneComparator()); - // lessons.addAll(getTimezoneService().getDefaultTimezones()); - - // let Flex know the number of lessons - languageOutput += "" + count + ""; - - languageOutput += "" + organisation.getName() + ""; - } - languageOutput += ""; response.setContentType("text/xml"); @@ -762,25 +736,28 @@ return null; } - - public ActionForward getAllContributeActivities(ActionMapping mapping, ActionForm form, HttpServletRequest request, + + public ActionForward getAllCompletedActivities(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException { + String wddxPacket; IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet() .getServletContext()); - String wddxPacket = null; try { - Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); - wddxPacket = monitoringService.getAllContributeActivities(lessonID); + Long lessonID = WebUtil.readLongParam(request, "lessonID", false); + Long learnerID = WebUtil.readLongParam(request, "learnerID", true); + wddxPacket = monitoringService.getAllCompletedActivities(lessonID, learnerID, getUserId()); + } catch (Exception e) { - FlashMessage flashMessage = handleException(e, "getAllContributeActivities", monitoringService); - wddxPacket = flashMessage.serializeMessage(); + wddxPacket = handleException(e, "getAllLearnersProgress", monitoringService).serializeMessage(); } + PrintWriter writer = response.getWriter(); writer.println(wddxPacket); return null; - } + } + /** * Calls the server to bring up the learner progress page. Assumes destination is a new window. The userid that * comes from Flash is the user id of the learner for which we are calculating the url. This is different to all the @@ -1255,24 +1232,12 @@ */ public ActionForward learnerExportPortfolioAvailable(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet() .getServletContext()); - FlashMessage flashMessage = null; - try { - Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); - Integer userID = getUserId(); - Boolean learnerExportPortfolioAvailable = WebUtil - .readBooleanParam(request, "learnerExportPortfolio", false); - monitoringService.setLearnerPortfolioAvailable(lessonID, userID, learnerExportPortfolioAvailable); - - flashMessage = new FlashMessage("learnerExportPortfolioAvailable", "learnerExportPortfolioAvailable"); - } catch (Exception e) { - flashMessage = handleException(e, "renameLesson", monitoringService); - } - String wddxPacket = flashMessage.serializeMessage(); - PrintWriter writer = response.getWriter(); - writer.println(wddxPacket); + Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); + Integer userID = getUserId(); + Boolean learnerExportPortfolioAvailable = WebUtil.readBooleanParam(request, "learnerExportPortfolio", false); + monitoringService.setLearnerPortfolioAvailable(lessonID, userID, learnerExportPortfolioAvailable); return null; } @@ -1282,28 +1247,19 @@ */ public ActionForward presenceAvailable(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet() .getServletContext()); - FlashMessage flashMessage = null; - try { - Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); - Integer userID = getUserId(); - Boolean presenceAvailable = WebUtil.readBooleanParam(request, "presenceAvailable", false); - monitoringService.setPresenceAvailable(lessonID, userID, presenceAvailable); + Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID")); + Integer userID = getUserId(); + Boolean presenceAvailable = WebUtil.readBooleanParam(request, "presenceAvailable", false); - if (!presenceAvailable) { - monitoringService.setPresenceImAvailable(lessonID, userID, false); - } + monitoringService.setPresenceAvailable(lessonID, userID, presenceAvailable); - flashMessage = new FlashMessage("presenceAvailable", "presenceAvailable"); - } catch (Exception e) { - flashMessage = handleException(e, "presenceAvailable", monitoringService); + if (!presenceAvailable) { + monitoringService.setPresenceImAvailable(lessonID, userID, false); } - String wddxPacket = flashMessage.serializeMessage(); - PrintWriter writer = response.getWriter(); - writer.println(wddxPacket); + return null; } Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:54:14 -0000 1.2 +++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:59 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_assessment/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.6 -r1.7 --- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:42 -0000 1.6 +++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:46 -0000 1.7 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_bbb/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:03 -0000 1.2 +++ lams_tool_bbb/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:08 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_chat/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:54:22 -0000 1.2 +++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:56:09 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_daco/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.5 -r1.6 --- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:17 -0000 1.5 +++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:54:49 -0000 1.6 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_dimdim/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_eadventure/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.6 -r1.7 --- lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:54:18 -0000 1.6 +++ lams_tool_eadventure/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:54:53 -0000 1.7 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.6 refers to a dead (removed) revision in file `lams_tool_forum/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:52:41 -0000 1.2 +++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:56:18 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:44 -0000 1.2 +++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:54:50 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_images/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.5 -r1.6 --- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:52:54 -0000 1.5 +++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:09 -0000 1.6 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_imscc/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.5 -r1.6 --- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:46 -0000 1.5 +++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:54:45 -0000 1.6 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.1 -r1.2 --- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld 30 Jul 2012 18:50:19 -0000 1.1 +++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:41 -0000 1.2 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:24 -0000 1.2 +++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:56:16 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_larsrc/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.24 -r1.25 --- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:00 -0000 1.24 +++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:02 -0000 1.25 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:26 -0000 1.2 +++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:28 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.1 -r1.2 --- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld 30 Jul 2012 18:51:09 -0000 1.1 +++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:24 -0000 1.2 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:20 -0000 1.2 +++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:56 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_pixlr/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:35 -0000 1.2 +++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:06 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_sbmt/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:52:34 -0000 1.2 +++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:54:52 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_scratchie/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.1 -r1.2 --- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld 30 Jul 2012 18:53:24 -0000 1.1 +++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:40 -0000 1.2 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.6 -r1.7 --- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld 30 Jul 2012 18:54:02 -0000 1.6 +++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:45 -0000 1.7 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.5 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.19 -r1.20 --- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:37 -0000 1.19 +++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:56:20 -0000 1.20 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_task/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.10 -r1.11 --- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 18:20:42 -0000 1.10 +++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:43 -0000 1.11 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -461,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -512,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_videorecorder/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_videorecorder/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.1 -r1.2 --- lams_tool_videorecorder/web/WEB-INF/tlds/lams/lams.tld 30 Jul 2012 18:53:39 -0000 1.1 +++ lams_tool_videorecorder/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:56:11 -0000 1.2 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:54:25 -0000 1.2 +++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:56:04 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:53:14 -0000 1.2 +++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:38 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.3 refers to a dead (removed) revision in file `lams_tool_wookie/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_wookie/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wookie/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.2 -r1.3 --- lams_tool_wookie/web/WEB-INF/tlds/lams/lams.tld 23 Jul 2013 17:54:20 -0000 1.2 +++ lams_tool_wookie/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:55:00 -0000 1.3 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_www/web/WEB-INF/tags/Passon.tag'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_www/web/WEB-INF/tlds/lams/lams.tld =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tlds/lams/lams.tld,v diff -u -r1.1 -r1.2 --- lams_www/web/WEB-INF/tlds/lams/lams.tld 30 Jul 2012 18:45:12 -0000 1.1 +++ lams_www/web/WEB-INF/tlds/lams/lams.tld 3 Sep 2013 10:56:12 -0000 1.2 @@ -28,26 +28,6 @@ - Output a random number for the learner and passon flash movies to communicate directly. - generate unique ID - - - generateID - org.lamsfoundation.lams.web.tag.GenerateIDTag - empty - - - Output a random number for the learner and passon flash movies to communicate directly. - id - false - - true - - - - - - Help tag Help tag @@ -191,17 +171,6 @@ - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - - - - Output stylesheet based on the user preferences. User's chosen stylesheet @@ -304,6 +273,11 @@ true + index + false + true + + indexed false true @@ -456,12 +430,8 @@ headItems /WEB-INF/tags/headItems.tag - + - Passon - /WEB-INF/tags/Passon.tag - - Date /WEB-INF/tags/Date.tag @@ -507,15 +477,6 @@ true - - Checks whether Flash enabled for learner - Checks whether Flash enabled for learner - - - LearnerFlashEnabled - org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag - empty - head /WEB-INF/tags/Head.tag