Author: fdesbois Date: 2010-06-17 13:48:37 +0000 (Thu, 17 Jun 2010) New Revision: 543 Log: Evo #2332 : Improve css style Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties trunk/wao-ui/src/main/webapp/Contacts.tml trunk/wao-ui/src/main/webapp/css/common.css trunk/wao-ui/src/main/webapp/css/contacts.css Modified: trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java =================================================================== --- trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/java/fr/ifremer/wao/ui/services/ContactModelFactory.java 2010-06-17 13:48:37 UTC (rev 543) @@ -91,8 +91,10 @@ public BeanModel<Contact> buildCoordinatorContactModel(BeanModelSource beanModelSource, ComponentResources resources) { BeanModel<Contact> contactModel = buildContactModel(beanModelSource, resources); - contactModel.add(RelativePosition.AFTER, "validation", "commentCoordinator", getCommentCoordinatorPropertyConduit()); - contactModel.add(RelativePosition.AFTER, "commentCoordinator", "commentAdmin", getCommentAdminPropertyConduit()); + contactModel.add(RelativePosition.AFTER, "validation", Contact.COMMENT_COORDINATOR, getCommentCoordinatorPropertyConduit()); + contactModel.add(RelativePosition.AFTER, Contact.COMMENT_COORDINATOR, Contact.COMMENT_ADMIN, getCommentAdminPropertyConduit()); + contactModel.get(Contact.COMMENT_COORDINATOR).sortable(false); + contactModel.get(Contact.COMMENT_ADMIN).sortable(false); return contactModel; } Modified: trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties =================================================================== --- trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/resources/fr/ifremer/wao/ui/pages/Contacts.properties 2010-06-17 13:48:37 UTC (rev 543) @@ -56,6 +56,8 @@ fishingZoneSector-label: Zone fishingZoneDivision-label: Division validation-label: Validations +commentAdmin-label: Com. admin +commentCoordinator-label: Com. soci\u00e9t\u00e9 # Form labels contactsForm-errors-banner: Le contact n'a pas \u00e9t\u00e9 sauvegard\u00e9 \u00e0 cause des erreurs suivantes : Modified: trunk/wao-ui/src/main/webapp/Contacts.tml =================================================================== --- trunk/wao-ui/src/main/webapp/Contacts.tml 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/webapp/Contacts.tml 2010-06-17 13:48:37 UTC (rev 543) @@ -322,7 +322,7 @@ <t:if t:test="editionMode"> <img src="${asset:context:img/comment-unavailable-22px.png}" alt="Add comment" /> <p:else> - <a onclick="commentController.openWindow(${commentData});"> + <a class="link" onclick="commentController.openWindow(${commentData});"> <img src="${asset:context:img/comment-22px.png}" alt="Add comment" /> </a> </p:else> @@ -333,7 +333,7 @@ </form> </t:zone> <div t:type="ck/Window" t:id="commentWindow" t:show="false" t:modal="true" - title="literal:Ajouter un commentaire" t:width="550" t:height="230"> + title="literal:Ajouter un commentaire" t:width="510" t:height="195"> <form t:type="form" t:id="commentForm" action="tapestry"> <p> <textarea t:type="textarea" t:id="editComment" t:value="extraComment" cols="50" rows="7" /> Modified: trunk/wao-ui/src/main/webapp/css/common.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/common.css 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/webapp/css/common.css 2010-06-17 13:48:37 UTC (rev 543) @@ -48,6 +48,10 @@ display:block; } +.link { + cursor: pointer; +} + .hidden { display: none; } Modified: trunk/wao-ui/src/main/webapp/css/contacts.css =================================================================== --- trunk/wao-ui/src/main/webapp/css/contacts.css 2010-06-17 13:07:45 UTC (rev 542) +++ trunk/wao-ui/src/main/webapp/css/contacts.css 2010-06-17 13:48:37 UTC (rev 543) @@ -142,6 +142,8 @@ white-space: nowrap; } +div#so-contacts table.t-data-grid tbody tr td.commentCoordinator, +div#so-contacts table.t-data-grid tbody tr td.commentAdmin, div#so-contacts table.t-data-grid tbody tr td.comment { white-space: normal; width: 100px;