Skip to content
Snippets Groups Projects
Commit a753d603 authored by srosse's avatar srosse
Browse files

Merge remote-tracking branch 'origin/OpenOLAT_13.1'

parents 359d5d65 bd727da8
No related branches found
No related tags found
No related merge requests found
Showing
with 18 additions and 13 deletions
#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.bodytext=<p></p>---<p>Ir imediatamente para o grupo "{0}"\: {1}</p>
businessgroup.contact.subject=Mensagem para grupo {0} businessgroup.contact.subject=Mensagem para grupo {0}
contact.all.coaches=Todos os treinadores (coaches) de grupo contact.all.coaches=Todos os treinadores (coaches) de grupo
......
#Wed Jan 23 20:10:40 CET 2019 #Fri Feb 08 20:39:52 CET 2019
MULTIPLE=M\u00FAltipla escolha MULTIPLE=M\u00FAltipla escolha
SINGLE=Escolha \u00FAnica SINGLE=Escolha \u00FAnica
add=Adicionar add=Adicionar
...@@ -16,6 +16,7 @@ add.match.row=Adicionar linha ...@@ -16,6 +16,7 @@ add.match.row=Adicionar linha
answers=Respostas answers=Respostas
change.elements=Edi\u00E7\u00E3o change.elements=Edi\u00E7\u00E3o
configuration.option.inherited=Herdado configuration.option.inherited=Herdado
configuration.option.inherited.val=Herdado ({0})
configuration.option.no=N\u00E3o configuration.option.no=N\u00E3o
configuration.option.yes=Sim configuration.option.yes=Sim
configuration.overview=Vis\u00E3o geral da configura\u00E7\u00E3o de teste configuration.overview=Vis\u00E3o geral da configura\u00E7\u00E3o de teste
......
#Mon Feb 04 18:28:42 CET 2019 #Fri Feb 08 20:39:53 CET 2019
add.formcontainer=Recipiente add.formcontainer=Recipiente
add.formdisclaimer=Termos de uso add.formdisclaimer=Termos de uso
add.formfileupload=Enviar arquivo add.formfileupload=Enviar arquivo
......
...@@ -32,7 +32,6 @@ import javax.persistence.GenerationType; ...@@ -32,7 +32,6 @@ import javax.persistence.GenerationType;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.JoinColumn; import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne; import javax.persistence.ManyToOne;
import javax.persistence.NamedQueries;
import javax.persistence.NamedQuery; import javax.persistence.NamedQuery;
import javax.persistence.OneToMany; import javax.persistence.OneToMany;
import javax.persistence.OrderColumn; import javax.persistence.OrderColumn;
...@@ -64,11 +63,12 @@ import org.olat.resource.OLATResourceImpl; ...@@ -64,11 +63,12 @@ import org.olat.resource.OLATResourceImpl;
*/ */
@Entity(name="pfbinder") @Entity(name="pfbinder")
@Table(name="o_pf_binder") @Table(name="o_pf_binder")
@NamedQueries({ @NamedQuery(name="loadBinderByKey", query="select binder from pfbinder as binder" +
@NamedQuery(name="loadBinderByKey", query="select binder from pfbinder as binder inner join fetch binder.baseGroup as baseGroup where binder.key=:portfolioKey") " 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 { public class BinderImpl implements Persistable, ModifiedInfo, CreateInfo, Binder {
private static final long serialVersionUID = -2607615295380443760L; private static final long serialVersionUID = -2607615295380443760L;
......
...@@ -40,6 +40,7 @@ public class ContinueAtCommand extends JSCommand { ...@@ -40,6 +40,7 @@ public class ContinueAtCommand extends JSCommand {
sb.append("try {\n") sb.append("try {\n")
.append(" var player = jQuery('#").append(elementId).append("').data('player');\n") .append(" var player = jQuery('#").append(elementId).append("').data('player');\n")
.append(" player.play();\n") .append(" player.play();\n")
.append(" player.options.enableKeyboard=true;\n")
.append(" player.setCurrentTime(").append(timeInSeconds).append(");\n") .append(" player.setCurrentTime(").append(timeInSeconds).append(");\n")
.append(" jQuery('#' + player.id + ' .mejs__overlay-play')\n") .append(" jQuery('#' + player.id + ' .mejs__overlay-play')\n")
.append(" .show()\n") .append(" .show()\n")
......
...@@ -40,6 +40,7 @@ public class ContinueCommand extends JSCommand { ...@@ -40,6 +40,7 @@ public class ContinueCommand extends JSCommand {
sb.append("try {\n") sb.append("try {\n")
.append(" var player = jQuery('#").append(elementId).append("').data('player');\n") .append(" var player = jQuery('#").append(elementId).append("').data('player');\n")
.append(" player.play();\n") .append(" player.play();\n")
.append(" player.options.enableKeyboard=true;\n")
.append(" jQuery('#' + player.id + ' .mejs__overlay-play')\n") .append(" jQuery('#' + player.id + ' .mejs__overlay-play')\n")
.append(" .show()\n") .append(" .show()\n")
.append(" .css('width', '100%');\n") .append(" .css('width', '100%');\n")
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
jQuery(function() { jQuery(function() {
var player = jQuery('#o_so_vid${videoElementId}').data('player'); var player = jQuery('#o_so_vid${videoElementId}').data('player');
player.pause(); player.pause();
player.options.enableKeyboard=false;
#if($r.isFalse($authorMode)) #if($r.isFalse($authorMode))
jQuery(player.controls).hide(); jQuery(player.controls).hide();
jQuery('#' + player.id + ' .mejs__overlay-play') jQuery('#' + player.id + ' .mejs__overlay-play')
......
...@@ -156,6 +156,7 @@ ...@@ -156,6 +156,7 @@
&.mejs__overlay { &.mejs__overlay {
width: 100%; width: 100%;
height: 100%; height: 100%;
background-color: rgba(255,255,255,0.5);
} }
#itemBody, .modalFeedback { #itemBody, .modalFeedback {
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
source diff could not be displayed: it is too large. Options to address this: view the blob.
source diff could not be displayed: it is too large. Options to address this: view the blob.
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment