More compact branch view
authorJoachim Breitner <mail@joachim-breitner.de>
Sat, 23 Apr 2016 19:00:57 +0000 (19:00 +0000)
committerJoachim Breitner <mail@joachim-breitner.de>
Sat, 23 Apr 2016 19:03:06 +0000 (19:03 +0000)
site/index.html
site/js/gipeda.js

index f9465c0..3ace964 100644 (file)
@@ -274,13 +274,15 @@ html {
        <abbrv class="timeago" title="{{ iso8601 this.summary.gitDate }}">{{ humanDate this.summary.gitDate}}</abbrv>
        {{/with}}
      </td>
-     <td class="col-md-2">
-      {{# if commitCount }}
+     <td class="col-md-2 text-right">
+      {{# if @interesting }}
+       <!--
        <a href="{{revisionLink mergeBaseHash}}" title="Merge base of this branch">
          {{> rev-id hash=mergeBaseHash}}
        </a>
+       -->
        <a href="{{compareLink mergeBaseHash branchHash}}" title="Compare against merge base">
-         ..{{ commitCount }}..
+         {{ commitCount }} commits to
        </a>
        <a href="{{revisionLink branchHash}}" title="Show branch tip">
          {{> rev-id hash=branchHash}}
index ef91c8e..080c6e8 100644 (file)
@@ -265,7 +265,9 @@ Handlebars.registerHelper('each_branch', function(context,options){
                 }
                 return naturalSort(a.branchName, b.branchName);
             }).map(function (b,i) {
-                output += options.fn(b.branchData, {data: {key: b.branchName, index: i}});
+               var interesting = b.branchData.branchHash != b.branchData.mergeBaseHash;
+                output += options.fn(b.branchData,
+                       {data: {key: b.branchName, index: i, interesting: interesting}});
             });
     }
     return output;