Author: lkaufmann Date: 2014-05-16 17:59:16 +0200 (Fri, 16 May 2014) New Revision: 1954 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1954 Log: Refs #4997 Display updates Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.css Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/boat-details.jsp 2014-05-16 15:59:16 UTC (rev 1954) @@ -243,7 +243,7 @@ <s:text name="wao.ui.boatDetails.boatContactsCounts.title"/> </h3> -<table id="boat-contacts-counts-table" class="table"> +<table id="boat-contacts-counts-table" class="table no-border-top"> <thead> <tr> <td> @@ -292,10 +292,10 @@ <table class="table"> <tbody> <tr> - <th> + <th class="no-border-top"> <s:text name="wao.ui.field.Boat.shipOwner"/> </th> - <td> + <td class="no-border-top"> <s:property value="boatDetails.boatInfos.boat.shipOwner.firstName"/> <s:property value="boatDetails.boatInfos.boat.shipOwner.lastName"/> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 15:59:16 UTC (rev 1954) @@ -447,7 +447,7 @@ <s:text name="%{observedDataControl.i18nKey}"/> </s:if> </td> - <td> + <td class="align-center"> <s:if test="mammalsObservation"> <i class="fa fa-eye" title="<s:text name="wao.ui.field.Contact.mammalsObservation"/>"></i>  @@ -476,14 +476,14 @@ <td> <s:if test=" ! commentCoordinator.empty"> <span data-original-title="<s:property value="commentCoordinator" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> - <i class="icon-comment"></i> + <i class="fa fa-comment"></i> </span> </s:if> </td> <td> <s:if test=" ! commentAdmin.empty"> <span data-original-title="<s:property value="commentAdmin" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> - <i class="icon-comment"></i> + <i class="fa fa-comment"></i> </span> </s:if> </td> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/news.jsp 2014-05-16 15:59:16 UTC (rev 1954) @@ -64,14 +64,14 @@ <s:url action="delete-news" id="deleteNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{deleteNewsUrl}" cssClass="btn-delete" title="%{getText('wao.ui.action.delete')}" > + <s:a href="%{deleteNewsUrl}" cssClass="btn-link" title="%{getText('wao.ui.action.delete')}" > <i class="fa fa-trash-o"></i> </s:a> <s:url action="edit-news!input" id="editNewsUrl"> <s:param name="newsId" value="topiaId" /> </s:url> - <s:a href="%{editNewsUrl}" cssClass="btn-edit" title="%{getText('wao.ui.action.edit')}"> + <s:a href="%{editNewsUrl}" cssClass="btn-link btn-link-edit" title="%{getText('wao.ui.action.edit')}"> <i class="fa fa-edit"></i> </s:a> </s:if> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-05-16 15:59:16 UTC (rev 1954) @@ -52,7 +52,7 @@ <div class="navbar"> <div class="navbar-inner"> - <a class="brand" href="#">WAO <span><s:text name="%{obsProgram.getI18nKey()}"/></span></a> + <a class="brand" href="#"><span>WAO</span> <s:text name="%{obsProgram.getI18nKey()}"/></a> <%--<a class="brand" href="#">Wao <s:property value="%{getText(#obsProgram.getI18nKey())}" /></a>--%> <ul class="nav"> Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-16 15:36:38 UTC (rev 1953) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-16 15:59:16 UTC (rev 1954) @@ -117,7 +117,16 @@ .float-right { float: right; } +.align-center { + text-align: center; +} +.btn-link { + color: #2f4f4f !important; +} +.no-border-top { + border-top: 0 !important; +} /****************************************************************************** * Styles globaux à l'application @@ -212,6 +221,7 @@ } .navbar .nav > li > a:hover { color: #FFF; + background-color: #00b2b2; } .navbar .nav > .active > a, .navbar .nav > .active > a:hover, @@ -674,7 +684,7 @@ } /* Fix a 1px gap between icons in fontawesome */ -main.home .news a.btn-edit { +main.home .news a.btn-link-edit { padding-top: 1px; } @@ -687,13 +697,9 @@ float: right; margin-left: 10px; text-decoration: none; - color: #2f4f4f; font-weight: bold; font-size: 15px; } -main.home .news p.publication > a i.fa { - color: #2f4f4f; -} main.home .news p.publication > a:hover, main.home .news p.publication > a:hover i.fa { @@ -710,7 +716,19 @@ float: right; } + /** + * Contatcs + */ +#edit-contact > fieldset { + width: 100%; +} +#edit-contact > fieldset legend { + padding: 0 2%; + width: 96%; +} + +/** * Form edition */ main.form > form,