Activity lams-github/

LDEV-4017: Allow dialog maximising. Allow dialog minimising (only one dialog at the moment). Adjust dialog sizes. Re-introduce jQuery UI bootstrap theme as some theme must be added in order to display jQuery UI widgets (resizing handlers, for example) correctly.

- -38
- +44
/lams_central/web/css/index.css
- History
- Source
- Diff
/lams_central/web/css/index.css
- -0
- +1614
/lams_central/web/css/jquery-ui-bootstrap-theme.css
- History
- Source
- Diff
/lams_central/.../jquery-ui-bootstrap-theme.css
- -26
- +70
/lams_central/web/includes/javascript/dialog.js
- History
- Source
- Diff
/lams_central/web/.../javascript/dialog.js
- -3
- +3
/lams_central/web/includes/javascript/groupDisplay.js
- History
- Source
- Diff
/lams_central/web/.../groupDisplay.js
- -3
- +1
/lams_central/web/main.jsp
- History
- Source
- Diff
/lams_central/web/main.jsp

3:44 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

More
a132196
changed 1 file
v4.7, v4.8

LDEV-3676 :Use bootstrap as UI framework

- -152
- +149
/lams_central/web/emailuser.jsp
- History
- Source
- Diff
/lams_central/web/emailuser.jsp

11:43 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

More
0a35410
changed 1 file
v4.7, v4.8

LDEV-3676: Update My profile pages

- -143
- +223
/lams_central/web/portrait.jsp
- History
- Source
- Diff
/lams_central/web/portrait.jsp

11:43 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
f059acd
changed 15 files
v4.7, v4.8

LDEV-3806: Moved reflections to a separate page, with the reflections for a single session shown. Added some simple statistics - number of users in a session and number of users completed in a session.

- -1
- +5
/lams_tool_preview/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_preview/.../ApplicationResources.properties
- -1
- +5
/lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_preview/.../ApplicationResources_en_AU.properties
- -0
- +4
/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewDAO.java
- History
- Source
- Diff
/lams_tool_preview/src/.../PeerreviewDAO.java
- -0
- +18
/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewDAOHibernate.java
- History
- Source
- Diff
/lams_tool_preview/.../PeerreviewDAOHibernate.java
- -0
- +47
/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/PeerreviewStatisticsDTO.java
- History
- Source
/lams_tool_preview/.../PeerreviewStatisticsDTO.java
- -15
- +13
/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
- History
- Source
- Diff
/lams_tool_preview/.../IPeerreviewService.java
- -34
- +29
/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
- History
- Source
- Diff
/lams_tool_preview/.../PeerreviewServiceImpl.java
- -15
- +41
/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_preview/.../MonitoringAction.java
- -0
- +10
/lams_tool_preview/web/WEB-INF/struts-config.xml
- History
- Source
- Diff
/lams_tool_preview/web/.../struts-config.xml
- -1
- +1
/lams_tool_preview/web/pages/monitoring/criteria.jsp
- History
- Source
- Diff
/lams_tool_preview/web/.../criteria.jsp
- -8
- +23
/lams_tool_preview/web/pages/monitoring/monitoring.jsp
- History
- Source
- Diff
/lams_tool_preview/web/.../monitoring.jsp
- -23
- +49
/lams_tool_preview/web/pages/monitoring/reflections.jsp
- History
- Source
- Diff
/lams_tool_preview/web/.../reflections.jsp
- -53
- +3
/lams_tool_preview/web/pages/monitoring/statistic.jsp
- History
- Source
- Diff
/lams_tool_preview/web/.../statistic.jsp
- -0
- +54
/lams_tool_preview/web/pages/monitoring/statisticpart.jsp
- History
- Source
/lams_tool_preview/web/.../statisticpart.jsp
- -7
- +8
/lams_tool_preview/web/pages/monitoring/summary.jsp
- History
- Source
- Diff
/lams_tool_preview/web/.../summary.jsp

11:42 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

More
171f124
changed 4 files
v4.7, v4.8

LDEV-3676 :Update My profile pages(Bootstrap completed)

- -307
- +400
/lams_central/web/editprofile.jsp
- History
- Source
- Diff
/lams_central/web/editprofile.jsp
- -36
- +58
/lams_central/web/lessons.jsp
- History
- Source
- Diff
/lams_central/web/lessons.jsp
- -64
- +83
/lams_central/web/passwordChangeContent.jsp
- History
- Source
- Diff
/lams_central/.../passwordChangeContent.jsp
- -68
- +100
/lams_central/web/profile.jsp
- History
- Source
- Diff
/lams_central/web/profile.jsp

10:00 pm

Andrey Balan

More
0550d38
changed 9 files
v4.7, v4.8

LDEV-4015 * fixed Feedback that haven't been recorded * Removed completely redundant QaGeneralAuthoringDTO.java and replaced its occurrences in jsps with formBean

- -1
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAppConstants.java
- -365
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaGeneralAuthoringDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaGeneralAuthoringDTO.java
- -12
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../util/QaUtils.java
- -97
- +19
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../web/QaAction.java
- -30
- +6
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaStarterAction.java
- -0
- +16
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAuthoringForm.java
- -3
- +4
/lams_tool_laqa/web/authoring/BasicContent.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../BasicContent.jsp
- -1
- +1
/lams_tool_laqa/web/authoring/itemlist.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../itemlist.jsp
- -4
- +3
/lams_tool_laqa/web/authoring/newQuestionBox.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../newQuestionBox.jsp

9:45 pm

Marcin Cieslak

More
71f818a
changed 6 files
v4.7, v4.8

LDEV-4017: Add boostrap modal template. Allow dragging and resizing. Get rid of jQuery bootstrap theme. Prepare for minimise (not finished yet).

- -25
- +56
/lams_central/web/css/index.css
- History
- Source
- Diff
/lams_central/web/css/index.css
- -1614
- +0
/lams_central/web/css/jquery-ui-bootstrap-theme.css
- History
- Source
- Diff
/lams_central/.../jquery-ui-bootstrap-theme.css
- -25
- +80
/lams_central/web/includes/javascript/dialog.js
- History
- Source
- Diff
/lams_central/web/.../javascript/dialog.js
- -42
- +59
/lams_central/web/includes/javascript/groupDisplay.js
- History
- Source
- Diff
/lams_central/web/.../groupDisplay.js
- -1
- +3
/lams_central/web/main.jsp
- History
- Source
- Diff
/lams_central/web/main.jsp
- -1
- +0
/lams_monitoring/web/monitor.jsp
- History
- Source
- Diff
/lams_monitoring/web/monitor.jsp

8:39 pm

Andrey Balan

More
54f906e
changed 10 files

LDEV-4015 * fixed Feedback that haven't been recorded * Removed completely redundant QaGeneralAuthoringDTO.java and replaced its occurrences in jsps with formBean

- -1
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAppConstants.java
- -365
- +0
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaGeneralAuthoringDTO.java
- History
- Source
- Diff
/lams_tool_laqa/.../QaGeneralAuthoringDTO.java
- -12
- +1
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../util/QaUtils.java
- -97
- +19
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../web/QaAction.java
- -30
- +6
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaStarterAction.java
- -0
- +16
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java
- History
- Source
- Diff
/lams_tool_laqa/src/.../QaAuthoringForm.java
- -3
- +4
/lams_tool_laqa/web/authoring/BasicContent.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../BasicContent.jsp
- -2
- +2
/lams_tool_laqa/web/authoring/editQuestionBox.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../editQuestionBox.jsp
- -1
- +1
/lams_tool_laqa/web/authoring/itemlist.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../itemlist.jsp
- -3
- +3
/lams_tool_laqa/web/authoring/newQuestionBox.jsp
- History
- Source
- Diff
/lams_tool_laqa/web/.../newQuestionBox.jsp

2:46 pm

erniegx <ernieg@gmail.com>

More
6712a95
changed 3 files
v4.7, v4.8

LDEV-4014: initial changes to bootstrap monitor UI

- -0
- +14
/lams_monitoring/web/css/monitorLesson.css
- History
- Source
- Diff
/lams_monitoring/web/.../monitorLesson.css
- -19
- +48
/lams_monitoring/web/includes/javascript/monitorLesson.js
- History
- Source
- Diff
/lams_monitoring/web/.../monitorLesson.js
- -487
- +523
/lams_monitoring/web/monitor.jsp
- History
- Source
- Diff
/lams_monitoring/web/monitor.jsp

2:43 pm

erniegx <ernieg@gmail.com>

More
b3ac8b0
changed 24 files
v4.7, v4.8

LDEV-3962: implementing the new course bootstrap panel(ish).

- -15
- +15
/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
- History
- Source
- Diff
/lams_central/src/.../DisplayGroupAction.java
- -226
- +83
/lams_central/web/css/defaultHTML.css
- History
- Source
- Diff
/lams_central/web/css/defaultHTML.css
- -0
- +20
/lams_central/web/css/defaultHTML_learner.css
- History
- Source
- Diff
/lams_central/web/.../defaultHTML_learner.css
- binary
/lams_central/web/css/images/ui-bg_flat_0_aaaaaa_40x100.png
- History
- Source
/lams_central/.../ui-bg_flat_0_aaaaaa_40x100.png
- binary
/lams_central/web/css/images/ui-bg_glass_55_fbf9ee_1x400.png
- History
- Source
/lams_central/.../ui-bg_glass_55_fbf9ee_1x400.png
- binary
/lams_central/web/css/images/ui-bg_glass_65_ffffff_1x400.png
- History
- Source
/lams_central/.../ui-bg_glass_65_ffffff_1x400.png
- binary
/lams_central/web/css/images/ui-bg_glass_75_dadada_1x400.png
- History
- Source
/lams_central/.../ui-bg_glass_75_dadada_1x400.png
- binary
/lams_central/web/css/images/ui-bg_glass_75_e6e6e6_1x400.png
- History
- Source
/lams_central/.../ui-bg_glass_75_e6e6e6_1x400.png
- binary
/lams_central/web/css/images/ui-bg_glass_75_ffffff_1x400.png
- History
- Source
/lams_central/.../ui-bg_glass_75_ffffff_1x400.png
- binary
/lams_central/web/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
- History
- Source
/lams_central/.../ui-bg_highlight-soft_75_cccccc_1x100.png
- binary
/lams_central/web/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
- History
- Source
/lams_central/.../ui-bg_inset-soft_95_fef1ec_1x100.png
- binary
/lams_central/web/css/images/ui-icons_222222_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_222222_256x240.png
- binary
/lams_central/web/css/images/ui-icons_2e83ff_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_2e83ff_256x240.png
- binary
/lams_central/web/css/images/ui-icons_454545_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_454545_256x240.png
- binary
/lams_central/web/css/images/ui-icons_888888_256x240.png
- History
- Source
/lams_central/web/.../ui-icons_888888_256x240.png
… 9 more files in changeset.

11:23 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
0c0c05b
changed 2 files
v4.7, v4.8

LDEV-4013: Label missing, which cause the user's comments to not be displayed correctly in monitoring.

- -1
- +1
/lams_tool_images/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_images/.../ApplicationResources.properties
- -1
- +1
/lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_images/.../ApplicationResources_en_AU.properties

10:08 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
d560da2
changed 1 file
v4.7, v4.8

LDEV-4008: Fixing export - it used to contain actual Java class names. No longer includes the creator so this problem is avoided. The code was also breaking the link to the rating criteria's as it was updating the original activity rather than acting on a copy. Now the original is left alone when an export is done.