Author: lkaufmann Date: 2014-05-16 17:36:38 +0200 (Fri, 16 May 2014) New Revision: 1953 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1953 Log: Refs #4997 Update icons in contacts screen Added: trunk/wao-web/src/main/webapp/img/hook-22px.png Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp trunk/wao-web/src/main/webapp/wao.css 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:23:46 UTC (rev 1952) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/contacts.jsp 2014-05-16 15:36:38 UTC (rev 1953) @@ -449,25 +449,27 @@ </td> <td> <s:if test="mammalsObservation"> - <img src="<s:url value="/img/eye-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsObservation"/>"/>  + <i class="fa fa-eye" + title="<s:text name="wao.ui.field.Contact.mammalsObservation"/>"></i>  </s:if> <s:if test="mammalsCapture"> <s:if test="mammalsInfo"> - <img src="<s:url value="/img/fishing-net-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> + <img src="<s:url value="/img/hook-22px.png"/>" + alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" + title="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> <%--TODO<s:text name="wao.ui.field.Contact.mammalsInfo"><s:param value="%{getMammalsInfo(#contact)}"/></s:text>--%> </s:if> <s:else> - <img src="<s:url value="/img/fishing-net-22px.png"/>" - alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> + <img src="<s:url value="/img/hook-22px.png"/>" + alt="<s:text name="wao.ui.field.Contact.mammalsCapture"/>" + title="<s:text name="wao.ui.field.Contact.mammalsCapture"/>"/> </s:else> </s:if> </td> <td> <s:if test=" ! comment.empty"> <span data-original-title="<s:property value="comment" escapeHtml="false"/>" data-toggle="tooltip" data-placement="left"> - <i class="icon-comment"></i> + <i class="fa fa-comment"></i> </span> </s:if> </td> @@ -494,28 +496,37 @@ </td> <td> <s:if test="validationCompany == null"> - <img src="<s:url value="/img/help-22px.png"/>" - alt="<s:text name="wao.ui.misc.notValidated"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.notValidated"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + </span> </s:if> <s:elseif test="validationCompany"> - <img src="<s:url value="/img/true-22px.png"/>" - alt="<s:text name="wao.ui.misc.validated"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.validated"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + <i class="fa fa-check fa-stack-1x" ></i> + </span> </s:elseif> <s:else> - <img src="<s:url value="/img/false-22px.png"/>" - alt="<s:text name="wao.ui.misc.refused"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.refused"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + <i class="fa fa-times fa-stack-1x" ></i> + </span> </s:else> <s:if test="validationProgram == null"> - <img src="<s:url value="/img/help-22px.png"/>" - alt="<s:text name="wao.ui.misc.notValidated"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.notValidated"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + </span> </s:if> <s:elseif test="validationProgram"> - <img src="<s:url value="/img/true-22px.png"/>" - alt="<s:text name="wao.ui.misc.validated"/>"/> + <span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.validated"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + <i class="fa fa-check fa-stack-1x" ></i> + </span> </s:elseif> - <s:else> - <img src="<s:url value="/img/false-22px.png"/>" - alt="<s:text name="wao.ui.misc.refused"/>"/> + <s:else><span class="fa-stack fa-lg" title="<s:text name="wao.ui.misc.refused"/>"> + <i class="fa fa-square-o fa-stack-2x" ></i> + <i class="fa fa-times fa-stack-1x" ></i> + </span> </s:else> </td> <td class="actions"> Added: trunk/wao-web/src/main/webapp/img/hook-22px.png =================================================================== (Binary files differ) Property changes on: trunk/wao-web/src/main/webapp/img/hook-22px.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/wao-web/src/main/webapp/wao.css =================================================================== --- trunk/wao-web/src/main/webapp/wao.css 2014-05-16 15:23:46 UTC (rev 1952) +++ trunk/wao-web/src/main/webapp/wao.css 2014-05-16 15:36:38 UTC (rev 1953) @@ -204,7 +204,7 @@ color:#FFF; } .navbar .nav > li > a { - color: #00b2b2; + color: #FFFFFF; float: none; padding: 10px 15px; text-decoration: none; @@ -218,13 +218,14 @@ .navbar .nav > .active > a:focus { background-color: #00b2b2; /*box-shadow: 0 3px 8px #009090;*/ - color: #294545; + color: #FFF; text-decoration: none; } .navbar .nav > li > a i.fa { color: #FFF; margin-right: 4px; + font-sie: 1.1em; } .navbar .nav > li ul.dropdown-menu li a:hover { @@ -449,6 +450,7 @@ position: fixed; right: 0; top: 40px; + z-index: 5; } #notifications .alert { @@ -456,13 +458,33 @@ box-shadow: 0 1px 3px rgba(0, 0, 0, 0.3); } -#notifications .alert-info { - background: #00B2B2; - background: rgba(0, 178, 178, 0.7); - border-color: #299; - color: #444; - text-shadow: none; + + +/** + * Les icones + */ +.fa-stack.fa-lg { + font-size: 12px; } +.fa-stack.fa-lg .fa-square-o { + color: #AAA; +} +.fa-stack.fa-lg .fa-check { + color: #468847; + font-size: 1.4em; +} +.fa-stack.fa-lg .fa-times { + color: #B94A48; + font-size: 1.5em; +} +.fa-eye { + font-size: 1.7em; + color: #2F4F4F; +} +.fa-comment { + font-size: 1.5em; + color: #2F4F4F; +} /****************************************************************************** * Styles spécifiques pour certaines pages de l'appli