OO-2042: css tweaks and show generic images, wording

src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties

-#Wed Jun 01 11:46:29 CEST 2016
+#Wed Jun 01 16:58:31 CEST 2016
 add.solution=Musterl\u00F6sung hochladen
 add.task=Aufgabe hinzuf\u00FCgen
 assessment.group.tool=Gruppe bewerten
@@ -223,7 +223,7 @@ submission.text=Text nach erfolgter Abgabe
 submit.deadline=Abgabe bis ...
 submit.documents.desc=Bevor eine Abgabe durchgef\u00FChrt werden kann m\u00FCssen die Dokumente hochgeladen oder erstellt werden. Die Dokumente sind zu diesem Zeitpunkt noch nicht abgegeben und f\u00FCr den Betreuer nicht einsehbar. 
 submit.documents.title=Schritt 1\: Dokumente vorbereiten
-submit.submit.desc=Um die Dokumente abzugeben und f\u00FCr den Betreuer einsehbar zu mach m\u00FCssen die endg\u00FCltige Abgabe best\u00E4tigen. W\u00E4hlen Sie die untenstehende Schaltfl\u00E4che. Beachten Sie, dass die Abgabe damit geschlossen wird und danach keine neuen Dokumente abgegeben werden k\u00F6nnen. 
+submit.submit.desc=Um die Dokumente abzugeben und f\u00FCr den Betreuer einsehbar zu machen, m\u00FCssen Sie die endg\u00FCltige Abgabe best\u00E4tigen. W\u00E4hlen Sie die unten stehende Schaltfl\u00E4che. Beachten Sie, dass die Abgabe damit geschlossen wird und danach keine neuen Dokumente abgegeben werden k\u00F6nnen.
 submit.submit.title=Schritt 2\: Dokumente an Betreuer \u00FCbermitteln
 table.header.author=Autor
 table.header.comment=Kommentar

src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties

-#Mon Mar 14 09:41:44 CET 2016
+#Wed Jun 01 17:01:10 CEST 2016
 add.solution=Add solution
 add.task=Add task
 assessment.group.tool=Grade group
@@ -19,14 +19,15 @@ choosed.areas=Areas
 choosed.groups=Groups
 coach.assessment=Grade
 coach.back.to.submission=Re-open submission
-coach.back.to.submission.confirm.title=Re-open submission
 coach.back.to.submission.confirm.text=Are you sure you wish to re-open the task submission for "{0}"?
+coach.back.to.submission.confirm.title=Re-open submission
 coach.close.revision.button=Revision accepted
-coach.collect.confirm.title=Collect document(s)
+coach.collect.confirm.desc=In case a participant forgot to finalize the submission process, coaches can manually collect documents of a participant.
 coach.collect.confirm.text=You are about to close the submission for "{0}". Please make sure all required documents were submitted before clicking "OK".
+coach.collect.confirm.title=Collect document(s)
 coach.collect.revisions=$\:coach.collect.task
-coach.collect.revisions.confirm.title=$\:coach.collect.task
 coach.collect.revisions.confirm.text=You are about to close the revision for "{0}". Please make sure all required documents were submitted before clicking "OK".
+coach.collect.revisions.confirm.title=$\:coach.collect.task
 coach.collect.task=Collect document(s)
 coach.corrections.closed=The submission has been accepted for grading
 coach.corrections.description=You have returned the following documents.
@@ -35,6 +36,8 @@ coach.corrections.waiting=The submission is waiting to be reviewed
 coach.document=Documents
 coach.document.open.editor=Open editor
 coach.documents.successfully.reviewed=Reviewed\!
+coach.feedback.documents.desc=Uploaded documents are visible to the participatns as soon as you have either accepted the submission as is, or requested a revision
+coach.feedback.documents.title=Prepare feedback documents
 coach.need.revision.button=Needs revision
 coach.reviewed.button=Submission accepted
 coach.reviewed.confirm.text=Please confirm your acceptance of the submitted documents. The task is now closed for the user, and there is no revision option available.
@@ -48,6 +51,8 @@ coach.submit.corrections.to.revision.button=$\:coach.need.revision.button
 coach.submitted.documents.description=These documents have been submitted
 coach.submitted.nofiles=The submission was done without documents
 coach.task.assigned.description=The following task has been assigned
+coach.verdict.desc=Submitted documents can be either accepted or rejected for revision. Once the submitted documents are accepted, the submission process is closed.
+coach.verdict.title=Give feedback
 coach.waiting.assignment=Waiting for assignment
 coach.waiting.assignment.description=The has not been assigned yet. The submission and reviewing process can only be started when the task has been assigned first. 
 coach.waiting.submitted.documents=Waiting for documents
@@ -74,7 +79,7 @@ embedded.editor=Submit with OpenOLAT text editor
 enabled=enabled
 error.assignment.closed=Assignment is closed
 error.duplicate.coaching=This user is a member of multiple groups in this task.
-error.duplicate.memberships=The following users are members of multiple groups, and are therefore required to hand in this assignment multiple times: {1}
+error.duplicate.memberships=The following users are members of multiple groups, and are therefore required to hand in this assignment multiple times\: {1}
 error.editor.atLeastOne=You must choose at least one kind of editor.
 error.file.exists=$org.olat.core.commons.modules.bc\:cfile.already.exists
 error.file.invalid=$org.olat.core.commons.modules.bc\:cfile.name.notvalid
@@ -191,9 +196,9 @@ run.submit.individual.description.editor=Submit your solution by using the edito
 run.submit.individual.description.upload=Submit your solution by uploading a document you created on your computer.
 run.submit.revision.button=Submit revision
 run.submit.revision.confirm=Please confirm the submission for this revision. The submission of the revision is final and can not be undone. 
-run.submit.revision.confirm.group=$\:run.submit.revision.confirm<br/>This is a group task! The submitted document is valid for all members of the group "{0}"!
+run.submit.revision.confirm.group=$\:run.submit.revision.confirm<br/>This is a group task\! The submitted document is valid for all members of the group "{0}"\!
 run.submit.revision.confirm.warning=You have not yet uploaded / created a document. Do you still wish to submit? The submission of the revised task is final and can not be undone.<br/><br/>The drop box is closed. You will not be able to upload any documents.
-run.submit.revision.confirm.warning.group=$\:run.submit.revision.confirm.warning<br/>This is a group task! The submitted document is valid for all members of the group "{0}"!
+run.submit.revision.confirm.warning.group=$\:run.submit.revision.confirm.warning<br/>This is a group task\! The submitted document is valid for all members of the group "{0}"\!
 run.submitted.description=The following solutions have been submitted by you\:
 run.submitted.nofiles=The submission was done without documents
 sample.solution=Sample solution
@@ -215,6 +220,10 @@ submission.mail.subject=OpenOLAT-confirmation-E-Mail
 submission.nofile=No file uploaded
 submission.text=Text after handing in
 submit.deadline=Submission deadline
+submit.documents.desc=Before submitting a task, documents must be either created or uploaded. These documents are not yet submitted and therefore not visible for the coach.
+submit.documents.title=Step 1\: Prepare documents
+submit.submit.desc=In order to submit documents and thus make them visible for coaches, you need to confirm the submission by clicking the button below.
+submit.submit.title=Step 2\: Submit documents
 table.header.author=Author
 table.header.comment=Comment
 table.header.details.gta=$org.olat.course.nodes.ta\:table.header.details.ta
@@ -258,6 +267,6 @@ warning.no.task.choosed.coach=It\u00A0seems\u00A0that\u00A0due\u00A0to\u00A0a\u0
 warning.submit.documents.edited=You cannot submit the task. The document "{1}" is currently being edited by "{0}".
 warning.tasks.in.process.delete.text=Do you really wan to delete this task? There are already users who have started the task process. It could result in problems for these users.
 warning.tasks.in.process.delete.title=$\:warning.tasks.in.process.title
-warning.tasks.in.process.text=There are already users who have started the task process. Changing the workflow configuration could result in problems for these users. Please refer to the <a href="{0}" target="_blank"><i class='o_icon o_icon_help'> </i> manual</a> for more information.
+warning.tasks.in.process.text=There are already users who have started the task process. Changing the workflow configuration could result in problems for these users. Please refer to the <a href\="{0}" target\="_blank"><i class\='o_icon o_icon_help'> </i> manual</a> for more information.
 warning.tasks.in.process.title=Task already started
 warning.tasks.submitted=You cannot edit this task anymore, it has already been submitted.  

src/main/java/org/olat/course/nodes/members/Member.java

@@ -39,6 +39,7 @@ public class Member extends UserPropertiesRow {
 	private final String firstName;
 	private final String lastName;
 	private final String fullName;
+	private final String gender;
 	private final Long key;
 	private boolean portrait;
 	private String portraitCssClass;
@@ -50,8 +51,14 @@ public class Member extends UserPropertiesRow {
 	
 	public Member(Identity identity, String fullName,  List<UserPropertyHandler> userPropertyHandlers, Locale locale, boolean portrait, String portraitCssClass) {
 		super(identity, userPropertyHandlers, locale);
-		this.firstName = identity.getUser().getProperty(UserConstants.FIRSTNAME, locale);;
+		this.firstName = identity.getUser().getProperty(UserConstants.FIRSTNAME, locale);
 		this.lastName = identity.getUser().getProperty(UserConstants.LASTNAME, locale);
+		String genderEn = identity.getUser().getProperty(UserConstants.GENDER, Locale.ENGLISH);
+		if(genderEn != null) {
+			gender = genderEn.toLowerCase();
+		} else {
+			gender = "-";
+		}
 		this.fullName = fullName;
 		this.key = identity.getKey();
 		this.portrait = portrait;
@@ -66,6 +73,10 @@ public class Member extends UserPropertiesRow {
 		return lastName;
 	}
 	
+	public String getGender() {
+		return gender;
+	}
+	
 	public String getPortraitCssClass() {
 		return portraitCssClass;
 	}

src/main/java/org/olat/course/nodes/members/MembersCourseNodeRunController.java

@@ -160,7 +160,7 @@ public class MembersCourseNodeRunController extends FormBasicController {
 		if(formLayout instanceof FormLayoutContainer) {
 			printLink = LinkFactory.createButton("print", ((FormLayoutContainer)formLayout).getFormItemComponent(), this);
 			printLink.setIconLeftCSS("o_icon o_icon_print o_icon-lg");
-			printLink.setPopup(new LinkPopupSettings(880, 500, "print-members"));
+			printLink.setPopup(new LinkPopupSettings(700, 500, "print-members"));
 			((FormLayoutContainer)formLayout).getFormItemComponent().put("print", printLink);
 		}
 

src/main/java/org/olat/course/nodes/members/MembersPrintController.java

@@ -19,6 +19,7 @@
  */
 package org.olat.course.nodes.members;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.olat.core.gui.UserRequest;
@@ -55,15 +56,18 @@ public class MembersPrintController extends BasicController {
 		mainVC.contextPut("courseTitle", courseEnv.getCourseTitle());
 		mainVC.contextPut("avatarBaseURL", avatarBaseURL);
 		mainVC.contextPut("userPropertyHandlers", userPropertyHandlers);
+		
+		List<Member> members = new ArrayList<>();
 		if(owners != null && owners.size() > 0) {
-			initFormMemberList("owners", owners);
+			members.addAll(owners);
 		}
 		if(coaches != null && coaches.size() > 0) {
-			initFormMemberList("coaches", coaches);
+			members.addAll(coaches);
 		}
 		if(participants != null && participants.size() > 0) {
-			initFormMemberList("participants", participants);
+			members.addAll(participants);
 		}
+		initFormMemberList("members", members);
 
 		MainPanel mainPanel = new MainPanel("membersPrintPanel");
 		mainPanel.setContent(mainVC);

src/main/java/org/olat/course/nodes/members/_content/print.html

@@ -3,16 +3,9 @@
 </div>
 <h1>$r.translate("print.title")</h1>
 <h3>$courseTitle</h3>
-#if($r.available("owners"))
-	$r.render("owners")
+#if($r.available("members"))
+	$r.render("members")
 #end
-#if($r.available("coaches"))
-	$r.render("coaches")
-#end
-#if($r.available("participants"))
-	$r.render("participants")
-#end
-<div class="clearfix"> </div>
 <script type='text/javascript'>
 /* <![CDATA[ */
 	jQuery(function() {

src/main/java/org/olat/course/nodes/members/_content/printList.html

@@ -2,7 +2,15 @@
 	<div class="o_cmember col-xs-3 col-sm-3 col-md-3">
 		<div class="clearfix">
 			<div class="o_portrait">
-				<img src="$avatarBaseURL/$member.getKey()/portrait.jpg">
+				#if(${member.isPortraitAvailable()})
+					<img src="$avatarBaseURL/$member.getKey()/portrait.jpg">
+				#elseif(${member.getGender().equals("female")})
+					<img src='$r.staticLink("themes/light/images/portrait/dummy_female_big.png")'>
+				#elseif(${member.getGender().equals("male")})
+					<img src='$r.staticLink("themes/light/images/portrait/dummy_male_big.png")'>
+				#else
+					<img src='$r.staticLink("themes/light/images/portrait/anonymous.png")'>
+				#end
 			</div>
 			<div class="o_cmember_info_wrapper">
 				<strong>$member.fullName</strong>
@@ -14,4 +22,7 @@
 			</div>
 		</div>
 	</div>
+	#if($foreach.count % 4 == 0)
+		<div class="clearfix"> </div>
+	#end
 #end

src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_de.properties

@@ -6,7 +6,7 @@ areachoice.no.areas.owner=Es wurde kein Lernbereich gefunden. Lernbereiche k\u00
 assessment=$org.olat.group.ui.main\:assessment
 group.id.help=Suchen Sie nach dieser ID in der erweiterten Suche.
 chkBox.open=Gruppe f\u00FCr Buchung in Gruppenbereich ver\u00F6ffentlichen
-chkBox.open.downloadList=Benutzer d\u00FCrfen Teilnehmerliste herunterladen
+chkBox.open.downloadList=Mitglieder d\u00FCrfen Mitgliederliste herunterladen
 chkBox.open.owners=Alle Benutzer sehen Betreuer
 chkBox.open.owners.help=Diese Option betrifft alle Systembenutzer und selektiert deshalb automatisch die Option \u201EMitglieder sehen Betreuer\u201C.
 chkBox.open.partips=Alle Benutzer sehen Teilnehmer

src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_en.properties

@@ -6,7 +6,7 @@ areachoice.no.areas.owner=No learning areas found. New learning areas can only b
 assessment=$org.olat.group.ui.main\:assessment
 group.id.help=Search for this ID in the advanced search.
 chkBox.open=Publish group in group area for booking
-chkBox.open.downloadList=Users can download the list of members
+chkBox.open.downloadList=Members can download the list of members
 chkBox.open.owners=All users can see coaches
 chkBox.open.owners.help=This option effects all system users and thus automatically checks the \u201EMembers can see coaches\u201C option.
 chkBox.open.partips=All users can see participants

src/main/java/org/olat/group/ui/edit/_i18n/LocalStrings_fr.properties

@@ -5,7 +5,7 @@ areachoice.no.areas.admin=Aucun domaine d'\u00E9tude trouv\u00E9. Cr\u00E9ez SVP
 areachoice.no.areas.owner=Aucun domaine d'\u00E9tude trouv\u00E9. Les domaines d'\u00E9tude peuvent \u00EAtre cr\u00E9\u00E9s uniquement par les personnes autoris\u00E9es pour toute la gestion des groupes.
 assessment=$org.olat.group.ui.main\:assessment
 chkBox.open=Publier ce groupe \u00E0 la r\u00E9servation
-chkBox.open.downloadList=Les utilisateurs peuvent t\u00E9l\u00E9charger la liste des membres
+chkBox.open.downloadList=Les membres peuvent t\u00E9l\u00E9charger les listes de membres
 chkBox.open.owners=Tous voient les coaches
 chkBox.open.owners.help=Cette option affecte tous les utilisateurs du syst\u00E8me et par cons\u00E9quent s\u00E9lectionne automatiquement l'option "Membres voient coaches".
 chkBox.open.partips=Tous voient les participants

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

@@ -178,8 +178,20 @@
 	}
 }
 
-.o_cmembers_print #o_print_brand img {
-	float: right;
+.o_cmembers_print {
+	#o_print_brand img {
+		float: right;
+	}
+	
+	.o_cmember {
+		padding-left: 0px;
+		padding-right: 15px;
+		margin-bottom: 25px;
+		
+		.o_cmember_info_wrapper {
+			word-wrap:break-word;
+		}
+	}
 }
 
 .tag.label.label-info {