diff --git a/rhodecode/public/css/navigation.less b/rhodecode/public/css/navigation.less
--- a/rhodecode/public/css/navigation.less
+++ b/rhodecode/public/css/navigation.less
@@ -156,6 +156,14 @@
position: relative;
}
+ .menulink {
+ &.disabled {
+ color: @grey3;
+ cursor: default;
+ opacity: 0.5;
+ }
+ }
+
#quick_login {
li a {
diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako
--- a/rhodecode/templates/base/base.mako
+++ b/rhodecode/templates/base/base.mako
@@ -308,43 +308,34 @@
%endif
+ ## determine if we have "any" option available
+ <%
+ can_lock = h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking
+ has_actions = (c.rhodecode_user.username != h.DEFAULT_USER and c.rhodecode_db_repo.repo_type in ['git','hg'] ) or can_lock
+ %>
-
-
- %if c.rhodecode_db_repo.fork:
-
-
- ${_('Compare fork')}
-
-
- %endif
-
- %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking:
- %if c.rhodecode_db_repo.locked[0]:
- ${_('Unlock')}
- %else:
- ${_('Lock')}
- %endif
- %endif
- %if c.rhodecode_user.username != h.DEFAULT_USER:
- %if c.rhodecode_db_repo.repo_type in ['git','hg']:
- ${_('Fork')}
- ${_('Create Pull Request')}
- %endif
- %endif
-
-
@@ -402,19 +393,30 @@
% if c.is_super_admin or group_admin:
% endif
-
+ ## determine if we have "any" option available
+ <%
+ can_create_repos = c.is_super_admin or group_admin or (group_write and create_on_write)
+ can_create_repo_groups = c.is_super_admin or group_admin
+ has_actions = can_create_repos or can_create_repo_groups
+ %>
-
-
+ % else:
+
+ % endif
diff --git a/rhodecode/templates/compare/compare_diff.mako b/rhodecode/templates/compare/compare_diff.mako
--- a/rhodecode/templates/compare/compare_diff.mako
+++ b/rhodecode/templates/compare/compare_diff.mako
@@ -47,6 +47,7 @@
% endif
+
@@ -87,6 +88,21 @@