From 33730b1698272d31fd3d811c732a786598c166ea Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Wed, 7 Aug 2013 15:08:55 +0200
Subject: [PATCH] OO-683 align semester dates UI in details page with form
style
---
.../org/olat/repository/_content/details.html | 35 ++++++++++++++-----
.../RepositoryDetailsController.java | 4 +--
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/olat/repository/_content/details.html b/src/main/java/org/olat/repository/_content/details.html
index 03b23cd3f36..a9652abaaf0 100644
--- a/src/main/java/org/olat/repository/_content/details.html
+++ b/src/main/java/org/olat/repository/_content/details.html
@@ -24,18 +24,35 @@ $r.render("backLink")
<fieldset class="b_clearfix">
<legend>$r.translate("cif.dates")</legend>
#if($lfStart || $lfEnd)
- #if($lfLabel)
- <b>$lfLabel</b>
- #end
- #if($lfSoftKey)
- ( $lfSoftKey )
+ <div class="b_form">
+ #if($lfLabel)
+ <div class="b_form_element_wrapper b_clearfix">
+ <div class="b_form_element_label"><label>$r.translate("cif.dates.public")</label></div>
+ <div class="b_form_element b_dates_public">
+ <span>$lfLabel</span>
+ #if($lfSoftKey)
+ (${lfSoftKey})
+ #end
+ </div>
+ </div>
#end
#if($lfStart)
- $r.translate("cif.date.start") $lfStart
- #end
- #if($lfEnd)
- $r.translate("cif.date.end") $lfEnd
+ <div class="b_form_element_wrapper b_clearfix">
+ <div class="b_form_element_label"><label>$r.translate("cif.date.start")</label></div>
+ <div class="b_form_element o_date_start">
+ $lfStart
+ </div>
+ </div>
#end
+ #if($lfStart)
+ <div class="b_form_element_wrapper b_clearfix">
+ <div class="b_form_element_label"><label>$r.translate("cif.date.end")</label></div>
+ <div class="b_form_element o_date_end">
+ $lfEnd
+ </div>
+ </div>
+ #end
+ </div>
#else
<p>$r.translate("no.lifecycle")</p>
#end
diff --git a/src/main/java/org/olat/repository/controllers/RepositoryDetailsController.java b/src/main/java/org/olat/repository/controllers/RepositoryDetailsController.java
index fee5768dd1f..841118f832e 100644
--- a/src/main/java/org/olat/repository/controllers/RepositoryDetailsController.java
+++ b/src/main/java/org/olat/repository/controllers/RepositoryDetailsController.java
@@ -279,8 +279,8 @@ public class RepositoryDetailsController extends BasicController implements Gene
RepositoryEntryLifecycle cycle = repositoryEntry.getLifecycle();
if(cycle != null) {
Formatter format = Formatter.getInstance(getLocale());
- main.contextPut("lfStart", format.formatDateAndTime(cycle.getValidFrom()));
- main.contextPut("lfEnd", format.formatDateAndTime(cycle.getValidTo()));
+ main.contextPut("lfStart", format.formatDate(cycle.getValidFrom()));
+ main.contextPut("lfEnd", format.formatDate(cycle.getValidTo()));
if(!cycle.isPrivateCycle()) {
String label = cycle.getLabel();
String softKey = cycle.getSoftKey();
--
GitLab