Author: bleny Date: 2011-04-12 09:14:02 +0000 (Tue, 12 Apr 2011) New Revision: 1184 Log: fix layout for obsdeb sampling plan Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml trunk/wao-ui/src/main/webapp/css/common.css trunk/wao-ui/src/main/webapp/css/main.css Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-04-12 09:13:48 UTC (rev 1183) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/components/SamplingFilterComponent.tml 2011-04-12 09:14:02 UTC (rev 1184) @@ -26,7 +26,7 @@ <div t:type="zone" t:id="filtersZone" t:visible="prop:filtersVisible" id="so-sampling-filters" style="margin: 10px; padding: 10px;"> <fieldset> <legend>${legendMsg}</legend> - <div class="so-filters-form" style="padding: 10px;"> + <div class="so-filters-form"> <form t:type="form" t:id="filtersForm" t:zone="so-sampling-filters" action="post"> <t:errors/> <div style="float: left; margin-right: 15px;"> Modified: trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-12 09:13:48 UTC (rev 1183) +++ trunk/wao-ui/src/main/webapp/ObsDebSamplingPlan.tml 2011-04-12 09:14:02 UTC (rev 1184) @@ -25,19 +25,26 @@ xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <h1 class="fleft">${message:wao.ui.samplingPlan.title}</h1> - <div style="clear: left;" class="actions-top"> - <t:actionlink t:id="showFilters" t:zone="so-sampling-filters"> - ${message:wao.ui.misc.advancedSearch} - </t:actionlink> + + <ul id="so-submenu" style="clear: left;"> + <li> + <t:actionlink t:id="showFilters" t:zone="so-sampling-filters"> + ${message:wao.ui.misc.advancedSearch} + </t:actionlink> + </li> <t:unless test="connectedUser.observer"> - <t:actionlink t:id="showImport" t:zone="importZone"> - ${message:wao.ui.misc.import} + <li> + <t:actionlink t:id="showImport" t:zone="importZone"> + ${message:wao.ui.misc.import} + </t:actionlink> + </li> + </t:unless> + <li> + <t:actionlink t:id="exportSamplingPlan"> + ${message:wao.ui.misc.export} </t:actionlink> - </t:unless> - <t:actionlink t:id="exportSamplingPlan"> - ${message:wao.ui.misc.export} - </t:actionlink> - </div> + </li> + </ul> <div style="clear: both;" /> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2011-04-12 09:13:48 UTC (rev 1183) +++ trunk/wao-ui/src/main/webapp/css/common.css 2011-04-12 09:14:02 UTC (rev 1184) @@ -255,6 +255,7 @@ color: black; } + /* Common for forms (userProfile and administration forms) */ fieldset.user-form { width: 50%; Modified: trunk/wao-ui/src/main/webapp/css/main.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/main.css 2011-04-12 09:13:48 UTC (rev 1183) +++ trunk/wao-ui/src/main/webapp/css/main.css 2011-04-12 09:14:02 UTC (rev 1184) @@ -169,6 +169,30 @@ color: white; } +#so-submenu { + text-align: center; +} + +#so-submenu li { + display: inline; + margin-left: 10px; +} + +#so-submenu li:first-child { + margin-left: 0px; +} + +#so-submenu a { + text-decoration: none; + color: #19a28d; + font-weight: bold; +} + +#so-submenu a:hover { + text-decoration: underline; + color: black; +} + div#so-footer { clear: both; margin-top: 20px;