From 6762c4dd44baa35b26f2808d8ac8319cddded32f Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 12 Dec 2013 11:59:08 +0100
Subject: [PATCH] OO-899: better line breaking for the identity informations in
assessment tool
---
.../assessment/_content/detailview.html | 14 +++++++----
.../assessment/_content/identityoverview.html | 23 ++++++++++++-------
.../_i18n/LocalStrings_fr.properties | 4 ++--
3 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/olat/course/assessment/_content/detailview.html b/src/main/java/org/olat/course/assessment/_content/detailview.html
index 27904268fa2..2c1da022754 100644
--- a/src/main/java/org/olat/course/assessment/_content/detailview.html
+++ b/src/main/java/org/olat/course/assessment/_content/detailview.html
@@ -16,15 +16,21 @@ $r.render("backLink")
<span class="b_with_small_icon_left b_user_icon">$r.escapeHtml($user.getProperty("firstName", $locale)) $r.escapeHtml($user.getProperty("lastName", $locale))</span>
</td>
<td>
+ #if ($user.getProperty("institutionalName", $locale) && $user.getProperty("institutionalName", $locale).length() > 0)
+ #set ($inst = $r.escapeHtml($user.getProperty("institutionalName", $locale)))
+ #end
+ #if ($user.getProperty("institutionalUserIdentifier", $locale) && $user.getProperty("institutionalUserIdentifier", $locale).length() > 0)
+ #set ($matnr = $r.escapeHtml($user.getProperty("institutionalUserIdentifier", $locale)))
+ #end
$user.getProperty("email", $locale)
#if ($user.getProperty("institutionalEmail", $locale) && $user.getProperty("institutionalEmail", $locale) != "" && $user.getProperty("email", $locale) != $user.getProperty("institutionalEmail", $locale))
/ $user.getProperty("institutionalEmail", $locale)
#end
- #if ($user.getProperty("institutionalName", $locale))
- <br />$r.escapeHtml($user.getProperty("institutionalName", $locale))
+ #if ($inst)
+ <br />$inst
#end
- #if ($user.getProperty("institutionalUserIdentifier", $locale))
- <br />$r.escapeHtml($user.getProperty("institutionalUserIdentifier", $locale))
+ #if ($matnr)
+ <br />$matnr
#end
</td>
</tr>
diff --git a/src/main/java/org/olat/course/assessment/_content/identityoverview.html b/src/main/java/org/olat/course/assessment/_content/identityoverview.html
index dbaa17ad4a9..54bfc81ea67 100644
--- a/src/main/java/org/olat/course/assessment/_content/identityoverview.html
+++ b/src/main/java/org/olat/course/assessment/_content/identityoverview.html
@@ -5,23 +5,30 @@
#end
#if($user)
+<div>
+ #if ($user.getProperty("institutionalName", $locale) && $user.getProperty("institutionalName", $locale).length() > 0)
+ #set ($inst = $r.escapeHtml($user.getProperty("institutionalName", $locale)))
+ #end
+ #if ($user.getProperty("institutionalUserIdentifier", $locale) && $user.getProperty("institutionalUserIdentifier", $locale).length() > 0)
+ #set ($matnr = $r.escapeHtml($user.getProperty("institutionalUserIdentifier", $locale)))
+ #end
<span class="b_with_small_icon_left b_user_icon">
$r.escapeHtml($user.getProperty("firstName", $locale)) $r.escapeHtml($user.getProperty("lastName", $locale))
- </span>
+ </span>
+ #if ($matnr)
+ ($matnr)
+ #end
<br />
<a href="mailto:$user.getProperty("email", $locale)" class="b_link_mailto">$user.getProperty("email", $locale)</a>
#if ($user.getProperty("institutionalEmail", $locale) && $user.getProperty("institutionalEmail", $locale) != "" && $user.getProperty("email", $locale) != $user.getProperty("institutionalEmail", $locale))
<br />
<a href="mailto:$user.getProperty("institutionalEmail", $locale)" class="b_link_mailto">$user.getProperty("institutionalEmail", $locale)</a>
#end
- #if ($user.getProperty("institutionalName", $locale))
+ #if ($inst)
<br />
- <span class="b_with_small_icon_left b_institution_icon">
- $r.escapeHtml($user.getProperty("institutionalName", $locale))
- </span>
- #end
- #if ($user.getProperty("institutionalUserIdentifier", $locale))
- $r.escapeHtml($user.getProperty("institutionalUserIdentifier", $locale)))
+ <span class="b_with_small_icon_left b_institution_icon">$inst</span>
#end
+ <br />
+</div>
#end
$r.render("assessmentOverviewTable")
\ No newline at end of file
diff --git a/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_fr.properties
index e0d82776a9d..69aa24e58fc 100644
--- a/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/assessment/_i18n/LocalStrings_fr.properties
@@ -125,8 +125,8 @@ notifications.entry.scorm=Test SCORM
notifications.entry.ta=Devoir
notifications.header=Nouveaux tests de r\u00E9sultats dans le cours "{0}"
notifications.title=Cours "{0}"
-participantgroups.noGroups=Cet utilisateur ne participe dans aucun groupe.
-participantgroups.title=Participants dans groupes
+participantgroups.noGroups=Cet utilisateur ne participe \u00E0 aucun groupe.
+participantgroups.title=Participant des groupes
passed.false=<span class\="o_notpassed">Pas r\u00E9ussi</span>
passed.true=<span class\="o_passed">R\u00E9ussi</span>
table.action.delete=Effacer
--
GitLab