pull-requests: simplified the UI for pr view.

- hide some information we don't need all the time
- style the UI similar to upcomming UI overhaul of PRs
- less info == more readability

rhodecode/apps/repository/tests/test_repo_pullrequests.py

@@ -101,12 +101,11 b' class TestPullrequestsView(object):'
         for commit_id in pull_request.revisions:
             response.mustcontain(commit_id)
 
-        assert pull_request.target_ref_parts.type in response
-        assert pull_request.target_ref_parts.name in response
-        target_clone_url = pull_request.target_repo.clone_url()
-        assert target_clone_url in response
+        response.mustcontain(pull_request.target_ref_parts.type)
+        response.mustcontain(pull_request.target_ref_parts.name)
 
-        assert 'class="pull-request-merge"' in response
+        response.mustcontain('class="pull-request-merge"')
+
         if pr_merge_enabled:
             response.mustcontain('Pull request reviewer approval is pending')
         else:
@@ -536,9 +535,9 b' class TestPullrequestsView(object):'
 
         # Check generated diff contents
         response = response.follow()
-        assert 'content_of_ancestor' not in response.body
-        assert 'content_of_ancestor-child' not in response.body
-        assert 'content_of_change' in response.body
+        response.mustcontain(no=['content_of_ancestor'])
+        response.mustcontain(no=['content_of_ancestor-child'])
+        response.mustcontain('content_of_change')
 
     def test_merge_pull_request_enabled(self, pr_util, csrf_token):
         # Clear any previous calls to rcextensions
@@ -689,8 +688,8 b' class TestPullrequestsView(object):'
                        pull_request_id=pull_request.pull_request_id))
 
         assert response.status_int == 200
-        assert 'Pull request updated to' in response.body
-        assert 'with 1 added, 0 removed commits.' in response.body
+        response.mustcontain('Pull request updated to')
+        response.mustcontain('with 1 added, 0 removed commits.')
 
         # check that we have now both revisions
         pull_request = PullRequest.get(pull_request_id)
@@ -752,8 +751,8 b' class TestPullrequestsView(object):'
                        repo_name=target.repo_name,
                        pull_request_id=pull_request.pull_request_id))
         assert response.status_int == 200
-        assert 'Pull request updated to' in response.body
-        assert 'with 1 added, 1 removed commits.' in response.body
+        response.mustcontain('Pull request updated to')
+        response.mustcontain('with 1 added, 1 removed commits.')
 
     def test_update_target_revision_with_removal_of_1_commit_git(self, backend_git, csrf_token):
         backend = backend_git
@@ -994,12 +993,13 b' class TestPullrequestsView(object):'
             pull_request_id=pull_request.pull_request_id))
         assert response.status_int == 200
 
-        origin = response.assert_response().get_element('.pr-origininfo .tag')
-        origin_children = origin.getchildren()
-        assert len(origin_children) == 1
-        target = response.assert_response().get_element('.pr-targetinfo .tag')
-        target_children = target.getchildren()
-        assert len(target_children) == 1
+        source = response.assert_response().get_element('.pr-source-info')
+        source_parent = source.getparent()
+        assert len(source_parent) == 1
+
+        target = response.assert_response().get_element('.pr-target-info')
+        target_parent = target.getparent()
+        assert len(target_parent) == 1
 
         expected_origin_link = route_path(
             'repo_commits',
@@ -1009,10 +1009,8 b' class TestPullrequestsView(object):'
             'repo_commits',
             repo_name=pull_request.target_repo.scm_instance().name,
             params=dict(branch='target'))
-        assert origin_children[0].attrib['href'] == expected_origin_link
-        assert origin_children[0].text == 'branch: origin'
-        assert target_children[0].attrib['href'] == expected_target_link
-        assert target_children[0].text == 'branch: target'
+        assert source_parent.attrib['href'] == expected_origin_link
+        assert target_parent.attrib['href'] == expected_target_link
 
     def test_bookmark_is_not_a_link(self, pr_util):
         pull_request = pr_util.create_pull_request()
@@ -1027,13 +1025,13 b' class TestPullrequestsView(object):'
             pull_request_id=pull_request.pull_request_id))
         assert response.status_int == 200
 
-        origin = response.assert_response().get_element('.pr-origininfo .tag')
-        assert origin.text.strip() == 'bookmark: origin'
-        assert origin.getchildren() == []
+        source = response.assert_response().get_element('.pr-source-info')
+        assert source.text.strip() == 'bookmark:origin'
+        assert source.getparent().attrib.get('href') is None
 
-        target = response.assert_response().get_element('.pr-targetinfo .tag')
+        target = response.assert_response().get_element('.pr-target-info')
         assert target.text.strip() == 'bookmark: target'
-        assert target.getchildren() == []
+        assert target.getparent().attrib.get('href') is None
 
     def test_tag_is_not_a_link(self, pr_util):
         pull_request = pr_util.create_pull_request()
@@ -1048,13 +1046,13 b' class TestPullrequestsView(object):'
             pull_request_id=pull_request.pull_request_id))
         assert response.status_int == 200
 
-        origin = response.assert_response().get_element('.pr-origininfo .tag')
-        assert origin.text.strip() == 'tag: origin'
-        assert origin.getchildren() == []
+        source = response.assert_response().get_element('.pr-source-info')
+        assert source.text.strip() == 'tag:origin'
+        assert source.getparent().attrib.get('href') is None
 
-        target = response.assert_response().get_element('.pr-targetinfo .tag')
+        target = response.assert_response().get_element('.pr-target-info')
         assert target.text.strip() == 'tag: target'
-        assert target.getchildren() == []
+        assert target.getparent().attrib.get('href') is None
 
     @pytest.mark.parametrize('mergeable', [True, False])
     def test_shadow_repository_link(

rhodecode/lib/helpers.py

@@ -726,7 +726,7 b' import tzlocal'
 local_timezone = tzlocal.get_localzone()
 
 
-def age_component(datetime_iso, value=None, time_is_local=False):
+def age_component(datetime_iso, value=None, time_is_local=False, tooltip=True):
     title = value or format_date(datetime_iso)
     tzinfo = '+00:00'
 
@@ -740,9 +740,11 b' def age_component(datetime_iso, value=No'
         tzinfo = '{}:{}'.format(offset[:-2], offset[-2:])
 
     return literal(
-        '<time class="timeago tooltip" '
-        'title="{1}{2}" datetime="{0}{2}">{1}</time>'.format(
-            datetime_iso, title, tzinfo))
+        '<time class="timeago {cls}" title="{tt_title}" datetime="{dt}{tzinfo}">{title}</time>'.format(
+            cls='tooltip' if tooltip else '',
+            tt_title=('{title}{tzinfo}'.format(title=title, tzinfo=tzinfo)) if tooltip else '',
+            title=title, dt=datetime_iso, tzinfo=tzinfo
+        ))
 
 
 def _shorten_commit_id(commit_id, commit_len=None):

rhodecode/public/css/main.less

@@ -379,8 +379,9 b' ul.auth_plugins {'
   font-family: @text-bold;
 }
 
-.pr-origininfo, .pr-targetinfo {
+.pr-commit-flow  {
     position: relative;
+    font-weight: 600;
 
     .tag {
         display: inline-block;
@@ -413,7 +414,6 b' ul.auth_plugins {'
     padding: 0 0;
 }
 
-
 .pr-title-input {
   width: 80%;
   font-size: 1em;
@@ -438,6 +438,19 b' ul.auth_plugins {'
   }
 }
 
+.pr-title-closed-tag {
+    font-size: 16px;
+}
+
+#pr-desc {
+  padding: 10px 0;
+
+  .markdown-block {
+    padding: 0;
+    margin-bottom: -30px;
+  }
+}
+
 #pullrequest_title {
     width: 100%;
     box-sizing: border-box;
@@ -451,6 +464,31 b' ul.auth_plugins {'
     overflow: hidden;
 }
 
+.pr-details-title {
+    height: 16px
+}
+
+.pr-details-title-author-pref {
+    padding-right: 10px
+}
+
+.label-pr-detail {
+  display: table-cell;
+  width: 120px;
+  padding-top: 7.5px;
+  padding-bottom: 7.5px;
+  padding-right: 7.5px;
+}
+
+.source-details ul {
+  padding: 10px 16px;
+}
+
+.source-details-action {
+  color: @grey4;
+  font-size: 11px
+}
+
 .pr-submit-button {
     float: right;
     margin: 0 0 0 5px;
@@ -469,6 +507,15 b' ul.auth_plugins {'
     vertical-align: top;
 }
 
+#close_edit_pullrequest {
+    padding-left: 1em
+}
+
+#delete_pullrequest {
+    clear: inherit;
+    padding: 0
+}
+
 .perms_section_head {
     min-width: 625px;
 
@@ -1880,9 +1927,10 b' BIN_FILENODE = 7'
 
 .pr-versions {
     font-size: 1.1em;
+    padding: 7.5px;
 
     table {
-      padding: 0px 5px;
+
     }
 
     td {

rhodecode/public/js/src/rhodecode/pullrequests.js

@@ -558,6 +558,21 b' VersionController = function () {'
         }
 
         return false
+    };
+
+    this.toggleElement = function (elem, target) {
+        var $elem = $(elem);
+        var $target = $(target);
+
+        if ($target.is(':visible')) {
+            $target.hide();
+            $elem.html($elem.data('toggleOn'))
+        } else {
+            $target.show();
+            $elem.html($elem.data('toggleOff'))
+        }
+
+        return false
     }
 
 };

rhodecode/templates/pullrequests/pullrequest_show.mako

@@ -10,14 +10,12 b''
 </%def>
 
 <%def name="breadcrumbs_links()">
-    <%
-    pr_title = c.pull_request.title
-    if c.pull_request.is_closed():
-        pr_title = '[{}] {}'.format(_('Closed'), pr_title)
-    %>
 
     <div id="pr-title">
-        <input class="pr-title-input large disabled" disabled="disabled" name="pullrequest_title" type="text" value="${pr_title}">
+        % if c.pull_request.is_closed():
+            <span class="pr-title-closed-tag tag">${_('Closed')}</span>
+        % endif
+        <input class="pr-title-input large disabled" disabled="disabled" name="pullrequest_title" type="text" value="${c.pull_request.title}">
     </div>
     <div id="pr-title-edit" class="input" style="display: none;">
         <input class="pr-title-input large" id="pr-title-input" name="pullrequest_title" type="text" value="${c.pull_request.title}">
@@ -39,6 +37,7 b''
     AJAX_COMMENT_DELETE_URL = "${h.route_path('pullrequest_comment_delete',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id,comment_id='__COMMENT_ID__')}";
     templateContext.pull_request_data.pull_request_id = ${c.pull_request.pull_request_id};
 </script>
+
 <div class="box">
 
   ${self.breadcrumbs()}
@@ -48,9 +47,19 b''
       <div class="summary-details block-left">
         <% summary = lambda n:{False:'summary-short'}.get(n) %>
         <div class="pr-details-title">
-            <a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request !{}').format(c.pull_request.pull_request_id)}</a> ${_('From')} ${h.format_date(c.pull_request.created_on)}
+        <div class="pull-left">
+            <a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request !{}').format(c.pull_request.pull_request_id)}</a>
+            ${_('Created on')}
+            <span class="tooltip" title="${_('Last updated on')} ${h.format_date(c.pull_request.updated_on)}">${h.format_date(c.pull_request.created_on)},</span>
+            <span class="pr-details-title-author-pref">${_('by')}</span>
+        </div>
+
+        <div class="pull-left">
+            ${self.gravatar_with_user(c.pull_request.author.email, 16, tooltip=True)}
+        </div>
+
             %if c.allowed_to_update:
-              <div id="delete_pullrequest" class="pull-right action_button ${'' if c.allowed_to_delete else 'disabled' }" style="clear:inherit;padding: 0">
+          <div id="delete_pullrequest" class="pull-right action_button ${('' if c.allowed_to_delete else 'disabled' )}" >
                   % if c.allowed_to_delete:
                       ${h.secure_form(h.route_path('pullrequest_delete', repo_name=c.pull_request.target_repo.repo_name, pull_request_id=c.pull_request.pull_request_id), request=request)}
                           ${h.submit('remove_%s' % c.pull_request.pull_request_id, _('Delete'),
@@ -61,124 +70,131 b''
                   % endif
               </div>
               <div id="open_edit_pullrequest" class="pull-right action_button">${_('Edit')}</div>
-              <div id="close_edit_pullrequest" class="pull-right action_button" style="display: none;padding: 0">${_('Cancel')}</div>
+          <div id="close_edit_pullrequest" class="pull-right action_button" style="display: none;">${_('Cancel')}</div>
+          <div id="edit_pull_request" class="pull-right action_button pr-save" style="display: none;">${_('Save Changes')}</div>
             %endif
         </div>
 
+    <div id="pr-desc" class="input" title="${_('Rendered using {} renderer').format(c.renderer)}">
+        ${h.render(c.pull_request.description, renderer=c.renderer, repo_name=c.repo_name)}
+    </div>
+
+    <div id="pr-desc-edit" class="input textarea" style="display: none;">
+        <input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
+        ${dt.markup_form('pr-description-input', form_text=c.pull_request.description)}
+    </div>
+
         <div id="summary" class="fields pr-details-content">
+
+       ## review
            <div class="field">
-            <div class="label-summary">
-                <label>${_('Source')}:</label>
+        <div class="label-pr-detail">
+            <label>${_('Review status')}:</label>
+        </div>
+        <div class="input">
+          %if c.pull_request_review_status:
+          <div class="tag status-tag-${c.pull_request_review_status}">
+            <i class="icon-circle review-status-${c.pull_request_review_status}"></i>
+            <span class="changeset-status-lbl">
+              %if c.pull_request.is_closed():
+                  ${_('Closed')},
+              %endif
+
+              ${h.commit_status_lbl(c.pull_request_review_status)}
+
+            </span>
+          </div>
+            - ${_ungettext('calculated based on {} reviewer vote', 'calculated based on {} reviewers votes', len(c.pull_request_reviewers)).format(len(c.pull_request_reviewers))}
+          %endif
+        </div>
+       </div>
+
+       ## source
+       <div class="field">
+        <div class="label-pr-detail">
+            <label>${_('Commit flow')}:</label>
             </div>
             <div class="input">
-                <div class="pr-origininfo">
-                    ## branch link is only valid if it is a branch
-                    <span class="tag">
+            <div class="pr-commit-flow">
+                ## Source
                       %if c.pull_request.source_ref_parts.type == 'branch':
-                        <a href="${h.route_path('repo_commits', repo_name=c.pull_request.source_repo.repo_name, _query=dict(branch=c.pull_request.source_ref_parts.name))}">${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}</a>
+                    <a href="${h.route_path('repo_commits', repo_name=c.pull_request.source_repo.repo_name, _query=dict(branch=c.pull_request.source_ref_parts.name))}"><code class="pr-source-info">${c.pull_request.source_ref_parts.type}:${c.pull_request.source_ref_parts.name}</code></a>
                       %else:
-                        ${c.pull_request.source_ref_parts.type}: ${c.pull_request.source_ref_parts.name}
+                    <code class="pr-source-info">${'{}:{}'.format(c.pull_request.source_ref_parts.type, c.pull_request.source_ref_parts.name)}</code>
+                %endif
+                ${_('of')} <a href="${h.route_path('repo_summary', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.repo_name}</a>
+                &rarr;
+                ## Target
+                %if c.pull_request.target_ref_parts.type == 'branch':
+                    <a href="${h.route_path('repo_commits', repo_name=c.pull_request.target_repo.repo_name, _query=dict(branch=c.pull_request.target_ref_parts.name))}"><code class="pr-target-info">${c.pull_request.target_ref_parts.type}:${c.pull_request.target_ref_parts.name}</code></a>
+                %else:
+                    <code class="pr-target-info">${'{}:{}'.format(c.pull_request.target_ref_parts.type, c.pull_request.target_ref_parts.name)}</code>
                       %endif
-                    </span>
-                    <span class="clone-url">
-                        <a href="${h.route_path('repo_summary', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.clone_url()}</a>
-                    </span>
-                    <br/>
+
+                ${_('of')} <a href="${h.route_path('repo_summary', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.repo_name}</a>
+
+                <a class="source-details-action" href="#expand-source-details" onclick="return versionController.toggleElement(this, '.source-details')" data-toggle-on='<i class="icon-angle-down">more details</i>' data-toggle-off='<i class="icon-angle-up">less details</i>'>
+                    <i class="icon-angle-down">more details</i>
+                </a>
+
+            </div>
+
+            <div class="source-details" style="display: none">
+
+                <ul>
+
+                    ## common ancestor
+                    <li>
+                        ${_('Common ancestor')}:
                     % if c.ancestor_commit:
-                        ${_('Common ancestor')}:
-                        <code><a href="${h.route_path('repo_commit', repo_name=c.target_repo.repo_name, commit_id=c.ancestor_commit.raw_id)}">${h.show_id(c.ancestor_commit)}</a></code>
+                            <a href="${h.route_path('repo_commit', repo_name=c.target_repo.repo_name, commit_id=c.ancestor_commit.raw_id)}">${h.show_id(c.ancestor_commit)}</a>
+                        % else:
+                            ${_('not available')}
                     % endif
-                </div>
+                    </li>
+
+                    ## pull url
+                    <li>
                 %if h.is_hg(c.pull_request.source_repo):
                     <% clone_url = 'hg pull -r {} {}'.format(h.short_id(c.source_ref), c.pull_request.source_repo.clone_url()) %>
                 %elif h.is_git(c.pull_request.source_repo):
                     <% clone_url = 'git pull {} {}'.format(c.pull_request.source_repo.clone_url(), c.pull_request.source_ref_parts.name) %>
                 %endif
 
-                <div class="">
-                    <input type="text" class="input-monospace pr-pullinfo" value="${clone_url}" readonly="readonly">
+                        <span>${_('Pull changes from source')}</span>: <input type="text" class="input-monospace pr-pullinfo" value="${clone_url}" readonly="readonly">
                     <i class="tooltip icon-clipboard clipboard-action pull-right pr-pullinfo-copy" data-clipboard-text="${clone_url}" title="${_('Copy the pull url')}"></i>
-                </div>
+                    </li>
 
-            </div>
-           </div>
-           <div class="field">
-            <div class="label-summary">
-                <label>${_('Target')}:</label>
-            </div>
-            <div class="input">
-                <div class="pr-targetinfo">
-                    ## branch link is only valid if it is a branch
-                    <span class="tag">
-                      %if c.pull_request.target_ref_parts.type == 'branch':
-                        <a href="${h.route_path('repo_commits', repo_name=c.pull_request.target_repo.repo_name, _query=dict(branch=c.pull_request.target_ref_parts.name))}">${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}</a>
-                      %else:
-                        ${c.pull_request.target_ref_parts.type}: ${c.pull_request.target_ref_parts.name}
-                      %endif
-                    </span>
-                    <span class="clone-url">
-                        <a href="${h.route_path('repo_summary', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.clone_url()}</a>
-                    </span>
-                </div>
-            </div>
-           </div>
-
-            ## Link to the shadow repository.
-            <div class="field">
-                <div class="label-summary">
-                    <label>${_('Merge')}:</label>
-                </div>
-                <div class="input">
+                    ## Shadow repo
+                    <li>
                     % if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref:
                         %if h.is_hg(c.pull_request.target_repo):
                             <% clone_url = 'hg clone --update {} {} pull-request-{}'.format(c.pull_request.shadow_merge_ref.name, c.shadow_clone_url, c.pull_request.pull_request_id) %>
                         %elif h.is_git(c.pull_request.target_repo):
                             <% clone_url = 'git clone --branch {} {} pull-request-{}'.format(c.pull_request.shadow_merge_ref.name, c.shadow_clone_url, c.pull_request.pull_request_id) %>
                         %endif
-                        <div class="">
-                            <input type="text" class="input-monospace pr-mergeinfo" value="${clone_url}" readonly="readonly">
+
+                            <span class="tooltip" title="${_('Clone repository in its merged state using shadow repository')}">${_('Clone from shadow repository')}</span>: <input type="text" class="input-monospace pr-mergeinfo" value="${clone_url}" readonly="readonly">
                             <i class="tooltip icon-clipboard clipboard-action pull-right pr-mergeinfo-copy" data-clipboard-text="${clone_url}" title="${_('Copy the clone url')}"></i>
-                        </div>
+
                     % else:
                         <div class="">
                             ${_('Shadow repository data not available')}.
                         </div>
                     % endif
-                </div>
+                    </li>
+
+                </ul>
+
             </div>
 
-           <div class="field">
-            <div class="label-summary">
-                <label>${_('Review')}:</label>
             </div>
-            <div class="input">
-              %if c.pull_request_review_status:
-                <i class="icon-circle review-status-${c.pull_request_review_status}"></i>
-                <span class="changeset-status-lbl">
-                  %if c.pull_request.is_closed():
-                      ${_('Closed')},
-                  %endif
-                  ${h.commit_status_lbl(c.pull_request_review_status)}
-                </span>
-                - ${_ungettext('calculated based on %s reviewer vote', 'calculated based on %s reviewers votes', len(c.pull_request_reviewers)) % len(c.pull_request_reviewers)}
-              %endif
-            </div>
-           </div>
-           <div class="field">
-            <div class="pr-description-label label-summary" title="${_('Rendered using {} renderer').format(c.renderer)}">
-                <label>${_('Description')}:</label>
-            </div>
-            <div id="pr-desc" class="input">
-                <div class="pr-description">${h.render(c.pull_request.description, renderer=c.renderer, repo_name=c.repo_name)}</div>
-            </div>
-            <div id="pr-desc-edit" class="input textarea editor" style="display: none;">
-                <input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
-                ${dt.markup_form('pr-description-input', form_text=c.pull_request.description)}
-            </div>
+
            </div>
 
+       ## versions
            <div class="field">
-               <div class="label-summary">
+           <div class="label-pr-detail">
                    <label>${_('Versions')}:</label>
                </div>
 
@@ -189,10 +205,11 b''
                % if c.show_version_changes:
                    <% outdated_comm_count_ver = len(c.inline_versions[c.at_version_num]['outdated']) %>
                    <% general_outdated_comm_count_ver = len(c.comment_versions[c.at_version_num]['outdated']) %>
-                   <a id="show-pr-versions" class="input" onclick="return versionController.toggleVersionView(this)" href="#show-pr-versions"
-                        data-toggle-on="${_ungettext('{} version available for this pull request, show it.', '{} versions available for this pull request, show them.', len(c.versions)).format(len(c.versions))}"
-                        data-toggle-off="${_('Hide all versions of this pull request')}">
-                       ${_ungettext('{} version available for this pull request, show it.', '{} versions available for this pull request, show them.', len(c.versions)).format(len(c.versions))}
+               ${_ungettext('{} version available for this pull request, ', '{} versions available for this pull request, ', len(c.versions)).format(len(c.versions))}
+               <a id="show-pr-versions" onclick="return versionController.toggleVersionView(this)" href="#show-pr-versions"
+                    data-toggle-on="${_('show versions')}."
+                    data-toggle-off="${_('hide versions')}.">
+                    ${_('show versions')}.
                    </a>
                    <table>
                        ## SHOW ALL VERSIONS OF PR
@@ -221,9 +238,9 b''
                                </td>
                                <td>
                                    % if c.at_version_num != ver_pr:
-                                    <i class="icon-comment"></i>
-                                       <code class="tooltip" title="${_('Comment from pull request version v{0}, general:{1} inline:{2}').format(ver_pos, len(c.comment_versions[ver_pr]['at']), len(c.inline_versions[ver_pr]['at']))}">
-                                           G:${len(c.comment_versions[ver_pr]['at'])} / I:${len(c.inline_versions[ver_pr]['at'])}
+                                <i class="tooltip icon-comment" title="${_('Comments from pull request version v{0}').format(ver_pos)}"></i>
+                                <code>
+                                   General:${len(c.comment_versions[ver_pr]['at'])} / Inline:${len(c.inline_versions[ver_pr]['at'])}
                                        </code>
                                    % endif
                                </td>
@@ -231,7 +248,7 b''
                                    ##<code>${ver.source_ref_parts.commit_id[:6]}</code>
                                </td>
                                <td>
-                                   ${h.age_component(ver.updated_on, time_is_local=True)}
+                               <code>${h.age_component(ver.updated_on, time_is_local=True, tooltip=False)}</code>
                                </td>
                            </tr>
                        % endfor
@@ -256,27 +273,8 b''
                </div>
            </div>
 
-           <div id="pr-save" class="field" style="display: none;">
-            <div class="label-summary"></div>
-            <div class="input">
-              <span id="edit_pull_request" class="btn btn-small no-margin">${_('Save Changes')}</span>
             </div>
-           </div>
-        </div>
-      </div>
-      <div>
-        ## AUTHOR
-        <div class="reviewers-title block-right">
-          <div class="pr-details-title">
-              ${_('Author of this pull request')}
-          </div>
-        </div>
-        <div class="block-right pr-details-content reviewers">
-            <ul class="group_members">
-              <li>
-                ${self.gravatar_with_user(c.pull_request.author.email, 16, tooltip=True)}
-              </li>
-            </ul>
+
         </div>
 
         ## REVIEW RULES
@@ -351,12 +349,28 b''
                 </div>
             %endif
         </div>
-      </div>
+
+##     ## TODOs will be listed here
+##     <div class="reviewers-title block-right">
+##       <div class="pr-details-title">
+##           ${_('TODOs')}
+##       </div>
+##     </div>
+##     <div class="block-right pr-details-content reviewers">
+##         <ul class="group_members">
+##           <li>
+##             XXXX
+##           </li>
+##         </ul>
+##     </div>
+##   </div>
+
   </div>
 
   <div class="box">
 
   % if c.state_progressing:
+
     <h2 style="text-align: center">
         ${_('Cannot show diff when pull request state is changing. Current progress state')}: <span class="tag tag-merge-state-${c.pull_request.state}">${c.pull_request.state}</span>
     </h2>
@@ -420,7 +434,7 b''
                                     ${_('Update commits')}
                                 </a>
 
-                                <a id="update_commits_switcher" class="btn btn-primary" style="margin-left: -1px" data-toggle="dropdown" aria-pressed="false" role="button">
+                                <a id="update_commits_switcher" class="tooltip btn btn-primary" style="margin-left: -1px" data-toggle="dropdown" aria-pressed="false" role="button" title="${_('more update options')}">
                                     <i class="icon-down"></i>
                                 </a>
 
@@ -631,12 +645,16 b''
               closeButton: $('#close_edit_pullrequest'),
               deleteButton: $('#delete_pullrequest'),
               viewFields: $('#pr-desc, #pr-title'),
-              editFields: $('#pr-desc-edit, #pr-title-edit, #pr-save'),
+              editFields: $('#pr-desc-edit, #pr-title-edit, .pr-save'),
 
               init: function() {
                 var that = this;
-                this.editButton.on('click', function(e) { that.edit(); });
-                this.closeButton.on('click', function(e) { that.view(); });
+                  this.editButton.on('click', function (e) {
+                      that.edit();
+                  });
+                  this.closeButton.on('click', function (e) {
+                      that.view();
+                  });
               },
 
               edit: function(event) {
@@ -665,8 +683,12 b''
 
               init: function() {
                 var self = this;
-                this.editButton.on('click', function(e) { self.edit(); });
-                this.closeButton.on('click', function(e) { self.close(); });
+                  this.editButton.on('click', function (e) {
+                      self.edit();
+                  });
+                  this.closeButton.on('click', function (e) {
+                      self.close();
+                  });
               },
 
               edit: function(event) {
@@ -814,6 +836,7 b''
         })
 
       </script>
+
 </div>
 
 </%def>