Author: echatellier Date: 2011-11-27 17:34:26 +0100 (Sun, 27 Nov 2011) New Revision: 3090 Url: http://chorem.org/repositories/revision/pollen/3090 Log: Add home page css. Added: trunk/pollen-wm/src/main/webapp/WEB-INF/head.jsp trunk/pollen-wm/src/main/webapp/WEB-INF/login.jsp trunk/pollen-wm/src/main/webapp/WEB-INF/register.jsp trunk/pollen-wm/src/main/webapp/img/ trunk/pollen-wm/src/main/webapp/img/bigCreation.png trunk/pollen-wm/src/main/webapp/img/bigVote.png trunk/pollen-wm/src/main/webapp/img/bigVoteCounting.png trunk/pollen-wm/src/main/webapp/img/contact.png trunk/pollen-wm/src/main/webapp/img/en.png trunk/pollen-wm/src/main/webapp/img/fr.png trunk/pollen-wm/src/main/webapp/img/pollen.png trunk/pollen-wm/src/main/webapp/img/pollenIndex_en.png trunk/pollen-wm/src/main/webapp/img/pollenIndex_fr.png trunk/pollen-wm/src/main/webapp/img/smallCreation_en.png trunk/pollen-wm/src/main/webapp/img/smallCreation_fr.png trunk/pollen-wm/src/main/webapp/img/smallVoteCounting_en.png trunk/pollen-wm/src/main/webapp/img/smallVoteCounting_fr.png trunk/pollen-wm/src/main/webapp/img/smallVote_en.png trunk/pollen-wm/src/main/webapp/img/smallVote_fr.png Modified: trunk/pollen-wm/pom.xml trunk/pollen-wm/src/main/java/org/chorem/pollen/web/PollenAction.java trunk/pollen-wm/src/main/resources/mapping trunk/pollen-wm/src/main/webapp/WEB-INF/footer.jsp trunk/pollen-wm/src/main/webapp/WEB-INF/header.jsp trunk/pollen-wm/src/main/webapp/WEB-INF/index.jsp trunk/pollen-wm/src/main/webapp/css/pollen.css Modified: trunk/pollen-wm/pom.xml =================================================================== --- trunk/pollen-wm/pom.xml 2011-11-27 16:32:49 UTC (rev 3089) +++ trunk/pollen-wm/pom.xml 2011-11-27 16:34:26 UTC (rev 3090) @@ -83,6 +83,12 @@ </connectors> </configuration> </plugin> + + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>2.0-SNAPSHOT</version> + </plugin> </plugins> </build> Modified: trunk/pollen-wm/src/main/java/org/chorem/pollen/web/PollenAction.java =================================================================== --- trunk/pollen-wm/src/main/java/org/chorem/pollen/web/PollenAction.java 2011-11-27 16:32:49 UTC (rev 3089) +++ trunk/pollen-wm/src/main/java/org/chorem/pollen/web/PollenAction.java 2011-11-27 16:34:26 UTC (rev 3090) @@ -3,7 +3,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.debux.webmotion.server.WebMotionController; -import org.debux.webmotion.server.call.Render; +import org.debux.webmotion.server.render.Render; /** * Misc pollen action : home ... @@ -16,7 +16,7 @@ /** Logger */ private static Log log = LogFactory.getLog(PollenAction.class); - public Render home() { + public Render index() { return renderView("index.jsp"); } } Modified: trunk/pollen-wm/src/main/resources/mapping =================================================================== --- trunk/pollen-wm/src/main/resources/mapping 2011-11-27 16:32:49 UTC (rev 3089) +++ trunk/pollen-wm/src/main/resources/mapping 2011-11-27 16:34:26 UTC (rev 3090) @@ -11,7 +11,7 @@ [actions] # All match -GET / PollenAction.home +GET / PollenAction.index # All match Modified: trunk/pollen-wm/src/main/webapp/WEB-INF/footer.jsp =================================================================== --- trunk/pollen-wm/src/main/webapp/WEB-INF/footer.jsp 2011-11-27 16:32:49 UTC (rev 3089) +++ trunk/pollen-wm/src/main/webapp/WEB-INF/footer.jsp 2011-11-27 16:34:26 UTC (rev 3090) @@ -1,10 +1,10 @@ - <!-- Pied de page --> - <div id="po-footer" class="po-footer" xml:space="preserve"> - <a href="">Pollen</a> - <a href="http://www.chorem.org/projects/pollen/files">${version}</a> - - <a href="http://www.gnu.org/licenses/gpl.html">License</a> - - <span title="Copyright">© 2009 - 2011</span> - <a href="http://www.codelutin.com">Code Lutin</a> - - <a href="http://www.chorem.org/projects/pollen/issues">Bug report</a> - - <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">Support</a> - </div> \ No newline at end of file + <!-- Pied de page --> + <div id="po-footer"> + <a href="">Pollen</a> + <a href="http://www.chorem.org/projects/pollen/files">version</a> - + <a href="http://www.gnu.org/licenses/gpl.html">License</a> - + <span title="Copyright">© 2009 - 2011</span> + <a href="http://www.codelutin.com">Code Lutin</a> - + <a href="http://www.chorem.org/projects/pollen/issues">Bug report</a> - + <a href="http://list.chorem.org/cgi-bin/mailman/listinfo/pollen-users">Support</a> + </div> Added: trunk/pollen-wm/src/main/webapp/WEB-INF/head.jsp =================================================================== --- trunk/pollen-wm/src/main/webapp/WEB-INF/head.jsp (rev 0) +++ trunk/pollen-wm/src/main/webapp/WEB-INF/head.jsp 2011-11-27 16:34:26 UTC (rev 3090) @@ -0,0 +1,2 @@ + <link rel=stylesheet type="text/css" href="css/pollen.css"> + <script type="text/javascript" lang="javascript" src="js/jquery-1.7.1.min.js"></script> Modified: trunk/pollen-wm/src/main/webapp/WEB-INF/header.jsp =================================================================== --- trunk/pollen-wm/src/main/webapp/WEB-INF/header.jsp 2011-11-27 16:32:49 UTC (rev 3089) +++ trunk/pollen-wm/src/main/webapp/WEB-INF/header.jsp 2011-11-27 16:34:26 UTC (rev 3090) @@ -1,77 +1,82 @@ + <div class="po-header"> + <!-- Langue --> <div id="po-header-localization" class="po-localization"> - <a href="mailto:contactEmail" title="message:header-contact-title"> - <img src="img/contact.png" alt="Contact" /> - </a> | - <t:output value="currentTime" format="dateFormat"/> | - <a t:type="actionlink" t:id="localeFr" href="#"> - <img src="img/fr.png" alt="Fran�ais" /> - </a> | - <a t:type="actionlink" t:id="localeEn" href="#"> - <img src="img/en.png" alt="English" /> + <a href="mailto:contactEmail" title="message:header-contact-title" class="po-contactlink"> + Contact </a> + | + Date + | + <a t:type="actionlink" t:id="localeFr" href="#" lang="fr" class="po-localelink"> + Francais + </a> + | + <a t:type="actionlink" t:id="localeEn" href="#" lang="en" class="po-localelink"> + English + </a> </div> <!-- Ent�te de la page --> - <p id="po-header-logo"> - <a href="index"> - <img class="po-img-header-logo" alt="Pollen" /> + <div id="po-header-logo"> + <a href="index" class="po-homelink"> + Pollen </a> - </p> - <div class="pageLogo" show="show" update="show"> + </div> + <div id="po-header-menu"> + <!-- Login --> - <div id="po-header-connection" class="po-header-connection"> - <t:if test="userExists"> - <span class="menu_elt" onmouseover="$('compte_menu').show()" onmouseout="$('compte_menu').hide()"> - user.displayName - <div class="dropdown_menu" id="compte_menu" style="display: none;"> - <div class="top_right"></div> - <div class="top_left"></div> + <div id="po-header-connection"> + <% if (false) { %> + <span class="menu_elt" onmouseover="$('compte_menu').show()" + onmouseout="$('compte_menu').hide()">user.displayName</span> + + <div class="dropdown_menu" id="compte_menu"> + <div class="top_right"></div> + <div class="top_left"></div> + <ul class="top_middle"> + <li> + <a href="user/profile">message:account</a> + </li> + <li> + <a href="logout">message:logout</a> + </li> + </ul> + </div> + <% } else { %> + <span onClick="$('login_menu').toggle()" class="po-login">Login</span> + <div class="dropdown_menu" id="po-header-login-box"> + <div class="top_right"></div> + <div class="top_left"></div> + <form id="connection" action="post"> <ul class="top_middle"> <li> - <t:pagelink page="user/profile">message:account</t:pagelink> + <div id="login-errors" /> </li> <li> - <t:actionlink t:id="logout" t:zone="top">message:logout</t:actionlink> + <label for="login" />: + <input type="text" id="login" size="10" /> </li> + <li> + <label for="password"/>: + <input type="password" id="password" size="10" /> + </li> + <li> + <input type="submit" t:value="Submit" /> + </li> </ul> - </div> - </span> - <p:else> - <span onClick="$('login_menu').toggle()">message:login</span> - <div class="dropdown_menu" id="login_menu" style="display: none;"> - <div class="top_right"></div> - <div class="top_left"></div> - <form t:type="form" t:id="connection" action="post"> - <ul class="top_middle"> - <li> - <div t:type="errors" /> - </li> - <li> - <label t:type="label" for="login" />: - <input t:type="TextField" t:id="login" t:validate="required" size="10" /> - </li> - <li> - <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> - </ul> - </form> - </div> - message:or - <t:pagelink t:page="user/register">message:register</t:pagelink> - </p:else> - </t:if> + </form> + </div> + or + <span><a href="user/register">Register</a></span> + <% } %> </div> <!-- Menu --> - <ul id="menu"> + <ul id="po-header-connection-menu"> <li class="menu_elt"> - <a t:type="pagelink" t:page="Index" href="index">${message:home}</a> + <a href="index">message:home</a> </li> <li class="menu_elt" onmouseout="$('menu1').hide()" onmouseover="$('menu1').show()"> <a>message:menu1</a> @@ -80,24 +85,24 @@ <div class="top_left"></div> <ul class ="top_middle"> <li> - <t:pagelink t:page="poll/form">message:pollCreation</t:pagelink> + <a href="poll/form">message:pollCreation</a> </li> <t:if test="userExists"> <li> - <t:pagelink t:page="user/pollsCreated">message:createdPolls</t:pagelink> + <a href="user/pollsCreated">message:createdPolls</a> </li> <li> - <t:pagelink t:page="user/pollsParticipated">message:participatedPolls</t:pagelink> + <a href="user/pollsParticipated">message:participatedPolls</a> </li> <li> - <t:pagelink t:page="user/lists">message:votingLists</t:pagelink> + <a href="user/lists">message:votingLists</a> </li> </t:if> </ul> </div> </li> - <t:if test="userExists"> - <t:if test="user.admin"> + <% if (true) { %> + <% if (true) { %> <li class="menu_elt" onmouseout="$('menu2').hide()" onmouseover="$('menu2').show()"> <a>message:menu2</a> <div class="dropdown_menu" id="menu2" style="display:none"> @@ -105,15 +110,16 @@ <div class="top_left"></div> <ul class ="top_middle"> <li> - <t:pagelink t:page="admin/polls">message:pollsAdmin</t:pagelink> + <a href="admin/polls">message:pollsAdmin</a> </li> <li> - <t:pagelink t:page="admin/users">message:usersAdmin</t:pagelink> + <a href="admin/users">message:usersAdmin</a> </li> </ul> </div> </li> - </t:if> - </t:if> + <% } %> + <% } %> </ul> - </t:zone> \ No newline at end of file + </div> + </div> \ No newline at end of file Modified: trunk/pollen-wm/src/main/webapp/WEB-INF/index.jsp =================================================================== --- trunk/pollen-wm/src/main/webapp/WEB-INF/index.jsp 2011-11-27 16:32:49 UTC (rev 3089) +++ trunk/pollen-wm/src/main/webapp/WEB-INF/index.jsp 2011-11-27 16:34:26 UTC (rev 3090) @@ -1,27 +1,37 @@ -<html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> <head> <title>Pollen</title> + <jsp:include page="head.jsp"/> </head> <body> -<%-- <jsp:include page="header.jsp"> --%> + <jsp:include page="header.jsp"/> - <div class="homelogo"> - <img src="img/pollen.png" alt="Pollen logo"/> - </div> + <div class="page"> + <div id="po-placebar"> + <span class="pbitem">Pollen</span> + </div> - <div class="actionslogos"> - <a href="poll/create"> - <img src="img/smallCreation.png" alt="poll creation" /> - </a> - <a href="user/myvote"> - <img src="img/smallVote.png" alt="vote" /> - </a> - <a href="user/myvote"> - <img src="img/smallVoteCounting.png" alt="voteCounting" /> - </a> + <div class="content"> + <div id="po-homelogo"> + Pollen logo + </div> + + <div id="po-homeactions"> + <a href="poll/create" class="createpoll"> + Create poll + </a> + <a href="user/myvote" class="mypoll"> + My vote + </a> + <a href="user/votecounting" class="votecounting"> + Vote counting + </a> + </div> + </div> </div> - -<%-- <jsp:include page="footer.jsp"> --%> + + <jsp:include page="footer.jsp"/> </body> </html> \ No newline at end of file Added: trunk/pollen-wm/src/main/webapp/WEB-INF/login.jsp =================================================================== --- trunk/pollen-wm/src/main/webapp/WEB-INF/login.jsp (rev 0) +++ trunk/pollen-wm/src/main/webapp/WEB-INF/login.jsp 2011-11-27 16:34:26 UTC (rev 3090) @@ -0,0 +1,37 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> + <head> + <title>Pollen</title> + <jsp:include page="head.jsp"/> + </head> + + <body> + <jsp:include page="header.jsp"/> + + <div class="page"> + <div id="po-placebar"> + <span class="pbitem">Pollen</span> + </div> + + <div class="content"> + <div id="po-homelogo"> + Pollen logo + </div> + + <div id="po-homeactions"> + <a href="poll/create" class="createpoll"> + Create poll + </a> + <a href="user/myvote" class="mypoll"> + My vote + </a> + <a href="user/votecounting" class="votecounting"> + Vote counting + </a> + </div> + </div> + </div> + + <jsp:include page="footer.jsp"/> + </body> +</html> \ No newline at end of file Added: trunk/pollen-wm/src/main/webapp/WEB-INF/register.jsp =================================================================== --- trunk/pollen-wm/src/main/webapp/WEB-INF/register.jsp (rev 0) +++ trunk/pollen-wm/src/main/webapp/WEB-INF/register.jsp 2011-11-27 16:34:26 UTC (rev 3090) @@ -0,0 +1,64 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" lang="fr"> + <head> + <title>Pollen</title> + <jsp:include page="head.jsp"/> + </head> + + <body> + <jsp:include page="header.jsp"/> + + <div class="page"> + <div id="po-placebar"> + <span class="pbitem"><a href="index">Pollen</a></span> + <span class="pbitem">Register</span> + </div> + + <div class="content"> + <h1>Register</h1> + + <form action="register" method="post"> + + <fieldset> + <legend>Informations de connexion</legend> + + <div class="registerfield"> + <label for="login" class="required">Login:</label> + <input type="text" id="login" name="login"> + <div> + <div class="registerfield"> + <label for="password" class="required">Password :<label> + <input type="password" id="password" name="password"> + <div> + <div class="registerfield"> + <label for="password2" class="required">Confirm password :<label> + <input type="password" id="password2" name="password2"> + <div> + + </fieldset> + + <fieldset> + <legend>Informations de l'utilisateur</legend> + + <div class="registerfield"> + <label for="email" class="required">Email:</label> + <input type="text" id="email" name="email"> + <div> + <div class="registerfield"> + <label for="lastname">Nom:</label> + <input type="text" id="lastname" name="lastname"> + <div> + <div class="registerfield"> + <label for="firstname">Pr�nom:</label> + <input type="text" id="firstname" name="firstname"> + <div> + </fieldset> + + <input type="submit" value="Register" /> + </form> + </div> + </div> + + <jsp:include page="footer.jsp"/> + </body> +</html> \ No newline at end of file Modified: trunk/pollen-wm/src/main/webapp/css/pollen.css =================================================================== --- trunk/pollen-wm/src/main/webapp/css/pollen.css 2011-11-27 16:32:49 UTC (rev 3089) +++ trunk/pollen-wm/src/main/webapp/css/pollen.css 2011-11-27 16:34:26 UTC (rev 3090) @@ -0,0 +1,135 @@ +/* global */ +body { + font-family: "Trebuchet MS",Arial,sans-serif; + width: 1000px; + margin: auto; + font-size: small; +} + +/* header */ +#po-header-localization{ + text-align:right; + margin-top: 10px; +} +#po-header-localization .po-contactlink { + width:20px; + background:url("../img/contact.png") no-repeat center; +} +#po-header-localization .po-localelink { + width:20px; + background:url("../img/en.png") no-repeat center; +} +#po-header-localization .po-localelink:lang(fr){ + background-image:url("../img/fr.png") +} + +#po-header-logo{ + float: left; + margin-right: 10px; + margin-top: -100px; + width:350px; + height:153px; + background:url("../img/pollenIndex_en.png") no-repeat; +} +html:lang(fr) #po-header-logo { + background-image:url("../img/pollenIndex_fr.png") +} + +#po-header-menu{ + padding: 7px; + background-color: #FFFF00; +} +#po-header-menu #po-header-connection { + float:right; +} +#po-header-menu #po-header-connection #po-header-login-box{ + display:none; +} +#po-header-menu #po-header-connection-menu{ + margin:0; + padding:0; +} +#po-header-menu #po-header-connection-menu li{ + display:inline +} +#po-header-menu #po-header-connection span{ + cursor:pointer; + padding: 1px 5px; +} +#po-header-menu #po-header-connection span:hover{ + background-color: #000000; + border-radius: 10px 10px 10px 10px; + color: white; +} +#po-header-menu #po-header-connection a{ + color: black; + text-decoration:none; +} +#po-header-menu #po-header-connection a:hover{ + color: white; +} + +/* footer */ +#po-footer { + background-color: #FFFF00; + font-size: small; + margin-top: 20px; + padding: 5px; + text-align: center; + color: #727A7E; +} +#po-footer a{ + color: #727A7E; +} + +/* page content */ +.page #po-placebar { + background-color: #FFFFAA; + margin-left: 350px; + padding: 5px; +} +.page #po-placebar .pbitem { + font-weight:bold; +} +.page #po-placebar .pbitem:before{ + content:"> "; +} +.page .content { + padding: 15px; +} + +/* page : home page */ +#po-homelogo { + width:20px; + background:url("../img/pollen.png") no-repeat center; + margin:auto; + width:260px; + height:200px; +} +#po-homeactions { + text-align:center; +} +#po-homeactions .createpoll{ + background:url("../img/smallCreation_en.png") no-repeat center; + width:250px; + height:100px; +} +html:lang(fr) #po-homeactions .createpoll { + background-image:url("../img/smallCreation_fr.png") +} +#po-homeactions .mypoll{ + background:url("../img/smallVote_en.png") no-repeat center; + width:200px; + height:100px; +} +html:lang(fr) #po-homeactions .mypoll { + background-image:url("../img/smallVote_fr.png") +} +#po-homeactions .votecounting{ + background:url("../img/smallVoteCounting_en.png") no-repeat center; + width:250px; + height:100px; +} +html:lang(fr) #po-homeactions .votecounting { + background-image:url("../img/smallVoteCounting_fr.png") +} \ No newline at end of file Added: trunk/pollen-wm/src/main/webapp/img/bigCreation.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/bigCreation.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/bigVote.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/bigVote.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/bigVoteCounting.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/bigVoteCounting.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/contact.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/contact.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/en.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/fr.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/pollen.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/pollen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/pollenIndex_en.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/pollenIndex_en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/pollenIndex_fr.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/pollenIndex_fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/smallCreation_en.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/smallCreation_en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/smallCreation_fr.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/smallCreation_fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/smallVoteCounting_en.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/smallVoteCounting_en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/smallVoteCounting_fr.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/smallVoteCounting_fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/smallVote_en.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/smallVote_en.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/pollen-wm/src/main/webapp/img/smallVote_fr.png =================================================================== (Binary files differ) Property changes on: trunk/pollen-wm/src/main/webapp/img/smallVote_fr.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream