This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coser. See http://git.codelutin.com/coser.git commit b697cb93a904033a093823621f7ddbaba951b3e0 Author: Eric Chatellier <chatellier@codelutin.com> Date: Tue Jun 9 14:43:06 2015 +0200 fixes #7200: Ajouter les logos du minitère et de l'europe sur le site des indicateurs --- coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp | 4 ++++ coser-web/src/main/webapp/images/europe.png | Bin 0 -> 1284 bytes coser-web/src/main/webapp/images/logo_ministere.jpg | Bin 0 -> 10526 bytes coser-web/src/main/webapp/styles/coser.css | 11 ++++++++++- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp b/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp index d8feddb..e87e684 100644 --- a/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp +++ b/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp @@ -85,6 +85,10 @@ <!--<span class="clb"> </span>--> </div> <div class="col_droite"> + <div class="logos"> + <img src="<s:url value='/images/europe.png'/>" alt="Europe" /> + <img src="<s:url value='/images/logo_ministere.jpg'/>" alt="Ministère de l'écologie, du développement durable et de l'énergie" /> + </div> <img src="<s:url value='/images/carte_accueil.png'/>" alt="carte des zones de campage en europe" title="carte des zones de campage en europe"/> <div class="mgt20"> <h3><s:text name="message.layout.oceanicdatatitle" /></h3> diff --git a/coser-web/src/main/webapp/images/europe.png b/coser-web/src/main/webapp/images/europe.png new file mode 100644 index 0000000..9cf393c Binary files /dev/null and b/coser-web/src/main/webapp/images/europe.png differ diff --git a/coser-web/src/main/webapp/images/logo_ministere.jpg b/coser-web/src/main/webapp/images/logo_ministere.jpg new file mode 100644 index 0000000..f0f2558 Binary files /dev/null and b/coser-web/src/main/webapp/images/logo_ministere.jpg differ diff --git a/coser-web/src/main/webapp/styles/coser.css b/coser-web/src/main/webapp/styles/coser.css index 1da33e9..f4ac342 100644 --- a/coser-web/src/main/webapp/styles/coser.css +++ b/coser-web/src/main/webapp/styles/coser.css @@ -537,12 +537,21 @@ body { #middle .col_droite { float: right; - margin-top: 155px; + margin-top: 23px; width: 288px; position: relative; height: 100%; } +#middle .col_droite .logos img { + float: left; + height: 120px; /* resize */ + margin-bottom: 12px; +} +#middle .col_droite .logos img:first-child { + padding-right: 10px; +} + #middle .col_droite ul li { background: url(../images/puce_liste.png) no-repeat left center; list-style: none; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.