# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2019-04-23 09:09:13
# Node ID a4f7a8dbfb686e302face4bdf40109aecfc40d16
# Parent  1403c308ece5133c8a9c7015feef8d6e94581dc4

ui: optimized changelog view with phases, and made display of comments similar like in summary page.

diff --git a/rhodecode/templates/changelog/changelog.mako b/rhodecode/templates/changelog/changelog.mako
--- a/rhodecode/templates/changelog/changelog.mako
+++ b/rhodecode/templates/changelog/changelog.mako
@@ -110,11 +110,10 @@
                     <tr>
                       ## checkbox
                       <th></th>
-                      <th colspan="2"></th>
+                      <th></th>
 
                       <th>${_('Commit')}</th>
-                      ## Mercurial phase/evolve state
-                      <th></th>
+
                       ## commit message expand arrow
                       <th></th>
                       <th>${_('Commit Message')}</th>
@@ -123,6 +122,8 @@
                       <th>${_('Author')}</th>
 
                       <th>${_('Refs')}</th>
+                      ## comments
+                      <th></th>
                     </tr>
 
                     <tbody class="commits-range">
diff --git a/rhodecode/templates/changelog/changelog_elements.mako b/rhodecode/templates/changelog/changelog_elements.mako
--- a/rhodecode/templates/changelog/changelog_elements.mako
+++ b/rhodecode/templates/changelog/changelog_elements.mako
@@ -23,8 +23,8 @@
     <td class="td-checkbox">
         ${h.checkbox(commit.raw_id,class_="commit-range")}
     </td>
+
     <td class="td-status">
-
     %if c.statuses.get(commit.raw_id):
       <div class="changeset-status-ico">
         %if c.statuses.get(commit.raw_id)[2]:
@@ -41,44 +41,38 @@
         <div class="tooltip flag_status not_reviewed" title="${_('Commit status: Not Reviewed')}"></div>
     %endif
     </td>
-    <td class="td-comments comments-col">
-    %if c.comments.get(commit.raw_id):
-      <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id,_anchor='comment-%s' % c.comments[commit.raw_id][0].comment_id)}">
-          <i class="icon-comment"></i> ${len(c.comments[commit.raw_id])}
-      </a>
-    %endif
-    </td>
+
     <td class="td-hash">
     <code>
 
       <a href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id)}">
         <span class="${'commit_hash obsolete' if getattr(commit, 'obsolete', None) else 'commit_hash'}">${h.show_id(commit)}</span>
       </a>
+
       <i class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${commit.raw_id}" title="${_('Copy the full commit id')}"></i>
-    </code>
-    </td>
-    <td class="td-tags tags-col">
-      ## phase
+
+      ## COMMIT PHASES
+
+      ## Draft
       % if hasattr(commit, 'phase'):
           % if commit.phase != 'public':
-              <span class="tag phase-${commit.phase} tooltip" title="${_('Commit phase')}">${commit.phase}</span>
+              <span class="tag phase-${commit.phase} tooltip" title="${_('{} commit phase').format(commit.phase)}">${commit.phase[0].upper()}</span>
           % endif
       % endif
 
       ## obsolete commits
-      % if hasattr(commit, 'obsolete'):
-          % if commit.obsolete:
-              <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Evolve State')}">${_('obsolete')}</span>
-          % endif
+      % if hasattr(commit, 'obsolete') and commit.obsolete:
+          <span class="tag obsolete-${commit.obsolete} tooltip" title="${_('Obsolete Evolve State')}">O</span>
       % endif
 
       ## hidden commits
-      % if hasattr(commit, 'hidden'):
-          % if commit.hidden:
-              <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Evolve State')}">${_('hidden')}</span>
-          % endif
+      % if hasattr(commit, 'hidden') and commit.hidden:
+          <span class="tag obsolete-${commit.hidden} tooltip" title="${_('Hidden Evolve State')}">H</span>
       % endif
+
+    </code>
     </td>
+
     <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_('Expand commit message')}" onclick="commitsController.expandCommit(this, true); return false">
         <i class="icon-expand-linked"></i>&nbsp;
     </td>
@@ -130,6 +124,18 @@
 
       </div>
     </td>
+
+    <td class="td-comments comments-col">
+        <% cs_comments = c.comments.get(commit.raw_id,[]) %>
+        % if cs_comments:
+            <a title="${_('Commit has comments')}" href="${h.route_path('repo_commit',repo_name=c.repo_name,commit_id=commit.raw_id,_anchor='comment-%s' % cs_comments[0].comment_id)}">
+                <i class="icon-comment"></i> ${len(cs_comments)}
+            </a>
+        % else:
+            <i class="icon-comment"></i> ${len(cs_comments)}
+        % endif
+    </td>
+
 </tr>
 % endfor