Author: bleny Date: 2011-01-05 19:28:19 +0000 (Wed, 05 Jan 2011) New Revision: 887 Log: when accessing to contactFrom from contacts, going to the right fieldset depending on role Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml trunk/wao-ui/src/main/webapp/Contacts.tml Modified: trunk/wao-ui/src/main/webapp/ContactForm.tml =================================================================== --- trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-01-05 19:19:43 UTC (rev 886) +++ trunk/wao-ui/src/main/webapp/ContactForm.tml 2011-01-05 19:28:19 UTC (rev 887) @@ -95,6 +95,9 @@ </t:block> <fieldset> + <t:unless t:test="connectedUser.admin"> + <a name="focus" /> + </t:unless> <legend>${message:wao.ui.misc.observationReport}</legend> <t:delegate to="viewOrEditObservationReport" /> </fieldset> @@ -231,6 +234,9 @@ </t:block> <t:unless test="connectedUser.observer"> + <t:if t:test="connectedUser.admin"> + <a name="focus" /> + </t:if> <fieldset> <legend>${message:wao.ui.form.programEvaluation}</legend> <t:if test="showDataReliability()"> Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-05 19:19:43 UTC (rev 886) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2011-01-05 19:28:19 UTC (rev 887) @@ -319,7 +319,7 @@ </p:commentAdminCell> <p:actionsCell> <t:unless t:test="contact.validationProgram"> - <a t:type="pagelink" t:page="contactForm" t:context="contact.topiaId"> + <a t:type="pagelink" t:page="contactForm" t:anchor="focus" t:context="contact.topiaId"> <img src="${asset:context:}/img/edit.png" alt="Modifier" title="Modifier le contact"/> </a> <p:else>