[gen] Bugfix in ref (now it is possible to display several refs with render='menus' at the same time); CSS improvements.

This commit is contained in:
Gaetan Delannay 2014-06-03 15:55:28 +02:00
parent 432a579d47
commit ef68bb420b
2 changed files with 7 additions and 7 deletions

View file

@ -314,7 +314,7 @@ class Ref(Field):
<div if="objects" <div if="objects"
for="menu in field.getLinkedObjectsByMenu(obj, objects)" for="menu in field.getLinkedObjectsByMenu(obj, objects)"
var2="dtc='display: table-cell'" var2="dtc='display: table-cell'"
style=":not loop.menu.last and ('%s;padding-right:7px') % dtc or dtc"> style=":not loop.menu.last and ('%s;padding-right:4px') % dtc or dtc">
<!-- A single object in the menu: show a clickable icon to get it --> <!-- A single object in the menu: show a clickable icon to get it -->
<a if="len(menu.objects) == 1" var2="tied=menu.objects[0]" <a if="len(menu.objects) == 1" var2="tied=menu.objects[0]"
@ -325,7 +325,7 @@ class Ref(Field):
<!-- Several objects: put them in a dropdown menu --> <!-- Several objects: put them in a dropdown menu -->
<div if="len(menu.objects) &gt; 1" class="dropdownMenu" <div if="len(menu.objects) &gt; 1" class="dropdownMenu"
var2="dropdownId='%s_%d' % (zobj.id, loop.menu.nb)" var2="dropdownId='%s_%s_%d' % (zobj.id, name, loop.menu.nb)"
onmouseover=":'toggleDropdown(%s)' % q(dropdownId)" onmouseover=":'toggleDropdown(%s)' % q(dropdownId)"
onmouseout=":'toggleDropdown(%s,%s)' % (q(dropdownId), q('none'))"> onmouseout=":'toggleDropdown(%s,%s)' % (q(dropdownId), q('none'))">
<img if="menu.icon" src=":menu.icon" title=":menu.text"/><x <img if="menu.icon" src=":menu.icon" title=":menu.text"/><x

View file

@ -83,7 +83,7 @@ input.buttonSmall { width: 100px !important; font-size: 85%; height: 18px;
.lostPassword { font-size: 90%; color: white; padding-left: 1em } .lostPassword { font-size: 90%; color: white; padding-left: 1em }
.current { font-weight: bold } .current { font-weight: bold }
.portlet { width: 150px; border-right: 3px solid #e4e4e4; .portlet { width: 150px; border-right: 3px solid #e4e4e4;
background-color: #f3f3f3 } background-color: whitesmoke }
.portletContent { padding: 4px 9px } .portletContent { padding: 4px 9px }
.portletTitle { font-size: 110%; margin-bottom: 4px } .portletTitle { font-size: 110%; margin-bottom: 4px }
.portletSep { border-top: 3px solid #e4e4e4 } .portletSep { border-top: 3px solid #e4e4e4 }
@ -92,7 +92,7 @@ input.buttonSmall { width: 100px !important; font-size: 85%; height: 18px;
.portletSearch { font-size: 90%; font-style: italic } .portletSearch { font-size: 90%; font-style: italic }
.inputSearch { height: 15px; width: 132px; margin: 3px 3px 2px 3px !important } .inputSearch { height: 15px; width: 132px; margin: 3px 3px 2px 3px !important }
td.search { padding-top: 8px } td.search { padding-top: 8px }
.content { padding: 9px; background-color: whitesmoke } .content { padding: 9px; background-color: #fbfbfb }
.popup { display: none; position: absolute; top: 30%; left: 35%; .popup { display: none; position: absolute; top: 30%; left: 35%;
width: 350px; z-index : 100; background: white; padding: 8px; width: 350px; z-index : 100; background: white; padding: 8px;
border: 1px solid grey; box-shadow: 2px 2px 2px #888888} border: 1px solid grey; box-shadow: 2px 2px 2px #888888}
@ -123,8 +123,8 @@ td.search { padding-top: 8px }
.section3 { font-size: 11px; font-weight: bold; text-transform: uppercase; .section3 { font-size: 11px; font-weight: bold; text-transform: uppercase;
padding: 2px 0px; background-color: #a1aeb5; text-align: center; padding: 2px 0px; background-color: #a1aeb5; text-align: center;
color: white } color: white }
.even { background-color: #f9f9f9 } .even { background-color: #fbfbfb }
.odd { background-color: #f4f4f4 } .odd { background-color: #f6f6f6 }
.odd2 { background-color: #f2f2f2 } .odd2 { background-color: #f2f2f2 }
.refMenuItem { border-top: grey 1px dashed; margin: 3px 0; padding-top: 3px } .refMenuItem { border-top: grey 1px dashed; margin: 3px 0; padding-top: 3px }
.summary { margin-bottom: 5px; background-color: #f9f9f9; .summary { margin-bottom: 5px; background-color: #f9f9f9;
@ -137,7 +137,7 @@ td.search { padding-top: 8px }
.history th { font-style: italic; text-align: left; padding: 0 5px 0 5px } .history th { font-style: italic; text-align: left; padding: 0 5px 0 5px }
.topSpace { margin-top: 15px } .topSpace { margin-top: 15px }
.bottomSpace { margin-bottom: 15px } .bottomSpace { margin-bottom: 15px }
.phase { background-color: white; border: 1px solid #d0d0d0; .phase { background-color: whitesmoke; border: 1px solid #d0d0d0;
box-shadow: 2px 2px 2px #888888; margin-bottom: 7px } box-shadow: 2px 2px 2px #888888; margin-bottom: 7px }
.phase td { padding: 3px 7px 3px 7px; border-right: 1px solid #d0d0d0; .phase td { padding: 3px 7px 3px 7px; border-right: 1px solid #d0d0d0;
font-size: 96% } font-size: 96% }