Show More
@@ -593,7 +593,7 b' address {' | |||||
593 | } |
|
593 | } | |
594 |
|
594 | |||
595 | .help-block-inline { |
|
595 | .help-block-inline { | |
596 | margin: 0; |
|
596 | margin: 0 !important; | |
597 | } |
|
597 | } | |
598 |
|
598 | |||
599 | // help block text |
|
599 | // help block text |
@@ -28,7 +28,7 b'' | |||||
28 | <div class="sidebar"> |
|
28 | <div class="sidebar"> | |
29 | <ul class="nav nav-pills nav-stacked"> |
|
29 | <ul class="nav nav-pills nav-stacked"> | |
30 | <li class="${h.is_active('settings', c.active)}"><a href="${h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name)}">${_('Settings')}</a></li> |
|
30 | <li class="${h.is_active('settings', c.active)}"><a href="${h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name)}">${_('Settings')}</a></li> | |
31 | <li class="${h.is_active('permissions', c.active)}"><a href="${h.route_path('edit_repo_group_perms', repo_group_name=c.repo_group.group_name)}">${_('Permissions')}</a></li> |
|
31 | <li class="${h.is_active('permissions', c.active)}"><a href="${h.route_path('edit_repo_group_perms', repo_group_name=c.repo_group.group_name)}">${_('Access Permissions')}</a></li> | |
32 | <li class="${h.is_active('advanced', c.active)}"><a href="${h.route_path('edit_repo_group_advanced', repo_group_name=c.repo_group.group_name)}">${_('Advanced')}</a></li> |
|
32 | <li class="${h.is_active('advanced', c.active)}"><a href="${h.route_path('edit_repo_group_advanced', repo_group_name=c.repo_group.group_name)}">${_('Advanced')}</a></li> | |
33 | <li class="${h.is_active('integrations', c.active)}"><a href="${h.route_path('repo_group_integrations_home', repo_group_name=c.repo_group.group_name)}">${_('Integrations')}</a></li> |
|
33 | <li class="${h.is_active('integrations', c.active)}"><a href="${h.route_path('repo_group_integrations_home', repo_group_name=c.repo_group.group_name)}">${_('Integrations')}</a></li> | |
34 | </ul> |
|
34 | </ul> |
@@ -61,7 +61,12 b'' | |||||
61 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} |
|
61 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} | |
62 | <span class="user"> |
|
62 | <span class="user"> | |
63 | % if _user.username == h.DEFAULT_USER: |
|
63 | % if _user.username == h.DEFAULT_USER: | |
64 | ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span> |
|
64 | ${h.DEFAULT_USER} | |
|
65 | % if _user.active: | |||
|
66 | <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span> | |||
|
67 | % else: | |||
|
68 | <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span> | |||
|
69 | % endif | |||
65 | % else: |
|
70 | % else: | |
66 | ${h.link_to_user(_user.username)} |
|
71 | ${h.link_to_user(_user.username)} | |
67 | %if getattr(_user, 'duplicate_perm', None): |
|
72 | %if getattr(_user, 'duplicate_perm', None): | |
@@ -104,7 +109,12 b'' | |||||
104 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} |
|
109 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} | |
105 | <span class="user"> |
|
110 | <span class="user"> | |
106 | % if _user.username == h.DEFAULT_USER: |
|
111 | % if _user.username == h.DEFAULT_USER: | |
107 | ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span> |
|
112 | ${h.DEFAULT_USER} | |
|
113 | % if _user.active: | |||
|
114 | <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span> | |||
|
115 | % else: | |||
|
116 | <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span> | |||
|
117 | % endif | |||
108 | % else: |
|
118 | % else: | |
109 | ${h.link_to_user(_user.username)} |
|
119 | ${h.link_to_user(_user.username)} | |
110 | %if getattr(_user, 'duplicate_perm', None): |
|
120 | %if getattr(_user, 'duplicate_perm', None): |
@@ -87,7 +87,12 b'' | |||||
87 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} |
|
87 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} | |
88 | <span class="user"> |
|
88 | <span class="user"> | |
89 | % if _user.username == h.DEFAULT_USER: |
|
89 | % if _user.username == h.DEFAULT_USER: | |
90 | ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span> |
|
90 | ${h.DEFAULT_USER} | |
|
91 | % if _user.active: | |||
|
92 | <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span> | |||
|
93 | % else: | |||
|
94 | <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span> | |||
|
95 | % endif | |||
91 | % else: |
|
96 | % else: | |
92 | ${h.link_to_user(_user.username)} |
|
97 | ${h.link_to_user(_user.username)} | |
93 | %if getattr(_user, 'duplicate_perm', None): |
|
98 | %if getattr(_user, 'duplicate_perm', None): |
@@ -63,7 +63,12 b'' | |||||
63 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} |
|
63 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} | |
64 | <span class="user"> |
|
64 | <span class="user"> | |
65 | % if _user.username == h.DEFAULT_USER: |
|
65 | % if _user.username == h.DEFAULT_USER: | |
66 | ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span> |
|
66 | ${h.DEFAULT_USER} | |
|
67 | % if _user.active: | |||
|
68 | <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span> | |||
|
69 | % else: | |||
|
70 | <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span> | |||
|
71 | % endif | |||
67 | % else: |
|
72 | % else: | |
68 | ${h.link_to_user(_user.username)} |
|
73 | ${h.link_to_user(_user.username)} | |
69 | %if getattr(_user, 'duplicate_perm', None): |
|
74 | %if getattr(_user, 'duplicate_perm', None): | |
@@ -106,7 +111,12 b'' | |||||
106 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} |
|
111 | ${base.gravatar(_user.email, 16, user=_user, tooltip=True)} | |
107 | <span class="user"> |
|
112 | <span class="user"> | |
108 | % if _user.username == h.DEFAULT_USER: |
|
113 | % if _user.username == h.DEFAULT_USER: | |
109 | ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span> |
|
114 | ${h.DEFAULT_USER} | |
|
115 | % if _user.active: | |||
|
116 | <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span> | |||
|
117 | % else: | |||
|
118 | <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span> | |||
|
119 | % endif | |||
110 | % else: |
|
120 | % else: | |
111 | ${h.link_to_user(_user.username)} |
|
121 | ${h.link_to_user(_user.username)} | |
112 | %if getattr(_user, 'duplicate_perm', None): |
|
122 | %if getattr(_user, 'duplicate_perm', None): |
General Comments 0
You need to be logged in to leave comments.
Login now