Author: bleny Date: 2014-04-01 15:34:10 +0200 (Tue, 01 Apr 2014) New Revision: 1788 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1788 Log: refs #4483 move delete row action button to edit-sample-row form Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/wao-web/src/main/webapp/wao.js Modified: trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java =================================================================== --- trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/java/fr/ifremer/wao/web/action/obsmer/DeleteSampleRowAction.java 2014-04-01 13:34:10 UTC (rev 1788) @@ -7,8 +7,8 @@ import org.apache.struts2.convention.annotation.Results; @Results({ - @Result(name="error", type="redirectAction", params = { "actionName", "sampling-plan" }), - @Result(name="success", type="redirectAction", params = { "actionName", "sampling-plan" }) + @Result(name="error", type="redirectAction", params = { "actionName", "edit-sample-row!input", "sampleRowId", "%{sampleRowId}" }), + @Result(name="success", type="redirectAction", params = { "actionName", "edit-sample-row!input", "sampleRowId", "%{sampleRowId}" }) }) public class DeleteSampleRowAction extends WaoJspActionSupport { @@ -50,4 +50,7 @@ } + public String getSampleRowId() { + return sampleRowId; + } } \ No newline at end of file Modified: trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/resources/i18n/wao-web_en_GB.properties 2014-04-01 13:34:10 UTC (rev 1788) @@ -50,6 +50,7 @@ wao.ui.action.deleteWaoUser.failure=The user cannot be deleted wao.ui.action.deleteWaoUser.success=User deleted successfully wao.ui.action.edit=Edit +wao.ui.action.editOrDeleteSampleRow=Edit or delete sample row wao.ui.action.enlargeView=Enlarge view wao.ui.action.exportBoats=Export boats with private infos wao.ui.action.filter=Filter Modified: trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties =================================================================== --- trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties 2014-04-01 13:34:10 UTC (rev 1788) @@ -50,6 +50,7 @@ wao.ui.action.deleteWaoUser.failure=La suppression de l'utilisateur a échoué wao.ui.action.deleteWaoUser.success=L'utilisateur a bien été supprimé wao.ui.action.edit=Modifier +wao.ui.action.editOrDeleteSampleRow=Modifier ou supprimer la ligne wao.ui.action.enlargeView=Agrandir la vue wao.ui.action.exportBoats=Exporter les $s navires avec leurs informations privées wao.ui.action.filter=Filtrer Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/edit-sample-row-input.jsp 2014-04-01 13:34:10 UTC (rev 1788) @@ -248,6 +248,12 @@ <s:submit type="button" cssClass="btn"> <i class="icon-hdd"></i> <s:text name="wao.ui.action.save" /> </s:submit> + <s:url action="delete-sample-row" id="deleteSampleRowUrl"> + <s:param name="sampleRowId" value="sampleRowId" /> + </s:url> + <s:a href="%{deleteSampleRowUrl}" cssClass="btn pull-right"> + <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteSampleRow" /> + </s:a> </div> </s:form> Modified: trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/webapp/WEB-INF/content/obsmer/sampling-plan.jsp 2014-04-01 13:34:10 UTC (rev 1788) @@ -427,17 +427,9 @@ <s:param name="sampleRowId" value="sampleRowId" /> </s:url> <s:a href="%{editSampleRowUrl}"> - <i class="icon-edit"></i> <s:text name="wao.ui.action.edit" /> + <i class="icon-edit"></i> <s:text name="wao.ui.action.editOrDeleteSampleRow" /> </s:a> </li> - <li> - <s:url action="delete-sample-row" id="deleteSampleRowUrl"> - <s:param name="sampleRowId" value="sampleRowId" /> - </s:url> - <s:a href="%{deleteSampleRowUrl}"> - <i class="icon-trash"></i> <s:text name="wao.ui.action.deleteSampleRow" /> - </s:a> - </li> </s:if> <li> <s:url action="sample-row-log" id="sampleRowLogUrl"> Modified: trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2014-04-01 13:34:10 UTC (rev 1788) @@ -169,6 +169,7 @@ <s:actionerror theme="bootstrap" /> <s:actionmessage theme="bootstrap" /> <s:fielderror theme="bootstrap" /> + <div id="notifications"></div> <decorator:body /> </main> Modified: trunk/wao-web/src/main/webapp/wao.js =================================================================== --- trunk/wao-web/src/main/webapp/wao.js 2014-04-01 10:33:15 UTC (rev 1787) +++ trunk/wao-web/src/main/webapp/wao.js 2014-04-01 13:34:10 UTC (rev 1788) @@ -133,10 +133,55 @@ }; +var Notifications = function () { + + this.$notifications = $('#notifications'); + + this.info = function (message) { + this._notify('info', message); + } + + this.warn = function (message) { + this._notify('warn', message); + } + + this.error = function (message) { + this._notify('error', message); + } + + this.success = function (message) { + this._notify('success', message); + } + + this._notify = function (level, message) { + var cssClasses = 'alert alert-' + level; + if (level === 'warn') { + var cssClasses = 'alert'; + } + var html = '<div class="' + cssClasses + '">' + + ' <button type="button" class="close" data-dismiss="alert">×</button>' + + ' ' + message + + '</div>'; + this.$notifications.append(html); + } + +} + +var Wao = function () { + + var self = this; + + this.notifications = new Notifications(); + +} + + $(document).ready(function () { // $('select').select2(); - $('a[data-toggle="popover"]').popover(); + // $('a[data-toggle="popover"]').popover(); + WAO = new Wao(); + }); \ No newline at end of file