# HG changeset patch # User Marcin Kuzminski # Date 2018-11-29 17:15:55 # Node ID 92a130b79c74d1c3bd89641c7efc99ec915652e5 # Parent 84d9886d3925367f5df8f5a6be6bc51b707669d8 auth: UI changes - make buttons wider to handle longer names for SAML plugins - make order of plugins sorted again because it tends to jump arround in order without that sorting. - social is now external auth diff --git a/rhodecode/authentication/routes.py b/rhodecode/authentication/routes.py --- a/rhodecode/authentication/routes.py +++ b/rhodecode/authentication/routes.py @@ -88,15 +88,15 @@ class AuthnRootResource(AuthnResourceBas # TODO: Store this info in the resource element. return self._resource_name_map[resource_name] - def get_sorted_list(self): + def get_sorted_list(self, sort_key=None): """ Returns a sorted list of sub resources for displaying purposes. """ - def sort_key(resource): + def default_sort_key(resource): return str.lower(safe_str(resource.display_name)) active = [item for item in self] - return sorted(active, key=sort_key) + return sorted(active, key=sort_key or default_sort_key) def get_nav_list(self, sort=True): """ diff --git a/rhodecode/public/css/buttons.less b/rhodecode/public/css/buttons.less --- a/rhodecode/public/css/buttons.less +++ b/rhodecode/public/css/buttons.less @@ -254,7 +254,7 @@ input[type="button"] { .btn-social { &:extend(.btn-default); margin: 5px 5px 5px 0px; - min-width: 150px; + min-width: 160px; } // TODO: johbo: check these exceptions diff --git a/rhodecode/templates/admin/auth/auth_settings.mako b/rhodecode/templates/admin/auth/auth_settings.mako --- a/rhodecode/templates/admin/auth/auth_settings.mako +++ b/rhodecode/templates/admin/auth/auth_settings.mako @@ -29,7 +29,7 @@