Author: tchemit Date: 2012-01-13 10:46:10 +0100 (Fri, 13 Jan 2012) New Revision: 268 Url: http://forge.codelutin.com/repositories/revision/echobase/268 Log: reformat jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2012-01-12 18:00:45 UTC (rev 267) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/csvImportResult.jsp 2012-01-13 09:46:10 UTC (rev 268) @@ -26,7 +26,7 @@ <title><s:text name="echobase.title.dbEditor"/></title> <h2> - <s:text name="echobase.info.dbeditor.propertyDiffsResult"/> + <s:text name="echobase.info.dbeditor.propertyDiffsResult"/> </h2> <fieldset> @@ -44,6 +44,6 @@ </fieldset> <s:a namespace="/dbeditor" action="dbeditor"> - <s:param name="entityType" value="%{result.entityType}"/> - <s:text name="echobase.action.return"/> + <s:param name="entityType" value="%{result.entityType}"/> + <s:text name="echobase.action.return"/> </s:a> 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 2012-01-12 18:00:45 UTC (rev 267) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-01-13 09:46:10 UTC (rev 268) @@ -41,36 +41,36 @@ // Hack to make name=id on sj tags var combos = $('select[name=""]'); - combos.each(function(obj) { - this.name = this.id; + combos.each(function (obj) { + this.name = this.id; }); var pickers = $('input.hasDatepicker'); - pickers.each(function(obj) { - this.name = this.id; + pickers.each(function (obj) { + this.name = this.id; }); // on table name change, let's reload reload this page - $('[name="entityType"]').change(function(event) { + $('[name="entityType"]').change(function (event) { var url = "${reloadUrl}?" + $.param({entityType:this.value}); window.location = url; }); // on reset let's just reload the selected row - $('[name="resetAction"]').click(function(event){ + $('[name="resetAction"]').click(function (event) { $.publish('datas-rowSelect') }); // on grid selected clear, let's remove the edit form - $.addClearSelectTopic('datas', function(event) { + $.addClearSelectTopic('datas', function (event) { $('#noRowSelected').show(); $('#editForm').hide(); }); // on row selection, let's load the edit form - $.addRowSelectTopic('datas', function(event) { - + $.addRowSelectTopic('datas', function (event) { + $('#noRowSelected').hide(); $('#editForm').show(); @@ -82,14 +82,14 @@ // get entity value from json jQuery.getJSON("${getTableData}", - { "entityType":entityType, "id":id }, function (result) { + { "entityType":entityType, "id":id }, function (result) { // get metadatas from the response var metas = result.metas; // iterate on result to push in form the value to edit - $.each(result.datas, function(propertyName, value) { + $.each(result.datas, function (propertyName, value) { if (propertyName == 'topiaId') { @@ -123,7 +123,7 @@ switch (type) { case 'boolean': case 'Boolean': - editor.attr('checked', value=="Y"?true:false); + editor.attr('checked', value == "Y" ? true : false); break; case 'Date': @@ -151,84 +151,84 @@ function updateDate(value, editor) { - // parse date formated like : dd/MM/yyyy HH:mm:ss - var date = parseDate(value); + // parse date formated like : dd/MM/yyyy HH:mm:ss + var date = parseDate(value); - // get timePicker instance - var inst = $.datepicker._getInst(editor[0]); + // get timePicker instance + var inst = $.datepicker._getInst(editor[0]); - // set date - $.datepicker._setDate(inst, date); + // set date + $.datepicker._setDate(inst, date); - // set time - $.datepicker._setTime(inst, date); + // set time + $.datepicker._setTime(inst, date); } function parseDate(value) { - // parse date formated like : dd/MM/yyyy HH:mm:ss - var dateString = value.substring(0, 10); - var dateSplited = dateString.split("/"); + // parse date formated like : dd/MM/yyyy HH:mm:ss + var dateString = value.substring(0, 10); + var dateSplited = dateString.split("/"); - var hourString = value.substring(11, 19); - var hourSplited = hourString.split(":"); + var hourString = value.substring(11, 19); + var hourSplited = hourString.split(":"); - var day = parseInt(dateSplited[0]); + var day = parseInt(dateSplited[0]); - // FIXME sletellier 20111122 : currently, one month more are displayed.... - var month = parseInt(dateSplited[1]) - 1; - var year = parseInt(dateSplited[2]); - var hour = parseInt(hourSplited[0]); - var minute = parseInt(hourSplited[1]); - var second = parseInt(hourSplited[2]); + // FIXME sletellier 20111122 : currently, one month more are displayed.... + var month = parseInt(dateSplited[1]) - 1; + var year = parseInt(dateSplited[2]); + var hour = parseInt(hourSplited[0]); + var minute = parseInt(hourSplited[1]); + var second = parseInt(hourSplited[2]); - // update date - // TODO sletellier 20111122 : edit milliseconds ? - return new Date(year, month, day, hour, minute, second, 0); + // update date + // TODO sletellier 20111122 : edit milliseconds ? + return new Date(year, month, day, hour, minute, second, 0); } </script> <s:select key="entityType" label='%{getText("echobase.common.entityType")}' - list="entityTypes" headerKey="" headerValue=""/> + list="entityTypes" headerKey="" headerValue=""/> <br class="clearBoth"/> <s:if test="tableSelected"> - <sj:tabbedpanel id="io" collapsible="true"> - <sj:tab id="tab_importForm" target="importForm" title="ss" - label="%{getText('echobase.title.importTable')}"/> + <sj:tabbedpanel id="io" collapsible="true"> + <sj:tab id="tab_importForm" target="importForm" title="ss" + label="%{getText('echobase.title.importTable')}"/> - <sj:tab id="tab_exportForm" target="exportForm" - label="%{getText('echobase.title.exportTable')}"/> + <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:form id="importForm" namespace="/dbeditor" method="post" + enctype="multipart/form-data"> - <s:hidden key="entityType" label=''/> - <s:file key="importFile" required="true" - label="%{getText('echobase.label.importFile')}"/> + <s:hidden key="entityType" label=''/> + <s:file key="importFile" required="true" + label="%{getText('echobase.label.importFile')}"/> - <s:checkbox key='createIfNotFound' value='true' - label='%{getText("echobase.label.createIfNotFound")}'/> - <br/> - <s:submit key="echobase.action.importTable" action="doImport" - align="right"/> - </s:form> + <s:checkbox key='createIfNotFound' value='true' + label='%{getText("echobase.label.createIfNotFound")}'/> + <br/> + <s:submit key="echobase.action.importTable" action="doImport" + align="right"/> + </s:form> - <s:form id="exportForm" namespace="/dbeditor" method="post"> - <s:hidden key="entityType" label=''/> - <s:textfield key="exportFileName" required="true" size="100" - label="%{getText('echobase.label.exportFileName')}"/> + <s:form id="exportForm" namespace="/dbeditor" method="post"> + <s:hidden key="entityType" label=''/> + <s:textfield key="exportFileName" required="true" size="100" + label="%{getText('echobase.label.exportFileName')}"/> - <br/> - <s:submit key="echobase.action.exportTable" action="doExport" - align="right"/> - </s:form> + <br/> + <s:submit key="echobase.action.exportTable" action="doExport" + align="right"/> + </s:form> - </sj:tabbedpanel> + </sj:tabbedpanel> - </s:if> +</s:if> <br class="clearBoth"/> <s:if test="tableSelected"> @@ -281,10 +281,10 @@ <fieldset id="noRowSelected"> <legend> - <s:text name="echobase.legend.dbeditor.edit"> - <s:param value="%{tableI18nName}"/> - </s:text> - </legend> + <s:text name="echobase.legend.dbeditor.edit"> + <s:param value="%{tableI18nName}"/> + </s:text> + </legend> <i><s:text name="echobase.message.no.row.selected"/>.</i> </fieldset> @@ -299,14 +299,14 @@ <s:hidden key="entityType" label=''/> <s:hidden id="topiaId" name='topiaId' label=''/> - + <s:iterator value="columnMetas" var="meta" status="status"> <s:set var="metaName" value='%{#meta.name}'/> <s:if test="#meta.fK"> <s:url id="urlName" - action="getForeignEntities" - namespace="/dbeditor" - escapeAmp="false"> + action="getForeignEntities" + namespace="/dbeditor" + escapeAmp="false"> <s:param name="entityType" value="%{#meta.typeSimpleName}"/> </s:url> <sj:select id="%{#metaName}" @@ -316,28 +316,28 @@ emptyOption="true"/> </s:if> <s:else> - <s:if test='#meta.columnType == "string"'> - <s:textfield id="%{#metaName}" + <s:if test='#meta.columnType == "string"'> + <s:textfield id="%{#metaName}" + name="%{#metaName}" + label="%{#metaName}" + disabled="%{#meta.fK}" + value=""/> + </s:if> + <s:elseif test='#meta.columnType == "boolean"'> + <s:checkbox id="%{#metaName}" + name="%{#metaName}" + label="%{#metaName}" value="%{false}"/> + </s:elseif> + <s:elseif test='#meta.columnType == "date"'> + <sj:datepicker id="%{#metaName}" name="%{#metaName}" label="%{#metaName}" - disabled="%{#meta.fK}" - value=""/> - </s:if> - <s:elseif test='#meta.columnType == "boolean"'> - <s:checkbox id="%{#metaName}" - name="%{#metaName}" - label="%{#metaName}" value="%{false}"/> - </s:elseif> - <s:elseif test='#meta.columnType == "date"'> - <sj:datepicker id="%{#metaName}" - name="%{#metaName}" - label="%{#metaName}" - value="%{new java.util.Date()}" - displayFormat="dd/mm/yy" - timepicker="true" - timepickerShowSecond="true" - timepickerFormat="hh:mm:ss"/> - </s:elseif> + value="%{new java.util.Date()}" + displayFormat="dd/mm/yy" + timepicker="true" + timepickerShowSecond="true" + timepickerFormat="hh:mm:ss"/> + </s:elseif> </s:else> <br/> </s:iterator>