- Coser-commits - mailman.cloud.codelutin.com

r553 - trunk/coser-ui/src/main/jnlp
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 13:53:39 +0000 (Mon, 24 Jan 2011) New Revision: 553 Log: Change memory setting Modified: trunk/coser-ui/src/main/jnlp/coser-jnlp.vm Modified: trunk/coser-ui/src/main/jnlp/coser-jnlp.vm =================================================================== --- trunk/coser-ui/src/main/jnlp/coser-jnlp.vm 2011-01-24 09:31:27 UTC (rev 552) +++ trunk/coser-ui/src/main/jnlp/coser-jnlp.vm 2011-01-24 13:53:39 UTC (rev 553) @@ -18,7 +18,7 @@ </security> #end <resources> - <j2se version="$j2seVersion" java-vm-args="-Xmx512M"/> + <j2se version="$j2seVersion" max-heap-size="512m"/> $dependencies $extensions </resources>

1 0

r552 - trunk
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 09:31:27 +0000 (Mon, 24 Jan 2011) New Revision: 552 Log: Update to http components 4.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-01-24 09:13:12 UTC (rev 551) +++ trunk/pom.xml 2011-01-24 09:31:27 UTC (rev 552) @@ -96,14 +96,14 @@ <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> - <version>4.1-beta1</version> + <version>4.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpmime</artifactId> - <version>4.1-beta1</version> + <version>4.1</version> <scope>compile</scope> </dependency>

1 0

r551 - in trunk: coser-business/src/main/java/fr/ifremer/coser coser-ui coser-ui/src/main/java/fr/ifremer/coser/ui coser-ui/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 09:13:12 +0000 (Mon, 24 Jan 2011) New Revision: 551 Log: Add help menu links. Add about coser dialog. Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java trunk/coser-ui/pom.xml trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2011-01-24 08:54:14 UTC (rev 550) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/CoserBusinessConfig.java 2011-01-24 09:13:12 UTC (rev 551) @@ -127,6 +127,11 @@ return result; } + public String getWebFrontEnd() { + String result = getOption(CoserBusinessOption.WEB_FRONT_END.key); + return result; + } + public String getWebUploadURL() { String result = getOption(CoserBusinessOption.WEB_UPLOAD_URL.key); return result; @@ -185,7 +190,7 @@ SELECTION_FILTER_DENSITY("coser.selection.densityFilter", _("coser.config.selection.densityFilter.description"), "5.0", Double.class, false, false), /** Client side. */ - WEB_FRONT_END("coser.web.frontend", _("coser.config.web.frontend.description"), "http://www.ifremer.fr/coser", String.class, false, false), + WEB_FRONT_END("coser.web.frontend", _("coser.config.web.frontend.description"), "http://demo.codelutin.com/coser", String.class, false, false), WEB_UPLOAD_URL("coser.web.uploadurl", _("coser.config.web.uploadurl.description"), "${" + WEB_FRONT_END.key + "}/upload-result.action", String.class, false, false), /** Server side. */ Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-01-24 08:54:14 UTC (rev 550) +++ trunk/coser-ui/pom.xml 2011-01-24 09:13:12 UTC (rev 551) @@ -138,6 +138,14 @@ <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> + <generateBundle>true</generateBundle> + </configuration> + </plugin> + + <plugin> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-01-24 08:54:14 UTC (rev 550) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-01-24 09:13:12 UTC (rev 551) @@ -65,6 +65,8 @@ <JMenu text="coser.ui.mainframe.menu.help"> <JMenuItem text="coser.ui.mainframe.menu.website" onActionPerformed="getHandler().showCoserWebsite()"/> + <JMenuItem text="coser.ui.mainframe.menu.websitesih" onActionPerformed="getHandler().showCoserWebsiteSIH()"/> + <JMenuItem text="coser.ui.mainframe.menu.about" onActionPerformed="getHandler().showAboutView()"/> </JMenu> </JMenuBar> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-24 08:54:14 UTC (rev 550) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-01-24 09:13:12 UTC (rev 551) @@ -39,6 +39,7 @@ import javax.swing.JOptionPane; import javax.swing.filechooser.FileFilter; +import jaxx.runtime.swing.AboutPanel; import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; @@ -214,8 +215,34 @@ throw new CoserException("Can't open system browser", ex); } } + + /** + * Open default system browser to coser website. + */ + public void showCoserWebsiteSIH() { + CoserConfig config = view.getContextValue(CoserConfig.class); + URI uri = URI.create(config.getWebFrontEnd()); + try { + Desktop.getDesktop().browse(uri); + } catch (IOException ex) { + throw new CoserException("Can't open system browser", ex); + } + } /** + * Display coser about view. + */ + public void showAboutView() { + CoserConfig config = view.getContextValue(CoserConfig.class); + AboutPanel aboutPanel = new AboutPanel(view); + aboutPanel.setTitle(_("coser.ui.about.title")); + aboutPanel.setAboutText(_("coser.ui.about.about", config.getApplicationVersion())); + aboutPanel.setLicenseFile("META-INF/coser-ui-LICENSE.txt"); + aboutPanel.setThirdpartyFile("META-INF/coser-ui-THIRD-PARTY.txt"); + aboutPanel.showInDialog(view, true); + } + + /** * Affiche la fenetre de configuration des validateurs personnel de * l'utilisateur. */ Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-01-24 08:54:14 UTC (rev 550) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2011-01-24 09:13:12 UTC (rev 551) @@ -9,6 +9,8 @@ coser.config.lookandfeel.description=Application's swing theme coser.config.support.email.description=Support email address coser.config.website.description=Coser website +coser.ui.about.about=<html><b>Coser</b><br /><br />Version %s<br /><br />Usefull links \:<ul><li><a href\="http\://coser.labs.libre-entreprise.org/">Documentation</a></li><li><a href\="http\://labs.libre-entreprise.org/tracker/?atid\=721&group_id\=164">Bug report</a></li></ul><br /><br />Copyright 2010 - 2011 <a href\="http\://www.ifremer.fr">Ifremer</a>, <a href\="http\://www.codelutin.com">Code Lutin</a><html> +coser.ui.about.title=About Coser coser.ui.common.cancel=Cancel coser.ui.common.selectAll=Select all coser.ui.common.selectAll.short=All @@ -64,6 +66,7 @@ coser.ui.home.text=<html><center><b>CoSeR</b><br /><br />Le logiciel Coser est con\u00E7u par l'Ifremer (projet Syst\u00E8me d'informations halieutiques) comme l'un des maillons<br />d'une cha\u00EEne de traitement des donn\u00E9es des campagnes halieutiques pour calculer des indicateurs \u00E9cosyst\u00E9miques.<br />Il se situe \u00E0 l'interface entre les donn\u00E9es extraites des bases de donn\u00E9es source des campagnes et le logiciel<br />de calcul R-Sufi. Il remplit trois fonctions \: contr\u00F4le de qualit\u00E9 des donn\u00E9es, s\u00E9lection de jeux de donn\u00E9es<br />coh\u00E9rents en r\u00E9f\u00E9rence aux objectifs de calcul et gestion de la m\u00E9ta-information relative aux traitements r\u00E9alis\u00E9s.<br /><br />Coser a \u00E9t\u00E9 cr\u00E9\u00E9 par Code Lutin avec des logiciels libres dans le cadre d'une convention Ifremer-MEEDDM 2010.</center></html> coser.ui.locale.mustRestart=You must restart application to take effect coser.ui.locale.title=Locale modification +coser.ui.mainframe.menu.about=About Coser coser.ui.mainframe.menu.admin=Admin coser.ui.mainframe.menu.admin.publishResult=Results publication coser.ui.mainframe.menu.closeProject=Close project @@ -89,6 +92,7 @@ coser.ui.mainframe.menu.view=View coser.ui.mainframe.menu.view.lookandfeel=Look and feel coser.ui.mainframe.menu.website=Online help +coser.ui.mainframe.menu.websitesih=SIH Indices campagnes website coser.ui.mainview.titleempty=Contr\u00F4le et S\u00E9lection RSufi coser.ui.mainview.titleproject=Contr\u00F4le et S\u00E9lection RSufi (%s) coser.ui.project.addMaps=Add map\u2026 Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-01-24 08:54:14 UTC (rev 550) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2011-01-24 09:13:12 UTC (rev 551) @@ -9,6 +9,8 @@ coser.config.lookandfeel.description=Themes graphique Swing de l'application coser.config.support.email.description=Adresse de support pour l'envoi des erreurs coser.config.website.description=Site internet de Coser +coser.ui.about.about=<html><b>Coser</b><br /><br />Version %s<br /><br />Liens utiles \:<ul><li><a href\="http\://coser.labs.libre-entreprise.org/">Documentation</a></li><li><a href\="http\://labs.libre-entreprise.org/tracker/?atid\=721&group_id\=164">Rapport de bug</a></li></ul><br /><br />Copyright 2010 - 2011 <a href\="http\://www.ifremer.fr">Ifremer</a>, <a href\="http\://www.codelutin.com">Code Lutin</a><html> +coser.ui.about.title=\u00C0 propos de Coser coser.ui.common.cancel=Annuler coser.ui.common.selectAll=S\u00E9lectionner tout coser.ui.common.selectAll.short=Tout @@ -64,6 +66,7 @@ coser.ui.home.text=<html><center><b>CoSeR</b><br /><br />Le logiciel Coser est con\u00E7u par l'Ifremer (projet Syst\u00E8me d'informations halieutiques) comme l'un des maillons<br />d'une cha\u00EEne de traitement des donn\u00E9es des campagnes halieutiques pour calculer des indicateurs \u00E9cosyst\u00E9miques.<br />Il se situe \u00E0 l'interface entre les donn\u00E9es extraites des bases de donn\u00E9es source des campagnes et le logiciel<br />de calcul R-Sufi. Il remplit trois fonctions \: contr\u00F4le de qualit\u00E9 des donn\u00E9es, s\u00E9lection de jeux de donn\u00E9es<br />coh\u00E9rents en r\u00E9f\u00E9rence aux objectifs de calcul et gestion de la m\u00E9ta-information relative aux traitements r\u00E9alis\u00E9s.<br /><br />Coser a \u00E9t\u00E9 cr\u00E9\u00E9 par Code Lutin avec des logiciels libres dans le cadre d'une convention Ifremer-MEEDDM 2010.</center></html> coser.ui.locale.mustRestart=Vous devez red\u00E9marrer l'application pour prendre en compte la modification. coser.ui.locale.title=Modification de la langue +coser.ui.mainframe.menu.about=\u00C0 propos de Coser coser.ui.mainframe.menu.admin=Administration coser.ui.mainframe.menu.admin.publishResult=Publication des r\u00E9sultats coser.ui.mainframe.menu.closeProject=Fermer le projet @@ -89,6 +92,7 @@ coser.ui.mainframe.menu.view=Vue coser.ui.mainframe.menu.view.lookandfeel=Th\u00E8me coser.ui.mainframe.menu.website=Aide en ligne +coser.ui.mainframe.menu.websitesih=Site SIH Indices campagnes coser.ui.mainview.titleempty=Contr\u00F4le et S\u00E9lection RSufi coser.ui.mainview.titleproject=Contr\u00F4le et S\u00E9lection RSufi (%s) coser.ui.project.addMaps=Ajouter\u2026

1 0

r550 - trunk/coser-web/src/main/webapp/images/zones
by chatellier＠users.labs.libre-entreprise.org 24 Jan '11

24 Jan '11

Author: chatellier Date: 2011-01-24 08:54:14 +0000 (Mon, 24 Jan 2011) New Revision: 550 Log: Update new maps set Added: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4b-4c.png trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c-E7d.png trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c.png trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4-E7d.png trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4.png trunk/coser-web/src/main/webapp/images/zones/C_Ciem-7d.png trunk/coser-web/src/main/webapp/images/zones/C_Ciem-E7d.png trunk/coser-web/src/main/webapp/images/zones/C_E-Corse.png trunk/coser-web/src/main/webapp/images/zones/C_Facades.png trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ciem-7.png trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ech.png trunk/coser-web/src/main/webapp/images/zones/C_GdG-MC.png trunk/coser-web/src/main/webapp/images/zones/C_GdL.png trunk/coser-web/src/main/webapp/images/zones/C_MC-Ciem-7.png trunk/coser-web/src/main/webapp/images/zones/C_MC-Ech.png trunk/coser-web/src/main/webapp/images/zones/C_Noursein.png Removed: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4b-4c.jpg trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c-E7d.jpg trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c.jpg trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4-E7d.jpg trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4.jpg trunk/coser-web/src/main/webapp/images/zones/C_Ciem-7d.jpg trunk/coser-web/src/main/webapp/images/zones/C_Ciem-E7d.jpg trunk/coser-web/src/main/webapp/images/zones/C_E-Corse.jpg trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ciem-7.jpg trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ech.jpg trunk/coser-web/src/main/webapp/images/zones/C_GdG-MC.jpg trunk/coser-web/src/main/webapp/images/zones/C_GdL.jpg trunk/coser-web/src/main/webapp/images/zones/C_MC-Ciem-7.jpg trunk/coser-web/src/main/webapp/images/zones/C_MC-Ech.jpg trunk/coser-web/src/main/webapp/images/zones/C_Noursein.jpg Deleted: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4b-4c.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4b-4c.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4b-4c.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c-E7d.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c-E7d.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c-E7d.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4-E7d.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4-E7d.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4-E7d.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-4c4.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-7d.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-7d.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-7d.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-E7d.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-E7d.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Ciem-E7d.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_E-Corse.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_E-Corse.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_E-Corse.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/coser-web/src/main/webapp/images/zones/C_Facades.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Facades.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ciem-7.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ciem-7.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ciem-7.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ech.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ech.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_GdG-Ech.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_GdG-MC.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_GdG-MC.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_GdG-MC.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_GdL.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_GdL.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_GdL.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_MC-Ciem-7.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_MC-Ciem-7.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_MC-Ciem-7.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_MC-Ech.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_MC-Ech.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_MC-Ech.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/coser-web/src/main/webapp/images/zones/C_Noursein.jpg =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/zones/C_Noursein.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/zones/C_Noursein.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream

1 0

r549 - trunk/coser-web/src/main/webapp/styles
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:36:00 +0000 (Sun, 23 Jan 2011) New Revision: 549 Log: Fix h3, h4 styles Modified: trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:32:47 UTC (rev 548) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:36:00 UTC (rev 549) @@ -337,6 +337,14 @@ text-transform: uppercase; } +h3 { + margin: 15px 0 10px; +} + +h4 { + margin: 15px 0 10px; +} + .col_droite h3 { text-transform: uppercase; color: #ffffff;

1 0

r548 - trunk/coser-web/src/main/webapp/styles
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:32:47 +0000 (Sun, 23 Jan 2011) New Revision: 548 Log: Fix puces Modified: trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:27:40 UTC (rev 547) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:32:47 UTC (rev 548) @@ -491,8 +491,9 @@ } #middle .page .degrade ul li { - list-style: none; - padding-left: 10px; + /*list-style: none;*/ + /*padding-left: 20px;*/ + margin-left: 20px; } #middle .page .degrade table {

1 0

r547 - trunk/coser-web/src/main/webapp/styles
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:27:40 +0000 (Sun, 23 Jan 2011) New Revision: 547 Log: Fix link color Modified: trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:23:20 UTC (rev 546) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:27:40 UTC (rev 547) @@ -556,6 +556,10 @@ } a:hover { + color: #044F90; +} + +.col_droite a:hover { color: #ffe600; }

1 0

r546 - in trunk/coser-web/src/main/webapp: WEB-INF/decorators styles
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:23:20 +0000 (Sun, 23 Jan 2011) New Revision: 546 Log: Fix css and layout. Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp trunk/coser-web/src/main/webapp/styles/coser.css Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-01-23 21:23:20 UTC (rev 546) @@ -48,8 +48,8 @@ <div id="middle" class="clearfix"> - <div class="page"> - <span class="clt"></span> + <div class="page pagemain"> +  <div class="content"> <div class="degrade"> <div class="top_content"> @@ -67,7 +67,7 @@ </div> </div> - <span class="clb"> </span> +  </div> <div class="col_droite"> <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"/> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-01-23 21:23:20 UTC (rev 546) @@ -59,7 +59,7 @@ </div> <div class="page"> - <span class="clt"></span> +  <div class="content"> <div class="clearfix"> @@ -68,7 +68,7 @@ </div> </div> - <span class="clb2"> </span> +  </div> <div class="part_bottom"> <div class="col_droite"> Modified: trunk/coser-web/src/main/webapp/styles/coser.css =================================================================== --- trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:22:32 UTC (rev 545) +++ trunk/coser-web/src/main/webapp/styles/coser.css 2011-01-23 21:23:20 UTC (rev 546) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Ifremer, Codelutin + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -389,11 +389,16 @@ } #middle .page { - width: 626px; margin: 23px 22px 10px 60px; float: left; + border-radius: 10px; + text-align: justify; } +#middle .pagemain { + width: 626px; +} + #middle .page span.clt { background: url(../images/haut_page.png) no-repeat; width: 626px; @@ -402,7 +407,9 @@ } #middle .page .content { - background: url(../images/warper_page.png) repeat-y; + /*background: url(../images/warper_page.png) repeat-y;*/ + background-color: white; + border-radius: 10px; font-size: 140%; color: #2e2e2e; line-height: 1.4em; @@ -423,7 +430,7 @@ } #middle .page .degrade { - background: url(../images/degrade.png) repeat-x 0 bottom; + /*background: url(../images/degrade.png) repeat-x 0 bottom;*/ margin: 0 5px; padding: 5px 20px; }

1 0

r545 - trunk/coser-web/src/main/resources
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:22:32 +0000 (Sun, 23 Jan 2011) New Revision: 545 Log: ACtion commune avec code commun et code layout. Added: trunk/coser-web/src/main/resources/coserweb.properties Added: trunk/coser-web/src/main/resources/coserweb.properties =================================================================== --- trunk/coser-web/src/main/resources/coserweb.properties (rev 0) +++ trunk/coser-web/src/main/resources/coserweb.properties 2011-01-23 21:22:32 UTC (rev 545) @@ -0,0 +1,22 @@ +### +# #%L +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2010 Ifremer, Codelutin, Chatellier Eric +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +coser.application.version=${project.version}

1 0

r544 - trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common
by chatellier＠users.labs.libre-entreprise.org 23 Jan '11

23 Jan '11

Author: chatellier Date: 2011-01-23 21:22:24 +0000 (Sun, 23 Jan 2011) New Revision: 544 Log: ACtion commune avec code commun et code layout. Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java Added: trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java =================================================================== --- trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java (rev 0) +++ trunk/coser-web/src/main/java/fr/ifremer/coser/web/actions/common/CoserAction.java 2011-01-23 21:22:24 UTC (rev 544) @@ -0,0 +1,67 @@ +/* + * #%L + * $Id: CommonFacade.java 519 2011-01-17 17:03:28Z chatellier $ + * $HeadURL: svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/coser/trunk/coser-web/src/main/java/fr/if… $ + * %% + * Copyright (C) 2010 - 2011 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + +package fr.ifremer.coser.web.actions.common; + +import com.opensymphony.xwork2.ActionSupport; + +import fr.ifremer.coser.web.CoserWebConfig; +import fr.ifremer.coser.web.ServiceFactory; + +/** + * Toutes les actions doivent étendre celle ci. Contient le code commun + * récurent, et notamment les actions utilisé par le layout et devant + * être presentes sur toutes les pages. + * + * @author chatellier + * @version $Revision: 519 $ + * + * Last update : $Date: 2011-01-17 18:03:28 +0100 (lun. 17 janv. 2011) $ + * By : $Author: chatellier $ + */ +public abstract class CoserAction extends ActionSupport { + + /** serialVersionUID. */ + private static final long serialVersionUID = 311574866032741326L; + + /** + * Recupere l'email dans la configuration. + * + * @return admin email + */ + public String getAdminEmail() { + CoserWebConfig config = ServiceFactory.getCoserConfig(); + String email = config.getAdminEmail(); + return email; + } + + /** + * Recupere l'email dans la configuration. + * + * @return admin email + */ + public String getApplicationVersion() { + CoserWebConfig config = ServiceFactory.getCoserConfig(); + String email = config.getApplicationVersion(); + return email; + } +}

1 0