Fisheye on lams/lams_learning/web/previewDefineLater.jsp

lams (MAIN): LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

Andrey Balan — Fri, 17 Jan 2014 23:37:08 +0100

Andrey Balan committed MAIN:andreyb:20140117223708 on branch MAIN in lams

LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

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

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/.settings/org.eclipse.core.resources.prefs

(-3, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

(-17, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

(-29, +8)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

(-13, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

(-4, +3)

| History

| Source

| Diff

· /lams_common/.classpath

(-1, +1)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml

(-8, +0)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml

(-8, +0)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml

(-45, +0)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml

(-28, +1)

| History

| Source

| Diff

· /lams_common/conf/middlegen/learningdesign-prefs.properties

(-10, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040022.sql

(-0, +19)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-36, +8)

| History

| Source

| Diff

… 58 more files in changeset.

lams (MAIN): 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:54:45 +0200

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-1208: Preview's special define later screen to update the Flash progress bar.

fmalikoff — Wed, 25 Jun 2008 08:40:23 +0200

fmalikoff committed MAIN:fmalikoff:20080625064023 on branch MAIN in lams

LDEV-1208: Preview's special define later screen to update the Flash progress bar.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/previewDefineLater.jsp	(-0, +6)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

fmalikoff — Sun, 08 Jun 2008 07:16:44 +0200

fmalikoff committed MAIN:fmalikoff:20080608051644 on branch MAIN in lams

LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

· /lams_learning/web/previewDefineLater.jsp

(-0, +10)

| History

| Source

| Diff

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...

fmalikoff — Thu, 28 Jun 2007 08:49:36 +0200

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): Added "copy-tags" to the build to make it easier to update the tags....

fmalikoff — Fri, 29 Sep 2006 01:24:42 +0200

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): Updated address of FSF in copyright statement

fmalikoff — Sun, 17 Sep 2006 08:09:25 +0200

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): Added space to the top of the page to make it look better.

fmalikoff — Fri, 14 Jul 2006 05:21:50 +0200

fmalikoff committed MAIN:fmalikoff:20060714032150 on branch MAIN in lams

Added space to the top of the page to make it look better.

· /lams_learning/web/previewDefineLater.jsp

(-0, +2)

| History

| Source

| Diff

lams (MAIN): Converted to the learner content styles

fmalikoff — Sat, 01 Jul 2006 14:49:10 +0200

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

fmalikoff — Thu, 29 Jun 2006 01:10:03 +0200

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): Added the define later special screen code to the wrong Action class.

fmalikoff — Thu, 15 Jun 2006 03:07:16 +0200

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't tell the tool that it is define later but display a special...

fmalikoff — Thu, 15 Jun 2006 01:13:29 +0200

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