engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

templates: few small UI fixes

Browse source
This commit is contained in:
RhodeCode Admin 2023-07-18 09:43:16 +02:00
parent 61376a296a
commit 932eb1d5c1
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rhodecode/templates/base/base.mako
View file

@ -342,7 +342,6 @@
</p>
%elif repo_instance.enable_locking:
<p class="locking_unlocked discreet">
<i class="icon-repo-unlock"></i>
${_('Repository not locked. Pull repository to lock it.')}
</p>
%endif
@ -403,14 +402,14 @@
<li class="${h.is_active('options', active)}">
% if has_actions:
<a class="menulink dropdown">
<div class="menulabel">${_('Options')}<div class="show_more"></div></div>
<div class="menulabel">${_('Quick Actions')}<div class="show_more"></div></div>
</a>
<ul class="submenu">
%if can_lock:
%if c.rhodecode_db_repo.locked[0]:
<li><a class="locking_del" href="${h.route_path('repo_edit_toggle_locking',repo_name=c.repo_name)}">${_('Unlock Repository')}</a></li>
<li><a class="locking_del" href="${h.route_path('repo_settings_quick_actions',repo_name=c.repo_name, _query={'action': 'toggle-lock', 'set_unlock': 1})}">${_('Unlock Repository')}</a></li>
%else:
<li><a class="locking_add" href="${h.route_path('repo_edit_toggle_locking',repo_name=c.repo_name)}">${_('Lock Repository')}</a></li>
<li><a class="locking_add" href="${h.route_path('repo_settings_quick_actions',repo_name=c.repo_name, _query={'action': 'toggle-lock', 'set_lock': 1})}">${_('Lock Repository')}</a></li>
%endif
%endif
</ul>

11
rhodecode/templates/base/sidebar.mako
View file

@ -41,19 +41,20 @@
<%
comment_ver_index = comment_obj.get_index_version(getattr(c, 'versions', []))
vers = getattr(c, 'versions', [])
comment_ver_index = comment_obj.get_index_version(vers)
prev_comment_ver_index = 0
if loop_obj.previous:
prev_comment_ver_index = loop_obj.previous.get_index_version(getattr(c, 'versions', []))
prev_comment_ver_index = loop_obj.previous.get_index_version(vers)
ver_info = None
if getattr(c, 'versions', []):
if vers:
ver_info = c.versions[comment_ver_index-1] if comment_ver_index else None
%>
<% hidden_at_ver = comment_obj.outdated_at_version_js(c.at_version_num) %>
<% is_from_old_ver = comment_obj.older_than_version_js(c.at_version_num) %>
<%
if (prev_comment_ver_index > comment_ver_index):
if prev_comment_ver_index > comment_ver_index:
comments_ver_divider = comment_ver_index
else:
comments_ver_divider = None

2
rhodecode/templates/codeblocks/diffs.mako
View file

@ -313,7 +313,7 @@ return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line)
</label>
${diff_menu(filediff, use_comments=use_comments)}
<table id="file-${h.safeid(h.safe_unicode(filediff.patch['filename']))}" data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
<table id="file-${h.safeid(h.safe_str(filediff.patch['filename']))}" data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}">
## new/deleted/empty content case
% if not filediff.hunks: