Skip to content

S
slapos.core
Commit 412b3035 authored by Łukasz Nowak's avatar Łukasz Nowak
Browse files
Options

Start dropping traditional login. 

Keep endpoint traditional_login_form in order to use old style login.
parent e9129686
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 370 deletions
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_viewVifibKVMOrder.xml
View file @ 412b3035
...@@ -120,7 +120,6 @@ ...@@ -120,7 +120,6 @@
<string>your_order_button</string> <string>your_order_button</string>
<string>your_software_button</string> <string>your_software_button</string>
<string>your_login_button</string> <string>your_login_button</string>
<string>your_join_button</string>
</list> </list>
</value> </value>
</item> </item>
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_jauks_theme/login_form.xml
View file @ 412b3035
...@@ -56,9 +56,6 @@ ...@@ -56,9 +56,6 @@
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: request.get(\'came_from\', None) is not None">\n <tal:block tal:condition="python: request.get(\'came_from\', None) is not None">\n
<h1 i18n:translate="" i18n:domain="ui">You do not have enough permissions to access this page.</h1>\n <h1 i18n:translate="" i18n:domain="ui">You do not have enough permissions to access this page.</h1>\n
<p i18n:translate="" i18n:domain="ui">You can login with another user name or\n
<span i18n:name="go_back"><a href="javascript:history.back();" i18n:translate="">go back</a></span>.\n
</p>\n
</tal:block>\n </tal:block>\n
<input tal:condition="exists: request/came_from"\n <input tal:condition="exists: request/came_from"\n
type="hidden" name="came_from"\n type="hidden" name="came_from"\n
...@@ -68,7 +65,7 @@ ...@@ -68,7 +65,7 @@
<div class="field nolabel validate widthAuto forgotten_password">\n <div class="field nolabel validate widthAuto forgotten_password">\n
You can login with with <a href="./login_with_facebook"><img width="25px" src="./vifib_image/facebook_logo.png" alt="Facebook" title="Facebook"></a>,\n You can login with with <a href="./login_with_facebook"><img width="25px" src="./vifib_image/facebook_logo.png" alt="Facebook" title="Facebook"></a>,\n
with <a href="./login_with_google"><img src="./vifib_image/google_logo.png" alt="Google" title="Google"></a>, BrowserID \n with <a href="./login_with_google"><img src="./vifib_image/google_logo.png" alt="Google" title="Google"></a>, BrowserID \n
<a href="#" id="browserid" title="Sign-in with BrowserID"> <img src="./vifib_image/browser_id_logo.png" alt="Sign-in with BrowserID" title="Sign-in with BrowserID"></a> or use traditional methods below.\n <a href="#" id="browserid" title="Sign-in with BrowserID"> <img src="./vifib_image/browser_id_logo.png" alt="Sign-in with BrowserID" title="Sign-in with BrowserID"></a>\n
</div>\n </div>\n
<browserid id="browser_id_login" tal:attributes=\'value python: here.getWebSiteValue().login_with_browser_id.absolute_url()\'/>\n <browserid id="browser_id_login" tal:attributes=\'value python: here.getWebSiteValue().login_with_browser_id.absolute_url()\'/>\n
<script type="text/javascript">\n <script type="text/javascript">\n
...@@ -108,47 +105,6 @@ function gotAssertion(assertion) { \n ...@@ -108,47 +105,6 @@ function gotAssertion(assertion) { \n
} \n } \n
} \n } \n
</script>\n </script>\n
<div class="field login_name">\n
<label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>\n
<div class="input"><input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get(\'__ac_name\') or \'\'" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field login_password">\n
<label for="password" i18n:translate="" i18n:domain="ui">Password</label>\n
<div class="input"><input type="password" name="__ac_password" id="password" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field login_remember">\n
<label for="cb_remember" i18n:translate="" i18n:domain="ui">Remember my name</label>\n
<div class="input"><input type="checkbox" name="__ac_persistent" value="1" checked="checked" id="cb_remember" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field login_button">\n
<label>&nbsp;</label>\n
<div class="input">\n
<input type="submit" value="Login" class="submit"\n
tal:attributes="name python: \'%s:method\' % (form_action, )"\n
i18n:attributes="value" i18n:domain="ui" />\n
</div>\n
<p class="clear"></p>\n
</div>\n
<div class="field forgotten_password">\n
<label>&nbsp;</label>\n
<div class="field nolabel validate widthAuto" title="">\n
<label>Join</label>\n
<a href="ERP5Site_viewCredentialRequestForm">Join</a>\n
</div>\n
<div class="field nolabel cancel widthAuto" title="">\n
<label>Lost password?</label>\n
<a href="ERP5Site_viewCredentialRecoveryLoginDialog">Lost password?</a>\n
</div>\n
</div>\n
</fieldset>\n
<script type="text/javascript">setFocus()</script>\n
<p i18n:translate="" i18n:domain="ui">Having trouble logging in? Make sure to enable cookies in your web browser.</p>\n
<p i18n:translate="" i18n:domain="ui">Do not forget to logout or exit your browser when you are done.</p>\n
<p i18n:translate="" i18n:domain="ui">Setting the \'Remember my name\' option will set a cookie with your username, so that when you login next time, your user name will already be filled in for you.</p>\n
</div>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
</tal:block>\n </tal:block>\n
......
master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_jauks_theme/traditional_login_form.xml 0 → 100644
View file @ 412b3035
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>_text</string> </key>
<value> <unicode encoding="cdata"><![CDATA[
<tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n">\n
<tal:block tal:define="form_action string:logged_in;\n
global form_id string:login_form;\n
js_list python: [\'%s/login_form.js\' % (here.portal_url(), ), \'%s/erp5.js\' % (here.portal_url(), )]">\n
<tal:block metal:use-macro="here/main_template/macros/master">\n
<tal:block metal:fill-slot="main">\n
<div class="content login">\n
<tal:block tal:condition="python: request.get(\'came_from\', None) is None">\n
<h1 i18n:translate="" i18n:domain="ui">Log in</h1>\n
</tal:block>\n
<tal:block tal:condition="python: request.get(\'came_from\', None) is not None">\n
<h1 i18n:translate="" i18n:domain="ui">You do not have enough permissions to access this page.</h1>\n
<p i18n:translate="" i18n:domain="ui">You can login with another user name or\n
<span i18n:name="go_back"><a href="javascript:history.back();" i18n:translate="">go back</a></span>.\n
</p>\n
</tal:block>\n
<input tal:condition="exists: request/came_from"\n
type="hidden" name="came_from"\n
tal:attributes="value request/came_from" />\n
<fieldset>\n
<div class="field login_name">\n
<label for="name" class="required" i18n:translate="" i18n:domain="ui">Name</label>\n
<div class="input"><input type="text" name="__ac_name" id="name" tal:attributes="value python: request.get(\'__ac_name\') or \'\'" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field login_password">\n
<label for="password" i18n:translate="" i18n:domain="ui">Password</label>\n
<div class="input"><input type="password" name="__ac_password" id="password" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field login_remember">\n
<label for="cb_remember" i18n:translate="" i18n:domain="ui">Remember my name</label>\n
<div class="input"><input type="checkbox" name="__ac_persistent" value="1" checked="checked" id="cb_remember" /></div>\n
<p class="clear"></p>\n
</div>\n
<div class="field login_button">\n
<label>&nbsp;</label>\n
<div class="input">\n
<input type="submit" value="Login" class="submit"\n
tal:attributes="name python: \'%s:method\' % (form_action, )"\n
i18n:attributes="value" i18n:domain="ui" />\n
</div>\n
<p class="clear"></p>\n
</div>\n
<div class="field forgotten_password">\n
<label>&nbsp;</label>\n
<div class="field nolabel validate widthAuto" title="">\n
<label>Join</label>\n
<a href="ERP5Site_viewCredentialRequestForm">Join</a>\n
</div>\n
<div class="field nolabel cancel widthAuto" title="">\n
<label>Lost password?</label>\n
<a href="ERP5Site_viewCredentialRecoveryLoginDialog">Lost password?</a>\n
</div>\n
</div>\n
</fieldset>\n
<script type="text/javascript">setFocus()</script>\n
<p i18n:translate="" i18n:domain="ui">Having trouble logging in? Make sure to enable cookies in your web browser.</p>\n
<p i18n:translate="" i18n:domain="ui">Do not forget to logout or exit your browser when you are done.</p>\n
<p i18n:translate="" i18n:domain="ui">Setting the \'Remember my name\' option will set a cookie with your username, so that when you login next time, your user name will already be filled in for you.</p>\n
</div>\n
</tal:block>\n
</tal:block>\n
</tal:block>\n
</tal:block>
]]></unicode> </value>
</item>
<item>
<key> <string>content_type</string> </key>
<value> <string>text/html</string> </value>
</item>
<item>
<key> <string>expand</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>traditional_login_form</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
<value> <string>utf-8</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <unicode></unicode> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_web/bt/revision
View file @ 412b3035
396 397
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7