diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html --- a/rhodecode/templates/pullrequests/pullrequest_show.html +++ b/rhodecode/templates/pullrequests/pullrequest_show.html @@ -189,68 +189,95 @@ + +
- -
+ +
+ +
+ % if c.show_version_changes: + + ## current visible version + + + + + + + -
- % if c.show_version_changes: -
+ % if c.at_version in [None, 'latest']: + + % endif + + + % if c.versions: + ${_('latest')} + % else: + ${_('initial')} + % endif + + + ${c.pull_request_latest.source_ref_parts.commit_id[:6]} + ${_('created')} ${h.age_component(c.pull_request_latest.updated_on)} + % if c.versions and c.at_version in [None, 'latest']: + ${_('(Show all)')} + % endif +
- - - - - - - % for ver in reversed(c.pull_request.versions()): - - - - - - - % endfor -
- % if c.at_version in [None, 'latest']: - - % endif - latest - ${c.pull_request_latest.source_ref_parts.commit_id[:6]} - ${_('created')} ${h.age_component(c.pull_request_latest.updated_on)}
- % if c.at_version == ver.pull_request_version_id: - - % endif - version ${ver.pull_request_version_id} - ${ver.source_ref_parts.commit_id[:6]} - ${_('created')} ${h.age_component(ver.updated_on)}
+ % for ver in reversed(c.pull_request.versions()): + + + % if c.at_version == ver.pull_request_version_id: + + % endif + + version ${ver.pull_request_version_id} + + ${ver.source_ref_parts.commit_id[:6]} + + ${_('created')} ${h.age_component(ver.updated_on)} + + % if c.at_version == ver.pull_request_version_id: + ${_('(Show all)')} + % endif + + + % endfor + - % if c.at_version: + % if c.at_version:
-  Changed commits:
-    * added: ${len(c.changes.added)}
-    * removed: ${len(c.changes.removed)}
+   Changed commits:
+     * added: ${len(c.changes.added)}
+     * removed: ${len(c.changes.removed)}
 
-  % if not (c.file_changes.added+c.file_changes.modified+c.file_changes.removed):
-  No file changes found
-  % else:
-  Changed files:
-    %for file_name in c.file_changes.added:
-    * A ${file_name}
-    %endfor
-    %for file_name in c.file_changes.modified:
-    * M ${file_name}
-    %endfor
-    %for file_name in c.file_changes.removed:
-    * R ${file_name}
-    %endfor
-  % endif
+   % if not (c.file_changes.added+c.file_changes.modified+c.file_changes.removed):
+   No file changes found
+   % else:
+   Changed files:
+     %for file_name in c.file_changes.added:
+     * A ${file_name}
+     %endfor
+     %for file_name in c.file_changes.modified:
+     * M ${file_name}
+     %endfor
+     %for file_name in c.file_changes.removed:
+     * R ${file_name}
+     %endfor
+   % endif
 
+ % endif + % else: + ${_('Pull request versions not available')}. % endif - % else: - ${_('Pull request versions not available')}. - % endif -
+