From echatellier@users.forge.codelutin.com Tue Aug 14 16:16:17 2012 From: echatellier@users.forge.codelutin.com To: coser-commits@list.forge.codelutin.com Subject: [Coser-commits] r1047 - in trunk/src/site: . en/rst/devel rst/devel Date: Tue, 14 Aug 2012 16:16:17 +0200 Message-ID: <20120814141617.E124F15996@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3595462480219474885==" --===============3595462480219474885== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: echatellier Date: 2012-08-14 16:16:17 +0200 (Tue, 14 Aug 2012) New Revision: 1047 Url: http://forge.codelutin.com/repositories/revision/coser/1047 Log: fixes #1334: Am?\195?\169liorer la documentation (mise ?\195?\160 jour des te= xtes du site)=20 Modified: trunk/src/site/en/rst/devel/textupdate.rst trunk/src/site/rst/devel/textupdate.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/src/site/en/rst/devel/textupdate.rst =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/site/en/rst/devel/textupdate.rst 2012-08-14 13:45:56 UTC (rev 1= 046) +++ trunk/src/site/en/rst/devel/textupdate.rst 2012-08-14 14:16:17 UTC (rev 1= 047) @@ -23,3 +23,77 @@ .. * #L% .. - =20 + +Website text update +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +This documentation shows hom to update text content of website available at: +http://www.ifremer.fr/SIH-indices-campagnes/. + +Source +------ +In order to modify source content, you have to be part of coser project deve= lopper +to be allowed to commit on repository. + +After this autorisation, sources can be retreived with a subversion client: + + * Windows : http://tortoisesvn.net/ + * Linux : command line ``svn`` + +Repository address is : http://svn.forge.codelutin.com/svn/coser/trunk + +Directory layout +---------------- +Root directory contains 3 maven modules: + + * *coser-business* : contains all business code (used by both other module= s) + * *coser-ui* : swing client + * *coser-web* : website + +In order to modify website content *coser-web* module will be used. + + +coser-web module source +----------------------- +In coser-web module, two groups of files concern the modification of text co= ntent: + + * ``src/main/webapp/WEB-INF/content`` : html pages + * ``src/main/resources/fr/ifremer/coser/web`` : text translation to includ= e in html pages + + +Indeed, in the html pages, we find this kind of code :: + + + <s:text name=3D"message.index.title" /> + + +This code define a html page title, with the translation key `message.layout= .title`. + +And in files ``package_en.properties`` and ``package_fr.properties`` we find +respectively:: + + message.index.title=3DHome + +et:: + + message.index.title=3DAccueil + + +Change and commit to the server +------------------------------- +You can change the formatting and content of HTML pages. +However, it is important to ensure that the contents of translation files +are in adequacy with the html. + +After making changes, you can commiting these changes +on the server with your svn client. + + +Production +---------- +The act of commiting does not mean that the production site will be updated. +Indeed, a new stable release must be prepared and installed in production. +The changes you make will only be integrated in the next production. + +However, it is possible to ask the development team to prepare +a new version if your changes were urgent. Modified: trunk/src/site/rst/devel/textupdate.rst =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/site/rst/devel/textupdate.rst 2012-08-14 13:45:56 UTC (rev 1046) +++ trunk/src/site/rst/devel/textupdate.rst 2012-08-14 14:16:17 UTC (rev 1047) @@ -46,7 +46,7 @@ Le r=C3=A9pertoire racine est constitu=C3=A9 de 3 modules maven: =20 * *coser-business* : contenant le code m=C3=A9tier (tout le code utilis=C3= =A9 par les deux - autre modules) + autres modules) * *coser-ui* : client swing * *coser-web* : site internet =20 @@ -56,7 +56,7 @@ =20 Source du modules coser-web --------------------------- -Dans le module coser-web, deux groupes de fichiers concerne la modification +Dans le module coser-web, deux groupes de fichiers concernent la modification du contenu textuel: =20 * ``src/main/webapp/WEB-INF/content`` : qui contient les pages html @@ -69,7 +69,7 @@ <s:text name=3D"message.index.title" /> =20 -Cette code d=C3=A9fini un titre de page html, contenant la traduction de le = cl=C3=A9 +Ce code d=C3=A9fini un titre de page html, contenant la traduction de le cl= =C3=A9 `message.layout.title`. =20 Et dans les fichiers ``package_en.properties`` et ``package_fr.properties``,= on trouve @@ -79,4 +79,25 @@ =20 et:: =20 - message.index.title=3DAccueil \ No newline at end of file + message.index.title=3DAccueil + + +Modification et commit sur le serveur +------------------------------------- +Il est possible de modifier la mise en forme et le contenu des pages html. +Toutefois, il est important de veiller =C3=A0 ce que le contenu des fichiers= de +traductions soit en adequation avec les fichiers html. + +Une fois les modifications effectu=C3=A9es, vous pouvez commiter ces modific= ations +sur le serveur avec votre client svn. + + +Mise en prod +------------ +Le fait de commiter ne signifie pas que le site de production sera mis =C3= =A0 jour. +En effet, une nouvelle version stable (release) doit =C3=AAtre pr=C3=A9par= =C3=A9e et mise +en production. Les modifications que vous pourrez effectuer ne seront +int=C3=A9gr=C3=A9es que lors de la prochaine mise en production. + +Il est toutefois possible de demander =C3=A0 l'equipe de developpement la pr= oduction +d'une nouvelle version si vos modifications se r=C3=A9v=C3=A9laient urgentes. Modified: trunk/src/site/site_en.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/site/site_en.xml 2012-08-14 13:45:56 UTC (rev 1046) +++ trunk/src/site/site_en.xml 2012-08-14 14:16:17 UTC (rev 1047) @@ -47,8 +47,6 @@ =20 - - =20 Modified: trunk/src/site/site_fr.xml =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/src/site/site_fr.xml 2012-08-14 13:45:56 UTC (rev 1046) +++ trunk/src/site/site_fr.xml 2012-08-14 14:16:17 UTC (rev 1047) @@ -47,8 +47,6 @@ =20 - - =20 --===============3595462480219474885==--