From 340accd193b20831e7b5e8b2f8a16f1231914b1d Mon Sep 17 00:00:00 2001 From: Xiaowu Zhang <xiaowu.zhang@nexedi.com> Date: Wed, 3 Jan 2018 16:25:20 +0000 Subject: [PATCH] erp5_web_renderjs_ui: fix Login&Password Label not displayed bug in login view --- .../erp5_web_renderjs_ui/login_form.zpt | 69 ++++++++++--------- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.zpt b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.zpt index 09fc4924b4..930c775cdf 100644 --- a/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.zpt +++ b/bt5/erp5_web_renderjs_ui/SkinTemplateItem/portal_skins/erp5_web_renderjs_ui/login_form.zpt @@ -21,45 +21,46 @@ </div> </div> </div> + <div data-role="page"> + <div class="gadget-content"> + <article> + <section> + <tal:block tal:condition="exists: request/portal_status_message"> + <span tal:attributes="data-i18n request/portal_status_message"><span tal:content="request/portal_status_message"></span></span> + </tal:block> + </section> - <div class="gadget-content"> - <article> - <section> - <tal:block tal:condition="exists: request/portal_status_message"> - <span tal:attributes="data-i18n request/portal_status_message"><span tal:content="request/portal_status_message"></span></span> - </tal:block> - </section> + <section> + <form method="post" tal:attributes="action python: '%s/' % context.absolute_url()"> - <section> - <form method="post" tal:attributes="action python: '%s/' % context.absolute_url()"> - - <div class="ui-field-contain"> - <label i18n:domain="ui" i18n:translate="" >Login</label> - <div><input autofocus type="text" name="__ac_name" value="" required=""></div> - </div> - <div class="ui-field-contain"> - <label i18n:domain="ui" i18n:translate="" >Password</label> - <div><input type="password" name="__ac_password" value="" required=""></div> - </div> - <div class="ui-field-contain"> - <label></label> - <div tal:define="absolute_url python:context.absolute_url()"> - <a i18n:domain="ui" i18n:translate="" tal:attributes="href python: '%s/WebSite_viewRecoverAccount?came_from=%s' % (absolute_url, absolute_url)">I forgot my password!</a> + <div class="ui-field-contain"> + <label i18n:domain="ui" i18n:translate="" >Login</label> + <div><input autofocus type="text" name="__ac_name" value="" required=""></div> + </div> + <div class="ui-field-contain"> + <label i18n:domain="ui" i18n:translate="" >Password</label> + <div><input type="password" name="__ac_password" value="" required=""></div> + </div> + <div class="ui-field-contain"> + <label></label> + <div tal:define="absolute_url python:context.absolute_url()"> + <a i18n:domain="ui" i18n:translate="" tal:attributes="href python: '%s/WebSite_viewRecoverAccount?came_from=%s' % (absolute_url, absolute_url)">I forgot my password!</a> + </div> + </div><br/> + <div class="ui-field-contain"> + <label></label> + <div><input type="submit" value='Login' i18n:attributes="value" i18n:domain="ui" tal:attributes="name python: '%s:method' % (form_action, )"/></div> </div> - </div><br/> - <div class="ui-field-contain"> - <label></label> - <div><input type="submit" value='Login' i18n:attributes="value" i18n:domain="ui" tal:attributes="name python: '%s:method' % (form_action, )"/></div> - </div> - <input type="hidden" name="url" tal:attributes="value python: context.absolute_url()" /> - <input tal:condition="exists: request/came_from" - type="hidden" name="came_from" - tal:attributes="value request/came_from" /> - </form> - </section> - </article> + <input type="hidden" name="url" tal:attributes="value python: context.absolute_url()" /> + <input tal:condition="exists: request/came_from" + type="hidden" name="came_from" + tal:attributes="value request/came_from" /> + </form> + </section> + </article> + </div> </div> </body> </html> \ No newline at end of file -- 2.30.9