Merge branch 'master' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

src/main/java/org/olat/group/ui/run/_i18n/LocalStrings_pt_BR.properties

-#Tue Feb 05 13:19:48 CET 2019
+#Fri Feb 08 20:39:43 CET 2019
 businessgroup.contact.bodytext=<p></p>---<p>Ir imediatamente para o grupo "{0}"\: {1}</p>
 businessgroup.contact.subject=Mensagem para grupo {0}
 contact.all.coaches=Todos os treinadores (coaches) de grupo

src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_pt_BR.properties

-#Wed Jan 23 20:10:40 CET 2019
+#Fri Feb 08 20:39:52 CET 2019
 MULTIPLE=M\u00FAltipla escolha
 SINGLE=Escolha \u00FAnica
 add=Adicionar
@@ -16,6 +16,7 @@ add.match.row=Adicionar linha
 answers=Respostas
 change.elements=Edi\u00E7\u00E3o
 configuration.option.inherited=Herdado
+configuration.option.inherited.val=Herdado ({0})
 configuration.option.no=N\u00E3o
 configuration.option.yes=Sim
 configuration.overview=Vis\u00E3o geral da configura\u00E7\u00E3o de teste

src/main/java/org/olat/modules/forms/ui/_i18n/LocalStrings_pt_BR.properties

-#Mon Feb 04 18:28:42 CET 2019
+#Fri Feb 08 20:39:53 CET 2019
 add.formcontainer=Recipiente
 add.formdisclaimer=Termos de uso
 add.formfileupload=Enviar arquivo

src/main/java/org/olat/modules/portfolio/model/BinderImpl.java

@@ -32,7 +32,6 @@ import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
 import javax.persistence.NamedQuery;
 import javax.persistence.OneToMany;
 import javax.persistence.OrderColumn;
@@ -64,11 +63,12 @@ import org.olat.resource.OLATResourceImpl;
  */
 @Entity(name="pfbinder")
 @Table(name="o_pf_binder")
-@NamedQueries({
-	@NamedQuery(name="loadBinderByKey", query="select binder from pfbinder as binder inner join fetch binder.baseGroup as baseGroup where binder.key=:portfolioKey")
-	
-	
-})
+@NamedQuery(name="loadBinderByKey", query="select binder from pfbinder as binder" +
+											" inner join fetch binder.baseGroup as baseGroup" +
+											" left join fetch binder.entry as v" +
+											" left join fetch v.olatResource as res" +
+											" where binder.key=:portfolioKey")
+
 public class BinderImpl implements Persistable, ModifiedInfo, CreateInfo, Binder {
 
 	private static final long serialVersionUID = -2607615295380443760L;

src/main/java/org/olat/modules/video/ui/component/ContinueAtCommand.java

@@ -40,6 +40,7 @@ public class ContinueAtCommand extends JSCommand {
 		sb.append("try {\n")
 		  .append(" var player = jQuery('#").append(elementId).append("').data('player');\n")
 		  .append(" player.play();\n")
+		  .append(" player.options.enableKeyboard=true;\n")
 		  .append(" player.setCurrentTime(").append(timeInSeconds).append(");\n")
 		  .append(" jQuery('#' + player.id + ' .mejs__overlay-play')\n")
 		  .append("   .show()\n")

src/main/java/org/olat/modules/video/ui/component/ContinueCommand.java

@@ -40,6 +40,7 @@ public class ContinueCommand extends JSCommand {
 		sb.append("try {\n")
 		  .append(" var player = jQuery('#").append(elementId).append("').data('player');\n")
 		  .append(" player.play();\n")
+		  .append(" player.options.enableKeyboard=true;\n")
 		  .append(" jQuery('#' + player.id + ' .mejs__overlay-play')\n")
 		  .append("   .show()\n")
 		  .append("   .css('width', '100%');\n")

src/main/java/org/olat/modules/video/ui/question/_content/item_wrapper.html

@@ -6,6 +6,7 @@
 jQuery(function() {
 	var player = jQuery('#o_so_vid${videoElementId}').data('player');
 	player.pause();
+	player.options.enableKeyboard=false;
 	#if($r.isFalse($authorMode))
 	jQuery(player.controls).hide();
 	jQuery('#' + player.id + ' .mejs__overlay-play')

src/main/webapp/static/themes/light/modules/_video.scss

@@ -156,6 +156,7 @@
 	&.mejs__overlay {
 		width: 100%;
 		height: 100%;
+		background-color: rgba(255,255,255,0.5);
 	}
 
 	#itemBody, .modalFeedback {