OO-3745: inline the marker editor (6643f0b5) · Commits · Lars Oliver Dam / OLAT CI-CD Testing Project

Commit 6643f0b5 authored 6 years ago by srosse

Browse files

OO-3745: inline the marker editor

parent 3d81cd88

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/org/olat/modules/ceditor/ui/_i18n/LocalStrings_en.properties 1 addition, 1 deletion

.../olat/modules/ceditor/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/video/VideoMarker.java 2 additions, 2 deletions

src/main/java/org/olat/modules/video/VideoMarker.java
src/main/java/org/olat/modules/video/VideoModule.java 21 additions, 0 deletions

src/main/java/org/olat/modules/video/VideoModule.java
src/main/java/org/olat/modules/video/manager/VideoXStream.java 1 addition, 0 deletions

...ain/java/org/olat/modules/video/manager/VideoXStream.java
src/main/java/org/olat/modules/video/model/VideoMarkerImpl.java 7 additions, 5 deletions

...in/java/org/olat/modules/video/model/VideoMarkerImpl.java
src/main/java/org/olat/modules/video/ui/VideoDisplayController.java 19 additions, 13 deletions

...ava/org/olat/modules/video/ui/VideoDisplayController.java
src/main/java/org/olat/modules/video/ui/VideoRuntimeController.java 1 addition, 1 deletion

...ava/org/olat/modules/video/ui/VideoRuntimeController.java
src/main/java/org/olat/modules/video/ui/_content/video_markers.html 16 additions, 3 deletions

...ava/org/olat/modules/video/ui/_content/video_markers.html
src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_de.properties 13 additions, 4 deletions

...rg/olat/modules/video/ui/_i18n/LocalStrings_de.properties
src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_en.properties 21 additions, 11 deletions

...rg/olat/modules/video/ui/_i18n/LocalStrings_en.properties
src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_fr.properties 5 additions, 0 deletions

...rg/olat/modules/video/ui/_i18n/LocalStrings_fr.properties
src/main/java/org/olat/modules/video/ui/_i18n/LocalStrings_pt_BR.properties 5 additions, 0 deletions

...olat/modules/video/ui/_i18n/LocalStrings_pt_BR.properties
src/main/java/org/olat/modules/video/ui/component/VideoMarkerStyleCellRenderer.java 56 additions, 0 deletions

...ules/video/ui/component/VideoMarkerStyleCellRenderer.java
src/main/java/org/olat/modules/video/ui/event/MarkerResizedEvent.java 18 additions, 0 deletions

...a/org/olat/modules/video/ui/event/MarkerResizedEvent.java
src/main/java/org/olat/modules/video/ui/marker/MarkerEditController.java 111 additions, 55 deletions

...rg/olat/modules/video/ui/marker/MarkerEditController.java
src/main/java/org/olat/modules/video/ui/marker/ReloadMarkersCommand.java 1 addition, 1 deletion

...rg/olat/modules/video/ui/marker/ReloadMarkersCommand.java
src/main/java/org/olat/modules/video/ui/marker/VideoMarkerEditController.java 85 additions, 78 deletions

...at/modules/video/ui/marker/VideoMarkerEditController.java
src/main/java/org/olat/modules/video/ui/marker/VideoMarkersTableModel.java 3 additions, 1 deletion

.../olat/modules/video/ui/marker/VideoMarkersTableModel.java
src/main/java/org/olat/modules/video/ui/marker/_content/marker_edit.html 115 additions, 0 deletions

...rg/olat/modules/video/ui/marker/_content/marker_edit.html
src/main/java/org/olat/modules/video/ui/marker/_content/markers_overview.html 5 additions, 2 deletions

...at/modules/video/ui/marker/_content/markers_overview.html

with 506 additions and 177 deletions

Please register or to comment