branch develop updated (49aae3d -> a577d26)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from 49aae3d fixes #6220: Ajouter automatiquement le suffixe du serveur en cours dans l'URL lors de la création d'une base new 6932ab7 fixes #6220 (ne pas modifier l'url en cas de clone) new a577d26 fixes #6270: Problème de feuille de style si plusieurs notifications The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit a577d2620e41e6c2ba0c03d3de30a0430b321b2e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 13:45:52 2014 +0100 fixes #6270: Problème de feuille de style si plusieurs notifications commit 6932ab7ce0efdb54736e793e0651a1f02abdec95 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 13:14:06 2014 +0100 fixes #6220 (ne pas modifier l'url en cas de clone) Summary of changes: .../echobase/ui/actions/workingDb/Create.java | 8 +++++++ .../webapp/WEB-INF/decorators/layout-default.jsp | 9 +++---- .../main/webapp/WEB-INF/jsp/workingDb/manage.jsp | 28 ++++++++++++---------- echobase-ui/src/main/webapp/css/screen.css | 19 +++++++-------- 4 files changed, 38 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit 6932ab7ce0efdb54736e793e0651a1f02abdec95 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 13:14:06 2014 +0100 fixes #6220 (ne pas modifier l'url en cas de clone) --- .../echobase/ui/actions/workingDb/Create.java | 8 +++++++ .../main/webapp/WEB-INF/jsp/workingDb/manage.jsp | 28 ++++++++++++---------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java index 89b590d..3b5abfd 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Create.java @@ -48,8 +48,16 @@ public class Create extends AbstractWorkingDbAction { return INPUT; } + protected boolean clone; + + public boolean isClone() { + return clone; + } + public String cloneConf() throws Exception { + clone = true; + getConf().setTopiaId(null); // new workingDbConfiguration in progress diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp index ed17ac4..265bf45 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/manage.jsp @@ -42,22 +42,26 @@ } function driverTypeChanged(driverTypeCombo) { -<s:if test="!confExists"> +<s:if test="newConf and !clone"> - var url; + if (driverTypeCombo) { - <%-- add prefix in url --%> - if (driverTypeCombo.selectedIndex ==0) { + var url; - <%-- Base H2 --%> - url ="jdbc:h2:file:dbPath/dbName"; - } else { + <%-- add prefix in url --%> + if (driverTypeCombo.selectedIndex ==0) { - <%-- Base PG --%> - url ="jdbc:postgresql://serverName/dbName"; - } + <%-- Base H2 --%> + url ="jdbc:h2:file:dbPath/dbName"; + } else { + + <%-- Base PG --%> + url ="jdbc:postgresql://serverName/dbName"; + } - $("#confUrl").val(url); + $("#confUrl").val(url); + + } </s:if> } @@ -113,7 +117,7 @@ <s:select key="conf.driverType" cssStyle="font-size: 140%" id="confDriverType" label="%{getText('echobase.label.driverType')}" requiredLabel="true" - list="driverTypes" disabled="%{confExists}" onchange="driverTypeChanged(this)" /> + list="driverTypes" disabled="%{confExists or clone}" onchange="driverTypeChanged(this)" /> <s:textfield key="conf.url" requiredLabel="true" size="80" id="confUrl" readonly="%{confExists}" -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit a577d2620e41e6c2ba0c03d3de30a0430b321b2e Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 30 13:45:52 2014 +0100 fixes #6270: Problème de feuille de style si plusieurs notifications --- .../main/webapp/WEB-INF/decorators/layout-default.jsp | 9 +++++---- echobase-ui/src/main/webapp/css/screen.css | 19 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp b/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp index 17513bf..a9f15ff 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp @@ -53,12 +53,13 @@ <s:if test="%{#session.echoBaseSession.withFlashMessages}"> <div class="info_success clearfix"> - <ul class="actionMessages fleft"> <s:iterator value="%{#session.echoBaseSession.flashMessages}" var="message"> - <li><span><s:property value="#message" escapeHtml="false"/></span> - </li> - </s:iterator> + <ul class="actionMessages fleft"> + + <li><span><s:property value="#message" escapeHtml="false"/></span></li> + </ul> + </s:iterator> </div> </s:if> diff --git a/echobase-ui/src/main/webapp/css/screen.css b/echobase-ui/src/main/webapp/css/screen.css index 3d8285d..86d54d9 100644 --- a/echobase-ui/src/main/webapp/css/screen.css +++ b/echobase-ui/src/main/webapp/css/screen.css @@ -89,26 +89,25 @@ select{ padding:2px; margin-bottom: 10px; } -.info_success { - background:url(../images/left_success.png) no-repeat 0 0; - padding-left:42px; + +.info_success ul { + background:url(../images/left_success.png) no-repeat 0 0; + padding-left:42px; margin-bottom: 5px; - /*width: 800px;*/ } -.info_success ul { + +.info_success li { + margin-bottom: 5px; margin-top: 5px; background:url(../images/success.png) repeat-x 0 0; - line-height:26px; -} -.info_success li { + line-height:26px; + background-attachment: scroll; background-clip: border-box; background-color: transparent; - /*background-image: url("../images/true.png");*/ background-origin: padding-box; background-position: 0 0; - background-repeat: no-repeat; background-size: auto auto; color: #006729; font-style: italic; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm