Skip to content

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

Rebrand external account management.

parent 1a66d6bc
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 174 deletions
master/bt5/vifib_data/PathTemplateItem/acl_users/vifib_browser_id_authentication.xml → master/bt5/slapos_web/PathTemplateItem/acl_users/slapos_browser_id_authentication.xml
View file @ 7f2d6351
......@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_browser_id_authentication</string> </value>
<value> <string>slapos_browser_id_authentication</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
master/bt5/vifib_data/PathTemplateItem/acl_users/vifib_facebook_authentication.xml → master/bt5/slapos_web/PathTemplateItem/acl_users/slapos_facebook_authentication.xml
View file @ 7f2d6351
......@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_facebook_authentication</string> </value>
<value> <string>slapos_facebook_authentication</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
master/bt5/vifib_data/PathTemplateItem/acl_users/vifib_google_authentication.xml → master/bt5/slapos_web/PathTemplateItem/acl_users/slapos_google_authentication.xml
View file @ 7f2d6351
......@@ -8,7 +8,7 @@
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_google_authentication</string> </value>
<value> <string>slapos_google_authentication</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
master/bt5/vifib_erp5/PathTemplateItem/portal_alarms/promise_vifib_pas_external.xml → master/bt5/slapos_web/PathTemplateItem/portal_alarms/promise_slapos_pas_external.xml
View file @ 7f2d6351
......@@ -30,7 +30,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>promise_vifib_pas_external</string> </value>
<value> <string>promise_slapos_pas_external</string> </value>
</item>
<item>
<key> <string>periodicity_day_frequency</string> </key>
......@@ -97,7 +97,7 @@
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Pluggable Auth Service Vifib Promise For Facebook, Google, Browser ID</string> </value>
<value> <string>Pluggable Auth Service SlapOS Promise For Facebook, Google, Browser ID</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/vifib_external_account/SkinTemplateItem/portal_skins/vifib_external_account.xml → master/bt5/slapos_web/SkinTemplateItem/portal_skins/slapos_web.xml
View file @ 7f2d6351
......@@ -31,11 +31,11 @@
</item>
<item>
<key> <string>business_template_skin_layer_priority</string> </key>
<value> <float>85.0</float> </value>
<value> <float>60.0</float> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_external_account</string> </value>
<value> <string>slapos_web</string> </value>
</item>
<item>
<key> <string>title</string> </key>
......
master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_promise/Alarm_checkPromiseVifibExternalPAS.xml → master/bt5/slapos_web/SkinTemplateItem/portal_skins/slapos_web/Alarm_checkPromiseSlapOSExternalPAS.xml
View file @ 7f2d6351
......@@ -60,7 +60,7 @@
\'ERP5 Google Extraction Plugin\',\n
],\n
}\n
context.Alarm_checkPromiseVifibPASBase(promise_dict, tag, fixit=fixit, **kw)\n
context.Alarm_checkPromiseSlapOSPASBase(promise_dict, tag, fixit=fixit, **kw)\n
</string> </value>
</item>
<item>
......@@ -69,7 +69,7 @@ context.Alarm_checkPromiseVifibPASBase(promise_dict, tag, fixit=fixit, **kw)\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Alarm_checkPromiseVifibExternalPAS</string> </value>
<value> <string>Alarm_checkPromiseSlapOSExternalPAS</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_promise/Alarm_checkPromiseVifibPASBase.xml → master/bt5/slapos_web/SkinTemplateItem/portal_skins/slapos_web/Alarm_checkPromiseSlapOSPASBase.xml
View file @ 7f2d6351
......@@ -105,7 +105,7 @@ context.newActiveProcess().postResult(active_result)\n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Alarm_checkPromiseVifibPASBase</string> </value>
<value> <string>Alarm_checkPromiseSlapOSPASBase</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_promise/Alarm_fixPromiseVifibExternalPAS.xml → master/bt5/slapos_web/SkinTemplateItem/portal_skins/slapos_web/Alarm_fixPromiseSlapOSExternalPAS.xml
View file @ 7f2d6351
......@@ -59,7 +59,7 @@
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Alarm_fixPromiseVifibExternalPAS</string> </value>
<value> <string>Alarm_fixPromiseSlapOSExternalPAS</string> </value>
</item>
</dictionary>
</pickle>
......
master/bt5/vifib_external_account/SkinTemplateItem/portal_skins/vifib_external_account/login_form.xml → master/bt5/slapos_web/SkinTemplateItem/portal_skins/vifib_jauks_theme/external_login_form.xml
View file @ 7f2d6351
......@@ -123,7 +123,7 @@ function gotAssertion(assertion) { \n
</item>
<item>
<key> <string>id</string> </key>
<value> <string>login_form</string> </value>
<value> <string>external_login_form</string> </value>
</item>
<item>
<key> <string>output_encoding</string> </key>
......
master/bt5/slapos_web/bt/revision
View file @ 7f2d6351
10
\ No newline at end of file
11
\ No newline at end of file
master/bt5/slapos_web/bt/template_path_list
View file @ 7f2d6351
acl_users/erp5_facebook_extraction
acl_users/erp5_google_extraction
acl_users/slapos_browser_id_authentication
acl_users/slapos_facebook_authentication
acl_users/slapos_google_authentication
image_module/vifib.cloud
image_module/vifib.kvm
image_module/vifib.rack
portal_alarms/promise_slapos_pas_external
portal_caches/browser_id_auth_token_cache_factory
portal_caches/browser_id_auth_token_cache_factory/persistent_cache_plugin
portal_caches/facebook_server_auth_token_cache_factory
portal_caches/facebook_server_auth_token_cache_factory/persistent_cache_plugin
portal_caches/google_server_auth_token_cache_factory
portal_caches/google_server_auth_token_cache_factory/persistent_cache_plugin
web_page_module/vifib*
web_page_module/vifib_payzen_cancel
web_page_module/vifib_payzen_error
......
master/bt5/slapos_web/bt/template_skin_id_list
View file @ 7f2d6351
slapos_web
vifib_hosting
vifib_hosting_theme
vifib_jauks_theme
......
master/bt5/vifib_data/bt/revision
View file @ 7f2d6351
111
\ No newline at end of file
112
\ No newline at end of file
master/bt5/vifib_data/bt/template_path_list
View file @ 7f2d6351
acl_users/erp5_facebook_extraction
acl_users/erp5_google_extraction
acl_users/vifib_browser_id_authentication
acl_users/vifib_facebook_authentication
acl_users/vifib_google_authentication
document_module/1
notification_message_module/vifib_hosting_hosting_request
service_module/cpu_consumption
......
master/bt5/vifib_erp5/bt/revision
View file @ 7f2d6351
580
\ No newline at end of file
581
\ No newline at end of file
master/bt5/vifib_external_account/RegisteredSkinSelectionTemplateItem/registered_skin_selection.xml deleted 100644 → 0
View file @ 1a66d6bc
<registered_skin_selection>
<skin_folder_selection>
<skin_folder>vifib_external_account</skin_folder>
<skin_selection>Hosting</skin_selection>
</skin_folder_selection>
</registered_skin_selection>
\ No newline at end of file
master/bt5/vifib_external_account/SkinTemplateItem/portal_skins/vifib_external_account/traditional_login_form.xml deleted 100644 → 0
View file @ 1a66d6bc
<?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:traditional_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_external_account/bt/description 0 → 100644
View file @ 7f2d6351
Empty placeholder for ease of "uninstallation".
\ No newline at end of file
master/bt5/vifib_external_account/bt/revision
View file @ 7f2d6351
4
\ No newline at end of file
5
\ No newline at end of file
master/bt5/vifib_external_account/bt/template_path_list deleted 100644 → 0
View file @ 1a66d6bc
portal_caches/browser_id_auth_token_cache_factory
portal_caches/browser_id_auth_token_cache_factory/persistent_cache_plugin
portal_caches/facebook_server_auth_token_cache_factory
portal_caches/facebook_server_auth_token_cache_factory/persistent_cache_plugin
portal_caches/google_server_auth_token_cache_factory
portal_caches/google_server_auth_token_cache_factory/persistent_cache_plugin
\ No newline at end of file
master/bt5/vifib_external_account/bt/template_registered_skin_selection_list deleted 100644 → 0
View file @ 1a66d6bc
vifib_external_account | Hosting
\ No newline at end of file
master/bt5/vifib_external_account/bt/template_skin_id_list deleted 100644 → 0
View file @ 1a66d6bc
vifib_external_account
\ 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