Author: fdesbois Date: 2010-02-17 18:49:42 +0100 (Wed, 17 Feb 2010) New Revision: 2868 Added: trunk/pollen-ui/src/main/webapp/img/contact.png Modified: trunk/pollen-ui/ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties trunk/pollen-ui/src/main/webapp/css/main.css Log: Ano #117 : Change footer : - suppress useless messages in properties file - change GPL link place - add contact link in header instead of footer + [WARN] use property in pollen.properties : "adminEmail", need to be override in demo server config - add other links - improve html code Property changes on: trunk/pollen-ui ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings *.ipr *.iws *.iml .pollen profiles.xml + *.ipr *.iws .classpath *.iml .project target profiles.xml .pollen nbactions.xml .settings Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/components/Border.java 2010-02-17 17:49:42 UTC (rev 2868) @@ -18,7 +18,9 @@ import java.io.File; import java.text.DateFormat; +import java.util.Calendar; import java.util.Date; +import java.util.GregorianCalendar; import java.util.Locale; import org.apache.tapestry5.BindingConstants; @@ -213,6 +215,7 @@ /** * Date et heure actuelles. + * @return current date */ public Date getCurrentTime() { return new Date(); @@ -220,11 +223,21 @@ /** * Version de l'application. + * @return current application version */ public String getVersion() { - return conf.getProperty("version"); + return conf.getProperty(Configuration.PROP_APP_VERSION); } + public int getCurrentYear() { + Calendar current = new GregorianCalendar(); + return current.get(Calendar.YEAR); + } + + public String getContactEmail() { + return conf.getProperty(Configuration.PROP_CONTACT_EMAIL); + } + /** * Retourne si l'utilisateur a renseigné un nom ou un prénom. */ Modified: trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java =================================================================== --- trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/java/org/chorem/pollen/ui/services/Configuration.java 2010-02-17 17:49:42 UTC (rev 2868) @@ -29,6 +29,8 @@ public static final String FEED_DIR = "feedDir"; public static final String IMG_DIR = "upImgDir"; + public static final String PROP_APP_VERSION = "version"; + public static final String PROP_CONTACT_EMAIL = "adminEmail"; /** * Retourne les propriétés. Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border.tml 2010-02-17 17:49:42 UTC (rev 2868) @@ -1,12 +1,12 @@ - +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_1_0.xsd" xmlns:p="tapestry:parameter"> <head> - <title>${message:pollen}</title> + <title>Pollen</title> <link rel="icon" type="image/png" href="${asset:context:favicon.png}" /> <t:FeedContextLink t:id="feedContext" /> <t:if test="${feedFileExisting}"> - <t:headlink rel="alternate" type="application/atom+xml" href="${feedFilename}" t:context="feedContext" /> + <link t:type="headlink" rel="alternate" type="application/atom+xml" href="${feedFilename}" t:context="feedContext" /> </t:if> <script type="text/javascript" src="${asset:context:js/pollen.js}" /> </head> @@ -15,20 +15,24 @@ <!-- Langue --> <div id="localization" class="${pageLogo}Localization"> - <t:output value="currentTime" format="dateFormat"/> - | - <t:actionlink t:id="localeFr"> + <a href="mailto:${contactEmail}" title="${message:header-contact-title}"> + <img src="${asset:context:img/contact.png}" alt="Contact" /> + </a> | + <t:output value="currentTime" format="dateFormat"/> | + <a t:type="actionlink" t:id="localeFr" href="#"> <img src="${asset:context:img/fr.png}" alt="Français" /> - </t:actionlink> | - <t:actionlink t:id="localeEn"> + </a> | + <a t:type="actionlink" t:id="localeEn" href="#"> <img src="${asset:context:img/en.png}" alt="English" /> - </t:actionlink> + </a> </div> <!-- Entête de la page --> - <t:pagelink t:page="Index"> - <img src="${asset:context:img}/${logo}" id="top_logo" alt="${message:pollen}" /> - </t:pagelink> + <p id="top_logo"> + <a t:type="pagelink" t:page="index" href="index"> + <img src="${asset:context:img}/${logo}" alt="Pollen" /> + </a> + </p> <t:zone t:id="top" class="${pageLogo}" show="show" update="show"> <!-- Login --> @@ -59,24 +63,24 @@ <div class="dropdown_menu" id="login_menu" style="display: none;"> <div class="top_right${pageLogo}"></div> <div class="top_left${pageLogo}"></div> - <ul class="top_middle${pageLogo}"> - <t:form t:id="loginForm"> + <form t:type="form" t:id="loginForm" action="post"> + <ul class="top_middle${pageLogo}"> <li> - <t:errors /> + <div t:type="errors" /> </li> <li> - <t:label for="login" />: - <input t:type="TextField" t:id="login" validate="required" size="10" /> + <label t:type="label" for="login" />: + <input t:type="TextField" t:id="login" t:validate="required" size="10" /> </li> <li> - <t:label for="password"/>: - <input t:type="PasswordField" t:id="password" validate="required" size="10" /> + <label t:type="label" for="password"/>: + <input t:type="PasswordField" t:id="password" t:validate="required" size="10" /> </li> <li> <input t:id="submitform" t:type="Submit" t:value="${message:loginSubmit}" /> </li> - </t:form> - </ul> + </ul> + </form> </div> ${message:or} <t:pagelink t:page="user/Register">${message:register}</t:pagelink> @@ -87,7 +91,7 @@ <!-- Menu --> <ul id="menu"> <li class="menu_elt"> - <t:pagelink t:page="Index">${message:home}</t:pagelink> + <a t:type="pagelink" t:page="Index" href="index">${message:home}</a> </li> <li class="menu_elt" onmouseout="$('menu1').hide()" onmouseover="$('menu1').show()"> <a>${message:menu1}</a> @@ -142,10 +146,10 @@ <t:loop t:source="address" t:value="lien"> > <strong> - <t:if test="lien.isLienNull()"> - ${lien.name} + <t:if test="lien.address"> + <a t:type="pagelink" t:page="${lien.address}" href="index">${lien.name}</a> <p:else> - <t:pagelink t:page="${lien.address}">${lien.name}</t:pagelink> + ${lien.name} </p:else> </t:if> </strong> @@ -164,12 +168,16 @@ <!-- Pied de page --> <div id="footer" class="${pageLogo}" xml:space="preserve"> - <a href="${message:docUrl}">${message:pollen}</a> - <a href="${message:downloadUrl}">${version}</a> - - <a href="${message:codeLutinUrl}">${message:copyright}</a> - - <a href="mailto:${message:contactEmail}">${message:contact}</a> - - <a href="${message:bugReportUrl}">${message:bugreport}</a> + <a href="${message:footer-documentation-url}">Pollen</a> + <a href="http://www.chorem.org/projects/list_files/pollen">${version}</a> - + <a href="http://www.gnu.org/licenses/gpl.html">${message:footer-license}</a> - + <!--<a href="${message:codeLutinUrl}">${message:copyright}</a>--> + <span title="Copyright">©2009-${currentYear}</span> + <a href="http://www.codelutin.com">Code Lutin</a> - + <!--<a href="mailto:${message:contactEmail}">${message:contact}</a> --> + <a href="http://www.chorem.org/projects/pollen/issues">${message:footer-bugReport}</a> - + <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">${message:footer-userSupport}</a> </div> - <a href="${message:gplUrl}"><img src="${asset:context:img/gplv3.png}" alt="GPLv3" /></a> + <!--<a href="${message:gplUrl}"><img src="${asset:context:img/gplv3.png}" alt="GPLv3" /></a>--> </body> </html> Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_en.properties 2010-02-17 17:49:42 UTC (rev 2868) @@ -1,3 +1,6 @@ +#head +header-contact-title=Send a mail to an administrator + #menu login=Log in register=Register @@ -26,5 +29,8 @@ loginFailed=Login or password invalid. #foot -contact=Contact -bugreport=Bug report \ No newline at end of file +#contact=Contact +footer-documentation-url=http://maven-site.chorem.org/pollen/ +footer-license=GPL +footer-bugReport=Bug report +footer-userSupport=User support \ No newline at end of file Modified: trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties =================================================================== --- trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/resources/org/chorem/pollen/ui/components/Border_fr.properties 2010-02-17 17:49:42 UTC (rev 2868) @@ -1,3 +1,6 @@ +#head +header-contact-title=Contacter un administrateur + #menu login=Identifiez-vous register=Inscrivez-vous @@ -26,5 +29,8 @@ loginFailed=Mauvais identifiant ou mot de passe. #foot -contact=Contact -bugreport=Rapport de bug \ No newline at end of file +#contact=Contact +footer-documentation-url=http://maven-site.chorem.org/pollen/fr +footer-license=Licence GPL +footer-bugReport=Rapport de bug +footer-userSupport=Support utilisateur \ No newline at end of file Modified: trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties =================================================================== --- trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/webapp/WEB-INF/app.properties 2010-02-17 17:49:42 UTC (rev 2868) @@ -1,17 +1,17 @@ # This is where global application properties go. # Title -pollen=Pollen +#pollen=Pollen # Copyright -copyright=2009-2010 Code Lutin +#copyright=2009-2010 Code Lutin # Contact contactEmail=webmaster@codelutin.com # Links -docUrl=http://maven-site.chorem.org/pollen/ -bugReportUrl=http://www.chorem.org/projects/pollen/issues -downloadUrl=http://www.chorem.org/projects/list_files/pollen -codeLutinUrl=http://www.codelutin.com/ -gplUrl=http://www.gnu.org/licenses/gpl.html +#docUrl=http://maven-site.chorem.org/pollen/ +#bugReportUrl=http://www.chorem.org/projects/pollen/issues +#downloadUrl=http://www.chorem.org/projects/list_files/pollen +#codeLutinUrl=http://www.codelutin.com/ +#gplUrl=http://www.gnu.org/licenses/gpl.html Modified: trunk/pollen-ui/src/main/webapp/css/main.css =================================================================== --- trunk/pollen-ui/src/main/webapp/css/main.css 2010-02-09 16:20:38 UTC (rev 2867) +++ trunk/pollen-ui/src/main/webapp/css/main.css 2010-02-17 17:49:42 UTC (rev 2868) @@ -68,9 +68,9 @@ /*Haut de page*/ #top_logo { - float: left; - margin-top: -102px; - margin-right: 10px; + float: left; + margin-top: -102px; + margin-right: 10px; } .Index { @@ -423,6 +423,7 @@ margin-top: 20px; } -#footer a { +#footer a, +#footer span { color:#727a7e; } \ No newline at end of file Added: trunk/pollen-ui/src/main/webapp/img/contact.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui/src/main/webapp/img/contact.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream