Skip to content
Snippets Groups Projects
Commit 33730b16 authored by gnaegi's avatar gnaegi
Browse files

OO-683 align semester dates UI in details page with form style

parent ea868694
No related branches found
No related tags found
No related merge requests found
...@@ -24,18 +24,35 @@ $r.render("backLink") ...@@ -24,18 +24,35 @@ $r.render("backLink")
<fieldset class="b_clearfix"> <fieldset class="b_clearfix">
<legend>$r.translate("cif.dates")</legend> <legend>$r.translate("cif.dates")</legend>
#if($lfStart || $lfEnd) #if($lfStart || $lfEnd)
#if($lfLabel) <div class="b_form">
<b>$lfLabel</b> #if($lfLabel)
#end <div class="b_form_element_wrapper b_clearfix">
#if($lfSoftKey) <div class="b_form_element_label"><label>$r.translate("cif.dates.public")</label></div>
( $lfSoftKey ) <div class="b_form_element b_dates_public">
<span>$lfLabel</span>
#if($lfSoftKey)
(${lfSoftKey})
#end
</div>
</div>
#end #end
#if($lfStart) #if($lfStart)
$r.translate("cif.date.start") $lfStart <div class="b_form_element_wrapper b_clearfix">
#end <div class="b_form_element_label"><label>$r.translate("cif.date.start")</label></div>
#if($lfEnd) <div class="b_form_element o_date_start">
$r.translate("cif.date.end") $lfEnd $lfStart
</div>
</div>
#end #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 #else
<p>$r.translate("no.lifecycle")</p> <p>$r.translate("no.lifecycle")</p>
#end #end
......
...@@ -279,8 +279,8 @@ public class RepositoryDetailsController extends BasicController implements Gene ...@@ -279,8 +279,8 @@ public class RepositoryDetailsController extends BasicController implements Gene
RepositoryEntryLifecycle cycle = repositoryEntry.getLifecycle(); RepositoryEntryLifecycle cycle = repositoryEntry.getLifecycle();
if(cycle != null) { if(cycle != null) {
Formatter format = Formatter.getInstance(getLocale()); Formatter format = Formatter.getInstance(getLocale());
main.contextPut("lfStart", format.formatDateAndTime(cycle.getValidFrom())); main.contextPut("lfStart", format.formatDate(cycle.getValidFrom()));
main.contextPut("lfEnd", format.formatDateAndTime(cycle.getValidTo())); main.contextPut("lfEnd", format.formatDate(cycle.getValidTo()));
if(!cycle.isPrivateCycle()) { if(!cycle.isPrivateCycle()) {
String label = cycle.getLabel(); String label = cycle.getLabel();
String softKey = cycle.getSoftKey(); String softKey = cycle.getSoftKey();
......
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