April 2012 - Echobase-commits - mailman.cloud.codelutin.com

r475 - trunk/echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:33:16 +0200 (Tue, 03 Apr 2012) New Revision: 475 Url: http://forge.codelutin.com/repositories/revision/echobase/475 Log: clean i18n Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-03 11:31:24 UTC (rev 474) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-03 11:33:16 UTC (rev 475) @@ -53,4 +53,5 @@ echobase.menu.editData=Modify datas echobase.menu.viewData=view datas echobase.title.confirm.deleteQuery=Delete a export query +echobase.title.dbEditor.read=Visualisation des données echobase.title.newLibreOfficeQuery=Import a new "Libre-Office" request Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-03 11:31:24 UTC (rev 474) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-03 11:33:16 UTC (rev 475) @@ -236,6 +236,7 @@ echobase.title.createEmbeddedApplication=Création de l'application embarquée echobase.title.createMission=Créer une mission echobase.title.dbEditor=Modification de la base +echobase.title.dbEditor.read=Visualisation des données echobase.title.embeddedApplicationProgress=Création de l'application embarquée en cours echobase.title.embeddedApplicationResult=Résultat de la création de l'application embarquée echobase.title.entityModificationLogs=Journal des modifications

1 0

r474 - trunk/echobase-ui/src/main/resources
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:31:24 +0200 (Tue, 03 Apr 2012) New Revision: 474 Url: http://forge.codelutin.com/repositories/revision/echobase/474 Log: refs #1016: Int?\195?\169grer les traductions anglaises (ne pas polluer l'url avec la langue utilis?\195?\169e) Modified: trunk/echobase-ui/src/main/resources/struts.xml Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:30:26 UTC (rev 473) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-04-03 11:31:24 UTC (rev 474) @@ -107,18 +107,18 @@ <interceptor-ref name="basicStack"/> </interceptor-stack> -  - <interceptor-stack name="paramsPrepareParamsStackLoggued"> +  + <interceptor-stack name="prepareParamsStackLoggued"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="paramsPrepareParamsStack"/> + <interceptor-ref name="defaultStack"/> </interceptor-stack> -  - <interceptor-stack name="prepareParamsStackLoggued"> +  + <interceptor-stack name="paramsPrepareParamsStackLoggued"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> - <interceptor-ref name="defaultStack"/> + <interceptor-ref name="paramsPrepareParamsStack"/> </interceptor-stack> </interceptors> @@ -138,6 +138,19 @@ <result>/WEB-INF/jsp/home.jsp</result> <interceptor-ref name="i18nStack"/> + <interceptor-ref name="checkUserLoggued"/> + </action> + +  + <action name="changeLang" + class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> + + <result type="redirectAction"> + <param name="namespace">/</param> + <param name="actionName">home</param> + </result> + + <interceptor-ref name="i18nStack"/>  <interceptor-ref name="paramRemover"> <param name="paramNames">request_locale</param>

1 0

r473 - trunk/echobase-ui/src/main/webapp/WEB-INF/includes
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:30:26 +0200 (Tue, 03 Apr 2012) New Revision: 473 Url: http://forge.codelutin.com/repositories/revision/echobase/473 Log: refs #1016: Int?\195?\169grer les traductions anglaises (ne pas polluer l'url avec la langue utilis?\195?\169e) Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2012-04-03 11:26:00 UTC (rev 472) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/i18n.jsp 2012-04-03 11:30:26 UTC (rev 473) @@ -34,7 +34,7 @@ </s:a> </s:if> <s:else> - <s:a namespace="/" action="home" cssClass="francais i18nNonActive" + <s:a namespace="/" action="changeLang" cssClass="francais i18nNonActive" title="%{toFrench}"> <s:param name="request_locale">fr</s:param> </s:a> @@ -47,7 +47,7 @@ </s:a> </s:if> <s:else> - <s:a namespace="/" action="home" cssClass="anglais i18nNonActive" + <s:a namespace="/" action="changeLang" cssClass="anglais i18nNonActive" title="%{toEnglish}"> <s:param name="request_locale">en</s:param> </s:a>

1 0

r472 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:26:00 +0200 (Tue, 03 Apr 2012) New Revision: 472 Url: http://forge.codelutin.com/repositories/revision/echobase/472 Log: refs #1047: Finaliser la charte graphique + changement de titre si utilisateur non admin Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-04-03 11:25:05 UTC (rev 471) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-04-03 11:26:00 UTC (rev 472) @@ -32,7 +32,14 @@ <s:set name="tableSelected" value="%{entityType != null}"/> -<title><s:text name="echobase.title.dbEditor"/></title> +<title> + <s:if test="admin"> + <s:text name="echobase.title.dbEditor"/> + </s:if> + <s:else> + <s:text name="echobase.title.dbEditor.read"/> + </s:else> +</title> <script type="text/javascript"> @@ -362,6 +369,7 @@ </s:iterator> </fieldset> <s:if test="admin"> + <div class="toolbar"> <ul class="toolbar floatRight"> <li><s:submit name='resetAction' key="echobase.action.reset" theme="simple" onclick="return false;"/> @@ -370,6 +378,7 @@ action="editTableData" theme="simple"/> </li> </ul> + </div> </s:if> </s:form>

1 0

r471 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user echobase-ui/src/main/webapp/WEB-INF/jsp/user
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:25:05 +0200 (Tue, 03 Apr 2012) New Revision: 471 Url: http://forge.codelutin.com/repositories/revision/echobase/471 Log: fixes #1076: Apr?\195?\168s la modification d'un utilisateur le mot de passe est perdu Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2012-04-03 11:24:28 UTC (rev 470) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/UserService.java 2012-04-03 11:25:05 UTC (rev 471) @@ -74,6 +74,21 @@ } } + public EchoBaseUser getUserById(String userId) { + Preconditions.checkNotNull(userId); + try { + EchoBaseUserDAO dao = getDAO(EchoBaseUser.class, EchoBaseUserDAO.class); + EchoBaseUser user = dao.findByTopiaId(userId); + EchoBaseUser result = newUser(); + result.setEmail(user.getEmail()); + result.setPassword(user.getPassword()); + result.setAdmin(user.isAdmin()); + return result; + } catch (TopiaException eee) { + throw new EchoBaseTechnicalException(eee); + } + } + public void createOrUpdate(EchoBaseUser user) { try { EchoBaseUserDAO dao = getDAO(EchoBaseUser.class, EchoBaseUserDAO.class); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-04-03 11:24:28 UTC (rev 470) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Delete.java 2012-04-03 11:25:05 UTC (rev 471) @@ -30,14 +30,17 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.ParameterAware; +import java.util.Map; + /** * To delete a user. * * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class Delete extends EchoBaseActionSupport implements Preparable { +public class Delete extends EchoBaseActionSupport implements Preparable, ParameterAware { protected static final Log log = LogFactory.getLog(Delete.class); @@ -47,6 +50,8 @@ protected EchoBaseUser user; + private Map<String, String[]> parameters; + public UserService getUserService() { if (userService == null) { userService = newService(UserService.class); @@ -80,16 +85,21 @@ @Override public void prepare() throws Exception { - String userId = getUser().getTopiaId(); + String userId = parameters.get("user.topiaId")[0]; if (!StringUtils.isEmpty(userId)) { // load user - user = getUserService().getEntityById(EchoBaseUser.class, userId); - + user = getUserService().getUserById(userId); + // do not want to have the password + user.setPassword(""); if (log.isInfoEnabled()) { log.info("Selected user " + user.getEmail()); } } + } + @Override + public void setParameters(Map<String, String[]> parameters) { + this.parameters=parameters; } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-04-03 11:24:28 UTC (rev 470) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/Update.java 2012-04-03 11:25:05 UTC (rev 471) @@ -30,14 +30,17 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.struts2.interceptor.ParameterAware; +import java.util.Map; + /** * To update a user. * * @author tchemit <chemit(a)codelutin.com> * @since 0.2 */ -public class Update extends EchoBaseActionSupport implements Preparable { +public class Update extends EchoBaseActionSupport implements Preparable, ParameterAware { protected static final Log log = LogFactory.getLog(Update.class); @@ -47,6 +50,8 @@ protected EchoBaseUser user; + private Map<String, String[]> parameters; + public UserService getUserService() { if (userService == null) { userService = newService(UserService.class); @@ -73,12 +78,13 @@ @Override public void prepare() throws Exception { - String userId = getUser().getTopiaId(); + String userId = parameters.get("user.topiaId")[0]; if (!StringUtils.isEmpty(userId)) { // load user - user = getUserService().getEntityById(EchoBaseUser.class, userId); - + user = getUserService().getUserById(userId); + // do not want to update password + user.setPassword(""); if (log.isInfoEnabled()) { log.info("Selected user " + user.getEmail()); } @@ -92,4 +98,8 @@ return user; } + @Override + public void setParameters(Map<String, String[]> parameters) { + this.parameters=parameters; + } } \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-04-03 11:24:28 UTC (rev 470) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2012-04-03 11:25:05 UTC (rev 471) @@ -48,8 +48,7 @@ }); </script> -<sjg:grid id="users" caption="%{getText('echobase.header.user.gridTitle')}" - dataType="json" href="%{loadUrl}" gridModel="users" +<sjg:grid id="users" dataType="json" href="%{loadUrl}" gridModel="users" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect'

1 0

r470 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:24:28 +0200 (Tue, 03 Apr 2012) New Revision: 470 Url: http://forge.codelutin.com/repositories/revision/echobase/470 Log: fixes #1075: La cr?\195?\169ation de requ?\195?\168te ne fonctionne plus Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-04-03 11:23:18 UTC (rev 469) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportQueryService.java 2012-04-03 11:24:28 UTC (rev 470) @@ -101,19 +101,21 @@ ExportQuery entityToSave; + exportQuery.setLastModifiedDate(newDate()); + exportQuery.setLastModifiedUser(user.getEmail()); + if (mustCreate) { - entityToSave = dao.create(); + entityToSave = dao.create(exportQuery); } else { entityToSave = dao.findByTopiaId(id); +// entityToSave.setName(queryName); + entityToSave.setDescription(exportQuery.getDescription()); + entityToSave.setSqlQuery(exportQuery.getSqlQuery()); + entityToSave.setLastModifiedDate(exportQuery.getLastModifiedDate()); + entityToSave.setLastModifiedUser(exportQuery.getLastModifiedUser()); } - entityToSave.setName(queryName); - entityToSave.setDescription(exportQuery.getDescription()); - entityToSave.setSqlQuery(exportQuery.getSqlQuery()); - entityToSave.setLastModifiedDate(newDate()); - entityToSave.setLastModifiedUser(user.getEmail()); - - dao.update(entityToSave); +// dao.update(entityToSave); getTransaction().commitTransaction(); return entityToSave; } catch (TopiaException eee) {

1 0

r469 - in trunk/echobase-ui/src/main: resources/template/themes/echobase-theme webapp/WEB-INF/includes webapp/WEB-INF/jsp/user webapp/css
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 13:23:18 +0200 (Tue, 03 Apr 2012) New Revision: 469 Url: http://forge.codelutin.com/repositories/revision/echobase/469 Log: fixes #1047: Finaliser la charte graphique Modified: trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css =================================================================== --- trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css 2012-04-03 09:00:44 UTC (rev 468) +++ trunk/echobase-ui/src/main/resources/template/themes/echobase-theme/jquery-ui.css 2012-04-03 11:23:18 UTC (rev 469) @@ -585,4 +585,33 @@ * http://docs.jquery.com/UI/Progressbar#theming */ .ui-progressbar { height:2em; text-align: left; overflow: hidden; } -.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } + +/* + * jQuery grid + */ +.ui-jqgrid-view tr.odd { + background-attachment: scroll; + background-clip: border-box; + /*background-color: white !important;*/ + background-image: none; + background-origin: padding-box; + background-position: 0 0; + background-repeat: repeat; + background-size: auto auto; +} +.ui-jqgrid-view tr.ui-state-highlight td { + font-weight: bold!important; + background: #ffd200 url(images/ui-bg_glass_55_ffd200_1x400.png) 50% 50% repeat-x!important; +} +.ui-jqgrid-view tr.even { + background-attachment: scroll; + background-clip: border-box; + background-color: #bddfff; + background-image: none; + background-origin: padding-box; + background-position: 0 0; + background-repeat: repeat; + background-size: auto auto; +} + Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2012-04-03 09:00:44 UTC (rev 468) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/footer.jsp 2012-04-03 11:23:18 UTC (rev 469) @@ -25,6 +25,7 @@ <%@ taglib prefix="s" uri="/struts-tags" %> +<br/> <hr/> <div id='footer'> <ul class="clearfix"> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-04-03 09:00:44 UTC (rev 468) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/login.jsp 2012-04-03 11:23:18 UTC (rev 469) @@ -42,37 +42,37 @@ <div class='displayBlock top'> <%@ include file="/WEB-INF/includes/i18n.jsp" %> <div class='floatLeft'> - <s:a action="home" cssClass="logo" namespace="/">Echobase</s:a> + <s:a action="home" cssClass="logo" namespace="/">Echobase</s:a> </div> <div id='headerRight'> </div> </div> <div class="cleanBoth"></div> -<div class="containerHomeSize"> -<%-- content --%> -<div class="containerHome ui-corner-all containerHomeSize"> +<div class="bodyHomeSize"> + <div class="containerHomeSize"> + <%-- content --%> + <div class="containerHome ui-corner-all containerHomeSize"> - <h2><s:text name="echobase.title.login"/></h2> + <h2><s:text name="echobase.title.login"/></h2> - <s:form method="POST" namespace="/user"> - <fieldset class="ui-corner-all"> - <legend> - <s:text name="echobase.title.login"/> - </legend> - <s:hidden key="redirectAction" label=""/> - <s:textfield name="email" key="echobase.common.email" required="true"/> - <s:password name="password" key="echobase.common.password" - required="true"/> - </fieldset> - <br/> - <s:submit action="login" key="echobase.action.login" align="right"/> - </s:form> + <s:form method="POST" namespace="/user"> + <fieldset class="ui-corner-all"> + <%--<legend><s:text name="echobase.title.login"/></legend>--%> + <s:hidden key="redirectAction" label=""/> + <s:textfield name="email" key="echobase.common.email" + required="true" size="60"/> + <s:password name="password" key="echobase.common.password" + required="true" size="60"/> + </fieldset> + <br/> + <s:submit action="login" key="echobase.action.login" align="right"/> + </s:form> + </div> + <%-- footer --%> + <%@ include file="/WEB-INF/includes/footer.jsp" %> + </div> </div> - -<%-- footer --%> -<%@ include file="/WEB-INF/includes/footer.jsp" %> -</div> </body> </html> Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 09:00:44 UTC (rev 468) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 11:23:18 UTC (rev 469) @@ -30,26 +30,7 @@ padding:0; font-size:10px; } -.ui-jqgrid-view tr.odd { - background-attachment: scroll; - background-clip: border-box; - background-color: white !important; - background-image: none; - background-origin: padding-box; - background-position: 0 0; - background-repeat: repeat; - background-size: auto auto; -} -.ui-jqgrid-view tr.even { - background-attachment: scroll; - background-clip: border-box; - background-color: #ffec3e!important; - background-image: none; - background-origin: padding-box; - background-position: 0 0; - background-repeat: repeat; - background-size: auto auto; -} + .inline { display: inline; } @@ -60,18 +41,19 @@ font-family: monospace; font-size: 9pt; } -.ui-tabs .ui-tabs-nav li a { -/* -moz-text-blink: none; - -moz-text-decoration-color: -moz-use-text-color; - -moz-text-decoration-line: none; - -moz-text-decoration-style: solid;*/ - float: left; - font-size: 11px; - padding-bottom: 0.5em; - padding-left: 0.1em; - padding-right: 0.1em; - padding-top: 0.5em; -} + +/*.ui-tabs .ui-tabs-nav li a {*/ +/* -moz-text-blink: none;*/ + /*-moz-text-decoration-color: -moz-use-text-color;*/ + /*-moz-text-decoration-line: none;*/ + /*-moz-text-decoration-style: solid;*/ + /*float: left;*/ + /*font-size: 11px;*/ + /*padding-bottom: 0.5em;*/ + /*padding-left: 0.1em;*/ + /*padding-right: 0.1em;*/ + /*padding-top: 0.5em;*/ +/*}*/ #body { padding-bottom: 10px; padding-left: 10px; @@ -209,6 +191,7 @@ width: 350px; margin:5px 0; } + .wwctrl { float: left; } @@ -294,6 +277,10 @@ padding-top: 0; float:right; } + +div.toolbar { + min-height: 55px; +} ul.toolbar { /*clear: both;*/ display: block; @@ -393,7 +380,6 @@ #body{ /*margin:3em 8em;*/ background:#03497c; - min-width:655px; min-height:415px; /*padding:20px;*/ min-width:655px; @@ -409,37 +395,33 @@ color:#FFF; } -.containerHomeSize { +.bodyHomeSize { margin:3em 8em; - /*padding:20px;*/ - position:relative; - clear:both; - width:665px; } +.containerHomeSize { + width:645px; +} + +form#login .wwlbl { + width: 150px; +} + .containerHome { - /*margin:3em 8em;*/ background:#03497c; padding:20px; - /*position:relative;*/ - /*clear:both;*/ + position:relative; + clear:both; color:#FFF; - /*width:655px;*/ } -/*form#login{*/ - /*width:615px; */ -/*}*/ -form#login legend{ - font-size:0px; -} form{ color:#FFF; } fieldset{ border:1px solid #ffec3e; padding:15px 30px; - color:#FFFFFF; + color:#FFFFFF; margin:20px 0; } legend{ @@ -486,7 +468,7 @@ padding:0 10px; border:5px solid #023b66; width:auto; - padding:0 10px; + padding:0 10px; } .ui-tabs input[type="submit"]{ border:2px solid #023b66; @@ -537,17 +519,17 @@ #wwctrl_configure_model_voyageIds br{ line-height:25px; } -#wwlbl_login_email, -#wwlbl_login_password{ - padding-bottom:5px; -} -#wwgrp_login_password{ - margin-top:20px; -} -form#login fieldset input{ - height:35px; - width:390px; -} +/*#wwlbl_login_email,*/ +/*#wwlbl_login_password{*/ + /*padding-bottom:5px;*/ +/*}*/ +/*#wwgrp_login_password{*/ + /*margin-top:20px;*/ +/*}*/ +/*form#login fieldset input{*/ + /*height:35px;*/ + /*width:390px;*/ +/*}*/ input#login_echobase_action_login{ background:url(../images/bt_jaune.jpg) repeat-x 0 0; height: 48px; @@ -587,7 +569,7 @@ background-color:#ffe810; color:#635a08; z-index:100; - + /* Text properties */ font-family:'Myriad Pro',Arial, Helvetica, sans-serif; font-size:14px; @@ -595,10 +577,10 @@ letter-spacing:0.6px; white-space:nowrap; line-height:48px; - + /* CSS3 Transition: */ -webkit-transition: 0.25s; - + /* Future proofing (these do not work yet): */ /* -moz-transition: 0.25s;*/ transition: 0.25s; @@ -610,11 +592,11 @@ width:48px; display:block; position:relative; -} +} .menu a:hover span{ width:auto; padding:0 20px;overflow:visible; } .menu a:hover{ text-decoration:none; - + /* CSS outer glow with the box-shadow property */ /* -moz-box-shadow:0 0 5px #9ddff5;*/ -webkit-box-shadow:0 0 5px #9ddff5;

1 0

r468 - in trunk/echobase-ui/src/main/webapp: WEB-INF/decorators css
by sletellier＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: sletellier Date: 2012-04-03 11:00:44 +0200 (Tue, 03 Apr 2012) New Revision: 468 Url: http://forge.codelutin.com/repositories/revision/echobase/468 Log: - refs #1047: Finaliser la charte graphique - remove all mozilla styles Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-03 08:31:01 UTC (rev 467) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-04-03 09:00:44 UTC (rev 468) @@ -48,6 +48,7 @@ <%-- body --%> +<div> <div class="containerSize"> <div id="body" class="ui-corner-all"> @@ -70,5 +71,6 @@ <%@ include file="/WEB-INF/includes/footer.jsp" %> </div> +</div> </body> </html> Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 08:31:01 UTC (rev 467) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 09:00:44 UTC (rev 468) @@ -61,10 +61,10 @@ font-size: 9pt; } .ui-tabs .ui-tabs-nav li a { - -moz-text-blink: none; +/* -moz-text-blink: none; -moz-text-decoration-color: -moz-use-text-color; -moz-text-decoration-line: none; - -moz-text-decoration-style: solid; + -moz-text-decoration-style: solid;*/ float: left; font-size: 11px; padding-bottom: 0.5em; @@ -73,12 +73,11 @@ padding-top: 0.5em; } #body { - float: left; padding-bottom: 10px; padding-left: 10px; padding-right: 10px; padding-top: 10px; - width: 99%; +/* width: 99%; */ } .clearBoth { clear: both; @@ -241,12 +240,12 @@ text-align: center; } #footer ul { - margin-bottom: 0; + /* margin-bottom: 0; margin-left: 6em; margin-right: auto; - margin-top: 0; + margin-top: 0;*/ width: auto; - float: left; +/* float: left; */ } #footer ul li { @@ -265,12 +264,12 @@ padding-top: 0; color:#FFF; } -#footer ul li a { +/**#footer ul li a { -moz-text-blink: none; -moz-text-decoration-color: -moz-use-text-color; -moz-text-decoration-line: none; -moz-text-decoration-style: solid; -} +} *// #footer ul li a:hover { text-decoration:underline; } @@ -382,22 +381,22 @@ } .containerSize { - width:auto; +/* width:-moz-max-content;*/ margin:3em 8em; - padding:20px; - min-width:655px; + float: left; + /*padding:20px;*/ + /*position:relative;*/ /*clear:both;*/ } .container, #body{ - width:auto; /*margin:3em 8em;*/ background:#03497c; + min-width:655px; + min-height:415px; /*padding:20px;*/ - position:relative; min-width:655px; - min-height:415px; /*clear:both;*/ color:#FFF; } @@ -452,7 +451,7 @@ input, textarea, select{ border:3px solid #0063ab; border-radius:5px; - -moz-border-radius:5px; +/* -moz-border-radius:5px; */ -webkit-border-radius:5px; font-size:120%; margin-bottom: 10px; @@ -472,14 +471,14 @@ color:#044f90; cursor:pointer; border-radius:5px; - -moz-border-radius:5px; +/* -moz-border-radius:5px; */ -webkit-border-radius:5px; } fieldset input[type="submit"]{ background:url(../images/bt_bleu.jpg) repeat-x 0 0; cursor:pointer; border-radius:5px; - -moz-border-radius:5px; +/* -moz-border-radius:5px;*/ -webkit-border-radius:5px; color:#FFFFFF; height: 48px; @@ -505,7 +504,7 @@ /*zoom: 1;*/ /*border-radius:0px;*/ /*-moz-border-radius:0px;*/ - /*-webkit-border-radius:0px;*/ + -webkit-border-radius:0px; width:600px; /*max-width:300px !important;*/ cursor:pointer; @@ -601,7 +600,7 @@ -webkit-transition: 0.25s; /* Future proofing (these do not work yet): */ - -moz-transition: 0.25s; +/* -moz-transition: 0.25s;*/ transition: 0.25s; } .menu a{ @@ -617,7 +616,7 @@ text-decoration:none; /* CSS outer glow with the box-shadow property */ - -moz-box-shadow:0 0 5px #9ddff5; +/* -moz-box-shadow:0 0 5px #9ddff5;*/ -webkit-box-shadow:0 0 5px #9ddff5; box-shadow:0 0 5px #9ddff5; }

1 0

r467 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase echobase-services/src/main/java/fr/ifremer/echobase/services echobase-ui/src/main/webapp/css
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 10:31:01 +0200 (Tue, 03 Apr 2012) New Revision: 467 Url: http://forge.codelutin.com/repositories/revision/echobase/467 Log: fixes #1050: La cr?\195?\169ation de base embarqu?\195?\169e ne fonctionne pas Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-04-03 08:07:09 UTC (rev 466) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-04-03 08:31:01 UTC (rev 467) @@ -75,7 +75,7 @@ } finally { Closeables.closeQuietly(input); } - String dbUrl = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase;CACHE_SIZE=65536;TRACE_LEVEL_FILE=3;"; + String dbUrl = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase;CACHE_SIZE=65536"; properties.setProperty(TopiaContextFactory.CONFIG_URL, dbUrl); if (log.isInfoEnabled()) { @@ -103,21 +103,6 @@ public TopiaContext newDatabaseFromConfig(EchoBaseConfiguration config) { - -// String jdbcUrl = config.getJdbcUrl(); -// if (config.isEmbedded() && jdbcUrl.contains("{data.directory}")) { -// -// // make sure that datadirectory is a absolute path -// -// File dataDirectory = config.getDataDirectory(); -// if (log.isInfoEnabled()) { -// log.info("Will use data directory "); -// } -// properties.setProperty( -// EchoBaseConfigurationOption.DATA_DIRECTORY.getKey(), -// dataDirectory.getAbsolutePath()); -// } - Properties properties = config.getProperties(); return newDatabaseFromProperties(properties); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-04-03 08:07:09 UTC (rev 466) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-04-03 08:31:01 UTC (rev 467) @@ -303,7 +303,7 @@ if (StringUtils.isNotEmpty(association)) { builder.append(String.format(updateString, topiaId, association)).append('\n'); compt++; - if (compt % 10000 == 0) { + if (compt % 1000 == 0) { // flush it getTransaction().executeSQL(builder.toString()); builder = new StringBuilder(); Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 08:07:09 UTC (rev 466) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-04-03 08:31:01 UTC (rev 467) @@ -396,7 +396,7 @@ background:#03497c; /*padding:20px;*/ position:relative; - /*min-width:655px;*/ + min-width:655px; min-height:415px; /*clear:both;*/ color:#FFF;

1 0

r466 - trunk/echobase-entities/src/main/java/fr/ifremer/echobase
by tchemit＠users.forge.codelutin.com 03 Apr '12

03 Apr '12

Author: tchemit Date: 2012-04-03 10:07:09 +0200 (Tue, 03 Apr 2012) New Revision: 466 Url: http://forge.codelutin.com/repositories/revision/echobase/466 Log: try new h2 db config Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-04-03 07:55:12 UTC (rev 465) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-04-03 08:07:09 UTC (rev 466) @@ -75,7 +75,7 @@ } finally { Closeables.closeQuietly(input); } - String dbUrl = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase"; + String dbUrl = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase;CACHE_SIZE=65536;TRACE_LEVEL_FILE=3;"; properties.setProperty(TopiaContextFactory.CONFIG_URL, dbUrl); if (log.isInfoEnabled()) {

1 0