Mercurial > kallithea

changeset 5683:5fe9bb7acee6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pullrequests: show tags in lists of included and available changesets Further improvement: Also show bookmarks and other names (preferably by using some helper function/template instead of duplicating code). It would perhaps also be better to avoid using floating.
author Mads Kiilerich <madski@unity3d.com>
date Mon, 01 Feb 2016 21:23:07 +0100
parents fff76ceb5e21
children 8d93d28adf25
files kallithea/public/css/style.css kallithea/templates/compare/compare_cs.html kallithea/templates/pullrequests/pullrequest_show.html
diffstat 3 files changed, 21 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Mon Feb 01 21:22:59 2016 +0100
+++ b/kallithea/public/css/style.css	Mon Feb 01 21:23:07 2016 +0100
@@ -950,7 +950,7 @@
 }
 
 #content div.box div.message {
-    clear: both;
+    float: left;
     overflow: hidden;
     margin: 0;
     padding: 5px 0;
--- a/kallithea/templates/compare/compare_cs.html	Mon Feb 01 21:22:59 2016 +0100
+++ b/kallithea/templates/compare/compare_cs.html	Mon Feb 01 21:23:07 2016 +0100
@@ -63,7 +63,16 @@
         <td class="expand_commit" commit_id="${cs.raw_id}" title="${_('Expand commit message')}">
             <i class="icon-align-left" style="color:#999"></i>
         </td>
-        <td><div id="C-${cs.raw_id}" class="message">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
+        <td>
+            <div style="float: right; margin-top: -4px;">
+                %for tag in cs.tags:
+                    <div class="tagtag" title="${_('Tag %s') % tag}">
+                        ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                    </div>
+                %endfor
+            </div>
+            <div id="C-${cs.raw_id}" class="message">${h.urlify_commit(cs.message, c.repo_name)}</div>
+        </td>
         </tr>
     %endfor
     </table>
--- a/kallithea/templates/pullrequests/pullrequest_show.html	Mon Feb 01 21:22:59 2016 +0100
+++ b/kallithea/templates/pullrequests/pullrequest_show.html	Mon Feb 01 21:23:07 2016 +0100
@@ -197,7 +197,16 @@
                         </td>
                         <td style="width: 120px"><span class="tooltip" title="${h.age(cs.date)}">${cs.date}</span></td>
                         <td>${h.link_to(h.show_id(cs),h.url('changeset_home',repo_name=c.cs_repo.repo_name,revision=cs.raw_id))}</td>
-                        <td><div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div></td>
+                        <td>
+                          <div style="float: right; margin-top: -4px;">
+                            %for tag in cs.tags:
+                              <div class="tagtag" title="${_('Tag %s') % tag}">
+                                ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
+                              </div>
+                            %endfor
+                          </div>
+                          <div class="message" style="white-space:normal; height:1.1em; max-width: 500px; padding:0">${h.urlify_commit(cs.message, c.repo_name)}</div>
+                        </td>
                       %endif
                     </tr>
                   %endfor