Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 Migrate old Bootstrap3 class names into Bootstrap5 in *all* tools' learning

* Did this following 2 guides:

https://getbootstrap.com/docs/4.1/migration/

https://getbootstrap.com/docs/5.2/migration/

* Apart from changing class names, also performed other updates required in aforementioned guides.

For instance, checkboxes, radios, selects have now proper Bootstrap5 structure; removed "media" objects.

* Replaced some outdated LAMS class names

  1. … 105 more files in changeset.
LDEV-5397 bootstrap5 discussion sentiment

  1. … 5 more files in changeset.
LDEV-5397 bootstrap5 Rating.tag

Also some minor modifications to Assessment learning

  1. … 6 more files in changeset.
LDEV-5397 further migration of Assessment's learning to Bootstrap 5

  1. … 9 more files in changeset.
LDEV-5397 migrate Assessment's learning to Bootstrap 5

  1. … 34 more files in changeset.
LDEV-5352 Slightly improve UI

  1. … 1 more file in changeset.
LDEV-5081 Merge changes made for monitor in LDEV-5083

  1. … 36 more files in changeset.
LDEV-5273 Move VSA allocation front end files to Central

  1. … 7 more files in changeset.
LDEV-5272 Apply VSA UI improvements to single question summary page

  1. … 7 more files in changeset.
LDEV-5200 Remove output CSS files

SCSS generates them on each build.

  1. … 1 more file in changeset.
LDEV-5200 Adjusting icons colours and svg optimisation

Adjust icons and activity colours according to new colour scheme. Optimise SVG compression and pngs.

Adding .DS_Store to .gitignore files

  1. … 49 more files in changeset.
LDEV-5187 Combine Mark Hedging and Assessment justifications

Mark Hedging questions have own settings for justification. We should

have a consistent user experience in Assessment, not matter where

justification is set up: on Assessment activity level or on Mark Hedging

question level.

  1. … 9 more files in changeset.
LDEV-5081 Allow proper saving of redesigned Assessment authoring

  1. … 2 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

  1. … 75 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

  1. … 54 more files in changeset.
LDEV-4765 Further UI improvements

* True/False type of questions now use bootstrap-toggle widget

* Update jqeuryvalidate plugin. And make it show bootstrap-like warnings

* Disable autocomplete for all form inputs

* A few other minor fixes

  1. … 12 more files in changeset.
LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

  1. … 7 more files in changeset.
LDEV-4765 UI improvements

* Use switches instead of checkboxes

* Properly use toggle in Mark hedging question type

    • -0
    • +28
    ./bootstrap-toggle.scss
  1. … 12 more files in changeset.
LDEV-4765 UI improvements

* Show CKEditor placeholder properly in cases when it's initially not

blank

* Proper transition on expanding/collapsing options

  1. … 3 more files in changeset.
LDEV-4765 Further work on this feature

* shrinking and expanding question options on selecting them

* improved placeholder for CKEditor

* arranged questions' Settings tab items

  1. … 17 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

  1. … 7 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

  1. … 7 more files in changeset.
LDEV-4765 Fixed essay's slider CSS and validation

  1. … 1 more file in changeset.
LDEV-4765 Experimental switch and radio button for Mark hedging question

Also several other CSS and JS fixes.

  1. … 9 more files in changeset.
LDEV-4765 Apply new UI to other question types

  1. … 23 more files in changeset.
LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

  1. … 11 more files in changeset.
LDEV-4451 Add scss files and fix their names

  1. … 9 more files in changeset.
LDEV-4367 CSS Files removed if they are now generated files using SASS

  1. … 41 more files in changeset.
LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

    • -0
    • +112
    ./assessment.scss
  1. … 155 more files in changeset.
LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput settings.

  1. … 9 more files in changeset.