Author: tchemit Date: 2012-10-18 09:27:32 +0200 (Thu, 18 Oct 2012) New Revision: 737 Url: http://forge.codelutin.com/repositories/revision/echobase/737 Log: only show ui when loaded Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 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-10-18 06:16:37 UTC (rev 736) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor/dbeditor.jsp 2012-10-18 07:27:32 UTC (rev 737) @@ -34,7 +34,7 @@ <title> <s:if test="admin"> - <s:text name="echobase.title.dbEditor"/> + <s:text name="echobase.title.dbEditor"/> </s:if> <s:else> <s:text name="echobase.title.dbEditor.read"/> @@ -192,9 +192,9 @@ // 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]?hourSplited[0]:0); - var minute = parseInt(!!hourSplited[1]?hourSplited[1]:0); - var second = parseInt(hourSplited[2]?hourSplited[2]:0); + var hour = parseInt(!!hourSplited[0] ? hourSplited[0] : 0); + var minute = parseInt(!!hourSplited[1] ? hourSplited[1] : 0); + var second = parseInt(hourSplited[2] ? hourSplited[2] : 0); // update date return new Date(year, month, day, hour, minute, second, 0); @@ -299,24 +299,8 @@ <br class="clearBoth"/> - <fieldset id="noRowSelected"> - <legend> - <s:if test="admin"> - <s:text name="echobase.legend.dbeditor.edit"> - <s:param value="%{tableI18nName}"/> - </s:text> - </s:if> - <s:else> - <s:text name="echobase.legend.dbeditor.show"> - <s:param value="%{tableI18nName}"/> - </s:text> - </s:else> - </legend> - <i><s:text name="echobase.message.no.row.selected"/>.</i> - </fieldset> - - <s:form id="editForm" namespace="/dbeditor"> - <fieldset> + <div class="showAtLoad hidden"> + <fieldset id="noRowSelected"> <legend> <s:if test="admin"> <s:text name="echobase.legend.dbeditor.edit"> @@ -329,58 +313,79 @@ </s:text> </s:else> </legend> + <i><s:text name="echobase.message.no.row.selected"/>.</i> + </fieldset> - <s:hidden key="entityType" label=''/> + <s:form id="editForm" namespace="/dbeditor"> + <fieldset> + <legend> + <s:if test="admin"> + <s:text name="echobase.legend.dbeditor.edit"> + <s:param value="%{tableI18nName}"/> + </s:text> + </s:if> + <s:else> + <s:text name="echobase.legend.dbeditor.show"> + <s:param value="%{tableI18nName}"/> + </s:text> + </s:else> + </legend> - <s:textfield id="topiaId" name='topiaId' readonly="true" - label='%{getText("echobase.common.id")}' size="250"/> + <s:hidden key="entityType" 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"> - <s:param name="entityType" value="%{#meta.typeSimpleName}"/> - </s:url> - <sj:select id="%{#metaName}" label="%{#metaName}" readonly="%{!admin}" - href="%{urlName}" list="entities" emptyOption="true"/> - </s:if> - <s:else> - <s:if test='#meta.columnType == "string"'> - <s:textfield id="%{#metaName}" name="%{#metaName}" - label="%{#metaName}" disabled="%{#meta.fK}" - value="" size="250" readonly="%{!admin}"/> + <s:textfield id="topiaId" name='topiaId' readonly="true" + label='%{getText("echobase.common.id")}' size="250"/> + + <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"> + <s:param name="entityType" value="%{#meta.typeSimpleName}"/> + </s:url> + <sj:select id="%{#metaName}" label="%{#metaName}" + readonly="%{!admin}" + href="%{urlName}" list="entities" emptyOption="true"/> </s:if> - <s:elseif test='#meta.columnType == "boolean"'> - <s:checkbox id="%{#metaName}" name="%{#metaName}" - readonly="%{!admin}" - 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" readonly="%{!admin}" - timepickerFormat="hh:mm:ss"/> - </s:elseif> - </s:else> - <br/> - </s:iterator> - </fieldset> - <s:if test="admin"> - <div class="toolbar"> - <ul class="toolbar floatRight"> - <li><s:submit name='resetAction' key="echobase.action.reset" - theme="simple" onclick="return false;"/> - </li> - <li><s:submit name="submitAction" key="echobase.action.save" - action="editTableData" theme="simple"/> - </li> - </ul> - </div> - </s:if> - </s:form> + <s:else> + <s:if test='#meta.columnType == "string"'> + <s:textfield id="%{#metaName}" name="%{#metaName}" + label="%{#metaName}" disabled="%{#meta.fK}" + value="" size="250" readonly="%{!admin}"/> + </s:if> + <s:elseif test='#meta.columnType == "boolean"'> + <s:checkbox id="%{#metaName}" name="%{#metaName}" + readonly="%{!admin}" + 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" readonly="%{!admin}" + timepickerFormat="hh:mm:ss"/> + </s:elseif> + </s:else> + <br/> + </s:iterator> + </fieldset> + <s:if test="admin"> + <div class="toolbar"> + <ul class="toolbar floatRight"> + <li><s:submit name='resetAction' key="echobase.action.reset" + theme="simple" onclick="return false;"/> + </li> + <li><s:submit name="submitAction" key="echobase.action.save" + action="editTableData" theme="simple"/> + </li> + </ul> + </div> + </s:if> + </s:form> + </div> </s:if> <script type="text/javascript"> @@ -393,5 +398,7 @@ <s:else> $('#tab_exportForm > a').click(); </s:else> + + $('.showAtLoad').removeClass('showAtLoad').removeClass('hidden').show(); }); </script> \ No newline at end of file