Fisheye on lams-github/lams_monitoring/web/dummyControlFrame.jsp

lams-github (v4.7): Removed the dummy monitoring page.

fmalikoff — Wed, 13 Sep 2006 07:39:51 +0200

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

Removed the dummy monitoring page.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyForm.java	(-156, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(-361, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/struts/struts-config.xml	(-39, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/web.xml	(-7, +13)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummy.jsp	(-48, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyControlFrame.jsp	(-85, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyDetail.jsp	(-170, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyStart.jsp	(-94, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyStarted.jsp	(-49, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/welcome.jsp	(-50, +0)	\| History	\| Source	\| Diff

lams-github (v4.7): Adding unarchive functionality.

fmalikoff — Wed, 07 Jun 2006 00:39:32 +0200

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

Adding unarchive functionality.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml	(-0, +3)	\| History	\| Source	\| Diff
· /lams_common/db/model/lams_11.clay	(-2433, +2446)	\| History	\| Source	\| Diff
· /lams_common/db/sql/create_lams_11_tables.sql	(-0, +1)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_users_org_test.sql	(-273, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java	(-5, +28)	\| History	\| Source	\| Diff
· /lams_documents/lams_monitoring/Monitoring.doc	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-3, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-11, +37)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(-5, +14)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-0, +40)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyControlFrame.jsp	(-0, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): Temporary indexContent page that points to Flash movies, set up for individual courses/classes rather than the old old o...

fmalikoff — Thu, 25 May 2006 03:07:27 +0200

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

Temporary indexContent page that points to Flash movies, set up for individual courses/classes rather than the old old organisation model. Done to allow Flash work to be done, while the admin work is in progress.

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

(-64, +55)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/lams.tld

(-0, +4)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/struts/struts-config.xml

(-2, +7)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-0, +15)

| History

| Source

· /lams_central/web/css/default.css

(-1, +0)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/openUrls.js

(-12, +37)

| History

| Source

| Diff

· /lams_central/web/indexContent.jsp

(-98, +117)

| History

| Source

| Diff

· /lams_central/web/learner.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_central/web/monitorLesson.jsp

(-0, +15)

| History

| Source

· /lams_central/web/staff.jsp

(-14, +0)

| History

| Source

| Diff

· /lams_central/web/template.jsp

(-1, +4)

| History

| Source

| Diff

· /lams_learning/web/controlFrame.jsp

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/dummyControlFrame.jsp

(-3, +0)

| History

| Source

| Diff

· /lams_learning/web/dummymain.jsp

(-0, +48)

| History

| Source

· /lams_learning/web/main.jsp

(-1, +1)

| History

| Source

| Diff

… 6 more files in changeset.

lams-github (v4.7): Added "real" monitor page, which will contain the Flash movie. Doesn't replace the dummy pages yet as the required funct...

fmalikoff — Fri, 21 Apr 2006 08:13:45 +0200

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

Added "real" monitor page, which will contain the Flash movie. Doesn't replace the dummy pages yet as the required functionality doesn't exist yet. Once completed, the dummy pages will be removed.

· /lams_monitoring/conf/language/ApplicationResources.properties	(-3, +9)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummy.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyControlFrame.jsp	(-0, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-0, +80)	\| History	\| Source
· /lams_monitoring/web/welcome.jsp	(-1, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): Updated JSPs to support UTF-8 - trying to get Bulgarian working properly.

fmalikoff — Thu, 20 Apr 2006 04:15:26 +0200

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

Updated JSPs to support UTF-8 - trying to get Bulgarian working properly.

· /lams_monitoring/web/dummy.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyControlFrame.jsp	(-1, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/header.jsp	(-1, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/web/template/template.jsp	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): Updated JSPs to support UTF-8 - trying to get Bulgarian working properly.

fmalikoff — Thu, 20 Apr 2006 04:08:52 +0200

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

Updated JSPs to support UTF-8 - trying to get Bulgarian working properly.

· /lams_monitoring/web/dummy.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyControlFrame.jsp	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyDetail.jsp	(-1, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyStart.jsp	(-1, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyStarted.jsp	(-1, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/index.jsp	(-1, +6)	\| History	\| Source	\| Diff
· /lams_monitoring/web/previewdeleted.jsp	(-2, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/welcome.jsp	(-2, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): Updated copyright statement - only support GPL v 2.0

fmalikoff — Thu, 06 Apr 2006 08:41:34 +0200

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

Updated copyright statement - only support GPL v 2.0

· /lams_monitoring/conf/xdoclet/filter-mappings.xml

(-20, +0)

| History

| Source

| Diff

· /lams_monitoring/conf/xdoclet/filters.xml

(-20, +0)

| History

| Source

| Diff

· /lams_monitoring/conf/xdoclet/global-forwards.xml

(-21, +0)

| History

| Source

| Diff

· /lams_monitoring/conf/xdoclet/servlet-mappings.xml

(-21, +0)

| History

| Source

| Diff

· /lams_monitoring/conf/xdoclet/servlets.xml

(-20, +0)

| History

| Source

| Diff

· /lams_monitoring/conf/xdoclet/struts-message-resources.xml

(-21, +0)

| History

| Source

| Diff

· /lams_monitoring/conf/xdoclet/web-settings.xml

(-21, +0)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java

(-19, +23)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/CloseScheduleGateJob.java

(-5, +7)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/FinishScheduleLessonJob.java

(-19, +23)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/MonitoringJob.java

(-19, +23)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java

(-5, +7)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/StartScheduleLessonJob.java

(-19, +23)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

(-19, +23)

| History

| Source

| Diff

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

(-19, +23)

| History

| Source

| Diff

… 172 more files in changeset.

lams-github (v4.7): Converted to Servlet 2.4, JSTL 1.1

fmalikoff — Fri, 24 Feb 2006 09:26:59 +0100

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

Converted to Servlet 2.4, JSTL 1.1

· /lams_admin/build.xml

(-1, +2)

| History

| Source

| Diff

· /lams_central/build.xml

(-1, +2)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/taglibs.xml

(-80, +75)

| History

| Source

| Diff

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

(-6, +6)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/jstl/tlds/c-rt.tld

(-393, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/jstl/tlds/c.tld

(-166, +313)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/jstl/tlds/fmt-rt.tld

(-403, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/jstl/tlds/fmt.tld

(-128, +357)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/jstl/tlds/fn.tld

(-0, +207)

| History

| Source

· /lams_central/web/WEB-INF/jstl/tlds/permittedTaglibs.tld

(-0, +34)

| History

| Source

· /lams_central/web/WEB-INF/jstl/tlds/scriptfree.tld

(-0, +51)

| History

| Source

· /lams_central/web/WEB-INF/jstl/tlds/x.tld

(-0, +448)

| History

| Source

· /lams_central/web/WEB-INF/lams.tld

(-5, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/struts/tlds/struts-bean-el.tld

(-212, +0)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/struts/tlds/struts-html-el.tld

(-3302, +0)

| History

| Source

| Diff

… 29 more files in changeset.

lams-github (v4.7): LDEV-79: Added remove lesson feature to the dummy monitoring interface.

fmalikoff — Fri, 20 Jan 2006 01:44:18 +0100

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

LDEV-79: Added remove lesson feature to the dummy monitoring interface.

· /lams_build/lib/lams/lams-monitoring.jar	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(-0, +31)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyControlFrame.jsp	(-0, +14)	\| History	\| Source	\| Diff

lams-github (v4.7): Fixed display of lessons so that it skips any lessons that are archived.

fmalikoff — Wed, 18 Jan 2006 02:03:20 +0100

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

Fixed display of lessons so that it skips any lessons that are archived.

· /lams_monitoring/web/dummyControlFrame.jsp

(-12, +14)

| History

| Source

| Diff

lams-github (v4.7): Added archive a lesson feature

fmalikoff — Wed, 07 Dec 2005 07:08:37 +0100

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

Added archive a lesson feature

· /lams_build/lib/lams/lams-monitoring.jar	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-0, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-1, +19)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(-1, +30)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-8, +37)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyControlFrame.jsp	(-0, +3)	\| History	\| Source	\| Diff

lams-github (v4.7): Regigged the dummy monitoring screen. Made the layout more compact, moved the learner functionality to the learner scree...

fmalikoff — Wed, 07 Dec 2005 06:11:27 +0100

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

Regigged the dummy monitoring screen. Made the layout more compact, moved the learner functionality to the learner screens.

Fixed a transaction bug with startLesson - the method was not named consistently in the applicationContext file, so the method was not part of a proper transaction. As such, the db changes done by the method were lost. This resulted in the lesson staying in the created state, never going onto the started state. Made the naming consistent and it now goes into the started state as expected.

· /lams_build/lib/lams/lams-monitoring.jar	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-1, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-2, +22)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyForm.java	(-0, +11)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java	(-21, +99)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/test/java/org/lamsfoundation/lams/monitoring/service/TestMonitoringService.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/struts/struts-config.xml	(-2, +17)	\| History	\| Source	\| Diff
· /lams_monitoring/web/WEB-INF/web.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummy.jsp	(-141, +46)	\| History	\| Source	\| Diff
· /lams_monitoring/web/dummyControlFrame.jsp	(-0, +42)	\| History	\| Source
· /lams_monitoring/web/dummyDetail.jsp	(-0, +114)	\| History	\| Source
· /lams_monitoring/web/dummyStart.jsp	(-0, +73)	\| History	\| Source
· /lams_monitoring/web/dummyStarted.jsp	(-0, +26)	\| History	\| Source
· /lams_monitoring/web/welcome.jsp	(-0, +47)	\| History	\| Source