Fisheye on lams/lams_learning/web/optionsActivity.jsp https://code.lamsfoundation.org/fisheye/changelog/lams/lams_learning/web/optionsActivity.jsp Recent activity in "lams" under directory /lams_learning/web/optionsActivity.jsp lams (lams2_head_wildfly): LDEV-3724: updating LAMS Learning to bootstrap Sun, 13 Mar 2016 06:37:52 +0100 Ernie Ghiglione https://code.lamsfoundation.org/fisheye/changelog/lams?cs=lams2_head_wildfly%3Aernieg%3A20160313053752 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=lams2_head_wildfly%3Aernieg%3A20160313053752 Ernie Ghiglione committed lams2_head_wildfly:ernieg:20160313053752 on branch lams2_head_wildfly in lams LDEV-3724: updating LAMS Learning to bootstrap

· /lams_learning/web/close.jsp (-7, +3) | History | Source | Diff
· /lams_learning/web/lessonComplete.jsp (-22, +18) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-139, +124) | History | Source | Diff
· /lams_learning/web/partialCompleted.jsp (-10, +8) | History | Source | Diff
· /lams_learning/web/progressBroken.jsp (-7, +2) | History | Source | Diff
· /lams_learning/web/welcome.jsp (-17, +11) | History | Source | Diff
]]> lams (MAIN): LDEV-3113: Remove Flash Learner. Remove unnecessary SWF, tag and other files, along with methods in service classes. Tue, 03 Sep 2013 12:54:45 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20130903105445 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20130903105445 Marcin Cieslak committed MAIN:marcin:20130903105445 on branch MAIN in lams LDEV-3113: Remove Flash Learner. Remove unnecessary SWF, tag and other files, along with methods in service classes.

· /lams_admin/conf/xdoclet/struts-forms.xml (-1, +0) | History | Source | Diff
· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (-2, +1) | History | Source | Diff
· /lams_admin/web/user.jsp (-19, +1) | History | Source | Diff
· /lams_admin/web/WEB-INF/tags/Passon.tag (-86, +0) | History | Source | Diff
· /lams_admin/web/WEB-INF/tlds/lams/lams.tld (-45, +6) | History | Source | Diff
· /lams_build/build.xml (-0, +2) | History | Source | Diff
· /lams_build/lib/lams/lams-central.jar (binary) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/conf/flashxml/lams/learner/ar_JO_dictionary.xml (-1, +0) | History | Source | Diff
· /lams_central/conf/flashxml/lams/learner/ca_ES_dictionary.xml (-1, +0) | History | Source | Diff
· /lams_central/conf/flashxml/lams/learner/cs_CZ_dictionary.xml (-1, +0) | History | Source | Diff
· /lams_central/conf/flashxml/lams/learner/cy_GB_dictionary.xml (-1, +0) | History | Source | Diff
· /lams_central/conf/flashxml/lams/learner/da_DK_dictionary.xml (-1, +0) | History | Source | Diff
· /lams_central/conf/flashxml/lams/learner/de_DE_dictionary.xml (-1, +0) | History | Source | Diff
· /lams_central/conf/flashxml/lams/learner/el_GR_dictionary.xml (-1, +0) | History | Source | Diff
… 145 more files in changeset.
]]> lams (MAIN): LDEV-3092: Don't display the must complete label unless there are completing restrictions Tue, 13 Aug 2013 01:02:59 +0200 Ernie Ghiglione https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aernieg%3A20130812230259 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aernieg%3A20130812230259 Ernie Ghiglione committed MAIN:ernieg:20130812230259 on branch MAIN in lams LDEV-3092: Don't display the must complete label unless there are completing restrictions

· /lams_learning/web/optionsActivity.jsp (-16, +18) | History | Source | Diff
]]> lams (MAIN): LDEV-3026: Add utilities for getting activity position. Make Tools position-aware and display different label if they ar... Tue, 09 Apr 2013 14:45:26 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20130409124526 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20130409124526 Marcin Cieslak committed MAIN:marcin:20130409124526 on branch MAIN in lams LDEV-3026: Add utilities for getting activity position. Make Tools position-aware and display different label if they are last in LD.

· /lams_build/lib/lams/lams-learning.jar (binary) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (-1, +2) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources.properties (-1, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java (-5, +10) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-65, +190) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-3, +4) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java (-2, +5) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityPositionDTO.java (-0, +60) | History | Source
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java (-20, +54) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-1, +10) | History | Source | Diff
· /lams_learning/web/grouping/show.jsp (-1, +10) | History | Source | Diff
· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties (-2, +3) | History | Source | Diff
· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java (-2, +11) | History | Source | Diff
· /lams_tool_assessment/web/pages/learning/learning.jsp (-2, +10) | History | Source | Diff
… 168 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): For LDEV-1874, max optional activities was implemented, but not max number of optional sequences, this has been fixed Mon, 21 Jul 2008 09:12:19 +0200 lfoxton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Alfoxton%3A20080721071219 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Alfoxton%3A20080721071219 lfoxton committed MAIN:lfoxton:20080721071219 on branch MAIN in lams For LDEV-1874, max optional activities was implemented, but not max number of optional sequences, this has been fixed

· /lams_learning/conf/language/lams/ApplicationResources.properties (-2, +3) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (-2, +3) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-3, +13) | History | Source | Diff
]]> lams (MAIN): For LDEV-1784. When the max number of optional activities has been reached, the choose button on the optional activity s... Wed, 16 Jul 2008 08:09:41 +0200 lfoxton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Alfoxton%3A20080716060941 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Alfoxton%3A20080716060941 lfoxton committed MAIN:lfoxton:20080716060941 on branch MAIN in lams For LDEV-1784. When the max number of optional activities has been reached, the choose button on the optional activity summary page will not appear, instead a message appears telling the user that they have reached the maximum number of optionals.

Also added a tick image to signify which activities were completed

· /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/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-1, +7) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java (-1, +8) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-8, +25) | History | Source | Diff
]]> lams (MAIN): LDEV-1788 customise text to use alternative text for optional sequences as opposed to optional activities. Fri, 30 May 2008 04:36:38 +0200 jliew https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Ajliew%3A20080530023638 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Ajliew%3A20080530023638 jliew committed MAIN:jliew:20080530023638 on branch MAIN in lams LDEV-1788 customise text to use alternative text for optional sequences as opposed to optional activities.

· /lams_learning/conf/language/lams/ApplicationResources.properties (-1, +4) | History | Source | Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (-2, +4) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-8, +40) | History | Source | Diff
]]> lams (MAIN): LDEV-1642 display different note if there's a maximum no. of activities involved Thu, 29 May 2008 09:18:06 +0200 jliew https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Ajliew%3A20080529071806 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Ajliew%3A20080529071806 jliew committed MAIN:jliew:20080529071806 on branch MAIN in lams LDEV-1642 display different note if there's a maximum no. of activities involved

· /lams_learning/web/optionsActivity.jsp (-1, +11) | History | Source | Diff
]]> lams (MAIN): LDEV-1732... Wed, 21 May 2008 07:31:10 +0200 asukkar https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aasukkar%3A20080521053110 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aasukkar%3A20080521053110 asukkar committed MAIN:asukkar:20080521053110 on branch MAIN in lams LDEV-1732

Moved the 'Choose' button to the center.

· /lams_learning/web/optionsActivity.jsp (-1, +1) | History | Source | Diff
]]> lams (MAIN): LDEV-1642... Fri, 02 May 2008 02:45:55 +0200 asukkar https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aasukkar%3A20080502004555 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aasukkar%3A20080502004555 asukkar committed MAIN:asukkar:20080502004555 on branch MAIN in lams LDEV-1642

Improved page layout.

· /lams_learning/web/optionsActivity.jsp (-114, +108) | History | Source | Diff
· /lams_learning/web/common/taglibs.jsp (-0, +11) | History | Source
· /lams_learning/web/layout/branchingWaitLayout.jsp (-7, +1) | History | Source | Diff
· /lams_learning/web/layout/framesetLayout.jsp (-0, +70) | History | Source
· /lams_learning/web/layout/gateLayout.jsp (-7, +1) | History | Source | Diff
· /lams_learning/web/layout/groupWaitLayout.jsp (-7, +1) | History | Source | Diff
· /lams_learning/web/layout/layout.jsp (-35, +36) | History | Source | Diff
]]> lams (MAIN): LDEV-1005: Implementing a non-Flash learner interface Wed, 05 Mar 2008 08:29:02 +0100 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20080305072902 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20080305072902 fmalikoff committed MAIN:fmalikoff:20080305072902 on branch MAIN in lams LDEV-1005: Implementing a non-Flash learner interface

· /lams_admin/conf/language/lams/ApplicationResources.properties (-1, +2) | History | Source | Diff
· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties (-1, +2) | History | Source | Diff
· /lams_central/conf/language/lams/ApplicationResources.properties (-1, +4) | History | Source | Diff
· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties (-2, +4) | History | Source | Diff
· /lams_central/conf/xdoclet/struts-forms.xml (-0, +1) | History | Source | Diff
· /lams_central/conf/xdoclet/taglib-tag.xml (-0, +8) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/tag/ConfigurationTag.java (-0, +93) | History | Source
· /lams_central/web/editprofile.jsp (-0, +35) | History | Source | Diff
· /lams_central/web/WEB-INF/lams.tld (-51, +79) | History | Source | Diff
· /lams_central/web/WEB-INF/struts/struts-config.xml (-59, +91) | History | Source | Diff
· /lams_central/web/WEB-INF/tags/LearnerFlashEnabled.tag (-0, +45) | History | Source
· /lams_central/web/WEB-INF/tags/ProgressOutput.tag (-0, +75) | History | Source
· /lams_central/web/css/thickbox.css (-0, +141) | History | Source
· /lams_central/web/images/loadingAnimation.gif (binary) | History | Source
· /lams_central/web/images/macFFBgHack.png (binary) | History | Source
… 37 more files in changeset.
]]> lams (MAIN): LDEV-1051 and LDEV-1198: Fixed the break out of frames logic for parallels at the end of a design and inside an optiona... Wed, 16 May 2007 01:39:52 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070515233952 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20070515233952 fmalikoff committed MAIN:fmalikoff:20070515233952 on branch MAIN in lams LDEV-1051 and LDEV-1198: Fixed the break out of frames logic for parallels at the end of a design and inside an optional activity.

· /lams_build/lib/lams/lams-learning.jar (binary) | History | Source | Diff
· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml (-1, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java (-4, +11) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-8, +21) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java (-2, +4) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java (-10, +7) | 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/form/OptionsActivityForm.java (-2, +9) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java (-16, +23) | History | Source | Diff
· /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java (-16, +29) | History | Source | Diff
· /lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestDisplayActivityAction.java (-2, +3) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-0, +2) | History | Source | Diff
]]> 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): Trying to make progress engine cope with "holes" in the progress ie if the user'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): Removed the description column - its no longer available in authoring so all it contains is the default activity descrip... Thu, 16 Nov 2006 02:07:33 +0100 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20061116010733 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20061116010733 fmalikoff committed MAIN:fmalikoff:20061116010733 on branch MAIN in lams Removed the description column - its no longer available in authoring so all it contains is the default activity description

· /lams_learning/web/optionsActivity.jsp (-2, +1) | History | Source | Diff
]]> lams (MAIN): Added cellspacing=0 to table using alternative-color Thu, 09 Nov 2006 06:36:44 +0100 asukkar https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aasukkar%3A20061109053644 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Aasukkar%3A20061109053644 asukkar committed MAIN:asukkar:20061109053644 on branch MAIN in lams Added cellspacing=0 to table using alternative-color

· /lams_admin/web/disabledusers.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/register.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/user.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/userlist.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/userorg.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/userorgrole.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/usersearchlist.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/config/editconfig.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/toolcontent/toolcontentlist.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/grouping/show.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/notebook/viewall.jsp (-2, +2) | History | Source | Diff
· /lams_learning/web/notebook/viewalljournals.jsp (-2, +2) | History | Source | Diff
· /lams_monitoring/web/grouping/viewGroups.jsp (-1, +1) | History | Source | Diff
· /lams_tool_forum/web/jsps/authoring/message/topiclist.jsp (-1, +1) | History | Source | Diff
… 14 more files in changeset.
]]> lams (MAIN): Fixing the probem breaking out of a parallel activity within an optional activity. Rather than trying to fix it in the w... Mon, 30 Oct 2006 00:29:58 +0100 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20061029232958 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20061029232958 fmalikoff committed MAIN:fmalikoff:20061029232958 on branch MAIN in lams Fixing the probem breaking out of a parallel activity within an optional activity. Rather than trying to fix it in the web layer, I've changed the progress engine so that as it processes up the hierarchy of complex activityes, it sets any completed complex activities to be the previous activity. Then the web layer works correctly.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java (-2, +4) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (-11, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-10, +2) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-5, +0) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java (-10, +1) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-2, +0) | History | Source | Diff
]]> lams (MAIN): fixed for finishing optional act when inside parallel act frame Tue, 24 Oct 2006 07:13:52 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20061024051352 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20061024051352 mseaton committed MAIN:mseaton:20061024051352 on branch MAIN in lams fixed for finishing optional act when inside parallel act frame

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java (-3, +11) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-0, +2) | History | Source | Diff
]]> lams (MAIN): fixed escaping from parallel frames when running parallel act as an option in optional activity ldev-817 Tue, 24 Oct 2006 06:40:05 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20061024044005 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20061024044005 mseaton committed MAIN:mseaton:20061024044005 on branch MAIN in lams fixed escaping from parallel frames when running parallel act as an option in optional activity ldev-817

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java (-3, +12) | History | Source | Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java (-1, +6) | 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 (-7, +16) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-1, +2) | History | Source | Diff
]]> lams (MAIN): Tweak spacing on buttons Fri, 29 Sep 2006 03:15:33 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060929011533 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060929011533 fmalikoff committed MAIN:fmalikoff:20060929011533 on branch MAIN in lams Tweak spacing on buttons

· /lams_learning/web/optionsActivity.jsp (-0, +2) | History | Source | Diff
]]> lams (MAIN): Added "copy-tags" to the build to make it easier to update the tags.... Fri, 29 Sep 2006 01:24:42 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060928232442 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060928232442 fmalikoff committed MAIN:fmalikoff:20060928232442 on branch MAIN in lams Added "copy-tags" to the build to make it easier to update the tags.

Updated the jsp pages to support stripes and the separate learner stylesheet.

· /lams_admin/build.xml (-0, +9) | History | Source | Diff
· /lams_admin/web/error.jsp (-1, +1) | History | Source | Diff
· /lams_admin/web/template.jsp (-2, +2) | History | Source | Diff
· /lams_admin/web/WEB-INF/lams.tld (-0, +8) | History | Source | Diff
· /lams_admin/web/WEB-INF/web.xml (-6, +13) | History | Source | Diff
· /lams_admin/web/WEB-INF/tags/Tab.tag (-26, +26) | History | Source | Diff
· /lams_admin/web/WEB-INF/tags/headItems.tag (-1, +2) | History | Source | Diff
· /lams_central/build.xml (-1, +0) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java (-1, +32) | History | Source | Diff
· /lams_central/web/addLesson.jsp (-1, +1) | History | Source | Diff
· /lams_central/web/admin.jsp (-8, +3) | History | Source | Diff
· /lams_central/web/author.jsp (-2, +2) | History | Source | Diff
· /lams_central/web/authoringConfirm.jsp (-20, +16) | History | Source | Diff
· /lams_central/web/copyright.jsp (-2, +2) | History | Source | Diff
· /lams_central/web/index.jsp (-8, +3) | History | Source | Diff
… 256 more files in changeset.
]]> 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): Converting to the new CSS look Thu, 29 Jun 2006 01:10:03 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060628231003 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060628231003 fmalikoff committed MAIN:fmalikoff:20060628231003 on branch MAIN in lams Converting to the new CSS look

· /lams_learning/web/error.jsp (-11, +4) | History | Source | Diff
· /lams_learning/web/exit.jsp (-10, +3) | History | Source | Diff
· /lams_learning/web/exportWaitingPage.jsp (-2, +5) | History | Source | Diff
· /lams_learning/web/lessonComplete.jsp (-4, +3) | History | Source | Diff
· /lams_learning/web/loadToolActivity.jsp (-10, +2) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-97, +46) | History | Source | Diff
· /lams_learning/web/partialCompleted.jsp (-5, +2) | History | Source | Diff
· /lams_learning/web/previewDefineLater.jsp (-15, +6) | History | Source | Diff
· /lams_learning/web/welcome.jsp (-10, +1) | History | Source | Diff
· /lams_learning/web/exportPortfolio/main.jsp (-17, +27) | History | Source | Diff
· /lams_learning/web/exportPortfolio/notSupported.jsp (-0, +6) | History | Source | Diff
· /lams_learning/web/gate/gateNext.jsp (-17, +11) | History | Source | Diff
· /lams_learning/web/gate/permissionGateContent.jsp (-6, +3) | History | Source | Diff
· /lams_learning/web/gate/scheduleGateContent.jsp (-9, +4) | History | Source | Diff
· /lams_learning/web/gate/synchGateContent.jsp (-18, +7) | History | Source | Diff
… 17 more files in changeset.
]]> lams (MAIN): The activityId was changed to activityID in a previous check in, but the change seems to have got lost. Mon, 19 Jun 2006 09:12:57 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060619071257 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060619071257 fmalikoff committed MAIN:fmalikoff:20060619071257 on branch MAIN in lams The activityId was changed to activityID in a previous check in, but the change seems to have got lost.

· /lams_learning/web/optionsActivity.jsp (-1, +1) | History | Source | Diff
]]> lams (MAIN): appended id to unique connection name to avoid conflicts with preview/learner Mon, 19 Jun 2006 05:48:29 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060619034829 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060619034829 mseaton committed MAIN:mseaton:20060619034829 on branch MAIN in lams appended id to unique connection name to avoid conflicts with preview/learner

· /lams_central/src/flash/learnerProgress_lc.fla (binary) | History | Source | Diff
· /lams_central/src/flash/main2.as (binary) | History | Source | Diff
· /lams_central/web/WEB-INF/lams.tld (-11, +20) | History | Source | Diff
· /lams_central/web/WEB-INF/tags/Passon.tag (binary) | History | Source | Diff
· /lams_learning/web/controlFrame.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/lams_learner.swf (binary) | History | Source | Diff
· /lams_learning/web/lessonComplete.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/loadToolActivity.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/main.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-2, +2) | History | Source | Diff
· /lams_learning/web/passon.swf (binary) | History | Source | Diff
· /lams_learning/web/WEB-INF/lams.tld (-11, +20) | History | Source | Diff
· /lams_learning/web/WEB-INF/tags/Passon.tag (binary) | History | Source | Diff
]]> lams (MAIN): Adding lessonID to the activity form, so that the passon.swf can have it separately and make it part of the connection n... Mon, 19 Jun 2006 05:34:57 +0200 fmalikoff https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060619033457 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Afmalikoff%3A20060619033457 fmalikoff committed MAIN:fmalikoff:20060619033457 on branch MAIN in lams Adding lessonID to the activity form, so that the passon.swf can have it separately and make it part of the connection name.

Changed form.activityId to form.activityID for consistency.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java (-7, +8) | 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 (-2, +2) | 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/form/ActivityForm.java (-6, +17) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-1, +1) | History | Source | Diff
]]> lams (MAIN): Preview changes: (1) when define later activity occurs don'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): used generate ID tag in passon tag to retrieve id from shared session Tue, 13 Jun 2006 02:47:57 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060613004757 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060613004757 mseaton committed MAIN:mseaton:20060613004757 on branch MAIN in lams used generate ID tag in passon tag to retrieve id from shared session

· /lams_central/web/WEB-INF/tags/Passon.tag (binary) | History | Source | Diff
· /lams_learning/web/controlFrame.jsp (-3, +0) | History | Source | Diff
· /lams_learning/web/lessonComplete.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/loadToolActivity.jsp (-5, +1) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/WEB-INF/tags/Passon.tag (binary) | History | Source | Diff
]]> lams (MAIN): added uniqueID param to custom tag Passon Sun, 11 Jun 2006 09:57:55 +0200 mseaton https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060611075755 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amseaton%3A20060611075755 mseaton committed MAIN:mseaton:20060611075755 on branch MAIN in lams added uniqueID param to custom tag Passon

· /lams_learning/web/lessonComplete.jsp (-1, +1) | History | Source | Diff
· /lams_learning/web/loadToolActivity.jsp (-2, +8) | History | Source | Diff
· /lams_learning/web/optionsActivity.jsp (-1, +1) | History | Source | Diff
]]>