From tchemit@users.forge.codelutin.com Thu Oct 18 09:27:32 2012 From: tchemit@users.forge.codelutin.com To: echobase-commits@list.forge.codelutin.com Subject: [Echobase-commits] r737 - trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/dbeditor Date: Thu, 18 Oct 2012 09:27:32 +0200 Message-ID: <20121018072732.569A515D7B@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8218337496280188496==" --===============8218337496280188496== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ =20 <s:if test=3D"admin"> - <s:text name=3D"echobase.title.dbEditor"/> + <s:text name=3D"echobase.title.dbEditor"/> </s:if> <s:else> <s:text name=3D"echobase.title.dbEditor.read"/> @@ -192,9 +192,9 @@ // FIXME sletellier 20111122 : currently, one month more are displayed..= .. var month =3D parseInt(dateSplited[1]) - 1; var year =3D parseInt(dateSplited[2]); - var hour =3D parseInt(!!hourSplited[0]?hourSplited[0]:0); - var minute =3D parseInt(!!hourSplited[1]?hourSplited[1]:0); - var second =3D parseInt(hourSplited[2]?hourSplited[2]:0); + var hour =3D parseInt(!!hourSplited[0] ? hourSplited[0] : 0); + var minute =3D parseInt(!!hourSplited[1] ? hourSplited[1] : 0); + var second =3D parseInt(hourSplited[2] ? hourSplited[2] : 0); =20 // update date return new Date(year, month, day, hour, minute, second, 0); @@ -299,24 +299,8 @@ =20 <br class=3D"clearBoth"/> =20 - <fieldset id=3D"noRowSelected"> - <legend> - <s:if test=3D"admin"> - <s:text name=3D"echobase.legend.dbeditor.edit"> - <s:param value=3D"%{tableI18nName}"/> - </s:text> - </s:if> - <s:else> - <s:text name=3D"echobase.legend.dbeditor.show"> - <s:param value=3D"%{tableI18nName}"/> - </s:text> - </s:else> - </legend> - <i><s:text name=3D"echobase.message.no.row.selected"/>.</i> - </fieldset> - - <s:form id=3D"editForm" namespace=3D"/dbeditor"> - <fieldset> + <div class=3D"showAtLoad hidden"> + <fieldset id=3D"noRowSelected"> <legend> <s:if test=3D"admin"> <s:text name=3D"echobase.legend.dbeditor.edit"> @@ -329,58 +313,79 @@ </s:text> </s:else> </legend> + <i><s:text name=3D"echobase.message.no.row.selected"/>.</i> + </fieldset> =20 - <s:hidden key=3D"entityType" label=3D''/> + <s:form id=3D"editForm" namespace=3D"/dbeditor"> + <fieldset> + <legend> + <s:if test=3D"admin"> + <s:text name=3D"echobase.legend.dbeditor.edit"> + <s:param value=3D"%{tableI18nName}"/> + </s:text> + </s:if> + <s:else> + <s:text name=3D"echobase.legend.dbeditor.show"> + <s:param value=3D"%{tableI18nName}"/> + </s:text> + </s:else> + </legend> =20 - <s:textfield id=3D"topiaId" name=3D'topiaId' readonly=3D"true" - label=3D'%{getText("echobase.common.id")}' size=3D"250"/> + <s:hidden key=3D"entityType" label=3D''/> =20 - <s:iterator value=3D"columnMetas" var=3D"meta" status=3D"status"> - <s:set var=3D"metaName" value=3D'%{#meta.name}'/> - <s:if test=3D"#meta.fK"> - <s:url id=3D"urlName" action=3D"getForeignEntities" namespace=3D"/= dbeditor" - escapeAmp=3D"false"> - <s:param name=3D"entityType" value=3D"%{#meta.typeSimpleName}"/> - </s:url> - <sj:select id=3D"%{#metaName}" label=3D"%{#metaName}" readonly=3D"= %{!admin}" - href=3D"%{urlName}" list=3D"entities" emptyOption=3D"tr= ue"/> - </s:if> - <s:else> - <s:if test=3D'#meta.columnType =3D=3D "string"'> - <s:textfield id=3D"%{#metaName}" name=3D"%{#metaName}" - label=3D"%{#metaName}" disabled=3D"%{#meta.fK}" - value=3D"" size=3D"250" readonly=3D"%{!admin}"/> + <s:textfield id=3D"topiaId" name=3D'topiaId' readonly=3D"true" + label=3D'%{getText("echobase.common.id")}' size=3D"250"= /> + + <s:iterator value=3D"columnMetas" var=3D"meta" status=3D"status"> + <s:set var=3D"metaName" value=3D'%{#meta.name}'/> + <s:if test=3D"#meta.fK"> + <s:url id=3D"urlName" action=3D"getForeignEntities" + namespace=3D"/dbeditor" + escapeAmp=3D"false"> + <s:param name=3D"entityType" value=3D"%{#meta.typeSimpleName}"= /> + </s:url> + <sj:select id=3D"%{#metaName}" label=3D"%{#metaName}" + readonly=3D"%{!admin}" + href=3D"%{urlName}" list=3D"entities" emptyOption=3D"= true"/> </s:if> - <s:elseif test=3D'#meta.columnType =3D=3D "boolean"'> - <s:checkbox id=3D"%{#metaName}" name=3D"%{#metaName}" - readonly=3D"%{!admin}" - label=3D"%{#metaName}" value=3D"%{false}"/> - </s:elseif> - <s:elseif test=3D'#meta.columnType =3D=3D "date"'> - <sj:datepicker id=3D"%{#metaName}" name=3D"%{#metaName}" - label=3D"%{#metaName}" value=3D"%{new java.util.D= ate()}" - displayFormat=3D"dd/mm/yy" timepicker=3D"true" - timepickerShowSecond=3D"true" readonly=3D"%{!admi= n}" - timepickerFormat=3D"hh:mm:ss"/> - </s:elseif> - </s:else> - <br/> - </s:iterator> - </fieldset> - <s:if test=3D"admin"> - <div class=3D"toolbar"> - <ul class=3D"toolbar floatRight"> - <li><s:submit name=3D'resetAction' key=3D"echobase.action.reset" - theme=3D"simple" onclick=3D"return false;"/> - </li> - <li><s:submit name=3D"submitAction" key=3D"echobase.action.save" - action=3D"editTableData" theme=3D"simple"/> - </li> - </ul> - </div> - </s:if> - </s:form> + <s:else> + <s:if test=3D'#meta.columnType =3D=3D "string"'> + <s:textfield id=3D"%{#metaName}" name=3D"%{#metaName}" + label=3D"%{#metaName}" disabled=3D"%{#meta.fK}" + value=3D"" size=3D"250" readonly=3D"%{!admin}"/> + </s:if> + <s:elseif test=3D'#meta.columnType =3D=3D "boolean"'> + <s:checkbox id=3D"%{#metaName}" name=3D"%{#metaName}" + readonly=3D"%{!admin}" + label=3D"%{#metaName}" value=3D"%{false}"/> + </s:elseif> + <s:elseif test=3D'#meta.columnType =3D=3D "date"'> + <sj:datepicker id=3D"%{#metaName}" name=3D"%{#metaName}" + label=3D"%{#metaName}" + value=3D"%{new java.util.Date()}" + displayFormat=3D"dd/mm/yy" timepicker=3D"true" + timepickerShowSecond=3D"true" readonly=3D"%{!ad= min}" + timepickerFormat=3D"hh:mm:ss"/> + </s:elseif> + </s:else> + <br/> + </s:iterator> + </fieldset> + <s:if test=3D"admin"> + <div class=3D"toolbar"> + <ul class=3D"toolbar floatRight"> + <li><s:submit name=3D'resetAction' key=3D"echobase.action.reset" + theme=3D"simple" onclick=3D"return false;"/> + </li> + <li><s:submit name=3D"submitAction" key=3D"echobase.action.save" + action=3D"editTableData" theme=3D"simple"/> + </li> + </ul> + </div> + </s:if> + </s:form> =20 + </div> </s:if> =20 <script type=3D"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 --===============8218337496280188496==--