Author: tchemit Date: 2011-11-21 16:26:30 +0100 (Mon, 21 Nov 2011) New Revision: 101 Url: http://forge.codelutin.com/repositories/revision/echobase/101 Log: improve ui for dbeditor Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp trunk/echobase-ui/src/main/webapp/css/screen.css Modified: trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties =================================================================== --- trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-entities/src/main/resources/i18n/echobase-entities_fr_FR.properties 2011-11-21 15:26:30 UTC (rev 101) @@ -6,12 +6,18 @@ echobase.common.admin=Administrateur echobase.common.age= echobase.common.ageClass=ageClass +echobase.common.aggregationHierarchy= +echobase.common.aggregationLevel= +echobase.common.aggregationLevelName= +echobase.common.aggregationLevelObservedWeight= +echobase.common.aggregationLevelSampledWeight= echobase.common.altCallsign= echobase.common.areaOfOperation=areaOfOperation echobase.common.areaOfOperationName= echobase.common.author= echobase.common.authorEmail= echobase.common.axis= +echobase.common.bathymetre= echobase.common.binSizePingAxis= echobase.common.binSizeRangeAxis= echobase.common.binUnitsPingAxis= @@ -39,6 +45,7 @@ echobase.common.classMeaning= echobase.common.codeMemo= echobase.common.comment= +echobase.common.commonName= echobase.common.count= echobase.common.data=data echobase.common.dataAcquisition=dataAcquisition @@ -66,6 +73,13 @@ echobase.common.echoBaseUser=Utilisateur echobase.common.echoBaseUserDTO= echobase.common.echosounderSoundSpeed= +echobase.common.echotype= +echobase.common.echotypeDepthStratum= +echobase.common.echotypeGeniusSpecies= +echobase.common.echotypeLengthCategory= +echobase.common.echotypeMeaning= +echobase.common.echotypeName= +echobase.common.elevationRatio= echobase.common.email=Courriel echobase.common.endDate= echobase.common.endPort= @@ -82,6 +96,17 @@ echobase.common.exportQueryDTO= echobase.common.fillValue= echobase.common.frequency= +echobase.common.gear= +echobase.common.gearMetadata= +echobase.common.gearMetadataName= +echobase.common.gearMetadataValue= +echobase.common.gearName= +echobase.common.gearShootingEndLatitude= +echobase.common.gearShootingEndLongitude= +echobase.common.gearShootingStartLatitude= +echobase.common.gearShootingStartLongitude= +echobase.common.gearType= +echobase.common.gearTypeName= echobase.common.genusSpecies= echobase.common.geospatialLatMax= echobase.common.geospatialLatMin= @@ -95,8 +120,10 @@ echobase.common.id=Identifiant echobase.common.impacte= echobase.common.individu= +echobase.common.individual= echobase.common.individualMeasureParameter= echobase.common.individualMeasureParameterValue= +echobase.common.individualValue= echobase.common.institution= echobase.common.keywords= echobase.common.label= @@ -109,14 +136,25 @@ echobase.common.libelle= echobase.common.licence= echobase.common.linestring= +echobase.common.localisation= +echobase.common.locationMaxLatitude= +echobase.common.locationMaxLongitude= +echobase.common.locationMinLatitude= +echobase.common.locationMinLongitude= echobase.common.loggedDataDatatype= echobase.common.loggedDataFormat= echobase.common.longName= echobase.common.longitudeEndFillageEngin= echobase.common.longitudeStartFillageEngin= +echobase.common.meaning= echobase.common.measureStep= echobase.common.measureType= echobase.common.measureUnit= +echobase.common.measurementBinSize= +echobase.common.measurementMetadata= +echobase.common.measurementMetadataName= +echobase.common.measurementTypeName= +echobase.common.measurementUnit= echobase.common.metadata=metadata echobase.common.metadataClass=metadataClass echobase.common.mission=mission @@ -126,11 +164,20 @@ echobase.common.modificationText=Modification echobase.common.name=Nom echobase.common.notes= +echobase.common.numberAtAge= +echobase.common.numberAtLength= +echobase.common.numberSampled= echobase.common.operation= echobase.common.operationEngineParameterValue= +echobase.common.operationGearMetadataValue= +echobase.common.operationMeasurementMetadataValue= +echobase.common.operationMetadata= +echobase.common.operationMetadataName= +echobase.common.operationMetadataValue= echobase.common.operationParameter= echobase.common.operationParameterValue= echobase.common.operationType= +echobase.common.operationTypeName= echobase.common.operator= echobase.common.organisationLevelAcknowledgements= echobase.common.organisationReferences= @@ -155,10 +202,14 @@ echobase.common.regionName= echobase.common.relatedActivity= echobase.common.sample= +echobase.common.sampleAge= +echobase.common.sampleAggregation= echobase.common.sampleCSJ= echobase.common.sampleLength= +echobase.common.sampleWeight= echobase.common.scaleFactor= echobase.common.scientistName= +echobase.common.seafloorSubstrate= echobase.common.size= echobase.common.soundSpeedCalculations= echobase.common.sounderConstant= @@ -171,6 +222,8 @@ echobase.common.startPort= echobase.common.startTimeFillageEngin= echobase.common.station=station +echobase.common.stationStartLatitude= +echobase.common.stationStartLongitude= echobase.common.surface= echobase.common.timeCoverageEnd= echobase.common.timeCoverageStart= @@ -232,7 +285,9 @@ echobase.common.voyage=Campagne echobase.common.voyageDescription= echobase.common.voyageEndDate= +echobase.common.voyageEndHarbour= echobase.common.voyageName= echobase.common.voyageStartDate= +echobase.common.voyageStartHarbour= echobase.common.weight= echobase.config.data.directory.description=Chemin de l'application Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/LoadEntities.java 2011-11-21 15:26:30 UTC (rev 101) @@ -35,9 +35,17 @@ private static final long serialVersionUID = 1L; + protected String exportFileName; + + public String getExportFileName() { + return exportFileName; + } + @Override public String input() throws Exception { + load(); + exportFileName = "export-" + tableMeta.getEntityType().getSimpleName() + ".csv"; return INPUT; } 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 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2011-11-21 15:26:30 UTC (rev 101) @@ -93,9 +93,11 @@ echobase.title.dbEditor=Modification de la base echobase.title.entityModificationLogs=Journal des modifications echobase.title.export=Export +echobase.title.exportTable=Exporter une table echobase.title.import=Imports echobase.title.importProgress=Import en cours echobase.title.importResult=Résultats de l'import +echobase.title.importTable=Importer une table echobase.title.login=Connexion echobase.title.modification.detail=Détail de la modification echobase.title.users=Adminitration des utilisateurs 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 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2011-11-21 15:26:30 UTC (rev 101) @@ -170,29 +170,44 @@ } </script> -<div class="inline"> - <s:select key="tableName" label='%{getText("echobase.common.tableName")}' +<s:select key="tableName" label='%{getText("echobase.common.tableName")}' list="tableNames" headerKey="" headerValue=""/> - <s:if test="tableSelected"> - <s:form id="importForm" namespace="/dbeditor" method="post" - enctype="multipart/form-data" cssClass="floatLeft"> +<br class="clearBoth"/> - <s:hidden key="tableName" label=''/> - <s:file key="importFile" required="true" - label="%{getText('echobase.common.importFile')}"/> - <s:submit key="echobase.action.importTable" action="doImport" /> - </s:form> +<s:if test="tableSelected"> - <s:form id="exportForm" namespace="/dbeditor" theme="simple" cssClass="floatRight"> + <sj:tabbedpanel id="io" collapsible="true"> + <sj:tab id="tab_importForm" target="importForm" title="ss" + label="%{getText('echobase.title.importTable')}"/> - <s:hidden key="tableName" label=''/> - <s:submit key="echobase.action.exportTable" action="doExport" /> - </s:form> - + <sj:tab id="tab_exportForm" target="exportForm" + label="%{getText('echobase.title.exportTable')}"/> + + <s:form id="importForm" namespace="/dbeditor" method="post" + enctype="multipart/form-data"> + + <s:hidden key="tableName" label=''/> + <s:file key="importFile" required="true" + label="%{getText('echobase.common.importFile')}"/> + <br/> + <s:submit key="echobase.action.importTable" action="doImport" + align="right"/> + </s:form> + + <s:form id="exportForm" namespace="/dbeditor" method="post"> + <s:hidden key="tableName" label=''/> + <s:textfield key="exportFileName" required="true" size="100" + label="%{getText('echobase.common.exportFileName')}"/> + + <br/> + <s:submit key="echobase.action.exportTable" action="doExport" + align="right"/> + </s:form> + + </sj:tabbedpanel> + </s:if> - -</div> <br class="clearBoth"/> <s:if test="tableSelected"> Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2011-11-21 12:00:23 UTC (rev 100) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2011-11-21 15:26:30 UTC (rev 101) @@ -33,11 +33,18 @@ font-size: 11px; } -.ui-tabs-panel pre { +.ui-tabs-panel { font-family: monospace; font-size: 9pt; } +.ui-tabs .ui-tabs-nav li a { + float: left; + padding: .5em .1em; + text-decoration: none; + font-size: 11px; +} + #body { /*min-height: 500px;*/ float: left;