Author: tchemit Date: 2012-09-22 14:27:48 +0200 (Sat, 22 Sep 2012) New Revision: 684 Url: http://forge.codelutin.com/repositories/revision/echobase/684 Log: - add icon for remove imports - do not display import to delete Added: trunk/echobase-ui/src/main/webapp/images/menu2.jpg Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.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/css/screen.css Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp 2012-09-22 11:20:01 UTC (rev 683) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/confirmDelete.jsp 2012-09-22 12:27:48 UTC (rev 684) @@ -29,7 +29,7 @@ <fieldset> <legend> - <s:text name="echobase.confirm.delete.selected.importData"/> + <s:text name="echobase.confirm.delete.selected.importData"/> </legend> <ul class=""> @@ -40,21 +40,22 @@ </s:iterator> </ul> - <s:form namespace="/removeData"> - - <s:iterator value="model.importLogIds" var="id"> - <s:hidden name="model.importLogIds" value="%{#id}"/> - </s:iterator> - <br/> - <ul class="toolbar floatRight"> - <li> + <br/> + <ul class="toolbar floatRight"> + <li> + <s:form namespace="/removeData"> <s:submit action="importLogs" theme="simple" key="echobase.action.cancel"/> - </li> - <li> + </s:form> + </li> + <li> + <s:form namespace="/removeData"> + <s:iterator value="model.importLogIds" var="id"> + <s:hidden name="model.importLogIds" value="%{#id}"/> + </s:iterator> <s:submit action="confirmDelete" theme="simple" key="echobase.action.delete"/> - </li> - </ul> - </s:form> + </s:form> + </li> + </ul> </fieldset> 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-22 11:20:01 UTC (rev 683) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/removeData/importLogs.jsp 2012-09-22 12:27:48 UTC (rev 684) @@ -35,47 +35,12 @@ return false; } - function loadImportLogDetail(importLogId) { - $.ajax( - { - url:'<s:url action="getDashboardImportLog" namespace="/workingDb"/>', - data:{importLogId:importLogId}, - async:false, - dataType:"json", - success:function (data, textStatus) { - - $('#noImportLogDetail').hide(); - $('#importLogDetail').show(); - var json = data.data; - - if ($('#noVoyageDetail').is(":visible")) { - - // need to load voyage - loadVoyageDetail(json['voyageId']); - } - - $('#importLogVoyage').html(json['voyageId_lbl']); - $('#importLogText').html(json['importText']); - $('#importLogUser').html(json['importUser']); - $('#importLogDate').html(json['importDate']); - $('#importLogImportType').html(json['importType']); - } - }); - return false; - } - jQuery(document).ready(function () { $('[name="voyageId"]').change(function (event) { reloadPage({'voyageId':this.value}); }); - $.addRowSelectTopic('importLogs', function (event) { - - var id = event.originalEvent.id; - loadImportLogDetail(id); - }); - $.addClearSelectTopic('importLogs', function (event) { $(':checkbox[name^="jqg"]').each(function () { @@ -85,8 +50,6 @@ elem.attr("name", "model.importLogIds"); elem.attr("value", newId); }); - $('#noImportLogDetail').show(); - $('#importLogDetail').hide(); }); $.addEvenAndOddClasses('importLogs'); }); @@ -123,7 +86,6 @@ navigatorDelete="false" navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" multiselect="true" - onSelectRowTopics='importLogs-rowSelect' onCompleteTopics="importLogs-clearSelect,importLogs-CompleteTopics"> <sjg:gridColumn name="id" title="id" hidden="true"/> @@ -139,38 +101,6 @@ title="%{getText('echobase.common.importUser')}"/> </sjg:grid> <br/> - <fieldset> - <legend><s:text name="echobase.title.importLog.detail"/></legend> - <div id="noImportLogDetail"> - <pre> - <s:text name="echobase.message.noImportLogSelected"/> - </pre> - </div> - <div id="importLogDetail"> - - <s:label key='echobase.common.importType' value=''/> - <pre id='importLogImportType' style="font-weight: bold;"></pre> - <br/> - - <s:label key='echobase.common.voyage' value=''/> - <pre id='importLogVoyage' style="font-weight: bold;"></pre> - <br/> - - <s:label key='echobase.common.importDate' value=''/> - <pre id='importLogDate' style="font-weight: bold;"></pre> - <br/> - - <s:label key='echobase.common.importText' value=''/> - - <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;" class="floatLeft"></pre> - </div> - </fieldset> - - <br/> <s:submit id='confirmDelete' action="confirmDelete" method="input" onclick="return checkOneRowSelected();" key="echobase.action.delete.selectedImport"/> 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-22 11:20:01 UTC (rev 683) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/dashboard.jsp 2012-09-22 12:27:48 UTC (rev 684) @@ -134,7 +134,7 @@ navigatorAdd="false" rowList="10,15,20,50,100,250,500" rowNum="10" onSelectRowTopics="voyages-rowSelect" onCellSelectTopics="voyages-rowSelect" - onCompleteTopics="voyages-clearSelect"> + onCompleteTopics="voyages-clearSelect,voyages-CompleteTopics"> <sjg:gridColumn name="id" title="id" hidden="true"/> <sjg:gridColumn name="id_lbl" sortable="true" Modified: trunk/echobase-ui/src/main/webapp/css/screen.css =================================================================== --- trunk/echobase-ui/src/main/webapp/css/screen.css 2012-09-22 11:20:01 UTC (rev 683) +++ trunk/echobase-ui/src/main/webapp/css/screen.css 2012-09-22 12:27:48 UTC (rev 684) @@ -592,7 +592,7 @@ transition: 0.25s; } .menu a{ - background:url(../images/menu.jpg) no-repeat; + background:url(../images/menu2.jpg) no-repeat; height:48px; width:48px; @@ -633,11 +633,11 @@ background-position:-144px -48px; } .menu .delDonnee{ - background-position:-144px 0; + background-position:-432px 0; } .menu .delDonnee:hover{ - background-position:-144px -48px; + background-position:-432px -48px; } .menu .modif{ Added: trunk/echobase-ui/src/main/webapp/images/menu2.jpg =================================================================== (Binary files differ) Property changes on: trunk/echobase-ui/src/main/webapp/images/menu2.jpg ___________________________________________________________________ Added: svn:mime-type + image/jpeg