Fisheye on lams-github/lams_learning/web/optionsActivity.jsp

lams-github (v4.8): LDEV-5397 update to reflect the latest changes done to optionsActivity.jsp

Andrey Balan — Wed, 10 Jan 2024 19:05:29 +0100

Andrey Balan committed 211b076 on branch v4.8 in lams-github

LDEV-5397 update to reflect the latest changes done to optionsActivity.jsp

· /lams_learning/web/branching/preview.jsp	(-76, +32)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 make sure all buttons have proper "type" attribute

Andrey Balan — Wed, 20 Dec 2023 01:24:02 +0100

Andrey Balan committed e68dab8 on branch v4.8 in lams-github

LDEV-5397 make sure all buttons have proper "type" attribute

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/grouping/wait.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/optionsActivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/results.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/learning/message/topicreplyform.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_mindmap/web/pages/learning/singleMindmap.jsp

(-1, +3)

| History

| Source

| Diff

· /lams_tool_nb/web/learnerContent.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_tool_preview/web/pages/learning/rubrics.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_preview/web/pages/learning/rubricsPivot.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_sbmt/web/learner/sbmtlearner.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_tool_scratchie/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

… 10 more files in changeset.

lams-github (v4.8): LDEV-5397 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment...

Andrey Balan — Fri, 15 Dec 2023 17:20:14 +0100

Andrey Balan committed b311244 on branch v4.8 in lams-github

LDEV-5397 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment

* Improved offcanvas progress bar:

icon for not completed activity should a hollow square, not a full one;

gate icons: hourglass icons replaced with locks;

support for long activity names;

tooltips on icon hover explaining what it means, for example “current activity”;

improved CSS

* Teams table should have maximum width and/or highlight on hover

* “Burning questions” button should have standard size (not small) and have the same primary colour as “Justification” button

* In burning questions summary the title does not have sufficient contrast

* In Chat the font should have standard and not reduced size

* In Daco there is an empty alert

* In Task List (and Share Resources) button to complete an item should say something like “Mark as completed” or “Complete” instead of “Completed”

* Admin pages: restored background colour to ghostly white

· /lams_admin/web/css/admin.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/tags/PageLearner.tag	(-4, +13)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/tags/Rating5.tag	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/css/bootstrap5.custom.scss	(-0, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/css/components-learner.scss	(-5, +17)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/learnerPage.js	(-25, +51)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_chat/web/includes/css/chat.scss	(-1, +0)	\| History	\| Source	\| Diff
· /lams_tool_daco/web/pages/learning/addRecord.jsp	(-14, +16)	\| History	\| Source	\| Diff
· /lams_tool_larsrc/web/pages/learning/learning.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/includes/css/scratchie-learning.scss	(-1, +5)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/questionlist.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_scratchie/web/pages/learning/scratchies.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_task/web/pages/learning/learning.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_task/web/pages/learning/parts/itemlist.jsp	(-1, +2)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 redesign "choose branch page". add modal confirmation dialog...

Andrey Balan — Wed, 13 Dec 2023 22:41:19 +0100

Andrey Balan committed 1d0ce1b on branch v4.8 in lams-github

LDEV-5397 redesign "choose branch page". add modal confirmation dialog

* add onhover effect to choose group page

· /lams_learning/web/grouping/choose.jsp	(-27, +29)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-89, +116)	\| History	\| Source	\| Diff

lams-github (v4.8): LDEV-5397 bootstrap5 Grouping, Branching, Optional activities

Andrey Balan — Thu, 19 Oct 2023 22:25:05 +0200

Andrey Balan committed 56ec8d9 on branch v4.8 in lams-github

LDEV-5397 bootstrap5 Grouping, Branching, Optional activities

· /lams_central/web/WEB-INF/tags/Alert5.tag	(-5, +11)	\| History	\| Source	\| Diff
· /lams_central/web/WEB-INF/tags/PageLearner.tag	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/web/css/components.scss	(-1, +11)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/BranchingActivityController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Alert5.tag	(-7, +17)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/PageLearner.tag	(-1, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/preview.jsp	(-115, +91)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/wait.jsp	(-31, +16)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-61, +63)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-62, +30)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-32, +25)	\| History	\| Source	\| Diff
· /lams_learning/web/lessonComplete.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-68, +56)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5404 Escaping funny characters that break js...

Ernie Ghiglione — Sun, 06 Aug 2023 00:29:41 +0200

Ernie Ghiglione committed 21f82ef on branch v4.7, v4.8 in lams-github

LDEV-5404 Escaping funny characters that break js

- Learner

· /lams_learning/web/branching/preview.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/common/taglibs.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/discussion/monitor5.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/kumalive/kumalive.jsp	(-20, +9)	\| History	\| Source	\| Diff
· /lams_learning/web/kumalive/kumaliveReport.jsp	(-11, +11)	\| History	\| Source	\| Diff
· /lams_learning/web/lessonComplete.jsp	(-8, +8)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/presenceChat.jsp	(-3, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5213 Use version-dependent imports for LAMS JS files

Marcin Cieslak — Tue, 11 Jul 2023 08:18:21 +0200

Marcin Cieslak committed fe19797 on branch v4.7, v4.8 in lams-github

LDEV-5213 Use version-dependent imports for LAMS JS files

· /lams_admin/web/WEB-INF/tags/AuthoringButton.tag

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Etherpad.tag

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Page.tag

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Page5.tag

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/headItems.tag

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/logevent.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_build/lams_build.eml

(-1, +4)

| History

| Source

| Diff

· /lams_build/lams_build.iml

(-11, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/AuthoringButton.tag

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Etherpad.tag

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Page.tag

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Page5.tag

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/headItems.tag

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/authoring/template/header.jsp

(-3, +2)

| History

| Source

| Diff

· /lams_central/web/authoringConfirm.jsp

(-2, +2)

| History

| Source

| Diff

… 324 more files in changeset.

lams-github (v4.7): LDEV-5294 Minor UI improvement...

Ernie Ghiglione — Thu, 10 Mar 2022 09:29:34 +0100

Ernie Ghiglione committed 62b95bf on branch v4.7, v4.8 in lams-github

LDEV-5294 Minor UI improvement

Minor UI improvement following changes done for LDEV-5298

· /lams_learning/web/optionsActivity.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5219 Use versioned JS import for gate check JS file

Marcin Cieslak — Thu, 15 Jul 2021 18:21:06 +0200

Marcin Cieslak committed d5fa417 on branch v4.7, v4.8 in lams-github

LDEV-5219 Use versioned JS import for gate check JS file

· /lams_learning/web/grouping/show.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/optionsActivity.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/results.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_chat/web/pages/learning/parts/finishButton.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/learning/galleryWalk.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/web/pages/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/web/jsps/learning/viewforum.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_images/web/pages/learning/learning.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_images/web/pages/learning/notebook.jsp

(-1, +1)

| History

| Source

| Diff

… 41 more files in changeset.

lams-github (v4.7): LDEV-5219 Check gate after Optional activity

Marcin Cieslak — Thu, 15 Jul 2021 18:07:56 +0200

Marcin Cieslak committed 74af22e on branch v4.7, v4.8 in lams-github

LDEV-5219 Check gate after Optional activity

· /lams_learning/web/optionsActivity.jsp

(-3, +8)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4075 Re-introduce skipping branching in Preview

Marcin Cieslak — Thu, 10 Dec 2020 13:33:46 +0100

Marcin Cieslak committed c61226d on branch v4.7, v4.8 in lams-github

LDEV-4075 Re-introduce skipping branching in Preview

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/CompleteActivityController.java	(-4, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../learning/web/controller/DisplayOptionsActivityController.java	(-10, +14)	\| History	\| Source	\| Diff
· /lams_learning/web/branching/preview.jsp	(-7, +15)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4803 Remove branching warning when there's no need to warn...

Andrey Balan — Fri, 05 Apr 2019 21:19:23 +0200

Andrey Balan committed 5b29d2e on branch v4.7, v4.8 in lams-github

LDEV-4803 Remove branching warning when there's no need to warn

* Fix problem with HibernateProxy

* Change warning messages and their presentation

* Further enhancements to choose branching page markup

· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-6, +6)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../learning/web/controller/DisplayOptionsActivityController.java	(-10, +28)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java	(-8, +14)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-138, +125)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4800 Enhance markup

Andrey Balan — Fri, 05 Apr 2019 00:32:09 +0200

Andrey Balan committed d5035b7 on branch v4.7, v4.8 in lams-github

LDEV-4800 Enhance markup

· /lams_learning/web/optionsActivity.jsp

(-4, +6)

| History

| Source

| Diff

lams-github (): LDEV-4800 Enhance markup

Andrey Balan — Fri, 05 Apr 2019 00:32:09 +0200

Andrey Balan committed 0d84af5 on branch in lams-github

LDEV-4800 Enhance markup

· /lams_learning/web/optionsActivity.jsp

(-4, +6)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4800 Proceed to the first incompleted activity in a branch, and not to simply the first one...

Andrey Balan — Thu, 04 Apr 2019 23:43:38 +0200

Andrey Balan committed f4e0bfe on branch v4.7, v4.8 in lams-github

LDEV-4800 Proceed to the first incompleted activity in a branch, and not to simply the first one

Also display list of child activities for the completed branch, so user

can revisit completed activities.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-4, +0)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/.../learning/web/controller/DisplayOptionsActivityController.java	(-4, +21)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/SequenceActivityController.java	(-7, +14)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-59, +60)	\| History	\| Source	\| Diff

lams-github (): LDEV-4759 Panels are now cards.

Wed, 06 Feb 2019 04:04:33 +0100

Fiona Malikoff committed 70e6fe3 on branch in lams-github

LDEV-4759 Panels are now cards.

· /lams_admin/web/WEB-INF/tags/Alert.tag

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/DefineLater.tag

(-2, +2)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/Page.tag

(-36, +18)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/SimplePanel.tag

(-4, +4)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/headItems.tag

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/config/editconfig.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/ldap.jsp

(-11, +11)

| History

| Source

| Diff

· /lams_admin/web/orgPasswordChange.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/organisation/cloneStart.jsp

(-16, +16)

| History

| Source

| Diff

· /lams_admin/web/organisation/list.jsp

(-9, +9)

| History

| Source

| Diff

· /lams_admin/web/remove.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_admin/web/statistics.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_admin/web/sysadmin.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_admin/web/themeManagement.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_admin/web/toolcontent/toolcontentlist.jsp

(-1, +1)

| History

| Source

| Diff

… 492 more files in changeset.

lams-github (v4.7): LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

Fri, 21 Sep 2018 06:08:34 +0200

Fiona Malikoff committed 54007f9 on branch v4.7, v4.8 in lams-github

LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

(-9, +9)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

(-4, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/BranchingActivityController.java

(-13, +13)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

(-13, +5)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/branching/preview.jsp

(-6, +6)

| History

| Source

| Diff

· /lams_learning/web/branching/wait.jsp

(-5, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/conditionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/gateDescription.jsp

(-4, +4)

| History

| Source

| Diff

· /lams_learning/web/gate/gateNext.jsp

(-7, +5)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-8, +8)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-3, +3)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-1, +1)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): LDEV-4440 Learning notebook

Tue, 21 Aug 2018 15:32:38 +0200

MichalKowalski committed bda6833 on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning notebook

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4440 Learning server start

Fri, 17 Aug 2018 12:26:22 +0200

MichalKowalski committed b546f3a on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning server start

· /lams_build/lib/lams/lams-gradebook.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams-learning.jar

(binary)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java

(-0, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java

(-1, +1)

| History

| Source

| Diff

· /lams_learning/web/branching/preview.jsp

(-98, +118)

| History

| Source

| Diff

· /lams_learning/web/branching/wait.jsp

(-21, +38)

| History

| Source

| Diff

· /lams_learning/web/close.jsp

(-34, +54)

| History

| Source

| Diff

· /lams_learning/web/gate/conditionGateContent.jsp

(-22, +53)

| History

| Source

| Diff

· /lams_learning/web/gate/permissionGateContent.jsp

(-22, +54)

| History

| Source

| Diff

· /lams_learning/web/gate/scheduleGateContent.jsp

(-39, +71)

| History

| Source

| Diff

· /lams_learning/web/gate/synchGateContent.jsp

(-11, +40)

| History

| Source

| Diff

· /lams_learning/web/grouping/choose.jsp

(-82, +100)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-85, +105)

| History

| Source

| Diff

· /lams_learning/web/grouping/wait.jsp

(-27, +38)

| History

| Source

| Diff

· /lams_learning/web/lessonComplete.jsp

(-171, +190)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): LDEV-4440 Learning

Thu, 16 Aug 2018 15:59:29 +0200

MichalKowalski committed 1f7150d on branch v4.7, v4.8 in lams-github

LDEV-4440 Learning

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/BranchingActivityController.java

(-17, +15)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/ChooseActivityController.java

(-13, +11)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/CompleteActivityController.java

(-11, +13)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/DisplayActivityController.java

(-12, +11)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/DisplayOptionsActivityController.java

(-17, +13)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/DisplayParallelActivityController.java

(-14, +12)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/DisplayToolActivityController.java

(-11, +11)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

(-19, +17)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

(-28, +20)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerAction.java

(-454, +0)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java

(-0, +480)

| History

| Source

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/LessonCompleteActivityAction.java

(-97, +0)

| History

| Source

| Diff

· /lams_learning/src/java/org/.../learning/web/controller/LessonCompleteActivityController.java

(-0, +112)

| History

| Source

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/LoadToolActivityAction.java

(-133, +0)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/controller/LoadToolActivityController.java

(-0, +143)

| History

| Source

… 41 more files in changeset.

lams-github (v4.7): LDEV-4554 Completed optional activities are now links to revisit.

Fri, 13 Apr 2018 09:17:58 +0200

Fiona Malikoff committed 964c0c4 on branch v4.7, v4.8 in lams-github

LDEV-4554 Completed optional activities are now links to revisit.

· /lams_central/web/css/_learner_base.scss	(-0, +5)	\| History	\| Source	\| Diff
· /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/web/optionsActivity.jsp	(-5, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3724: updating LAMS Learning to bootstrap

Sun, 13 Mar 2016 06:37:52 +0100

erniegx committed 02e61ba on branch v4.7, v4.8 in lams-github

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	(-141, +126)	\| 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	(-19, +13)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3113: Remove Flash Learner. Remove unnecessary SWF, tag and other files, along with methods in service classes.

Marcin Cieslak — Tue, 03 Sep 2013 12:56:20 +0200

Marcin Cieslak committed 6065810 on branch v4.7, v4.8 in lams-github

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

(-1, +0)

| 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_admin/web/user.jsp

(-19, +1)

| 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-github (v4.7): LDEV-3092: Don't display the must complete label unless there are completing restrictions

Tue, 13 Aug 2013 01:02:59 +0200

erniegx committed b4ef569 on branch v4.7, v4.8 in lams-github

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-github (v4.7): LDEV-3026: Add utilities for getting activity position. Make Tools position-aware and display different label if they ar...

Marcin Cieslak — Tue, 09 Apr 2013 14:47:47 +0200

Marcin Cieslak committed 8aded0b on branch v4.7, v4.8 in lams-github

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

(-0, +1)

| History

| Source

| Diff

· /lams_learning/conf/language/lams/ApplicationResources.properties

(-0, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

(-4, +9)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

(-64, +189)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

(-2, +3)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

(-1, +4)

| 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

(-19, +53)

| History

| Source

| Diff

· /lams_learning/web/grouping/show.jsp

(-1, +10)

| History

| Source

| Diff

· /lams_learning/web/optionsActivity.jsp

(-1, +10)

| History

| Source

| Diff

· /lams_tool_assessment/conf/language/lams/ApplicationResources.properties

(-1, +2)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

(-1, +10)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/learning/learning.jsp

(-2, +10)

| History

| Source

| Diff

… 168 more files in changeset.

lams-github (v4.7): LDEV-2152: adding next activity icon tto system activities

Mon, 02 Mar 2009 03:34:50 +0100

erniegx committed 6a00a38 on branch v4.7, v4.8 in lams-github

LDEV-2152: adding next activity icon tto system activities

· /lams_learning/web/WEB-INF/struts/struts-config.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/web.xml	(-1, +10)	\| 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_learning/web/optionsActivity.jsp	(-4, +17)	\| History	\| Source	\| Diff

lams-github (v4.7): For LDEV-1874, max optional activities was implemented, but not max number of optional sequences, this has been fixed

lfoxton — Mon, 21 Jul 2008 09:12:19 +0200

lfoxton committed 96fe21d on branch v4.7, v4.8 in lams-github

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	(-1, +2)	\| History	\| Source	\| Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-3, +13)	\| History	\| Source	\| Diff

lams-github (v4.7): For LDEV-1784. When the max number of optional activities has been reached, the choose button on the optional activity s...

lfoxton — Wed, 16 Jul 2008 08:09:42 +0200

lfoxton committed 5fdd0db on branch v4.7, v4.8 in lams-github

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	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java	(-0, +7)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-8, +25)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1788 customise text to use alternative text for optional sequences as opposed to optional activities.

jliew — Fri, 30 May 2008 04:36:38 +0200

jliew committed 753b952 on branch v4.7, v4.8 in lams-github

LDEV-1788 customise text to use alternative text for optional sequences as opposed to optional activities.

· /lams_learning/conf/language/lams/ApplicationResources.properties	(-0, +3)	\| History	\| Source	\| Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-1, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/optionsActivity.jsp	(-8, +40)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1642 display different note if there's a maximum no. of activities involved

jliew — Thu, 29 May 2008 09:18:06 +0200

jliew committed 5a44360 on branch v4.7, v4.8 in lams-github

LDEV-1642 display different note if there's a maximum no. of activities involved

· /lams_learning/web/optionsActivity.jsp

(-1, +11)

| History

| Source

| Diff