This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository wao. See http://git.codelutin.com/wao.git commit 9b577c76bd4a91322c46fefd35d3ad2b48ae97cd Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Oct 14 17:19:56 2014 +0200 Utilisation du pseudo-élément CSS :first-child qui est exactement fait pour ça au lieu de polluer le HTML --- .../webapp/WEB-INF/content/obsmer/sampling-plan.jsp | 10 +++++----- .../WEB-INF/content/obsvente/sampling-plan.jsp | 8 ++++---- wao-web/src/main/webapp/wao.css | 21 +-------------------- 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp index d32e078..2f2df20 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp @@ -230,13 +230,13 @@ <table id="sampling-plan" class="large-table sampling-plan show-estimated"> <thead> <tr> - <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view firstline"> + <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /> </th> - <th colspan="<s:property value="#nbColumnsForProfessionInCompactView" />" class="only-in-compact-view firstline"> + <th colspan="<s:property value="#nbColumnsForProfessionInCompactView" />" class="only-in-compact-view"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /> </th> - <th colspan="${nbColumnsForMonths}" class="firstline only-in-observations-view"> + <th colspan="${nbColumnsForMonths}" class="only-in-observations-view"> <s:text name="wao.ui.samplingPlan.effort" /> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> @@ -252,7 +252,7 @@ ] </s:if> </th> - <th colspan="${nbColumnsForMonths}" class="firstline only-in-days-view"> + <th colspan="${nbColumnsForMonths}" class="only-in-days-view"> <s:text name="wao.ui.samplingPlan.observationTimesInDays"/> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> [ @@ -267,7 +267,7 @@ ] </s:if> </th> - <th colspan="${nbColumnsForOther}" class="firstline"><s:text name="wao.ui.misc.others" /></th> + <th colspan="${nbColumnsForOther}"><s:text name="wao.ui.misc.others" /></th> </tr> <tr> <!-- Profession columns --> diff --git a/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp b/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp index 84f6f6b..cd1417c 100644 --- a/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp +++ b/wao-web/src/main/webapp/WEB-INF/content/obsvente/sampling-plan.jsp @@ -201,13 +201,13 @@ <table id="sampling-plan" class="large-table sampling-plan show-estimated"> <thead> <tr> - <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view firstline"> + <th colspan="<s:property value="#nbColumnsForProfessionInFullView" />" class="only-in-full-view"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /> </th> - <th colspan="<s:property value="#nbColumnsForProfessionInCompactView" />" class="only-in-compact-view firstline"> + <th colspan="<s:property value="#nbColumnsForProfessionInCompactView" />" class="only-in-compact-view"> <s:text name="wao.ui.samplingPlan.sampledProfessions" /> </th> - <th colspan="${nbColumnsForMonths}" class="firstline"> + <th colspan="${nbColumnsForMonths}"> <s:text name="wao.ui.samplingPlan.effort" /> <s:if test="authenticatedWaoUser.authorizedToViewSamplingPlanReal"> @@ -223,7 +223,7 @@ ] </s:if> </th> - <th colspan="${nbColumnsForOther}" class="firstline"><s:text name="wao.ui.misc.others" /></th> + <th colspan="${nbColumnsForOther}"><s:text name="wao.ui.misc.others" /></th> </tr> <tr> <!-- Profession columns --> diff --git a/wao-web/src/main/webapp/wao.css b/wao-web/src/main/webapp/wao.css index f4768ed..52b3e19 100644 --- a/wao-web/src/main/webapp/wao.css +++ b/wao-web/src/main/webapp/wao.css @@ -347,32 +347,13 @@ h3 { text-align: center; } -.large-table thead th.firstline { +.large-table thead tr:first-child th { color: #b2f0b2; letter-spacing: 0.5px; text-transform: uppercase; background-color: #666; } -/* -.large-table th.date, -.large-table td.date { - max-width: 75px; -} - -.large-table th.date-time, -.large-table td.date-time { - max-width: 120px; -} -*/ - -/* Html à changer dans le tableau pour modifier l'affichage des dates - -<th class="effort now"> -<span class="mois">04</span><br> 2014 -</th> - -*/ .effort .month { font-size: 21px; letter-spacing: 1px; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.