Author: tchemit Date: 2013-03-19 08:04:25 +0100 (Tue, 19 Mar 2013) New Revision: 797 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/797 Log: fixes #2098: Pb formattage Informations de connexion ?\195?\160 la base de donn?\195?\169es Added: trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2013-01-15 17:20:37 UTC (rev 796) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2013-03-19 07:04:25 UTC (rev 797) @@ -57,6 +57,12 @@ dbConfiguration = getEchoBaseSession().getWorkingDbConfiguration(); + dbConfiguration = JdbcConfiguration.newConfig( + dbConfiguration.getDriverType(), + dbConfiguration.getUrl().replaceAll("\\\\", "/"), + dbConfiguration.getLogin(), + dbConfiguration.getPassword()); + pilotVersion = dbConfiguration.getDriverType().getPilotVersion(configuration); Added: trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl (rev 0) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl 2013-03-19 07:04:25 UTC (rev 797) @@ -0,0 +1,45 @@ +<#-- + #%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2013 Ifremer, Codelutin, Tony Chemit + %% + 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% +--> +<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" /> +<label<#rt/> +<#if parameters.id??> + id="${parameters.id?html}"<#rt/> +</#if> +<#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> +</#if> +<#if parameters.cssStyle??> + style="${parameters.cssStyle?html}"<#rt/> +</#if> +<#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> +</#if> +<#if parameters.for??> + for="${parameters.for?html}"<#rt/> +</#if> + ><#rt/> +<#if parameters.nameValue??> + <@s.property value="parameters.nameValue"/><#t/> +</#if> +</label> +<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2013-01-15 17:20:37 UTC (rev 796) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2013-03-19 07:04:25 UTC (rev 797) @@ -57,15 +57,15 @@ <br/> <fieldset> <legend><s:text name="echobase.legend.connectionToDb.detail"/></legend> - <s:label key="dbConfiguration.url" + <s:label key="dbConfiguration.url" template="label_with_no_space" label='%{getText("echobase.common.jdbcUrl")} (*)'/> - <s:label key="dbConfiguration.login" + <s:label key="dbConfiguration.login" template="label_with_no_space" label='%{getText("echobase.common.jdbcLogin")} (*)'/> - <s:label key="dbConfiguration.password" + <s:label key="dbConfiguration.password" template="label_with_no_space" label='%{getText("echobase.common.jdbcPassword")} (*)'/> - <s:label key="dbConfiguration.driverType.driverClass.name" + <s:label key="dbConfiguration.driverType.driverClass.name" template="label_with_no_space" label='%{getText("echobase.common.jdbcDriver")} (*)'/> - <s:label key="pilotVersion" + <s:label key="pilotVersion" template="label_with_no_space" label='%{getText("echobase.common.pilotVersion")}'/> <br/>