diff --git a/rhodecode/public/css/summary.less b/rhodecode/public/css/summary.less --- a/rhodecode/public/css/summary.less +++ b/rhodecode/public/css/summary.less @@ -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 { diff --git a/rhodecode/templates/files/file_authors_box.mako b/rhodecode/templates/files/file_authors_box.mako --- a/rhodecode/templates/files/file_authors_box.mako +++ b/rhodecode/templates/files/file_authors_box.mako @@ -5,11 +5,10 @@ % for email, user, commits in sorted(c.authors, key=lambda e: c.file_last_commit.author_email!=e[0]):
  • - ${base.gravatar(email, 16)} -
    ${h.link_to_user(user)}
    + ${h.link_to_user(user)} % if c.file_author: - - ${h.age_component(c.file_last_commit.date)} + - ${h.age_component(c.file_last_commit.date)} % elif c.file_last_commit.author_email==email: (${_('last author')}) % endif @@ -23,9 +22,9 @@ % endif % endif -
    • % endfor % endif +${_('Show All')} diff --git a/rhodecode/templates/files/files_source_header.mako b/rhodecode/templates/files/files_source_header.mako --- a/rhodecode/templates/files/files_source_header.mako +++ b/rhodecode/templates/files/files_source_header.mako @@ -1,85 +1,82 @@ <%namespace name="base" file="/base/base.mako"/> <%namespace name="file_base" file="/files/base.mako"/> -
    -
    - ${_('Commit Description')}: -
    -
    ${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}
    -
    +
    +
    +
    + +
    + ${base.gravatar(c.file_last_commit.author_email, 30)} +
    + +
    +
    +
    ${h.urlify_commit_message(h.chop_at_smart(c.commit.message, '\n', suffix_if_chopped='...'), c.repo_name)}
    +
    + +
    +
    ${h.urlify_commit_message(c.commit.message,c.repo_name)}
    +
    -
    -
    - ${_('Commit Description')}: -
    -
    ${h.urlify_commit_message(c.commit.message,c.repo_name)}
    -
    +
    +
    + ## loads single author, or ALL + <%include file='file_authors_box.mako'/> +
    +
    +
    + +
    +
    +
    + ${_('File last commit')} + ${h.show_id(c.file_last_commit)} + + ${file_base.refs(c.file_last_commit)} +
    +
    +
    -
    -
    - ${_('References')}: -
    -
    -
    - ${h.show_id(c.commit)} - ${file_base.refs(c.commit)} +
    +
    + ${_('Show/Diff file')} + ${h.hidden('diff1')} + ${h.hidden('diff2',c.commit.raw_id)} + ${h.hidden('annotate', c.annotate)} +
    +
    + + +
    +
    + ${_('Action')}: +
    +
    + ${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")} +
    +
    -
    -
    -
    -
    - ${_('File last commit')}: -
    -
    -
    - ${h.show_id(c.file_last_commit)} +
    +
    +
    + ${h.show_id(c.commit)} + ${file_base.refs(c.commit)} +
    +
    +
    - ${file_base.refs(c.file_last_commit)} +
    + +
    + ${_('Show More')}
    +
    - -
    -
    - ${_('Show/Diff file')}: -
    -
    - ${h.hidden('diff1')} - ${h.hidden('diff2',c.commit.raw_id)} - ${h.hidden('annotate', c.annotate)} -
    -
    - - -
    -
    - ${_('Action')}: -
    -
    - ${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")} -
    -
    - -
    -
    - % if c.file_author: - ${_('Last Author')} - % else: - ${h.literal(_ungettext(u'File Author (%s)',u'File Authors (%s)',len(c.authors)) % ('%s' % len(c.authors))) } - % endif - ${_('Show All')} -
    -
    - ## loads single author, or ALL - <%include file='file_authors_box.mako'/> -
    -
    - - diff --git a/rhodecode/templates/files/files_tree_header.mako b/rhodecode/templates/files/files_tree_header.mako --- a/rhodecode/templates/files/files_tree_header.mako +++ b/rhodecode/templates/files/files_tree_header.mako @@ -19,7 +19,7 @@
    - ${h.link_to_user(c.commit.author)}-${h.age_component(c.commit.date)} + ${h.link_to_user(c.commit.author)} - ${h.age_component(c.commit.date)}
    @@ -33,12 +33,12 @@ ${file_base.refs(c.commit)}
    -
    -
    + +
    - -
    - ${_('Show More')} +
    + ${_('Show More')} +