This is an automated email from the git hooks/post-receive script. New commit to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 9df8d02db4e86a7bd4f151331111e890e036c961 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu Jun 23 16:31:15 2016 +0200 Toggle visibility between voyages and morings --- .../resources/i18n/echobase-ui_en_GB.properties | 2 + .../resources/i18n/echobase-ui_fr_FR.properties | 2 + .../webapp/WEB-INF/jsp/workingDb/dashboard.jsp | 120 +++++++++++++-------- echobase-ui/src/main/webapp/css/screen.css | 2 +- 4 files changed, 80 insertions(+), 46 deletions(-) diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties index 59e0086..959c540 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties @@ -472,5 +472,7 @@ echobase.title.workingDbConfiguration=Manage working database configurations echobase.tooltip.disconnectWorkingDb=Change working database echobase.tooltip.logout=Logout echobase.tooltip.selectWorkingDb=Select a working database +echobase.view.moorings= +echobase.view.voyages= echobase.warning.coser.not.reachable=Coser instance <strong>%s</strong> is not available, please contact his administrator. echobase.warning.no.importLog.selected=No selected import diff --git a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties index 8c9e6df..d4ceed1 100644 --- a/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties +++ b/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties @@ -475,5 +475,7 @@ echobase.title.workingDbConfiguration=Administration des configurations de base echobase.tooltip.disconnectWorkingDb=Changer de base de travail echobase.tooltip.logout=Se déconnecter echobase.tooltip.selectWorkingDb=Sélectionner une base de travail +echobase.view.moorings= +echobase.view.voyages= echobase.warning.coser.not.reachable=L'instance de Coser <strong>%s</strong> n'est pas disponible, veuillez contacter l'administrateur de ce projet. echobase.warning.no.importLog.selected=Aucun import sélectionné diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp index 3be2aa4..de7f095 100644 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp +++ b/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp @@ -158,12 +158,32 @@ return rowObject.id_lbl; } - - jQuery(document).ready(function () { + var togglePosition = false; + + function toggleTab() { $('#voyageDetail').hide(); $('#mooringDetail').hide(); $('#importLogDetail').hide(); - + + if (togglePosition) { + $('#voyagesTab').hide(); + $('#mooringsTab').show(); + $("#moorings").jqGrid && $("#moorings").jqGrid('setGridWidth', $("#mooringsTab")[0].offsetWidth); + $("#toggleTabButton").text('<s:text name="echobase.view.voyages"/>'); + + } else { + $('#voyagesTab').show(); + $("#voyages").jqGrid && $("#voyages").jqGrid('setGridWidth', $("#voyagesTab")[0].offsetWidth); + $('#mooringsTab').hide(); + $("#toggleTabButton").text('<s:text name="echobase.view.moorings"/>'); + } + + togglePosition = !togglePosition; + } + + jQuery(document).ready(function () { + toggleTab(); + var lastEntityId = null; // display voyage infos @@ -187,50 +207,60 @@ </script> <title><s:text name="echobase.title.dashboard"/></title> -<s:url id="loadUrl" action="getDashboardVoyageImportLogs" namespace="/workingDb" escapeAmp="false"/> -<sjg:grid id="voyages" dataType="json" href="%{loadUrl}" gridModel="datas" - pager="true" pagerButtons="true" pagerInput="true" navigator="true" - autowidth="true" rownumbers="false" viewrecords="true" - navigatorEdit="false" navigatorSearch="false" - navigatorDelete="false" - navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" - onSelectRowTopics="voyages-rowSelect" - onCellSelectTopics="voyages-rowSelect" - onCompleteTopics="voyages-clearSelect,voyages-CompleteTopics"> - - <sjg:gridColumn name="id" title="id" hidden="true"/> - <sjg:gridColumn name="name" sortable="true" formatter="formatName" - title="%{getText('echobase.common.voyage')}"/> - - <s:iterator value="%{importVoyageTypes}" var="entry"> - <sjg:gridColumn name="importType.%{#entry.name}" sortable="false" - title="%{#entry.label}" tooltip="%{#entry.title}" - formatter="formatImportLogs"/> - </s:iterator> -</sjg:grid> + +<div align="right"> + <button id="toggleTabButton" class="action" onclick="toggleTab()"><s:text name="echobase.view.voyages"/></button> +</div> <br/> + +<div id="voyagesTab"> + <s:url id="loadUrl" action="getDashboardVoyageImportLogs" namespace="/workingDb" escapeAmp="false"/> + <sjg:grid id="voyages" dataType="json" href="%{loadUrl}" gridModel="datas" + pager="true" pagerButtons="true" pagerInput="true" navigator="true" + autowidth="true" rownumbers="false" viewrecords="true" + navigatorEdit="false" navigatorSearch="false" + navigatorDelete="false" + navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" + onSelectRowTopics="voyages-rowSelect" + onCellSelectTopics="voyages-rowSelect" + onCompleteTopics="voyages-clearSelect,voyages-CompleteTopics"> + + <sjg:gridColumn name="id" title="id" hidden="true"/> + <sjg:gridColumn name="name" sortable="true" formatter="formatName" + title="%{getText('echobase.common.voyage')}"/> + + <s:iterator value="%{importVoyageTypes}" var="entry"> + <sjg:gridColumn name="importType.%{#entry.name}" sortable="false" + title="%{#entry.label}" tooltip="%{#entry.title}" + formatter="formatImportLogs"/> + </s:iterator> + </sjg:grid> +</div> + +<div id ="mooringsTab"> + <s:url id="loadUrl" action="getDashboardMooringImportLogs" namespace="/workingDb" escapeAmp="false"/> + <sjg:grid id="moorings" dataType="json" href="%{loadUrl}" gridModel="datas" + pager="true" pagerButtons="true" pagerInput="true" navigator="true" + autowidth="false" rownumbers="false" viewrecords="true" + navigatorEdit="false" navigatorSearch="false" + navigatorDelete="false" + navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" + onSelectRowTopics="moorings-rowSelect" + onCellSelectTopics="moorings-rowSelect" + onCompleteTopics="moorings-clearSelect,moorings-CompleteTopics"> + + <sjg:gridColumn name="id" title="id" hidden="true"/> + <sjg:gridColumn name="name" sortable="true" formatter="formatName" + title="%{getText('echobase.common.mooring')}"/> + + <s:iterator value="%{importMooringTypes}" var="entry"> + <sjg:gridColumn name="importType.%{#entry.name}" sortable="false" + title="%{#entry.label}" tooltip="%{#entry.title}" + formatter="formatImportLogs"/> + </s:iterator> + </sjg:grid> +</div> -<s:url id="loadUrl" action="getDashboardMooringImportLogs" namespace="/workingDb" escapeAmp="false"/> -<sjg:grid id="moorings" dataType="json" href="%{loadUrl}" gridModel="datas" - pager="true" pagerButtons="true" pagerInput="true" navigator="true" - autowidth="true" rownumbers="false" viewrecords="true" - navigatorEdit="false" navigatorSearch="false" - navigatorDelete="false" - navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" - onSelectRowTopics="moorings-rowSelect" - onCellSelectTopics="moorings-rowSelect" - onCompleteTopics="moorings-clearSelect,moorings-CompleteTopics"> - - <sjg:gridColumn name="id" title="id" hidden="true"/> - <sjg:gridColumn name="name" sortable="true" formatter="formatName" - title="%{getText('echobase.common.mooring')}"/> - - <s:iterator value="%{importMooringTypes}" var="entry"> - <sjg:gridColumn name="importType.%{#entry.name}" sortable="false" - title="%{#entry.label}" tooltip="%{#entry.title}" - formatter="formatImportLogs"/> - </s:iterator> -</sjg:grid> <br/> <fieldset id="voyageDetail"> diff --git a/echobase-ui/src/main/webapp/css/screen.css b/echobase-ui/src/main/webapp/css/screen.css index c322bc7..f7f2ae9 100644 --- a/echobase-ui/src/main/webapp/css/screen.css +++ b/echobase-ui/src/main/webapp/css/screen.css @@ -448,7 +448,7 @@ input, textarea, select{ input[type="password"], input[type="text"]:not(.ui-pg-input), select:not(.ui-pg-input){ height:35px; } -input[type="submit"]{ +input[type="submit"], button.action { background:url(../images/bt_jaune.jpg) repeat-x 0 0; height: 48px; width:auto; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.