Author: kcardineaud Date: 2011-08-18 15:51:09 +0200 (Thu, 18 Aug 2011) New Revision: 224 Url: http://nuiton.org/repositories/revision/scmwebeditor/224 Log: Add a theme for welcome page Added: trunk/src/main/webapp/img/accueil/ trunk/src/main/webapp/img/accueil/background.png trunk/src/main/webapp/img/accueil/background2.png trunk/src/main/webapp/img/accueil/machine-a-ecrire.png trunk/src/main/webapp/img/accueil/machine-a-ecrire.xcf trunk/src/main/webapp/img/accueil/tache.png trunk/src/main/webapp/img/editor/ trunk/src/main/webapp/img/editor/edit-hover.png trunk/src/main/webapp/img/editor/edit.png trunk/src/main/webapp/img/editor/machine-a-ecrire.png trunk/src/main/webapp/img/editor/post-it.png trunk/src/main/webapp/img/editor/recycle-hover.png trunk/src/main/webapp/img/editor/recycle.png trunk/src/main/webapp/img/editor/save-hover.png trunk/src/main/webapp/img/editor/save.png trunk/src/main/webapp/img/editor/screen-hover.png trunk/src/main/webapp/img/editor/screen.png trunk/src/main/webapp/img/editor/shut-down-hover.png trunk/src/main/webapp/img/editor/shut-down.png Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp trunk/src/main/webapp/WEB-INF/content/outConnection.jsp trunk/src/main/webapp/css/main.css Modified: trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/resources/i18n/scmwebeditor_en_GB.properties 2011-08-18 13:51:09 UTC (rev 224) @@ -1,4 +1,5 @@ scm.FileInEditor=File in editor \: +scm.atRevision=at revision scm.badPathOrFileName=Bad repository path or file name, or the file is not editable \! Please correct it. scm.badUsernameOrPassword=Bad username or password scm.beTransferred=You should be transferred automatically to the new page. If not please Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-08-18 13:51:09 UTC (rev 224) @@ -1,4 +1,5 @@ scm.FileInEditor=Fichier dans l''editeur \: +scm.atRevision=a la revision scm.badPathOrFileName=L''adresse du depot ou le nom du fichier est incorrect, ou le fichier n''est pas editable \! scm.badUsernameOrPassword=Identifiant ou mot de passe incorrect scm.beTransferred=Vous devriez etre redirige sur une nouvelle page. si non Modified: trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/webapp/WEB-INF/content/modificationViewer.jsp 2011-08-18 13:51:09 UTC (rev 224) @@ -76,7 +76,7 @@ </head> <body> - <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="ScmWebEditor logo"/></a> + <a title="ScmWebEditor Project Website" target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img width="150" height="120" src="img/editor/machine-a-ecrire.png" alt="ScmWebEditor logo"/></a> <center> <h2><s:text name="scm.welcome"/></h2> @@ -110,7 +110,7 @@ <p> <s:text name="scm.FileInEditor"/><a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> - at revision <span id="numrevisionDiv"><s:property value="numRevision" /></span> + <s:text name="scm.atRevision"/> <span id="numrevisionDiv"><s:property value="numRevision" /></span> </p> <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea> @@ -164,7 +164,7 @@ <%if (request.getAttribute("badLogin")!=null && request.getAttribute("badLogin").equals(true)) { %> <p> <font color="red"> - Bad username or password + <s:text name="scm.badUsernameOrPassword"/> </font> </p> <%} %> Modified: trunk/src/main/webapp/WEB-INF/content/outConnection.jsp =================================================================== --- trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/webapp/WEB-INF/content/outConnection.jsp 2011-08-18 13:51:09 UTC (rev 224) @@ -40,18 +40,21 @@ <title>SCM Web Editor</title> </head> <body> -<a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/ScmWebEditor_main.png" alt="$alt" /></a> -<center> -<h2><s:text name="scm.welcome"/></h2> -<noscript><h4><s:text name="scm.outConnection.noJavascript"/></h4></noscript> -<h4> -<s:text name="scm.outConnection.enterRepo"/> -</h4> -</center> +<!-- <a target="_blank" href="http://maven-site.nuiton.org/scmwebeditor/"><img src="img/accueil/machine-a-ecrire.png" alt="$alt" /></a> --> +<div id="wrapperConfig"> +<div id="wrapper2Config"> +<div id="titleConfig" > + <h2><s:text name="scm.welcome"/></h2> + <noscript><h4><s:text name="scm.outConnection.noJavascript"/></h4></noscript> + <h4> + <s:text name="scm.outConnection.enterRepo"/> + </h4> +</div> + <form id="configForm" method="get" action="checkout.action"> <center> - <p><label><s:text name="scm.outConnection.scmPath"/> <input TYPE=text name="address" SIZE=100></label> + <p><label><s:text name="scm.outConnection.scmPath"/> <input TYPE=text name="address" SIZE=50></label> <s:url id="ajaxSearch" value="search.action" /> @@ -88,7 +91,9 @@ </div> --> +</div> +</div> +<p align="right">©2004-2011 CodeLutin</p> -<p align="right">©2004-2009 CodeLutin</p> </body> </html> Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-08-18 13:48:04 UTC (rev 223) +++ trunk/src/main/webapp/css/main.css 2011-08-18 13:51:09 UTC (rev 224) @@ -26,7 +26,7 @@ font-family: Verdana,Arial,Helvetica,sans-serif; background-color: #b8b1b1; - max-width:70%; + width:1000px; margin:auto; } @@ -74,10 +74,37 @@ float:left; } -#scmButton { - +#wrapperConfig { + background-color:white; + background-image:url("../img/accueil/background2.png"); + background-position:right top; + margin-top:10px; } +#wrapper2Config { + background-image:url("../img/accueil/machine-a-ecrire.png"); + background-repeat:no-repeat; + background-position:-210px 0px; + min-height:500px; +} + +#titleConfig { + width:500px; + margin:auto; + text-align:center; + background-image:url("../img/accueil/tache.png"); + background-repeat:no-repeat; + background-position:right -1px; + padding-top:10px; + padding-right:30px; + padding-left:30px; +} + +#configForm { + padding-top:80px; + padding-left:250px; +} + #loginDiv { margin:auto; width:285px; @@ -108,8 +135,9 @@ border : solid 3px black; } -#search { +#searchTree { margin:auto; display:block; - border : solid 2px black; + border : solid 1px black; + margin-right:15px; } Added: trunk/src/main/webapp/img/accueil/background.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/background.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/accueil/background2.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/background2.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/accueil/machine-a-ecrire.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/machine-a-ecrire.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/accueil/machine-a-ecrire.xcf =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/machine-a-ecrire.xcf ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/accueil/tache.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/accueil/tache.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/edit-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/edit-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/edit.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/machine-a-ecrire.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/machine-a-ecrire.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/post-it.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/post-it.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/recycle-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/recycle-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/recycle.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/recycle.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/save-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/save-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/save.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/save.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/screen-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/screen-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/screen.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/screen.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/shut-down-hover.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/shut-down-hover.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/src/main/webapp/img/editor/shut-down.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/webapp/img/editor/shut-down.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream