Skip to content
Snippets Groups Projects
Commit b0d95321 authored by srosse's avatar srosse
Browse files

OO-1447: show softkey if available or label, small CSS changes

parent e22d70aa
No related branches found
No related tags found
No related merge requests found
...@@ -42,11 +42,8 @@ ...@@ -42,11 +42,8 @@
<div title="$r.translateInAttribute("cif.dates")"> <div title="$r.translateInAttribute("cif.dates")">
<i class="o_icon o_icon_lifecycle"></i> <i class="o_icon o_icon_lifecycle"></i>
#if(!$v.lifecycle.privateCycle) #if(!$v.lifecycle.privateCycle)
#if($v.lifecycle.label and !$v.lifecycle.label.isEmpty()) $v.lifecycle.label #end #if($v.lifecycle.softKey and !$v.lifecycle.softKey.isEmpty()) $v.lifecycle.softKey
#if($v.lifecycle.softKey and !$v.lifecycle.softKey.isEmpty()) #else $v.lifecycle.label #end
#if($v.lifecycle.label and !$v.lifecycle.label.isEmpty()) - #end
$v.lifecycle.softKey
#end
#else #else
#if($v.lifecycle.validFrom) $r.formatDate($v.lifecycle.validFrom) #end #if($v.lifecycle.validFrom) $r.formatDate($v.lifecycle.validFrom) #end
#if($v.lifecycle.validTo) - $r.formatDate($v.lifecycle.validTo) #end #if($v.lifecycle.validTo) - $r.formatDate($v.lifecycle.validTo) #end
......
...@@ -23,12 +23,9 @@ ...@@ -23,12 +23,9 @@
#if($row.lifecycle || $row.lifecycleSoftKey || $row.lifecycleLabel || $row.lifecycleStart || $row.lifecycleEnd) #if($row.lifecycle || $row.lifecycleSoftKey || $row.lifecycleLabel || $row.lifecycleStart || $row.lifecycleEnd)
<div class="o_lifecycle #if ($row.isActive()) o_active #end"> <div class="o_lifecycle #if ($row.isActive()) o_active #end">
<i class="o_icon o_icon_lifecycle"></i> <i class="o_icon o_icon_lifecycle"></i>
#if($row.lifecycleSoftKey || $row.lifecycleLabel) #if(($row.lifecycleSoftKey and !$row.lifecycleSoftKey.isEmpty()) || ($row.lifecycleLabel and !$row.lifecycleLabel.isEmpty()))
#if($row.lifecycleLabel and !$row.lifecycleLabel.isEmpty()) $row.lifecycleLabel #end #if($row.lifecycleSoftKey and !$row.lifecycleSoftKey.isEmpty()) $row.lifecycleSoftKey
#if($row.lifecycleSoftKey and !$row.lifecycleSoftKey.isEmpty()) #else $row.lifecycleLabel #end
#if($row.lifecycleLabel and !$row.lifecycleLabel.isEmpty()) - #end
$row.lifecycleSoftKey
#end
#else #else
#if($row.lifecycleStart) $r.formatDate($row.lifecycleStart) #end #if($row.lifecycleStart) $r.formatDate($row.lifecycleStart) #end
#if($row.lifecycleEnd) - $r.formatDate($row.lifecycleEnd) #end #if($row.lifecycleEnd) - $r.formatDate($row.lifecycleEnd) #end
......
...@@ -29,6 +29,12 @@ ...@@ -29,6 +29,12 @@
margin-bottom: 0.25em; margin-bottom: 0.25em;
} }
} }
.o_infopanel, o_usagepanel, o_managedpanel {
.panel-title {
cursor: pointer;
}
}
.o_start, .o_book { .o_start, .o_book {
margin: 2em 0; margin: 2em 0;
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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