Author: tchemit Date: 2012-09-21 21:33:41 +0200 (Fri, 21 Sep 2012) New Revision: 680 Url: http://forge.codelutin.com/repositories/revision/echobase/680 Log: refs #1439: Tableau de bord (ajout menu dashboard) 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 trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp trunk/echobase-ui/src/main/webapp/css/screen.css 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-09-21 19:25:39 UTC (rev 679) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-21 19:33:41 UTC (rev 680) @@ -10,7 +10,6 @@ echobase.action.createNewMission=Create a new mission echobase.action.createSqlQuery=Save echobase.action.createWorkingDbConfiguration=Save -echobase.action.dashboard=Voyages dashboard echobase.action.delete=Delete echobase.action.delete.selectedImport=Delete selected imports echobase.action.downloadEmbeddedApplicationFile=Download the portable database @@ -20,7 +19,6 @@ echobase.action.exportTable=Export echobase.action.generateSqlQuery=Generate query echobase.action.import=Import -echobase.action.importLogDelete=Delete echobase.action.importTable=Import echobase.action.login=Connect echobase.action.logout=Disconnect @@ -148,7 +146,6 @@ echobase.common.voyage=Cruise echobase.common.voyageDescription=Description echobase.common.voyageFile= -echobase.confirm.delete.importData=Delete import echobase.confirm.delete.query=Delete query echobase.confirm.delete.selected.importData=Delete selected imports echobase.confirm.delete.workingDbConfiguration=Delete working database configuration @@ -252,7 +249,7 @@ echobase.info.no.workingDbConfiguration.saved=No working database configuration saved echobase.info.no.workingDbConfiguration.selected=Select a working database configuration and then connect echobase.info.removeData.failed=Import removal failed -echobase.info.removeData.succeded=Successful data import removal in %s +echobase.info.removeData.succeded=Successful data import removal echobase.info.reportBug=Bug report echobase.info.sqlQuery.not.modifiable=You have not sufficient rights to update the selected query echobase.info.update.user.password=Keep empty password field to not modify it. @@ -318,6 +315,7 @@ echobase.legend.workingDbConfiguration.use=Working datbase configuration echobase.menu.connectToDbInformations=Database connection information echobase.menu.createEmbeddedApplication=Create a portable database +echobase.menu.dashboard=Dashboard echobase.menu.editData=Modify data echobase.menu.export=Export data echobase.menu.exportDb=Database export @@ -347,9 +345,9 @@ echobase.title.connectToDbInformations=Database connection information echobase.title.createEmbeddedApplication=Create a portable database echobase.title.createMission=Create a mission +echobase.title.dashboard=Dashboard echobase.title.dbEditor=Modify data echobase.title.dbEditor.read=Data display -echobase.title.delete.importLog=Delete a import echobase.title.embeddedApplicationProgress=Creating the portable database echobase.title.embeddedApplicationResult=Results of the portable database creation echobase.title.entityModificationLogs=Change log 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-09-21 19:25:39 UTC (rev 679) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-21 19:33:41 UTC (rev 680) @@ -10,7 +10,6 @@ echobase.action.createNewMission=Créer une nouvelle mission echobase.action.createSqlQuery=Enregistrer echobase.action.createWorkingDbConfiguration=Enregistrer -echobase.action.dashboard=Tableau de bord des campagnes echobase.action.delete=Suppression echobase.action.delete.selectedImport=Supprimer les imports sélectionnés echobase.action.downloadEmbeddedApplicationFile=Télécharger l'application embarquée @@ -20,7 +19,6 @@ echobase.action.exportTable=Exporter echobase.action.generateSqlQuery=Générer la requête echobase.action.import=Importer -echobase.action.importLogDelete=Supprimer echobase.action.importTable=Importer echobase.action.login=Connexion echobase.action.logout=Déconnexion @@ -148,7 +146,6 @@ echobase.common.voyage=Campagne echobase.common.voyageDescription=Description echobase.common.voyageFile= -echobase.confirm.delete.importData=Confirmer la suppression de l'import echobase.confirm.delete.query=Confirmer la suppression de la requête echobase.confirm.delete.selected.importData=Confirmer la suppression des imports sélectionnés echobase.confirm.delete.workingDbConfiguration=Confirmer la suppression de la configuration suivante @@ -252,7 +249,7 @@ echobase.info.no.workingDbConfiguration.saved=Aucune configuration de base de travail enregistrée echobase.info.no.workingDbConfiguration.selected=Sélectionner une configuration pour ensuite vous y connecter echobase.info.removeData.failed=La suppresion de l'import a échoué -echobase.info.removeData.succeded=La suppresion de l'import a réussi en %s +echobase.info.removeData.succeded=La suppresion de l'import a réussi echobase.info.reportBug=Rapport de bug echobase.info.sqlQuery.not.modifiable=Vous ne disposez pas des droits nécessaires pour modifier la requête sélectionnée echobase.info.update.user.password=Pour ne pas modifier le mot de passe laisser ce champs vide. @@ -318,6 +315,7 @@ echobase.legend.workingDbConfiguration.use=Configuration de base de travail echobase.menu.connectToDbInformations=Informations de connexion à la base de données echobase.menu.createEmbeddedApplication=Créer une application embarquée +echobase.menu.dashboard=Tableau de bord echobase.menu.editData=Modifier les données echobase.menu.export=Exporter des données echobase.menu.exportDb=Exporter une base @@ -347,9 +345,9 @@ echobase.title.connectToDbInformations=Informations de connexion à la base de données echobase.title.createEmbeddedApplication=Création de l'application embarquée echobase.title.createMission=Créer une mission +echobase.title.dashboard=Tableau de bord echobase.title.dbEditor=Modification des données echobase.title.dbEditor.read=Visualisation des données -echobase.title.delete.importLog=Confirmer la suppression d'un import 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 Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-21 19:25:39 UTC (rev 679) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-21 19:33:41 UTC (rev 680) @@ -53,8 +53,8 @@ <s:if test="workingDbSelected"> <li> <s:a action="disconnect" namespace="/workingDb" id='disconnect' - title='%{getText("echobase.tooltip.disconnectWorkingDb")}' - alt='%{getText("echobase.tooltip.disconnectWorkingDb")}'> + title='%{getText("echobase.tooltip.disconnectWorkingDb")}' + alt='%{getText("echobase.tooltip.disconnectWorkingDb")}'> <s:text name="echobase.action.workingDbconfiguration.disconnect"/> </s:a> </li> @@ -123,6 +123,11 @@ </s:a> </li> <li> + <s:a action="dashboard" namespace="/workingDb" cssClass="dashboard"> + <span><s:text name="echobase.menu.dashboard"/></span> + </s:a> + </li> + <li> <s:a action="information" namespace="/workingDb" cssClass="info"> <span> <s:text name="echobase.menu.connectToDbInformations"/> @@ -169,6 +174,11 @@ </span> </s:a> </li> + <li> + <s:a action="dashboard" namespace="/workingDb" cssClass="dashboard"> + <span><s:text name="echobase.menu.dashboard"/></span> + </s:a> + </li> </s:if> </s:else> </ul> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2012-09-21 19:25:39 UTC (rev 679) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/home.jsp 2012-09-21 19:33:41 UTC (rev 680) @@ -49,15 +49,4 @@ </li> </ul> </fieldset> -</div> -<br/> -<s:if test="%{workingDbSelected}"> - <s:form namespace="/workingDb" action="dashboard"> - <ul class="toolbar floatLeft"> - <li> - <s:submit theme="simple" action="dashboard" - key="echobase.action.dashboard"/> - </li> - </ul> - </s:form> -</s:if> +</div> \ No newline at end of file Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp 2012-09-21 19:25:39 UTC (rev 679) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp 2012-09-21 19:33:41 UTC (rev 680) @@ -161,11 +161,12 @@ <br/> <s:label key='echobase.common.importText' value=''/> - <pre id='importLogText' style="font-weight: bold;"></pre> + + <pre id='importLogText' style="font-weight: bold;" class="floatLeft"></pre> <br/> <s:label key='echobase.common.importUser' value=''/> - <pre id='importLogUser' style="font-weight: bold;"></pre> + <pre id='importLogUser' style="font-weight: bold;" class="floatLeft"></pre> </div> </fieldset> Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-21 19:25:39 UTC (rev 679) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-21 19:33:41 UTC (rev 680) @@ -122,7 +122,7 @@ </script> -<title><s:text name="echobase.title.importLogs"/></title> +<title><s:text name="echobase.title.dashboard"/></title> <s:url id="loadUrl" action="getDashboardImportLogs" namespace="/workingDb" escapeAmp="false"/> @@ -213,9 +213,12 @@ <br/> <s:label key='echobase.common.importText' value=''/> + <div class="floatLeft"> <pre id='importLogText' style="font-weight: bold;"></pre> + </div> <br/> + <div class="clearBoth"/> <s:label key='echobase.common.importUser' value=''/> <pre id='importLogUser' style="font-weight: bold;"></pre> </div> 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 2012-09-21 19:25:39 UTC (rev 679) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2012-09-21 19:33:41 UTC (rev 680) @@ -37,15 +37,15 @@ el.select(); } else if (!!window.getSelection) { // FF, Safari, Chrome, Opera var sel = window.getSelection(); - var range = document.createRange(); - range.selectNodeContents(el); + var range1 = document.createRange(); + range1.selectNodeContents(el); sel.removeAllRanges(); - sel.addRange(range); + sel.addRange(range1); } else if (!!document.selection) { // IE document.selection.empty(); - var range = document.body.createTextRange(); - range.moveToElementText(el); - range.select(); + var range2 = document.body.createTextRange(); + range2.moveToElementText(el); + range2.select(); } }); @@ -68,6 +68,7 @@ <s:label key="pilotVersion" label='%{getText("echobase.common.pilotVersion")}'/> <br/> + <div class="cleanBoth help"> <label> (*) <s:text name="echobase.info.click.to.select"/> @@ -87,10 +88,6 @@ <s:submit theme="simple" action="disconnect" key="echobase.action.workingDbconfiguration.disconnect"/> </li> - <li> - <s:submit theme="simple" action="dashboard" - key="echobase.action.dashboard"/> - </li> </ul> </s:form> Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-09-21 19:25:39 UTC (rev 679) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-09-21 19:33:41 UTC (rev 680) @@ -670,6 +670,13 @@ .menu .info:hover{ background-position:-384px -48px; } + +.menu .dashboard{ + background-position:-336px 0; +} +.menu .dashboard:hover{ + background-position:-336px -48px; +} /*connexion*/ #headerRight{ font-size:140%;