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

file details view summary box changes, not yet finnished

Browse source
This commit is contained in:
Liviu 2019-05-07 11:11:04 +00:00
parent fdb88048a9
commit 290740c9b0
4 changed files with 81 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

7
rhodecode/public/css/summary.less
View file

@ -183,11 +183,16 @@
}
.summary .sidebar-right-content {
margin-bottom: @space;
margin-bottom: 0;
.rc-user {
min-width: 0;
}
li {
list-style: none;
line-height: normal;
}
}
.summary {

7
rhodecode/templates/files/file_authors_box.mako
View file

@ -5,11 +5,10 @@
% for email, user, commits in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
<li class="file_author">
<div class="tooltip" title="${h.tooltip(h.author_string(email))}">
${base.gravatar(email, 16)}
<div class="user">${h.link_to_user(user)}</div>
<span class="user commit-author">${h.link_to_user(user)}</span>
% if c.file_author:
<span>- ${h.age_component(c.file_last_commit.date)}</span>
<span class="commit-date">- ${h.age_component(c.file_last_commit.date)}</span>
% elif c.file_last_commit.author_email==email:
<span> (${_('last author')})</span>
% endif
@ -23,9 +22,9 @@
% endif
</span>
% endif
</div>
</li>
% endfor
</ul>
% endif
<a href="#" id="show_authors" class="action_link">${_('Show All')}</a>

137
rhodecode/templates/files/files_source_header.mako
View file

@ -1,85 +1,82 @@
<%namespace name="base" file="/base/base.mako"/>
<%namespace name="file_base" file="/files/base.mako"/>
<div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
<div class="left-label">
${_('Commit Description')}:
</div>
<div class="commit right-content truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
</div>
<div class="summary">
<div class="fieldset">
<div class="left-content">
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="left-label">
${_('Commit Description')}:
</div>
<div class="commit right-content">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
</div>
<div class="left-content-avatar">
${base.gravatar(c.file_last_commit.author_email, 30)}
</div>
<div class="left-content-message">
<div class="fieldset collapsable-content no-hide" data-toggle="summary-details">
<div class="commit truncate-wrap">${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}</div>
</div>
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="commit">${h.urlify_commit_message(c.commit.message,c.repo_name)}</div>
</div>
<div class="fieldset" data-toggle="summary-details">
<div class="" id="file_authors">
## loads single author, or ALL
<%include file='file_authors_box.mako'/>
</div>
</div>
</div>
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="">
<div class="tags">
${_('File last commit')}
<code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
${file_base.refs(c.file_last_commit)}
</div>
</div>
</div>
<div class="fieldset " data-toggle="summary-details">
<div class="left-label">
${_('References')}:
</div>
<div class="right-content">
<div class="tags tags-main">
<code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a></code>
${file_base.refs(c.commit)}
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="">
${_('Show/Diff file')}
${h.hidden('diff1')}
${h.hidden('diff2',c.commit.raw_id)}
${h.hidden('annotate', c.annotate)}
</div>
</div>
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="">
${_('Action')}:
</div>
<div class="">
${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
</div>
</div>
</div>
</div>
</div>
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="left-label">
${_('File last commit')}:
</div>
<div class="right-content">
<div class="tags">
<code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.file_last_commit.raw_id)}">${h.show_id(c.file_last_commit)}</a></code>
${file_base.refs(c.file_last_commit)}
<div class="right-content">
<div data-toggle="summary-details">
<div class="tags commit-info tags-main">
<code><a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=c.commit.raw_id)}">${h.show_id(c.commit)}</a></code>
${file_base.refs(c.commit)}
</div>
</div>
</div>
<div class="clear-fix"></div>
<div class="btn-collapse" data-toggle="summary-details">
${_('Show More')}
</div>
</div>
</div>
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="left-label">
${_('Show/Diff file')}:
</div>
<div class="right-content">
${h.hidden('diff1')}
${h.hidden('diff2',c.commit.raw_id)}
${h.hidden('annotate', c.annotate)}
</div>
</div>
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="left-label">
${_('Action')}:
</div>
<div class="right-content">
${h.submit('diff_to_commit',_('Diff to Commit'),class_="btn disabled",disabled="true")}
${h.submit('show_at_commit',_('Show at Commit'),class_="btn disabled",disabled="true")}
</div>
</div>
<div class="fieldset collapsable-content" data-toggle="summary-details">
<div class="left-label" id="file_authors_title">
% if c.file_author:
${_('Last Author')}
% else:
${h.literal(_ungettext(u'File Author (%s)',u'File Authors (%s)',len(c.authors)) % ('<b>%s</b>' % len(c.authors))) }
% endif
<a href="#" id="show_authors" class="action_link">${_('Show All')}</a>
</div>
<div class="right-content" id="file_authors">
## loads single author, or ALL
<%include file='file_authors_box.mako'/>
</div>
</div>
<script>
collapsableContent();
</script>

10
rhodecode/templates/files/files_tree_header.mako
View file

@ -19,7 +19,7 @@
</div>
<div class="clear-fix">
<span class="commit-author">${h.link_to_user(c.commit.author)}</span><span class="commit-date">-${h.age_component(c.commit.date)}</span>
<span class="commit-author">${h.link_to_user(c.commit.author)}</span><span class="commit-date"> - ${h.age_component(c.commit.date)}</span>
</div>
</div>
</div>
@ -33,12 +33,12 @@
${file_base.refs(c.commit)}
</div>
</div>
<div class="clear-fix">
</div>
<div class="clear-fix"></div>
<div class="btn-collapse" data-toggle="summary-details">
${_('Show More')}
<div class="btn-collapse" data-toggle="summary-details">
${_('Show More')}
</div>
</div>
</div>
<script>