Show More
@@ -215,9 +215,10 b' class RhodeCodeAuthPluginBase(object):' | |||||
215 | """ |
|
215 | """ | |
216 | return self._plugin_id |
|
216 | return self._plugin_id | |
217 |
|
217 | |||
218 | def get_display_name(self): |
|
218 | def get_display_name(self, load_from_settings=False): | |
219 | """ |
|
219 | """ | |
220 | Returns a translation string for displaying purposes. |
|
220 | Returns a translation string for displaying purposes. | |
|
221 | if load_from_settings is set, plugin settings can override the display name | |||
221 | """ |
|
222 | """ | |
222 | raise NotImplementedError('Not implemented in base class') |
|
223 | raise NotImplementedError('Not implemented in base class') | |
223 |
|
224 |
@@ -213,7 +213,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter' | |||||
213 | def get_settings_schema(self): |
|
213 | def get_settings_schema(self): | |
214 | return CrowdSettingsSchema() |
|
214 | return CrowdSettingsSchema() | |
215 |
|
215 | |||
216 | def get_display_name(self): |
|
216 | def get_display_name(self, load_from_settings=False): | |
217 | return _('CROWD') |
|
217 | return _('CROWD') | |
218 |
|
218 | |||
219 | @classmethod |
|
219 | @classmethod |
@@ -95,7 +95,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter' | |||||
95 | route_name='auth_home', |
|
95 | route_name='auth_home', | |
96 | context=HeadersAuthnResource) |
|
96 | context=HeadersAuthnResource) | |
97 |
|
97 | |||
98 | def get_display_name(self): |
|
98 | def get_display_name(self, load_from_settings=False): | |
99 | return _('Headers') |
|
99 | return _('Headers') | |
100 |
|
100 | |||
101 | def get_settings_schema(self): |
|
101 | def get_settings_schema(self): |
@@ -89,7 +89,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter' | |||||
89 | def get_settings_schema(self): |
|
89 | def get_settings_schema(self): | |
90 | return JasigCasSettingsSchema() |
|
90 | return JasigCasSettingsSchema() | |
91 |
|
91 | |||
92 | def get_display_name(self): |
|
92 | def get_display_name(self, load_from_settings=False): | |
93 | return _('Jasig-CAS') |
|
93 | return _('Jasig-CAS') | |
94 |
|
94 | |||
95 | @hybrid_property |
|
95 | @hybrid_property |
@@ -421,7 +421,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter' | |||||
421 | def get_settings_schema(self): |
|
421 | def get_settings_schema(self): | |
422 | return LdapSettingsSchema() |
|
422 | return LdapSettingsSchema() | |
423 |
|
423 | |||
424 | def get_display_name(self): |
|
424 | def get_display_name(self, load_from_settings=False): | |
425 | return _('LDAP') |
|
425 | return _('LDAP') | |
426 |
|
426 | |||
427 | @classmethod |
|
427 | @classmethod |
@@ -95,7 +95,7 b' class RhodeCodeAuthPlugin(RhodeCodeExter' | |||||
95 | route_name='auth_home', |
|
95 | route_name='auth_home', | |
96 | context=PamAuthnResource) |
|
96 | context=PamAuthnResource) | |
97 |
|
97 | |||
98 | def get_display_name(self): |
|
98 | def get_display_name(self, load_from_settings=False): | |
99 | return _('PAM') |
|
99 | return _('PAM') | |
100 |
|
100 | |||
101 | @classmethod |
|
101 | @classmethod |
@@ -75,7 +75,7 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP' | |||||
75 | def get_settings_schema(self): |
|
75 | def get_settings_schema(self): | |
76 | return RhodeCodeSettingsSchema() |
|
76 | return RhodeCodeSettingsSchema() | |
77 |
|
77 | |||
78 | def get_display_name(self): |
|
78 | def get_display_name(self, load_from_settings=False): | |
79 | return _('RhodeCode Internal') |
|
79 | return _('RhodeCode Internal') | |
80 |
|
80 | |||
81 | @classmethod |
|
81 | @classmethod |
@@ -73,7 +73,7 b' class RhodeCodeAuthPlugin(RhodeCodeAuthP' | |||||
73 | def get_settings_schema(self): |
|
73 | def get_settings_schema(self): | |
74 | return RhodeCodeSettingsSchema() |
|
74 | return RhodeCodeSettingsSchema() | |
75 |
|
75 | |||
76 | def get_display_name(self): |
|
76 | def get_display_name(self, load_from_settings=False): | |
77 | return _('Rhodecode Token') |
|
77 | return _('Rhodecode Token') | |
78 |
|
78 | |||
79 | @classmethod |
|
79 | @classmethod |
@@ -32,8 +32,8 b'' | |||||
32 | <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/> |
|
32 | <img class="sign-in-image" src="${h.asset('images/sign-in.png')}" alt="RhodeCode"/> | |
33 | </div> |
|
33 | </div> | |
34 |
|
34 | |||
35 | <%block name="above_login_button" /> |
|
|||
36 | <div id="login" class="right-column"> |
|
35 | <div id="login" class="right-column"> | |
|
36 | <%block name="above_login_button" /> | |||
37 | <!-- login --> |
|
37 | <!-- login --> | |
38 | <div class="sign-in-title"> |
|
38 | <div class="sign-in-title"> | |
39 | <h1>${_('Sign In using username/password')}</h1> |
|
39 | <h1>${_('Sign In using username/password')}</h1> |
General Comments 0
You need to be logged in to leave comments.
Login now