Fisheye on lams/lams_learning/web/WEB-INF/struts https://code.lamsfoundation.org/fisheye/changelog/lams/lams_learning/web/WEB-INF/struts Recent activity in "lams" under directory /lams_learning/web/WEB-INF/struts lams (MAIN): LDEV-2847: Major changes to build.xml files. See JIRA comment for full explanation. Mon, 30 Jul 2012 20:44:35 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20120730184435 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20120730184435 Marcin Cieslak committed MAIN:marcin:20120730184435 on branch MAIN in lams LDEV-2847: Major changes to build.xml files. See JIRA comment for full explanation.

· /lams_admin/build.properties (-4, +7) | History | Source | Diff
· /lams_admin/build.xml (-400, +6) | History | Source | Diff
· /lams_admin/conf/xdoclet/servlets.xml (-1, +1) | History | Source | Diff
· /lams_admin/conf/xdoclet/struts-plugins.xml (-1, +1) | History | Source | Diff
· /lams_admin/conf/xdoclet/taglibs.xml (-19, +32) | History | Source | Diff
· /lams_admin/web/WEB-INF/lams.tld (-509, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/tiles-defs.xml (-0, +204) | History | Source
· /lams_admin/web/WEB-INF/web.xml (-282, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/jstl/tlds/c.tld (-563, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/jstl/tlds/fmt.tld (-671, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/jstl/tlds/fn.tld (-207, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/jstl/tlds/x.tld (-448, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/struts/struts-config.xml (-1045, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/struts/validation.xml (-13, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/struts/tlds/struts-bean-el.tld (-212, +0) | History | Source | Diff
… 1177 more files in changeset.
]]> lams (MAIN): LDEV-2577... Wed, 06 Oct 2010 12:09:17 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20101006100917 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20101006100917 Marcin Cieslak committed MAIN:marcin:20101006100917 on branch MAIN in lams LDEV-2577

The new CKEditor does not have Java Integration library (yet). We have been

using it to:

a) get the tag library to create our own tag <lams:FCKeditor>

But the new CKEditor uses AJAX to get the contents, so the library is

not needed anymore.

The references to it has been deleted from every tool.

FCKEditor.tag has been rewritten to use the new syntax.

b) get a FCKEditor internal file manager by a Connector from the jar

The new CKEditor does not provide a file manager - the license became

commercial and the whole thing became a separate project, CKFinder.

There were alternatives suggested on the web:

jasfinder - http://sourceforge.net/projects/jasfinder/support

kcfinder - http://kcfinder.sunhater.com/

some other - http://www.miguelmanchego.com/2009/gestor-de-archivos-ckeditor/

but we have already nicely integrated with the old file manager. This page:

http://jacek-kromski.jogger.pl/2009/09/25/integracja-ckeditor-z-przegladarka-plikow-z-fckeditor/

in polish says how to use the file manager from the old FCKEditor.

The steps that have to be done:

- download the new CKEditor

- download the old FCKEditor

- copy the filemanager to ckeditor directory

- in the file browser/default/frmresourceslist.html, line 92 (with SetUrl call) needs to be replaced to:

window.top.opener.CKEDITOR.tools.callFunction( window.top.document.CKEditorFuncNum, fileUrl, '' );

- in the file browser/default/browser.html add in line 80:

document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');

FCKeditor has been used in version 2.6.6, the last one before switching to CKEditor project.

Changes required to use newer version of Java Integration library

for FCKEditor so it was upgraded to the latest (for FCKEditor, because one for CKEditor does not exist) version 2.6.

This also required the Prototype to be upgraded to the latest 1.6.1.

The CKEditor code also needed to be changed, so if another upgrade to a newer version occurs, we need to remember to repeat these steps:

http://cksource.com/forums/viewtopic.php?f=5&t=15750

It says:

/ckeditor/plugins/link/dialogs/link.js

Changes

label:a.lang.common.target,'default':'notSet' --> label:a.lang.common.target,'default':'_blank'

label:a.lang.link.targetFrameName,'default':'' --> label:a.lang.link.targetFrameName,'default':'_blank'

It is also worth mentioning that if you include the ckeditor.js file twice in the same page, sometimes it causes trouble, thus detection in the CKEditor.tag files.

· /lams_admin/conf/xdoclet/servlet-mappings.xml (-1, +1) | History | Source | Diff
· /lams_admin/conf/xdoclet/taglibs.xml (-8, +0) | History | Source | Diff
· /lams_admin/web/loginmaintain.jsp (-16, +5) | History | Source | Diff
· /lams_admin/web/WEB-INF/lams.tld (-2, +2) | History | Source | Diff
· /lams_admin/web/WEB-INF/fckeditor/tlds/FCKeditor.tld (-129, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/tags/CKEditor.tag (-0, +54) | History | Source
· /lams_admin/web/WEB-INF/tags/FCKEditor.tag (-54, +0) | History | Source | Diff
· /lams_build/3rdParty.userlibraries (-1, +1) | History | Source | Diff
· /lams_build/liblist.txt (-1, +1) | History | Source | Diff
· /lams_build/lib/fckeditor/FCKeditor-2.4.1.jar (binary) | History | Source | Diff
· /lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar (binary) | History | Source
· /lams_central/build.xml (-2, +2) | History | Source | Diff
· /lams_central/conf/xdoclet/filter-mappings.xml (-3, +3) | History | Source | Diff
· /lams_central/conf/xdoclet/taglib-tag.xml (-2, +2) | History | Source | Diff
· /lams_central/conf/xdoclet/taglibs.xml (-4, +0) | History | Source | Diff
… 1082 more files in changeset.
]]> lams (MAIN): merging improvements from lams2_3_spring_jboss_tune branch Thu, 26 Mar 2009 11:00:26 +0100 jliew https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Ajliew%3A20090326100026 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Ajliew%3A20090326100026 jliew committed MAIN:jliew:20090326100026 on branch MAIN in lams merging improvements from lams2_3_spring_jboss_tune branch

· /lams_admin/conf/xdoclet/web-settings.xml (-8, +10) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml (-1, +1) | History | Source | Diff
· /lams_build/build.xml (-3, +84) | History | Source | Diff
· /lams_build/conf/j2ee/lams.application.xml (-6, +0) | History | Source | Diff
· /lams_build/conf/j2ee/rams.application.xml (-6, +0) | History | Source | Diff
· /lams_build/conf/unix/jboss/ejb-deployer.slim.xml (-0, +69) | History | Source | Diff
· /lams_build/conf/unix/jboss/jboss-service.slim.xml (-0, +395) | History | Source | Diff
· /lams_build/conf/unix/jboss/standardjboss.slim.xml (-0, +1038) | History | Source | Diff
· /lams_build/conf/windows/jboss/ejb-deployer.slim.xml (-0, +69) | History | Source | Diff
· /lams_build/conf/windows/jboss/jboss-service.slim.xml (-0, +395) | History | Source | Diff
· /lams_build/conf/windows/jboss/standardjboss.slim.xml (-0, +1038) | History | Source | Diff
· /lams_build/conf/windows/jboss/service/mysql-ds.xml (-40, +2) | History | Source | Diff
· /lams_build/deploy-tool/lib/lams-tool-deploy.jar (binary) | History | Source | Diff
· /lams_build/lib/lams/lams-central.jar (binary) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
… 104 more files in changeset.
]]> lams (lams2_3_spring_jboss_tune): LDEV-2174:... Tue, 17 Mar 2009 21:56:41 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=lams2_3_spring_jboss_tune%3Amarcin%3A20090317205641 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=lams2_3_spring_jboss_tune%3Amarcin%3A20090317205641 Marcin Cieslak committed lams2_3_spring_jboss_tune:marcin:20090317205641 on branch lams2_3_spring_jboss_tune in lams LDEV-2174:

Changed Spring contexts to use ContextSingletonBeanFactoryLocator.

Added Ant task to slim JBoss.

· /lams_admin/conf/xdoclet/web-settings.xml (-8, +10) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml (-1, +1) | History | Source | Diff
· /lams_build/build.xml (-3, +84) | History | Source | Diff
· /lams_build/conf/j2ee/lams.application.xml (-6, +0) | History | Source | Diff
· /lams_build/conf/unix/jboss/ejb-deployer.slim.xml (-0, +69) | History | Source | Diff
· /lams_build/conf/unix/jboss/jboss-service.slim.xml (-0, +395) | History | Source | Diff
· /lams_build/conf/unix/jboss/standardjboss.slim.xml (-0, +1038) | History | Source | Diff
· /lams_build/conf/windows/jboss/ejb-deployer.slim.xml (-0, +69) | History | Source | Diff
· /lams_build/conf/windows/jboss/jboss-service.slim.xml (-0, +395) | History | Source | Diff
· /lams_build/conf/windows/jboss/standardjboss.slim.xml (-0, +1038) | History | Source | Diff
· /lams_build/deploy-tool/lib/lams-tool-deploy.jar (binary) | History | Source | Diff
· /lams_central/conf/xdoclet/web-settings.xml (-17, +9) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (-1, +1) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/webApplicationContext.xml (-1, +1) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml (-1, +1) | History | Source | Diff
… 16 more files in changeset.
]]> lams (MAIN): LDEV-2152: adding next activity icon tto system activities Mon, 02 Mar 2009 03:34:50 +0100 Ernie Ghiglione https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aernieg%3A20090302023450 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aernieg%3A20090302023450 Ernie Ghiglione committed MAIN:ernieg:20090302023450 on branch MAIN in lams LDEV-2152: adding next activity icon tto system activities

· /lams_learning/web/optionsActivity.jsp (-4, +17) | History | Source | Diff
· /lams_learning/web/WEB-INF/web.xml (-1, +10) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-0, +1) | History | Source | Diff
· /lams_learning/web/branching/preview.jsp (-4, +9) | History | Source | Diff
· /lams_learning/web/grouping/show.jsp (-2, +11) | History | Source | Diff
]]> lams (MAIN): LDEV-1299: Added some logic for the new &#034;condition gate&#034; that allows learners to pass depending on condition satisfactio... Tue, 16 Sep 2008 05:18:13 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20080916031813 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20080916031813 Marcin Cieslak committed MAIN:marcin:20080916031813 on branch MAIN in lams LDEV-1299: Added some logic for the new "condition gate" that allows learners to pass depending on condition satisfaction.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-30, +53) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-733, +827) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (-2, +12) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml (-1, +1) | History | Source | Diff
· /lams_common/conf/language/lams/ApplicationResources.properties (-1, +3) | History | Source | Diff
· /lams_common/conf/language/lams/ApplicationResources_en_AU.properties (-1, +6) | History | Source | Diff
· /lams_common/db/model/lams_11.clay (-2, +2) | History | Source | Diff
· /lams_common/db/sql/create_lams_11_tables.sql (-1, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (-380, +352) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java (-66, +61) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java (-159, +167) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java (-0, +144) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java (-13, +13) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java (-72, +73) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (-231, +402) | History | Source | Diff
… 22 more files in changeset.
]]> lams (MAIN): LDEV-1581: Added most of the logic for creating/managing learner&#039;s choice grouping. Thu, 11 Sep 2008 04:23:09 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20080911022309 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20080911022309 Marcin Cieslak committed MAIN:marcin:20080911022309 on branch MAIN in lams LDEV-1581: Added most of the logic for creating/managing learner's choice grouping.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-675, +803) | History | Source | Diff
· /lams_central/web/lams_authoring.swf (binary) | History | Source | Diff
· /lams_central/web/lams_authoring_library.swf (binary) | History | Source | Diff
· /lams_central/web/WEB-INF/lams.tld (-5, +0) | History | Source | Diff
· /lams_central/web/WEB-INF/web.xml (-60, +60) | History | Source | Diff
· /lams_central/web/WEB-INF/struts/struts-config.xml (-154, +154) | History | Source | Diff
· /lams_central/web/flashxml/configData.xml (-0, +1) | History | Source | Diff
· /lams_central/web/flashxml/contributorData.xml (-0, +104) | History | Source
· /lams_central/web/flashxml/defaultTheme.xml (-0, +1) | History | Source | Diff
· /lams_central/web/flashxml/preloaderStyle.xml (-0, +1) | History | Source
· /lams_central/web/flashxml/authoring/ar_JO_dictionary.xml (-0, +1) | History | Source | Diff
· /lams_central/web/flashxml/authoring/bg_BG_dictionary.xml (-0, +1) | History | Source | Diff
· /lams_central/web/flashxml/authoring/cy_GB_dictionary.xml (-0, +1) | History | Source | Diff
· /lams_central/web/flashxml/authoring/da_DK_dictionary.xml (-0, +1) | History | Source | Diff
· /lams_central/web/flashxml/authoring/de_DE_dictionary.xml (-0, +1) | History | Source | Diff
… 122 more files in changeset.
]]> lams (MAIN): LDEV-1005: Added lesson name to headings, added help button, improved layout, improved browser compatibility on the page... Fri, 07 Mar 2008 01:33:37 +0100 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20080307003337 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20080307003337 fmalikoff committed MAIN:fmalikoff:20080307003337 on branch MAIN in lams LDEV-1005: Added lesson name to headings, added help button, improved layout, improved browser compatibility on the page sizing, added scrolling to the iframe, hide the branches that the user isn't doing, adding support for the jump ahead in preview.

· /lams_learning/web/main.jsp (-92, +0) | History | Source | Diff
· /lams_learning/web/mainflash.jsp (-0, +58) | History | Source
· /lams_learning/web/mainnoflash.jsp (-0, +72) | History | Source
· /lams_learning/web/progress.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/WEB-INF/web.xml (-0, +33) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-5, +5) | History | Source | Diff
· /lams_learning/web/WEB-INF/tags/LearnerFlashEnabled.tag (-1, +1) | History | Source | Diff
· /lams_learning/web/WEB-INF/tags/ProgressOutput.tag (-2, +6) | History | Source | Diff
· /lams_monitoring/src/java/org/.../lams/monitoring/service/ContributeActivitiesProcessor.java (-2, +2) | History | Source | Diff
]]> lams (MAIN): LDEV-1402: Support empty branches by going straight to the next activity - this will be supported in the authoring clien... Tue, 13 Nov 2007 12:50:18 +0100 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20071113115018 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20071113115018 fmalikoff committed MAIN:fmalikoff:20071113115018 on branch MAIN in lams LDEV-1402: Support empty branches by going straight to the next activity - this will be supported in the authoring client as a normal branch.

· /lams_learning/conf/language/lams/ApplicationResources.properties (-2, +1) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (-2, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java (-12, +13) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-3, +0) | History | Source | Diff
· /lams_learning/web/sequence/empty.jsp (-36, +0) | History | Source | Diff
]]> lams (MAIN): LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branc... Fri, 27 Jul 2007 07:13:24 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070727051324 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070727051324 fmalikoff committed MAIN:fmalikoff:20070727051324 on branch MAIN in lams LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times.

· /lams_learning/conf/language/lams/ApplicationResources.properties (-2, +2) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (-2, +2) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-forms.xml (-0, +2) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-0, +7) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-0, +4) | History | Source | Diff
· /lams_learning/web/branching/preview.jsp (-0, +139) | History | Source
· /lams_learning/web/branching/wait.jsp (-5, +0) | History | Source | Diff
]]> lams (MAIN): LDEV-1134: Branching: View screen for the class export portfolio Tue, 17 Jul 2007 03:27:11 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070717012711 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070717012711 fmalikoff committed MAIN:fmalikoff:20070717012711 on branch MAIN in lams LDEV-1134: Branching: View screen for the class export portfolio

· /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java (-33, +51) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (-19, +16) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-1, +1) | History | Source | Diff
· /lams_learning/web/branching/wait.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/layout/branchingWaitLayout.jsp (-1, +1) | History | Source | Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingExportPortfolioServlet.java (-0, +69) | History | Source
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java (-30, +62) | History | Source | Diff
· /lams_monitoring/web/WEB-INF/web.xml (-0, +9) | History | Source | Diff
· /lams_monitoring/web/branching/viewBranches.jsp (-2, +3) | History | Source | Diff
· /lams_monitoring/web/template/template.jsp (-3, +5) | History | Source | Diff
]]> lams (MAIN): Refactoring code so that all screens can update the progress bar. Thu, 12 Jul 2007 02:59:02 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070712005902 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070712005902 fmalikoff committed MAIN:fmalikoff:20070712005902 on branch MAIN in lams Refactoring code so that all screens can update the progress bar.

· /lams_learning/conf/xdoclet/struts-forms.xml (-2, +13) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (-97, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java (-4, +6) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (-4, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-7, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java (-3, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/action/DisplayParallelActivityAction.java (-4, +6) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java (-3, +5) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-11, +13) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-5, +4) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java (-3, +4) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java (-12, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (-4, +9) | History | Source | Diff
… 4 more files in changeset.
]]> lams (MAIN): Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two plac... Thu, 28 Jun 2007 08:49:36 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070628064936 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070628064936 fmalikoff committed MAIN:fmalikoff:20070628064936 on branch MAIN in lams Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two places.

· /lams_learning/build.xml (-0, +2) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources.properties (-3, +7) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (-1, +6) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-forms.xml (-0, +9) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml (-20, +18) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-37, +24) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java (-1, +18) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-19, +122) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (-9, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java (-52, +72) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-10, +2) | History | Source | Diff
… 11 more files in changeset.
]]> lams (MAIN): Merging RAMS and Edit On Fly changes from branch to the head. Wed, 09 May 2007 02:51:07 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070509005107 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070509005107 fmalikoff committed MAIN:fmalikoff:20070509005107 on branch MAIN in lams Merging RAMS and Edit On Fly changes from branch to the head.

· /lams_learning/conf/xdoclet/struts-actions.xml (-0, +3) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-forms.xml (-1, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-32, +111) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java (-14, +17) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-46, +82) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (-3, +15) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (-9, +11) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-26, +27) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java (-3, +6) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-1, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-24, +45) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-8, +17) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (-5, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java (-1, +11) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-77, +48) | History | Source | Diff
… 145 more files in changeset.
]]> lams (editonfly_branching): Removing LAMS from titles Sun, 29 Apr 2007 12:54:08 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070429105408 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070429105408 fmalikoff committed editonfly_branching:fmalikoff:20070429105408 on branch editonfly_branching in lams Removing LAMS from titles

· /lams_learning/web/WEB-INF/web.xml (-0, +1) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-28, +19) | History | Source | Diff
· /lams_learning/web/layout/gateLayout.jsp (-4, +1) | History | Source | Diff
· /lams_learning/web/layout/groupWaitLayout.jsp (-4, +1) | History | Source | Diff
· /lams_learning/web/layout/layout.jsp (-2, +3) | History | Source | Diff
]]> lams (editonfly_branching): Trying to make progress engine cope with &#034;holes&#034; in the progress ie if the user&#039;s current activity disappears (e.g. temp... Wed, 28 Mar 2007 08:41:35 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070328064135 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=editonfly_branching%3Afmalikoff%3A20070328064135 fmalikoff committed editonfly_branching:fmalikoff:20070328064135 on branch editonfly_branching in lams Trying to make progress engine cope with "holes" in the progress ie if the user's current activity disappears (e.g. temporary system gate and live edit end)

· /lams_learning/conf/language/lams/ApplicationResources.properties (-2, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-9, +20) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-20, +56) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (-9, +11) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-16, +19) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-1, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-21, +34) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (-4, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-2, +6) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-2, +2) | History | Source | Diff
· /lams_learning/web/progressBroken.jsp (-0, +37) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-19, +10) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-0, +4) | History | Source | Diff
· /lams_learning/web/gate/gateNext.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/layout/gateLayout.jsp (-1, +1) | History | Source | Diff
]]> lams (MAIN): journal entries page for teachers - accessible from Monitor (learners tab) Wed, 04 Oct 2006 09:56:47 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20061004075647 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20061004075647 mseaton committed MAIN:mseaton:20061004075647 on branch MAIN in lams journal entries page for teachers - accessible from Monitor (learners tab)

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java (-2, +5) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/notebook/model/NotebookEntry.hbm.xml (-5, +10) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-0, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java (-0, +3) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java (-0, +8) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/model/NotebookEntry.java (-8, +13) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java (-2, +23) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java (-0, +6) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources.properties (-1, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java (-3, +72) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-0, +3) | History | Source | Diff
· /lams_learning/web/exportPortfolio/notebook.jsp (-2, +2) | History | Source | Diff
· /lams_learning/web/notebook/addnew.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/notebook/view.jsp (-2, +14) | History | Source | Diff
· /lams_learning/web/notebook/viewall.jsp (-6, +6) | History | Source | Diff
· /lams_learning/web/notebook/viewalljournals.jsp (-0, +90) | History | Source
]]> lams (MAIN): my notes - add/edit/view notes/journal entries Fri, 29 Sep 2006 08:23:10 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060929062310 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060929062310 mseaton committed MAIN:mseaton:20060929062310 on branch MAIN in lams my notes - add/edit/view notes/journal entries

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/flash/org/lamsfoundation/lams/learner/Scratchpad.as (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/notebook/web/StoreNBEntryServlet.java (-4, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml (-1, +20) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources.properties (-8, +22) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-actions.xml (-1, +4) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-forms.xml (-1, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java (-7, +82) | History | Source | Diff
· /lams_learning/web/lams_learner.swf (binary) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-1, +10) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-0, +3) | History | Source | Diff
· /lams_learning/web/notebook/addnew.jsp (-14, +15) | History | Source | Diff
· /lams_learning/web/notebook/view.jsp (-0, +119) | History | Source
· /lams_learning/web/notebook/viewall.jsp (-16, +26) | History | Source | Diff
]]> lams (MAIN): notebook view all page (popup jsp) + add notebook entry or journal (not quite ready) (popup jsp) Thu, 28 Sep 2006 10:04:52 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060928080452 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060928080452 mseaton committed MAIN:mseaton:20060928080452 on branch MAIN in lams notebook view all page (popup jsp) + add notebook entry or journal (not quite ready) (popup jsp)

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/INotebookEntryDAO.java (-0, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/dao/hibernate/NotebookEntryDAO.java (-2, +9) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookConstants.java (-0, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/CoreNotebookService.java (-0, +4) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/IExtendedCoreNotebookService.java (-0, +1) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources.properties (-6, +20) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-actions.xml (-1, +1) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-forms.xml (-0, +7) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java (-0, +164) | History | Source | Diff
· /lams_learning/web/lams_learner.swf (binary) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-1, +32) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-1, +11) | History | Source | Diff
· /lams_learning/web/layout/layout.jsp (-1, +3) | History | Source | Diff
· /lams_learning/web/notebook/addnew.jsp (-0, +78) | History | Source
· /lams_learning/web/notebook/viewall.jsp (-0, +93) | History | Source
]]> lams (MAIN): Updated address of FSF in copyright statement Sun, 17 Sep 2006 08:09:25 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060917060925 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060917060925 fmalikoff committed MAIN:fmalikoff:20060917060925 on branch MAIN in lams Updated address of FSF in copyright statement

· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/AbstractTest.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/AbstractTestManager.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/Call.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/Main.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/MockUser.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/PropertyFileTestManager.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestHarnessException.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestReporter.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestSuite.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/TestUtil.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/AdminTest.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/admin/MockAdmin.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/AuthorTest.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/author/MockAuthor.java (-1, +1) | History | Source | Diff
· /TestHarness4LAMS2/src/org/lamsfoundation/testharness/learner/LearnerTest.java (-1, +1) | History | Source | Diff
… 571 more files in changeset.
]]> lams (MAIN): close learner (tool activity) popup window on &#039;finish&#039; click if tool session/activity completed LDEV-506 Fri, 11 Aug 2006 04:03:36 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060811020336 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060811020336 mseaton committed MAIN:mseaton:20060811020336 on branch MAIN in lams close learner (tool activity) popup window on 'finish' click if tool session/activity completed LDEV-506

· /lams_learning/conf/language/ApplicationResources.properties (-0, +3) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-actions.xml (-1, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-3, +10) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-1, +8) | History | Source | Diff
· /lams_learning/web/close.jsp (-0, +43) | History | Source
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-33, +11) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-0, +4) | History | Source | Diff
]]> lams (MAIN): Exception handler define for STRUTS. Tue, 25 Jul 2006 08:01:51 +0200 steven https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Asteven%3A20060725060151 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Asteven%3A20060725060151 steven committed MAIN:steven:20060725060151 on branch MAIN in lams Exception handler define for STRUTS.

· /lams_central/conf/xdoclet/error-pages.xml (-0, +13) | History | Source
· /lams_central/conf/xdoclet/global-exceptions.xml (-0, +8) | History | Source
· /lams_central/web/403.jsp (-0, +6) | History | Source
· /lams_central/web/404.jsp (-0, +8) | History | Source
· /lams_central/web/error.jsp (-0, +63) | History | Source
· /lams_central/web/WEB-INF/lams.tld (-4, +1) | History | Source | Diff
· /lams_central/web/css/default.css (-7, +7) | History | Source | Diff
· /lams_learning/conf/xdoclet/error-pages.xml (-0, +13) | History | Source | Diff
· /lams_learning/conf/xdoclet/global-exceptions.xml (-0, +8) | History | Source
· /lams_learning/src/java/org/lamsfoundation/lams/learning/util/CustomStrutsExceptionHandler.java (-105, +0) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java (-4, +0) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-5, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-5, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (-5, +1) | History | Source | Diff
· /lams_learning/web/403.jsp (-0, +6) | History | Source
… 15 more files in changeset.
]]> lams (MAIN): Lost the body tags from the loadToolActivity and previewDefineLater pages. Mon, 03 Jul 2006 08:25:48 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060703062548 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060703062548 fmalikoff committed MAIN:fmalikoff:20060703062548 on branch MAIN in lams Lost the body tags from the loadToolActivity and previewDefineLater pages.

· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-2, +0) | History | Source | Diff
]]> lams (MAIN): Converted to the learner content styles Sat, 01 Jul 2006 14:49:10 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060701124910 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060701124910 fmalikoff committed MAIN:fmalikoff:20060701124910 on branch MAIN in lams Converted to the learner content styles

· /lams_learning/conf/xdoclet/struts-forms.xml (-0, +1) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-1, +7) | History | Source | Diff
· /lams_learning/web/error.jsp (-6, +22) | History | Source | Diff
· /lams_learning/web/exit.jsp (-27, +0) | History | Source | Diff
· /lams_learning/web/exportWaitingPage.jsp (-5, +16) | History | Source | Diff
· /lams_learning/web/lessonComplete.jsp (-4, +18) | History | Source | Diff
· /lams_learning/web/loadToolActivity.jsp (-5, +23) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-15, +28) | History | Source | Diff
· /lams_learning/web/partialCompleted.jsp (-3, +18) | History | Source | Diff
· /lams_learning/web/previewDefineLater.jsp (-6, +22) | History | Source | Diff
· /lams_learning/web/welcome.jsp (-1, +18) | History | Source | Diff
· /lams_learning/web/WEB-INF/web.xml (-6, +1) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-0, +1) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-19, +8) | History | Source | Diff
· /lams_learning/web/css/learner.css (-341, +0) | History | Source | Diff
… 11 more files in changeset.
]]> lams (MAIN): Implementing gate and grouping screens for export portfolio. Wed, 21 Jun 2006 14:02:40 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060621120240 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060621120240 fmalikoff committed MAIN:fmalikoff:20060621120240 on branch MAIN in lams Implementing gate and grouping screens for export portfolio.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-5, +28) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml (-0, +1) | History | Source | Diff
· /lams_central/web/WEB-INF/lams.tld (-2, +8) | History | Source | Diff
· /lams_central/web/WEB-INF/struts/struts-config.xml (-4, +7) | History | Source | Diff
· /lams_central/web/WEB-INF/tags/ExportPortOutput.tag (-0, +59) | History | Source
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (-49, +60) | History | Source | Diff
· /lams_common/db/model/lams_11.clay (-2441, +2468) | History | Source | Diff
· /lams_common/db/sql/create_lams_11_tables.sql (-1, +5) | History | Source | Diff
· /lams_common/db/sql/insert_types_data.sql (-6, +9) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (-3, +32) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java (-3, +6) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java (-23, +8) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java (-25, +3) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (-26, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java (-26, +7) | History | Source | Diff
… 28 more files in changeset.
]]> lams (MAIN): Added the define later special screen code to the wrong Action class. Thu, 15 Jun 2006 03:07:16 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060615010716 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060615010716 fmalikoff committed MAIN:fmalikoff:20060615010716 on branch MAIN in lams Added the define later special screen code to the wrong Action class.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java (-21, +9) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java (-3, +19) | History | Source | Diff
· /lams_learning/web/previewDefineLater.jsp (-1, +2) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-0, +5) | History | Source | Diff
]]> lams (MAIN): Preview changes: (1) when define later activity occurs don&#039;t tell the tool that it is define later but display a special... Thu, 15 Jun 2006 01:13:29 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060614231329 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060614231329 fmalikoff committed MAIN:fmalikoff:20060614231329 on branch MAIN in lams Preview changes: (1) when define later activity occurs don't tell the tool that it is define later but display a special screen before going to the next tool (2) for chosen grouping, schedule and permission gates show the normal page with an extra preview message then override the normal process and continue.

Also part A of a change to the Flash call to get the learner progress - it should take the lesson id not the progress id.

· /lams_learning/conf/language/ApplicationResources.properties (-5, +21) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-forms.xml (-0, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java (-7, +13) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-17, +42) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java (-10, +22) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java (-4, +17) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-3, +17) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (-3, +9) | History | Source | Diff
· /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (-4, +4) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/previewDefineLater.jsp (-0, +43) | History | Source
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-0, +7) | History | Source | Diff
· /lams_learning/web/gate/gateNext.jsp (-11, +20) | History | Source | Diff
· /lams_learning/web/grouping/show.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/grouping/wait.jsp (-3, +15) | History | Source | Diff
]]> lams (MAIN): Call passon to update the progress bar on tool pages, optional activities and the completed screen.... Sun, 11 Jun 2006 04:48:34 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060611024834 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060611024834 fmalikoff committed MAIN:fmalikoff:20060611024834 on branch MAIN in lams Call passon to update the progress bar on tool pages, optional activities and the completed screen.

Should also cope with the user partially doing an optional activity, continuing on in the design, then coming back later to the optional activity to do more, and then going back to where they were up to in the sequence before jumping back.

· /lams_build/lib/lams/lams-learning.jar (binary) | History | Source | Diff
· /lams_learning/conf/language/ApplicationResources.properties (-9, +9) | History | Source | Diff
· /lams_learning/conf/xdoclet/struts-actions.xml (-3, +0) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-29, +57) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (-6, +70) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (-3, +7) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-1, +5) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java (-58, +8) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-1, +4) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/action/DisplayParallelActivityAction.java (-1, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java (-1, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java (-0, +69) | History | Source
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java (-2, +5) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-49, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java (-2, +2) | History | Source | Diff
… 4 more files in changeset.
]]> lams (MAIN): Bad definition for the group wait page. Tue, 06 Jun 2006 06:37:01 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060606043701 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060606043701 fmalikoff committed MAIN:fmalikoff:20060606043701 on branch MAIN in lams Bad definition for the group wait page.

· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-0, +7) | History | Source | Diff
]]> lams (MAIN): Added support for chosen grouping. Tue, 06 Jun 2006 04:35:26 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060606023526 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060606023526 fmalikoff committed MAIN:fmalikoff:20060606023526 on branch MAIN in lams Added support for chosen grouping.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java (-1, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-2, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (-3, +3) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-5, +5) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java (-9, +7) | History | Source | Diff
· /lams_learning/web/dummyControlFrame.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-3, +3) | History | Source | Diff
· /lams_learning/web/requestURL.jsp (-3, +0) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/struts-config.xml (-2, +7) | History | Source | Diff
· /lams_learning/web/WEB-INF/struts/tiles-defs.xml (-3, +8) | History | Source | Diff
· /lams_learning/web/grouping/show.jsp (-1, +1) | History | Source | Diff
]]>