# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-07-21 09:58:21
# Node ID 3d63a95d205c3436d5d9fd8d4f633b4240f2df04
# Parent  61564d6eab75a4e11f7091c7544ce9cb5641e682

summary/changelog: unified how data is displayed for summary and changelog pages.

- use consistent order of columns
- fix the link to commit status
- fix order of displaying comments

Fixes #4111

diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html
--- a/rhodecode/templates/changelog/changelog.html
+++ b/rhodecode/templates/changelog/changelog.html
@@ -97,14 +97,18 @@
           <div class="table">
             <table id="changesets" class="rctable">
                 <tr>
-                  <th></th>
+                  ## checkbox
                   <th></th>
-                  <th>${_('Author')}</th>
-                  <th>${_('Age')}</th>
+                  <th colspan="2"></th>
+
+                  <th>${_('Commit')}</th>
+                  ## commit message expand arrow
                   <th></th>
                   <th>${_('Commit Message')}</th>
-                  <th>${_('Commit')}</th>
-                  <th></th>
+
+                  <th>${_('Age')}</th>
+                  <th>${_('Author')}</th>
+
                   <th>${_('Refs')}</th>
                 </tr>
               <tbody>
@@ -128,26 +132,17 @@
                           </a>
                         %endif
                       </div>
+                    %else:
+                        <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
                     %endif
                     </td>
-                    <td class="td-user">
-                          ${self.gravatar_with_user(commit.author)}
-                    </td>
-                    <td class="td-time">
-                        ${h.age_component(commit.date)}
+                    <td class="td-comments comments-col">
+                    %if c.comments.get(commit.raw_id):
+                      <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
+                          <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[commit.raw_id])}
+                      </a>
+                    %endif
                     </td>
-
-                    <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}">
-                      <div class="show_more_col">
-                        <i class="show_more"></i>&nbsp;
-                      </div>
-                    </td>
-                    <td class="mid td-description">
-                      <div class="log-container truncate-wrap">
-                          <div class="message truncate" id="c-${commit.raw_id}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
-                      </div>
-                      </td>
-
                     <td class="td-hash">
                     <code>
                       <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id)}">
@@ -155,13 +150,22 @@
                       </a>
                     </code>
                     </td>
+                    <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}">
+                      <div class="show_more_col">
+                        <i class="show_more"></i>&nbsp;
+                      </div>
+                    </td>
+                    <td class="td-description mid">
+                      <div class="log-container truncate-wrap">
+                          <div class="message truncate" id="c-${commit.raw_id}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
+                      </div>
+                      </td>
 
-                    <td class="td-comments comments-col">
-                    %if c.comments.get(commit.raw_id):
-                      <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=commit.raw_id,anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
-                          ${len(c.comments[commit.raw_id])} <i class="icon-comment icon-comment-colored"></i>
-                      </a>
-                    %endif
+                    <td class="td-time">
+                        ${h.age_component(commit.date)}
+                    </td>
+                    <td class="td-user">
+                        ${self.gravatar_with_user(commit.author)}
                     </td>
 
                     <td class="td-tags tags-col truncate-wrap">
diff --git a/rhodecode/templates/changelog/changelog_summary_data.html b/rhodecode/templates/changelog/changelog_summary_data.html
--- a/rhodecode/templates/changelog/changelog_summary_data.html
+++ b/rhodecode/templates/changelog/changelog_summary_data.html
@@ -3,8 +3,9 @@
 %if c.repo_commits:
 <table class="rctable repo_summary table_disp">
     <tr>
+
+        <th class="status" colspan="2"></th>
         <th>${_('Commit')}</th>
-        <th class="status" colspan="2"></th>
         <th>${_('Commit message')}</th>
         <th>${_('Age')}</th>
         <th>${_('Author')}</th>
@@ -12,39 +13,45 @@
     </tr>
 %for cnt,cs in enumerate(c.repo_commits):
     <tr class="parity${cnt%2}">
+
+        <td class="td-status">
+            %if c.statuses.get(cs.raw_id):
+                <div class="changeset-status-ico shortlog">
+                    %if c.statuses.get(cs.raw_id)[2]:
+                    <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
+                        <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
+                    </a>
+                    %else:
+                    <a class="tooltip" title="${_('Commit status: %s') % h.commit_status_lbl(c.statuses.get(cs.raw_id)[0])}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
+                        <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
+                    </a>
+                    %endif
+                </div>
+            %else:
+                <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
+            %endif
+        </td>
+        <td class="td-comments">
+            %if c.comments.get(cs.raw_id,[]):
+            <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
+                <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[cs.raw_id])}
+            </a>
+            %endif
+        </td>
         <td class="td-commit">
             <pre><a href="${h.url('changeset_home', repo_name=c.repo_name, revision=cs.raw_id)}">${h.show_id(cs)}</a></pre>
         </td>
-        <td class="td-status">
-              %if c.statuses.get(cs.raw_id):
-                <div class="changeset-status-ico shortlog">
-                %if c.statuses.get(cs.raw_id)[2]:
-                  <a class="tooltip" title="${_('Commit status: %s\nClick to open associated pull request #%s') % (c.statuses.get(cs.raw_id)[0], c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}">
-                    <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
-                  </a>
-                %else:
-                  <div class="${'flag_status %s' % c.statuses.get(cs.raw_id)[0]}"></div>
-                %endif
-                </div>
-              %endif
-          </td>
-          <td class="td-comments">
-              %if c.comments.get(cs.raw_id,[]):
-                 <a title="${_('Commit has comments')}" href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
-                     <i class="icon-comment icon-comment-colored"></i> ${len(c.comments[cs.raw_id])}
-                  </a>
-              %endif
-        </td>
         <td class="td-message">
             ${h.urlify_commit_message(h.truncate(cs.message, 50), c.repo_name)}
         </td>
+
         <td class="td-time">
             ${h.age_component(cs.date)}
         </td>
-
         <td class="td-user author">
             ${base.gravatar_with_user(cs.author)}
         </td>
+
         <td class="td-tags truncate-wrap">
           <div class="truncate tags-truncate"><div class="autoexpand">
             %if h.is_hg(c.rhodecode_repo):