Merge branch 'master' of

ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git

src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_de.properties

@@ -23,7 +23,7 @@ FileResource.GLOSSARY=Glossar
 FileResource.IMAGE=Bild
 FileResource.IMSCP=CP-Lerninhalt
 FileResource.IMSQTI21=Test (QTI 2.1)
-FileResource.FORM=Fragebogen (Portfolio)
+FileResource.FORM=Fragebogen
 FileResource.MOVIE=Film
 FileResource.VIDEO=Video
 FileResource.PDF=PDF

src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_en.properties

@@ -24,7 +24,7 @@ FileResource.GLOSSARY=Glossary
 FileResource.IMAGE=Image
 FileResource.IMSCP=CP learning content
 FileResource.IMSQTI21=Test (QTI 2.1)
-FileResource.FORM=Survey (Portfolio)
+FileResource.FORM=Survey
 FileResource.MOVIE=Movie
 FileResource.VIDEO=Video
 FileResource.PDF=PDF

src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_fr.properties

@@ -20,7 +20,7 @@ FileResource.ANIM=Animation
 FileResource.BLOG=Blogue
 FileResource.DOC=Word
 FileResource.FILE=Fichier
-FileResource.FORM=Questionnaire (portfolio)
+FileResource.FORM=Questionnaire
 FileResource.GLOSSARY=Glossaire
 FileResource.IMAGE=Image
 FileResource.IMSCP=Contenu didactique CP 

src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_it.properties

@@ -19,7 +19,7 @@ FileResource.ANIM=Animazione
 FileResource.BLOG=Blog
 FileResource.DOC=Word
 FileResource.FILE=File
-FileResource.FORM=Questionario (Portfolio)
+FileResource.FORM=Questionario
 FileResource.GLOSSARY=Glossario
 FileResource.IMAGE=Immagine
 FileResource.IMSCP=Contenuto didattico CP

src/main/java/org/olat/core/commons/chiefcontrollers/_i18n/LocalStrings_pt_BR.properties

@@ -20,7 +20,7 @@ FileResource.ANIM=Anima\u00E7\u00E3o
 FileResource.BLOG=Blog
 FileResource.DOC=Word
 FileResource.FILE=Arquivo
-FileResource.FORM=Pesquisa (Portfolio)
+FileResource.FORM=Pesquisa
 FileResource.GLOSSARY=Gloss\u00E1rio
 FileResource.IMAGE=Imagem
 FileResource.IMSCP=M\u00F3dulo IMS-CP

src/main/java/org/olat/modules/forms/ui/_content/execute.html

+<div class="o_evaluation_execution">
 #if($messageNotDone)
 	<div class="o_warning">$r.translate("evaluation.in.progress")</div>
 #elseif($messageWithoutElements)
 	<div class="o_warning">$r.translate("evaluation.form.without.elements")</div>
 #else
 	#if($anonymous)
-		<div class="o_warning">$r.translate("evaluation.anonymous")</div>
+		<div class="o_evaluation_anonymous_info o_warning">$r.translate("evaluation.anonymous")</div>
 	#end
 	<div class="o_evaluation_form o_form form-vertical">
 		#foreach($fragment in $fragments)
@@ -21,4 +22,5 @@
 			#end
 		</div>
 	</div>
-#end
\ No newline at end of file
+#end
+</div>
\ No newline at end of file

src/main/java/org/olat/repository/_i18n/LocalStrings_de.properties

@@ -11,7 +11,7 @@ FileResource.GLOSSARY=Glossar
 FileResource.IMAGE=Bild
 FileResource.IMSCP=CP-Lerninhalt
 FileResource.IMSQTI21=Test (QTI 2.1)
-FileResource.FORM=Fragebogen (Portfolio)
+FileResource.FORM=Fragebogen
 FileResource.MOVIE=Film
 FileResource.PDF=PDF
 FileResource.PODCAST=Podcast

src/main/java/org/olat/repository/_i18n/LocalStrings_en.properties

@@ -7,7 +7,7 @@ FileResource.ANIM=Animation
 FileResource.BLOG=Blog
 FileResource.DOC=Word
 FileResource.FILE=Other file
-FileResource.FORM=Survey (Portfolio)
+FileResource.FORM=Survey
 FileResource.GLOSSARY=Glossary
 FileResource.IMAGE=Image
 FileResource.IMSCP=CP learning content

src/main/java/org/olat/repository/_i18n/LocalStrings_fr.properties

@@ -7,7 +7,7 @@ FileResource.ANIM=Animation
 FileResource.BLOG=Blogue
 FileResource.DOC=Word
 FileResource.FILE=Autres fichiers
-FileResource.FORM=Questionnaire (Portfolio)
+FileResource.FORM=Questionnaire
 FileResource.GLOSSARY=Glossar
 FileResource.IMAGE=Image
 FileResource.IMSCP=Contenu didactique CP

src/main/java/org/olat/repository/_i18n/LocalStrings_it.properties

@@ -7,7 +7,7 @@ FileResource.ANIM=Animazione
 FileResource.BLOG=Blog
 FileResource.DOC=Word
 FileResource.FILE=Altro file
-FileResource.FORM=Questionario (Portfolio)
+FileResource.FORM=Questionario
 FileResource.GLOSSARY=Glossario
 FileResource.IMAGE=Immagine
 FileResource.IMSCP=Contenuto didattico CP

src/main/java/org/olat/repository/_i18n/LocalStrings_pt_BR.properties

@@ -7,7 +7,7 @@ FileResource.ANIM=Anima\u00E7\u00E3o
 FileResource.BLOG=Blog
 FileResource.DOC=Word
 FileResource.FILE=Outro arquivo
-FileResource.FORM=Pesquisa (Portfolio)
+FileResource.FORM=Pesquisa
 FileResource.GLOSSARY=Gloss\u00E1rio
 FileResource.IMAGE=Imagem
 FileResource.IMSCP=M\u00F3dulo IMS-CP

src/main/java/org/olat/search/ui/_i18n/LocalStrings_de.properties

@@ -131,7 +131,7 @@ type.repository.entry.FileResource.ANIM=Lernressourcen, Animation
 type.repository.entry.FileResource.BLOG=Lernressourcen, Blog
 type.repository.entry.FileResource.DOC=Lernressourcen, Word-Datei
 type.repository.entry.FileResource.FILE=Lernressourcen, Datei
-type.repository.entry.FileResource.FORM=Lernressourcen, Fragebogen (Portfolio)
+type.repository.entry.FileResource.FORM=Lernressourcen, Fragebogen
 type.repository.entry.FileResource.GLOSSARY=Glossar
 type.repository.entry.FileResource.IMAGE = Bild
 type.repository.entry.FileResource.IMSCP=Lernressourcen, CP-Lerninhalt

src/main/java/org/olat/search/ui/_i18n/LocalStrings_en.properties

@@ -132,7 +132,7 @@ type.repository.entry.FileResource.ANIM=Learning resources, Animation
 type.repository.entry.FileResource.BLOG=Learning resources, Blog
 type.repository.entry.FileResource.DOC=Learning resources, Word file
 type.repository.entry.FileResource.FILE=Learning resources, File
-type.repository.entry.FileResource.FORM=Learning resources, Survey (Portfolio)
+type.repository.entry.FileResource.FORM=Learning resources, Survey
 type.repository.entry.FileResource.GLOSSARY=Glossary
 type.repository.entry.FileResource.IMAGE=Image
 type.repository.entry.FileResource.IMSCP=Learning resources, CP learning content

src/main/java/org/olat/search/ui/_i18n/LocalStrings_fr.properties

@@ -132,7 +132,7 @@ type.repository.entry.FileResource.ANIM=Ressources didactiques, animation
 type.repository.entry.FileResource.BLOG=Ressources didactiques, blogue
 type.repository.entry.FileResource.DOC=Ressources didactiques, Fichier Worf
 type.repository.entry.FileResource.FILE=Ressources didactiques, Fichier
-type.repository.entry.FileResource.FORM=Ressources didactiques, questionnaire (portfolio)
+type.repository.entry.FileResource.FORM=Ressources didactiques, questionnaire
 type.repository.entry.FileResource.GLOSSARY=Glossaire
 type.repository.entry.FileResource.IMAGE=Image
 type.repository.entry.FileResource.IMSCP=Ressources didactiques, contenu didactique CP

src/main/java/org/olat/search/ui/_i18n/LocalStrings_pt_BR.properties

@@ -132,7 +132,7 @@ type.repository.entry.FileResource.ANIM=Recursos did\u00E1ticos, anima\u00E7\u00
 type.repository.entry.FileResource.BLOG=Recursos did\u00E1ticos, blog
 type.repository.entry.FileResource.DOC=Recursos did\u00E1ticos, arquivo Word
 type.repository.entry.FileResource.FILE=Recursos did\u00E1ticos, arquivo
-type.repository.entry.FileResource.FORM=Recursos did\u00E1ticos, Survey (Portfolio)
+type.repository.entry.FileResource.FORM=Recursos did\u00E1ticos, Survey
 type.repository.entry.FileResource.GLOSSARY=Gloss\u00E1rio
 type.repository.entry.FileResource.IMAGE=Imagem
 type.repository.entry.FileResource.IMSCP=IMS-CP Reposit\u00F3rio

src/main/webapp/static/themes/light/_config.scss

@@ -512,6 +512,7 @@ $o-evaluation-slider-hover-background-color	: $table-bg-hover !default;
 $o-evaluation-insufficient-background-color : #fee08b !default;
 $o-evaluation-neutral-background-color		: #ffffbf !default;
 $o-evaluation-sufficient-background-color	: #d9ef8b !default;
+$o-evaluation-anonymous-info-display		: inherit !default;
 
 /* Portlets site */
 $o-portlet-border				: $panel-default-border !default;

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

@@ -346,4 +346,11 @@
 	.o_rubric_avg {
 		font-weight: bold;
 	}
-}
\ No newline at end of file
+}
+
+.o_evaluation_execution {
+	.o_evaluation_anonymous_info {
+		display: $o-evaluation-anonymous-info-display;
+	}
+}
+