• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging latest changes from HEAD to 2.3 branch

See MAIN:paulg:20090417074901 for details

Also, Video Recorder tool project was replaced completely given that it didn't exist in the 2.3 branch yet

  1. … 236 more files in changeset.
file user_online.png was added on branch lams2_3 on 2009-04-17 08:22:34 +0000

file user_offline.png was added on branch lams2_3 on 2009-04-17 08:22:34 +0000

LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated

- export portfolio fixed

- export fck recordings fixed

- conditions added

- preview images are now produced and displayed

- more feedback for rating

- instructions highlighted

- clicking delete button does not trigger viewing of recording

- timer display corrected

- prompt validation

- misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

    • binary
    ./images/icons/user_offline.png
    • binary
    ./images/icons/user_online.png
  1. … 51 more files in changeset.
LDEV-2229 internationalized "Learner's choice" label

  1. … 1 more file in changeset.
LDEV-2229 internationalized "Learner's choice" label

  1. … 1 more file in changeset.
LDEV-2217: Increase width of question display field in Survey authoring.

LDEV-2217: Increase width of question display field in Survey authoring.

LDEV-2178: Modify Question display in Survey Monitoring

LDEV-2217: Increase width of question display field in Survey authoring.

LDEV-2217: Increase width of question display field in Survey authoring.

LDEV-2178: Modify Question display in Survey Monitoring

LDEV-2175: Added Formulae editor to learner (merge to 2.3 branch)

    • -2
    • +2
    ./includes/javascript/fckconfig_custom.js
merging to branch 2.3

LDEV-2230: Add IE8 as support browser

LDEV-2231: min Flash Player version 8

LDEV-2230: warning about ie6

LDEV-2175: Added Formulae editor to learner

    • -2
    • +2
    ./includes/javascript/fckconfig_custom.js
LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

    • -150
    • +0
    ./gradebook/gradeBookCourseLearner.jsp
    • -183
    • +0
    ./gradebook/gradeBookCourseMonitor.jsp
    • -308
    • +0
    ./gradebook/gradeBookMonitor.jsp
    • -20
    • +20
    ./includes/javascript/openUrls.js
  1. … 135 more files in changeset.
LDEV-2208 - Prettying up interfaces for gradebook. Drastically reduced the size of the grids so they can fit in nice popups

    • -16
    • +16
    ./gradebook/gradeBookCourseLearner.jsp
    • -9
    • +9
    ./gradebook/gradeBookCourseMonitor.jsp
    • -25
    • +25
    ./gradebook/gradeBookMonitor.jsp
  1. … 1 more file in changeset.
LDEV-2120 Adding links from index page to gradebook

  1. … 3 more files in changeset.
LDEV-2204 Adding learner views for gradebook

    • -8
    • +14
    ./gradebook/gradeBookCourseLearner.jsp
    • -2
    • +1
    ./gradebook/gradeBookCourseMonitor.jsp
  1. … 9 more files in changeset.
LDEV-2173 Using an enum type to identify the view for gradebook so it is more re-usable

    • -0
    • +144
    ./gradebook/gradeBookCourseLearner.jsp
    • -8
    • +7
    ./gradebook/gradeBookCourseMonitor.jsp
  1. … 14 more files in changeset.
LDEV-2173 Fixing bug that caused updates to not work in gradebook

  1. … 2 more files in changeset.
LDEV-2187 Put time taken for activities and lessons in gradebook.

Adding in averaget time for activities for activity view in gradebook lesson monitor

  1. … 7 more files in changeset.
LDEV-2173 Standardising sorting and searching for GradeBookGridRows, now all can sort on name, id, mark and timeTaken (common properties for all types) and all can search on name

    • -1
    • +1
    ./gradebook/gradeBookCourseMonitor.jsp
LDEV-2173 Standardising sorting and searching for GradeBookGridRows, now all can sort on name, id, mark and timeTaken (common properties for all types) and all can search on name

    • -21
    • +13
    ./gradebook/gradeBookCourseMonitor.jsp
    • -13
    • +15
    ./gradebook/gradeBookMonitor.jsp
  1. … 17 more files in changeset.
LDEV-2197 Presence Chat

- Added a scrollbar to Presence user listings

- Changed css

- Scrolling better, still a bit iffy

  1. … 2 more files in changeset.
LDEV-2173 Moving jquery library so jqGrid can keep using 1.2.6 as the new 1.3.2 breaks the search function

    • -0
    • +11
    ./includes/javascript/jqgrid/js/jquery-1.2.6.pack.js
LDEV-2173 Adding gradebook images

    • binary
    ./images/table_edit.png
- Updated jQuery core to v1.3.2

- Updated jQuery UI to v1.7.1

- Classic Wizard now has checkbox visible to enable Presence Chat

- Learner no longer has a Presence box

- Presence Chat committed

    • -0
    • +412
    ./includes/javascript/jquery-ui/themes/base/jquery-ui.css
    • -0
    • +2
    ./includes/javascript/jquery-ui/themes/base/ui.all.css
    • -0
    • +62
    ./includes/javascript/jquery-ui/themes/base/ui.datepicker.css
    • -0
    • +4
    ./includes/javascript/jquery-ui/themes/base/ui.progressbar.css
    • -0
    • +13
    ./includes/javascript/jquery-ui/themes/base/ui.resizable.css
    • -0
    • +243
    ./includes/javascript/jquery-ui/themes/base/ui.theme.css
  1. … 250 more files in changeset.
LDEV-2173 Restructuring jqgrid javascript functions and jsps for re-use

    • -10
    • +11
    ./gradebook/gradeBookCourseMonitor.jsp
    • -131
    • +1
    ./gradebook/gradeBookMonitor.jsp
    • -0
    • +144
    ./gradebook/jqGridIncludes.jsp
  1. … 5 more files in changeset.
LDEV-2187 Adding time column to activities

and also, added tooltips to monitor view

    • -71
    • +186
    ./gradebook/gradeBookMonitor.jsp
  1. … 4 more files in changeset.
LDEV-2140 Made it so that tool activities outputs are retrieved once on single click the first time they are clicked, instead of when they are dropped from the toolkit. Also got it working so that when you open an existing design with outputs, it selects the correct one in the gradebook output combo box.

  1. … 3 more files in changeset.