Fisheye on lams-github/lams_learning/web/layout/branchingWaitLayout.jsp

lams-github (v4.7): LDEV-4440 Clean up shared files

Fri, 05 Oct 2018 09:05:08 +0200

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

LDEV-4440 Clean up shared files

· /lams_central/web/footer.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_central/web/header.jsp

(-14, +0)

| History

| Source

| Diff

· /lams_gradebook/web/footer.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_gradebook/web/template.jsp

(-26, +0)

| History

| Source

| Diff

· /lams_learning/web/layout/branchingWaitLayout.jsp

(-43, +0)

| History

| Source

| Diff

· /lams_learning/web/layout/framesetLayout.jsp

(-58, +0)

| History

| Source

| Diff

· /lams_learning/web/layout/gateLayout.jsp

(-57, +0)

| History

| Source

| Diff

· /lams_learning/web/layout/groupWaitLayout.jsp

(-38, +0)

| History

| Source

| Diff

· /lams_learning/web/layout/layout.jsp

(-63, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/common/footer.jsp

(-1, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/common/messages.jsp

(-2, +0)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/authoring.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_assessment/web/pages/authoring/parts/addmatchingpairs.jsp

(-1, +1)

| History

| Source

| Diff

… 192 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

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-3915: Updating core learner screens like gates and groups to suit sliding div based progress bar.

Fri, 29 Jul 2016 04:26:37 +0200

FionaMalikoff committed e27d5ec on branch v4.7, v4.8 in lams-github

LDEV-3915: Updating core learner screens like gates and groups to suit sliding div based progress bar.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	(-0, +4)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java	(-1, +14)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Page.tag	(-2, +5)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/branchingWaitLayout.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/groupWaitLayout.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-3674: Remove references to deleted JS Flash libraries.

Marcin Cieslak — Thu, 17 Mar 2016 12:20:59 +0100

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

LDEV-3674: Remove references to deleted JS Flash libraries.

· /lams_learning/web/layout/branchingWaitLayout.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/framesetLayout.jsp	(-2, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/groupWaitLayout.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/layout.jsp	(-2, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/mobileLayout.jsp	(-1, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2...

Marcin Cieslak — Fri, 26 Feb 2016 08:17:56 +0100

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

LDEV-2917: Change DOCTYPE tag of files which have not been picked up by previous runs as they had this tag broken into 2 lines and regex had not detected them.

· /lams_admin/web/error.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/admin.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/authoringConfirm.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/development/wddxPost.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/editLessonIntro.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/error.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/errorpages/403.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/errorpages/404.jsp

(-3, +1)

| History

| Source

| Diff

· /lams_central/web/errorpages/error.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/findUserLessons.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/index.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/lamscommunity/lamscommunityLogin.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/lessonIntro.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_central/web/sysadmin.jsp

(-2, +1)

| History

| Source

| Diff

· /lams_gradebook/web/error.jsp

(-2, +1)

| History

| Source

| Diff

… 326 more files in changeset.

lams-github (v4.7): LDEV-1765: Text said it would refresh after 1 minute, but the code was set to 5 mins. Changed code to 1 min.

fmalikoff — Mon, 26 May 2008 09:58:51 +0200

fmalikoff committed ac48ef7 on branch v4.7, v4.8 in lams-github

LDEV-1765: Text said it would refresh after 1 minute, but the code was set to 5 mins. Changed code to 1 min.

· /lams_learning/web/layout/branchingWaitLayout.jsp

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1691...

asukkar — Mon, 05 May 2008 08:20:11 +0200

asukkar committed 8f71fde on branch v4.7, v4.8 in lams-github

LDEV-1691

Changed doctype to 4.01 transitional.

· /lams_learning/web/layout/branchingWaitLayout.jsp

(-3, +5)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1642...

asukkar — Fri, 02 May 2008 02:45:55 +0200

asukkar committed 6f4f941 on branch v4.7, v4.8 in lams-github

LDEV-1642

Improved page layout.

· /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_learning/web/optionsActivity.jsp	(-112, +106)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1134: Branching: View screen for the class export portfolio

fmalikoff — Tue, 17 Jul 2007 03:32:21 +0200

fmalikoff committed ccf0c98 on branch v4.7, v4.8 in lams-github

LDEV-1134: Branching: View screen for the class export portfolio

· /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java	(-32, +50)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java	(-18, +15)	\| 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	(-29, +61)	\| 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-github (v4.7): Refactoring code so that all screens can update the progress bar.

fmalikoff — Thu, 12 Jul 2007 02:59:36 +0200

fmalikoff committed 5863520 on branch v4.7, v4.8 in lams-github

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

(-96, +0)

| History

| Source

| Diff

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

(-3, +5)

| History

| Source

| Diff

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

(-3, +2)

| History

| Source

| Diff

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

(-6, +2)

| History

| Source

| Diff

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

(-2, +2)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/.../learning/web/action/DisplayParallelActivityAction.java

(-3, +5)

| History

| Source

| Diff

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

(-2, +4)

| History

| Source

| Diff

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

(-10, +12)

| History

| Source

| Diff

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

(-4, +3)

| History

| Source

| Diff

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

(-2, +3)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-11, +1)

| History

| Source

| Diff

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

(-3, +8)

| History

| Source

| Diff

… 4 more files in changeset.

lams-github (v4.7): Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two plac...

fmalikoff — Thu, 28 Jun 2007 08:50:42 +0200

fmalikoff committed dd42ee5 on branch v4.7, v4.8 in lams-github

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

(-2, +6)

| History

| Source

| Diff

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

(-0, +5)

| 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

(-36, +23)

| History

| Source

| Diff

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

(-0, +17)

| History

| Source

| Diff

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

(-18, +121)

| History

| Source

| Diff

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

(-8, +0)

| History

| Source

| Diff

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

(-50, +70)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-1, +1)

| History

| Source

| Diff

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

(-9, +1)

| History

| Source

| Diff

… 11 more files in changeset.