Fisheye on lams/lams_central/web/css

lams (lams2_head_wildfly): LDEV-4352: Adding mark charts to Monitoring for Scratchie and MCQ. Moved more to the css file to be shared across tools....

fionam — Fri, 09 Jun 2017 05:21:27 +0200

fionam committed lams2_head_wildfly:fionam:20170609032127 on branch lams2_head_wildfly in lams

LDEV-4352: Adding mark charts to Monitoring for Scratchie and MCQ. Moved more to the css file to be shared across tools.

· /lams_central/web/css/chart.css

(-0, +9)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4341...

Andrey Balan — Mon, 15 May 2017 22:09:00 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170515200900 on branch lams2_head_wildfly in lams

LDEV-4341

1) Add advanced settings that will contain Save button

2) If there are *no* course groupings - jump directly to the create groups page

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java	(-5, +7)	\| History	\| Source	\| Diff
· /lams_central/web/orgGroup.jsp	(-9, +15)	\| History	\| Source	\| Diff
· /lams_central/web/css/orgGroup.css	(-3, +10)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGroup.js	(-0, +5)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4341 Ability to save lesson grouping as a course grouping

Andrey Balan — Fri, 12 May 2017 16:28:09 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170512142809 on branch lams2_head_wildfly in lams

LDEV-4341 Ability to save lesson grouping as a course grouping

· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +4)	\| History	\| Source	\| Diff
· /lams_central/web/orgGroup.jsp	(-1, +41)	\| History	\| Source	\| Diff
· /lams_central/web/css/orgGroup.css	(-0, +11)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/orgGroup.js	(-1, +111)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java	(-23, +103)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4331 Fix + button showing big when using in small screen

Andrey Balan — Fri, 05 May 2017 22:27:03 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170505202703 on branch lams2_head_wildfly in lams

LDEV-4331 Fix + button showing big when using in small screen

· /lams_central/web/css/defaultHTML_learner.css

(-3, +2)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart.

fionam — Thu, 04 May 2017 06:11:23 +0200

fionam committed lams2_head_wildfly:fionam:20170504041123 on branch lams2_head_wildfly in lams

LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(-12, +2)	\| History	\| Source	\| Diff
· /lams_central/web/css/chart.css	(-1, +16)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/chart.js	(-0, +5)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-19, +0)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-0, +2)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-6, +29)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitorTour.jsp	(-1, +3)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-1, +21)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4331 Fix + button showing big when using in small screen

Andrey Balan — Tue, 02 May 2017 22:33:45 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170502203345 on branch lams2_head_wildfly in lams

LDEV-4331 Fix + button showing big when using in small screen

· /lams_central/web/css/defaultHTML_learner.css

(-2, +1)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4323: changing background image for a solid colour instead: oops (thanks marcino)

Ernie Ghiglione — Fri, 21 Apr 2017 10:03:17 +0200

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20170421080317 on branch lams2_head_wildfly in lams

LDEV-4323: changing background image for a solid colour instead: oops (thanks marcino)

· /lams_central/web/css/jquery-ui-smoothness-theme.css

(-1, +0)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4323: changing background image for a solid colour instead

Ernie Ghiglione — Thu, 20 Apr 2017 01:58:23 +0200

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20170419235823 on branch lams2_head_wildfly in lams

LDEV-4323: changing background image for a solid colour instead

· /lams_central/web/css/jquery-ui-smoothness-theme.css

(-3, +5)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-3962 added box-shadow property to main.jsp so it started to look more consistently with other pages

Andrey Balan — Mon, 10 Apr 2017 16:01:15 +0200

Andrey Balan committed lams2_head_wildfly:andreyb:20170410140115 on branch lams2_head_wildfly in lams

LDEV-3962 added box-shadow property to main.jsp so it started to look more consistently with other pages

· /lams_central/web/groupHeader.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/css/main.css	(-0, +6)	\| History	\| Source	\| Diff
· /lams_central/web/less/main.less	(-0, +6)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3962 Added border-radius property

Andrey Balan — Fri, 10 Mar 2017 11:53:21 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20170310105321 on branch lams2_head_wildfly in lams

LDEV-3962 Added border-radius property

· /lams_central/web/css/main.css	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/web/less/main.less	(-0, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4124: Add label size and color.

Marcin Cieslak — Fri, 10 Mar 2017 09:27:51 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20170310082751 on branch lams2_head_wildfly in lams

LDEV-4124: Add label size and color.

· /lams_build/lib/lams/lams.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_central/web/authoring/authoring.jsp	(-0, +17)	\| History	\| Source	\| Diff
· /lams_central/web/css/authoring.css	(-0, +9)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js	(-7, +19)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js	(-5, +13)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js	(-3, +34)	\| History	\| Source	\| Diff
· /lams_common/conf/hibernate/mappings/.../lams/learningdesign/LearningDesignAnnotation.hbm.xml	(-0, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170310.sql	(-0, +14)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignAnnotation.java	(-0, +9)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java	(-2, +3)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3962 Added border-radius property

Andrey Balan — Wed, 08 Mar 2017 22:31:11 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20170308213111 on branch lams2_head_wildfly in lams

LDEV-3962 Added border-radius property

· /lams_central/web/main.jsp	(-99, +97)	\| History	\| Source	\| Diff
· /lams_central/web/css/defaultHTML_learner.css	(-4, +9)	\| History	\| Source	\| Diff
· /lams_central/web/css/main.css	(-17, +23)	\| History	\| Source	\| Diff
· /lams_central/web/css/thickbox.css	(-0, +2)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3962 Make tool's authoring html occupy all available space (this way avoiding white space at the bottom)

Andrey Balan — Tue, 07 Mar 2017 12:29:07 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20170307112907 on branch lams2_head_wildfly in lams

LDEV-3962 Make tool's authoring html occupy all available space (this way avoiding white space at the bottom)

· /lams_central/web/css/authoring.css

(-1, +1)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4240: Consistent upload widget: making the button and file name area smaller.

fionam — Mon, 06 Mar 2017 01:37:02 +0100

fionam committed lams2_head_wildfly:fionam:20170306003702 on branch lams2_head_wildfly in lams

LDEV-4240: Consistent upload widget: making the button and file name area smaller.

· /lams_admin/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_central/web/css/defaultHTML_learner.css

(-1, +12)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_bbb/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_images/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_imscc/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

· /lams_tool_kaltura/web/WEB-INF/tags/FileUpload.tag

(-2, +2)

| History

| Source

| Diff

… 17 more files in changeset.

lams (lams2_head_wildfly): LDEV-4237: Include label informing the max size file...

fionam — Mon, 27 Feb 2017 10:57:59 +0100

fionam committed lams2_head_wildfly:fionam:20170227095759 on branch lams2_head_wildfly in lams

LDEV-4237: Include label informing the max size file

LDEV-4241: File upload validation

LDEV-4240: Consistent upload widget

Creating tags and shared javascript code to create consistency across tools for the look and validation behaviour of file upload.

· /lams_admin/web/WEB-INF/tags/AuthoringButton.tag

(-1, +1)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/FileUpload.tag

(-0, +56)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tags/WaitingSpinner.tag

(-0, +17)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/lams/lams.tld

(-0, +8)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/FileUpload.tag

(-0, +56)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/WaitingSpinner.tag

(-0, +17)

| History

| Source

| Diff

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

(-0, +8)

| History

| Source

| Diff

· /lams_central/web/css/defaultHTML_learner.css

(-0, +7)

| History

| Source

| Diff

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

(-0, +95)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/AuthoringButton.tag

(-1, +1)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/FileUpload.tag

(-0, +56)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/WaitingSpinner.tag

(-0, +17)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld

(-0, +8)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/AuthoringButton.tag

(binary)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/FileUpload.tag

(-0, +56)

| History

| Source

| Diff

… 6 more files in changeset.

lams (lams2_head_wildfly): LDEV-3711: removing css files that are not longer needed (now we are on bootstrap see LDEV-3676)

Ernie Ghiglione — Fri, 24 Feb 2017 03:36:33 +0100

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20170224023633 on branch lams2_head_wildfly in lams

LDEV-3711: removing css files that are not longer needed (now we are on bootstrap see LDEV-3676)

· /lams_central/web/css/defaultHTML.css	(-1600, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/defaultHTML_rtl.css	(-1709, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/defaultHTML_rtl_learner.css	(-599, +0)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3962 Similar changes done to Open Lesson dialog as previously done to Open/Save sequence in authoring...

Andrey Balan — Sat, 18 Feb 2017 17:22:22 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20170218162222 on branch lams2_head_wildfly in lams

LDEV-3962 Similar changes done to Open Lesson dialog as previously done to Open/Save sequence in authoring

* ability to save sequences on pressing the Enter button when title input is focused

* focus title input field in case this element is visible in the current viewport (to avoid unwanted scrolling)

* ability to start lessons on double click

* prevent sequences from being deselected on any subsequent clicks

* Make 'Tour' word to appear after icon in order to be consistent with the rest of the buttons

* Make #notificationsPendingCount to be less prominent in case there are no messages. And assign it 'btn-primary' class when there are some messages available

· /lams_central/web/main.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/css/main.css	(-0, +3)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/addLesson.js	(-5, +41)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/main.js	(-0, +7)	\| History	\| Source	\| Diff
· /lams_central/web/less/main.less	(-0, +3)	\| History	\| Source	\| Diff

lams (MAIN): file bootstrap-tour.min.css was initially added on branch lams2_head_wildfly.

fionam — Tue, 07 Feb 2017 07:36:04 +0100

fionam committed MAIN:fionam:20170207063604:1 on branch MAIN in lams

file bootstrap-tour.min.css was initially added on branch lams2_head_wildfly.

· /lams_central/web/css/bootstrap-tour.min.css

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-4216: Creating a short tour for the main page. Using classes to tie the tour entries to the source elements.

fionam — Tue, 07 Feb 2017 07:35:01 +0100

fionam committed lams2_head_wildfly:fionam:20170207063501 on branch lams2_head_wildfly in lams

LDEV-4216: Creating a short tour for the main page. Using classes to tie the tour entries to the source elements.

· /lams_central/web/favoriteOrganisations.jsp	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/group.jsp	(-3, +4)	\| History	\| Source	\| Diff
· /lams_central/web/groupContents.jsp	(-1, +5)	\| History	\| Source	\| Diff
· /lams_central/web/groupHeader.jsp	(-4, +4)	\| History	\| Source	\| Diff
· /lams_central/web/main.jsp	(-9, +25)	\| History	\| Source	\| Diff
· /lams_central/web/mainTour.jsp	(-0, +142)	\| History	\| Source	\| Diff
· /lams_central/web/css/bootstrap-tour.min.css	(-0, +22)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/bootstrap-tour.min.js	(-0, +22)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/index/IndexLinkBean.java	(-0, +12)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4159: Make LD recent access list scrollable and have limited width.

Marcin Cieslak — Tue, 20 Dec 2016 10:29:26 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20161220092926 on branch lams2_head_wildfly in lams

LDEV-4159: Make LD recent access list scrollable and have limited width.

· /lams_central/web/css/addLesson.css

(-5, +4)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4158: Make LD recent access list scrollable and have limited width.

Marcin Cieslak — Tue, 20 Dec 2016 10:19:29 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20161220091929 on branch lams2_head_wildfly in lams

LDEV-4158: Make LD recent access list scrollable and have limited width.

· /lams_central/web/authoring/authoring.jsp	(-1, +3)	\| History	\| Source	\| Diff
· /lams_central/web/css/authoring.css	(-5, +10)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js	(-4, +4)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4149 Added CSS rule to be able to see entire navbar which gets enlarged at 1330px

Andrey Balan — Wed, 14 Dec 2016 18:16:22 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20161214171622 on branch lams2_head_wildfly in lams

LDEV-4149 Added CSS rule to be able to see entire navbar which gets enlarged at 1330px

· /lams_central/web/css/thickbox.css

(-0, +5)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4123: Removing the highContrast theme that is no longer used. Users with this theme should now revert to the defaul...

fionam — Thu, 08 Dec 2016 05:07:52 +0100

fionam committed lams2_head_wildfly:fionam:20161208040752 on branch lams2_head_wildfly in lams

LDEV-4123: Removing the highContrast theme that is no longer used. Users with this theme should now revert to the default theme. The code that handled invalid themes was not correct and was stopped users logging in - now if the theme id in the database is null or if the theme id points to a non-existent theme then it can still log in using the default theme, and next time the user updates their profile the theme id will be fixed.

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java	(-1, +2)	\| History	\| Source	\| Diff
· /lams_central/web/editprofile.jsp	(-1, +4)	\| History	\| Source	\| Diff
· /lams_central/web/css/highContrast.css	(-1666, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/highContrast_learner.css	(-578, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/highContrast_rtl.css	(-1662, +0)	\| History	\| Source	\| Diff
· /lams_central/web/css/highContrast_rtl_learner.css	(-542, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040079.sql	(-0, +12)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(-1, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4091: Reducing the size of the growl notification

fionam — Fri, 02 Dec 2016 02:49:51 +0100

fionam committed lams2_head_wildfly:fionam:20161202014951 on branch lams2_head_wildfly in lams

LDEV-4091: Reducing the size of the growl notification

· /lams_central/web/css/defaultHTML_learner.css

(-1, +15)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-3962 Entire offcanvas menu button is now clickable and not just an image inside

Andrey Balan — Tue, 29 Nov 2016 09:44:48 +0100

Andrey Balan committed lams2_head_wildfly:andreyb:20161129084448 on branch lams2_head_wildfly in lams

LDEV-3962 Entire offcanvas menu button is now clickable and not just an image inside

· /lams_central/web/main.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/web/css/main.css	(-7, +7)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4064: Disable some button in mobile authoring. Fix authoring initial height on iPad.

Marcin Cieslak — Mon, 28 Nov 2016 17:28:16 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20161128162816 on branch lams2_head_wildfly in lams

LDEV-4064: Disable some button in mobile authoring. Fix authoring initial height on iPad.

· /lams_central/web/authoring/authoring.jsp	(-11, +11)	\| History	\| Source	\| Diff
· /lams_central/web/css/authoring.css	(-1, +0)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/dialog.js	(-1, +6)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js	(-4, +13)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4085: Login footer now always at the bottom of the page.

fionam — Thu, 24 Nov 2016 03:24:23 +0100

fionam committed lams2_head_wildfly:fionam:20161124022423 on branch lams2_head_wildfly in lams

LDEV-4085: Login footer now always at the bottom of the page.

· /lams_central/web/login.jsp	(-5, +7)	\| History	\| Source	\| Diff
· /lams_central/web/css/defaultHTML_learner.css	(-5, +21)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-4082: Slightly increase z-index of Open/Save dialogs so they cover whatever is on canvas.

Marcin Cieslak — Wed, 23 Nov 2016 10:27:05 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20161123092705 on branch lams2_head_wildfly in lams

LDEV-4082: Slightly increase z-index of Open/Save dialogs so they cover whatever is on canvas.

· /lams_central/web/css/authoring.css

(-0, +4)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-3774: Content with floating divs was causing the divs to be displayed outside of the CKEditor inline editing area. ...

fionam — Wed, 23 Nov 2016 04:58:45 +0100

fionam committed lams2_head_wildfly:fionam:20161123035845 on branch lams2_head_wildfly in lams

LDEV-3774: Content with floating divs was causing the divs to be displayed outside of the CKEditor inline editing area. Overflow set to contain them within the div, which causes the editing area to resize properly.

· /lams_central/web/css/inlineeditor.css

(-0, +1)

| History

| Source

| Diff

lams (lams2_head_wildfly): LDEV-4061: Add overall completion chart in monitoring UI....

Marcin Cieslak — Fri, 18 Nov 2016 18:11:10 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20161118171110 on branch lams2_head_wildfly in lams

LDEV-4061: Add overall completion chart in monitoring UI.

Update d3.js to 3.x latest. Version 4 is not backwards compatible.

Allow legend on hover instead of a static one next to the chart.

· /lams_central/web/css/chart.css	(-0, +11)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/chart.js	(-29, +82)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/d3.js	(-5, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-0, +4)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-1, +31)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-18, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/monitorLesson.css	(-0, +6)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-6, +10)	\| History	\| Source	\| Diff