Merge branch 'develop'

src/IDF/Diff.php

@@ -71,7 +71,7 @@ class IDF_Diff
                 $current_chunk = 0;
                 $indiff = true;
                 continue;
-            } else if (0 === strpos($line, '=========')) {
+            } else if (!$indiff && 0 === strpos($line, '=========')) {
                 // ignore pseudo stanzas with a hint of a binary file
                 if (preg_match("/^# (.+) is binary/", $this->lines[$i]))
                     continue;

src/IDF/Key.php

@@ -84,7 +84,7 @@ class IDF_Key extends Pluf_Model
             return array('ssh', $m[2], $m[1]);
         }
 
-        throw new Exception('invalid or unknown key data detected');
+        throw new Exception(__('Invalid or unknown key data detected.'));
     }
 
     /**

src/IDF/Plugin/SyncGit/Cron.php

@@ -48,7 +48,13 @@ class IDF_Plugin_SyncGit_Cron
         $out = '';
         $keys = Pluf::factory('IDF_Key')->getList(array('view'=>'join_user'));
         foreach ($keys as $key) {
-            if ($key->getType() == 'ssh' and preg_match('/^[a-zA-Z][a-zA-Z0-9_.-]*(@[a-zA-Z][a-zA-Z0-9.-]*)?$/', $key->login)) {
+            try {
+                $key_type = $key->getType();
+            } catch (Exception $e) {
+                // The key is a bad key, skip it
+                continue;
+            }
+            if ($key_type == 'ssh' and preg_match('/^[a-zA-Z][a-zA-Z0-9_.-]*(@[a-zA-Z][a-zA-Z0-9.-]*)?$/', $key->login)) {
                 $content = trim(str_replace(array("\n", "\r"), '', $key->content));
                 $out .= sprintf($template, $cmd, $key->login, $content)."\n";
             }

src/IDF/Scm/Svn.php

@@ -433,6 +433,9 @@ class IDF_Scm_Svn extends IDF_Scm
         $res['date'] = gmdate('Y-m-d H:i:s', strtotime((string) $xml->logentry->date));
         $res['title'] = (string) $xml->logentry->msg;
         $res['commit'] = (string) $xml->logentry['revision'];
+        $res['parents'] = $xml->logentry['revision'] > 1
+            ? array((string) $xml->logentry['revision'] - 1)
+            : array();
         $res['diff'] = ($getdiff) ? $this->getDiff($commit) : '';
         $res['tree'] = '';
         $res['branch'] = '';

src/IDF/templates/idf/list-filter.html

@@ -8,29 +8,35 @@
 {literal}
 $(document).ready(function() {
   $("input.filter-list").each(function() {
-    var lists = $("ul#" + $(this).attr("rel"));
+    var input = $(this);
+    var lists = $("ul#" + input.attr("rel"));
     if (lists.length == 0)
       return;
     var list = $(lists[0]);
+    var wrapper = input.parent();
 
     // a list should contain a reasonable amount of items
     // to be filterable - we also give the filter input a
     // special class here so we recognize it later in case
     // we have to hide it when the list view is collapsed
     if (list.children("li").length > 10) {
-      $(this).addClass("activated");
-      $(this).focus(function() {
+      wrapper.addClass("activated");
+      input.focus(function() {
         // ensure that the parent of the list keeps activated / opened
         list.parent().addClass("activated");
-        if ($(this)[0].value == $(this).attr("title"))
-          $(this).attr("value", "").removeClass("default");
+        if (input.attr("value") == input.attr("title")) {
+          input.attr("value", "");
+          wrapper.removeClass("default");
+        }
       });
-      $(this).blur(function() {
+      input.blur(function() {
         list.parent().removeClass("activated");
-        if ($(this)[0].value.length == 0)
-          $(this).attr("value", $(this).attr("title")).addClass("default");
+        if (input.attr("value").length == 0) {
+          input.attr("value", input.attr("title"));
+          wrapper.addClass("default");
+        }
       });
-      $(this).keyup(function(ev) {
+      input.keyup(function(ev) {
         var filter = $(this)[0];
         list.children("li").css('display', 'block');
         list.children("li").filter(function(index) {
@@ -41,9 +47,11 @@ $(document).ready(function() {
           return true;
         }).css('display', 'none');
       });
+      wrapper.children('span').click(function() {
+        input.val('').keyup().blur();
+      });
       // initialize it with the default
-      $(this)[0].value = "";
-      $(this).blur();
+      input.val('').blur();
     }
   });
 });

src/IDF/templates/idf/source/commit.html

@@ -29,20 +29,20 @@
 <td>
 <table class="changes">
 {foreach $changes.deletions as $filename}
-<tr><td>D</td><td>{$filename}{if !empty($diff.files[$filename])} (<a href="#diff-{$filename|md5}">{trans 'full'}</a>){/if}</td></tr>
+<tr><td><span class="scm-action deleted" title="{trans 'deleted'}">D</span></td><td>{$filename}{if !empty($diff.files[$filename])} (<a href="#diff-{$filename|md5}">{trans 'full'}</a>){/if}</td></tr>
 {/foreach}
 {foreach $changes.renames as $oldname => $newname}
-<tr><td>R</td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $newname)}">{$oldname} -> {$newname}</a></td></tr>
+<tr><td><span class="scm-action renamed" title="{trans 'renamed'}">R</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $newname)}">{$oldname} &rarr; {$newname}</a></td></tr>
 {/foreach}
 {foreach $changes.additions as $filename}
-<tr><td>A</td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>{if !empty($diff.files[$filename])} (<a href="#diff-{$filename|md5}">{trans 'full'}</a>){/if}</td></tr>
+<tr><td><span class="scm-action added" title="{trans 'added'}">A</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>{if !empty($diff.files[$filename])} (<a href="#diff-{$filename|md5}">{trans 'full'}</a>){/if}</td></tr>
 {/foreach}
 {foreach $changes.patches as $filename}
 {assign $ndiff = count($diff.files[$filename]['chunks'])}
-<tr><td>M</td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>{if !empty($diff.files[$filename])} (<a href="#diff-{$filename|md5}">{blocktrans $ndiff}{$ndiff} diff{plural}{$ndiff} diffs{/blocktrans}</a>){/if}</td></tr>
+<tr><td><span class="scm-action patched" title="{trans 'modified'}">M</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>{if !empty($diff.files[$filename])} (<a href="#diff-{$filename|md5}">{blocktrans $ndiff}{$ndiff} diff{plural}{$ndiff} diffs{/blocktrans}</a>){/if}</td></tr>
 {/foreach}
 {foreach $changes.properties as $filename => $properties}
-<tr><td>P</td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>
+<tr><td><span class="scm-action property-changed" title="{trans 'properies changed'}">P</span></td><td><a href="{url 'IDF_Views_Source::tree', array($project.shortname, $commit, $filename)}">{$filename}</a>
 <table class="properties">
 {foreach $properties as $key => $value}
 <tr><td>{$key}</td>

src/IDF/templates/idf/source/git/branch_tag_list.html

@@ -0,0 +1,39 @@
+{if !$view_url}
+{assign $view_url = 'IDF_Views_Source::treeBase'}
+{/if}
+<div class="expander">
+<div class="gradient"></div>
+<h3>
+  {trans 'Branches'}
+  <span class="input-with-delete">
+    <input type="text" rel="branch-list" class="filter-list"  title="{trans 'filter branches'}" />
+    <span></span>
+  </span>
+</h3>
+<ul id="branch-list">
+{foreach $branches as $branch => $path}
+{aurl 'url', $view_url, array($project.shortname, $branch)}
+<li class="label{if in_array($branch, $tree_in)} active{/if}">
+  <a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a>
+</li>
+{/foreach}
+</ul>
+{if $tags}
+<h3>
+  {trans 'Tags'}
+  <span class="input-with-delete">
+    <input type="text" rel="tag-list" class="filter-list"  title="{trans 'filter tags'}" />
+    <span></span>
+  </span>
+</h3>
+<ul id="tag-list">
+{foreach $tags as $tag => $path}
+{aurl 'url', $view_url, array($project.shortname, $tag)}
+<li class="label{if in_array($tag, $tags_in)} active{/if}">
+  <a href="{$url}" class="label">{if $path}{$path}{else}{$tag}{/if}</a>
+</li>
+{/foreach}
+</ul>
+{/if}
+</div>
+

src/IDF/templates/idf/source/git/changelog.html

@@ -1,17 +1,5 @@
 {extends "idf/source/changelog.html"}
 {block context}
-<p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a></span><br/>
-{/foreach}
-</p>
-{if $tags}
-<p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$tag}{/if}</a></span><br/>
-{/foreach}
-</p>
-{/if}
+{assign $view_url = 'IDF_Views_Source::changeLog'}
+{include 'idf/source/git/branch_tag_list.html'}
 {/block}

src/IDF/templates/idf/source/git/commit.html

@@ -1,18 +1,5 @@
 {extends "idf/source/commit.html"}
 {block context}
-<p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br/>
-{/foreach}
-</p>
-{if $tags}
-<p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$tag}{/if}</a></span><br/>
-{/foreach}
-</p>
-{/if}
+{include 'idf/source/git/branch_tag_list.html'}
 {/block}
 

src/IDF/templates/idf/source/git/file.html

@@ -6,7 +6,7 @@
 
 <table class="code" summary=" ">
 {if !$tree_in and !$tags_in}
-{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)} 
+{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)}
 <tfoot>
 <tr><th colspan="2">{blocktrans}Source at commit <a class="mono" href="{$url}">{$commit}</a> created {$cobject.date|dateago}.{/blocktrans}<br/>
 <span class="smaller">{blocktrans}By {$cobject.author|strip_tags|trim}, {$cobject.title}{/blocktrans}</span>
@@ -22,20 +22,7 @@
 
 {/block}
 {block context}
-<p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a></span><br/>
-{/foreach}
-</p>
-{if $tags}
-<p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$tag}{/if}</a></span><br/>
-{/foreach}
-</p>
-{/if}
+{include 'idf/source/git/branch_tag_list.html'}
 {/block}
 
 {block javascript}

src/IDF/templates/idf/source/git/tree.html

@@ -52,18 +52,5 @@
 
 {/block}
 {block context}
-<p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$branch}{/if}</a></span><br/>
-{/foreach}
-</p>
-{if $tags}
-<p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$tag}{/if}</a></span><br/>
-{/foreach}
-</p>
-{/if}
+{include 'idf/source/git/branch_tag_list.html'}
 {/block}

src/IDF/templates/idf/source/mercurial/branch_tag_list.html

@@ -0,0 +1,39 @@
+{if !$view_url}
+{assign $view_url = 'IDF_Views_Source::treeBase'}
+{/if}
+<div class="expander">
+<div class="gradient"></div>
+<h3>
+  {trans 'Branches'}
+  <span class="input-with-delete">
+    <input type="text" rel="branch-list" class="filter-list"  title="{trans 'filter branches'}" />
+    <span></span>
+  </span>
+</h3>
+<ul id="branch-list">
+{foreach $branches as $branch => $path}
+{aurl 'url', $view_url, array($project.shortname, $branch)}
+<li class="label{if in_array($branch, $tree_in)} active{/if}">
+  <a href="{$url}" class="label">{$branch}</a>
+</li>
+{/foreach}
+</ul>
+{if $tags}
+<h3>
+  {trans 'Tags'}
+  <span class="input-with-delete">
+    <input type="text" rel="tag-list" class="filter-list"  title="{trans 'filter tags'}" />
+    <span></span>
+  </span>
+</h3>
+<ul id="tag-list">
+{foreach $tags as $tag => $path}
+{aurl 'url', $view_url, array($project.shortname, $tag)}
+<li class="label{if in_array($tag, $tags_in)} active{/if}">
+  <a href="{$url}" class="label">{$tag}</a>
+</li>
+{/foreach}
+</ul>
+{/if}
+</div>
+

src/IDF/templates/idf/source/mercurial/changelog.html

@@ -1,18 +1,6 @@
 {extends "idf/source/changelog.html"}
 {block context}
-<p><strong>{trans 'Branches:'}</strong><br />
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />
-{/foreach}
-</p>
-{if $tags}
-<p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{$tag}</a></span><br/>
-{/foreach}
-</p>
-{/if}
+{assign $view_url = 'IDF_Views_Source::changeLog'}
+{include 'idf/source/mercurial/branch_tag_list.html'}
 {/block}
 

src/IDF/templates/idf/source/mercurial/commit.html

@@ -1,18 +1,5 @@
 {extends "idf/source/commit.html"}
 {block context}
-<p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br/>
-{/foreach}
-</p>
-{if $tags}
-<p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{if $path}{$path}{else}{$tag}{/if}</a></span><br/>
-{/foreach}
-</p>
-{/if}
+{include 'idf/source/mercurial/branch_tag_list.html'}
 {/block}
 

src/IDF/templates/idf/source/mercurial/file.html

@@ -7,7 +7,7 @@
 
 <table class="code" summary=" ">
 {if !$tree_in}
-{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)} 
+{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)}
 <tfoot>
 <tr><th colspan="2">{blocktrans}Source at commit <a class="mono" href="{$url}">{$commit}</a> created {$cobject.date|dateago}.{/blocktrans}<br />
 <span class="smaller">{blocktrans}By {$cobject.author|strip_tags|trim}, {$cobject.title}{/blocktrans}</span>
@@ -23,20 +23,7 @@
 {/block}
 
 {block context}
-<p><strong>{trans 'Branches:'}</strong><br />
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />
-{/foreach}
-</p>
-{if $tags}
-<p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::tree', array($project.shortname, 'HEAD', $path)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{$tag}</a></span><br/>
-{/foreach}
-</p>
-{/if}
+{include 'idf/source/mercurial/branch_tag_list.html'}
 {/block}
 
 {block javascript}

src/IDF/templates/idf/source/mercurial/tree.html

@@ -12,7 +12,7 @@
 <th>{trans 'Size'}</th>
 </tr>
 </thead>{if !$tree_in and !$tags_in}
-{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)} 
+{aurl 'url', 'IDF_Views_Source::commit', array($project.shortname, $commit)}
 <tfoot>
 <tr><th colspan="5">{blocktrans}Source at commit <a class="mono" href="{$url}">{$commit}</a> created {$cobject.date|dateago}.{/blocktrans}<br />
 <span class="smaller">{blocktrans}By {$cobject.author|strip_tags|trim}, {$cobject.title}{/blocktrans}</span>
@@ -34,7 +34,7 @@
 <td{if $file.type != 'blob'} colspan="4"{/if}><a href="{$url}">{$file.file}</a></td>
 {if $file.type == 'blob'}
 {if isset($file.date)}
-<td><span class="smaller">{$file.date|dateago:"without"}</span></td> 
+<td><span class="smaller">{$file.date|dateago:"without"}</span></td>
 <td><span class="smaller">{$file.author|strip_tags|trim}{trans ':'} {$file.log}</span></td>
 {else}<td colspan="2"></td>{/if}
 <td></td>{/if}
@@ -47,17 +47,6 @@
 {/block}
 
 {block context}
-<p><strong>{trans 'Branches:'}</strong><br />
-{foreach $branches as $branch => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $branch)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}"><a href="{$url}" class="label">{$branch}</a></span><br />
-{/foreach}
-</p>
-{if $tags}<p><strong>{trans 'Tags:'}</strong><br />
-{foreach $tags as $tag => $path}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $tag)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}"><a href="{$url}" class="label">{$tag}</a></span><br />
-{/foreach}
-</p>{/if}
+{include 'idf/source/mercurial/branch_tag_list.html'}
 {/block}
 

src/IDF/templates/idf/source/mtn/branch_tag_list.html

@@ -0,0 +1,39 @@
+{if !$view_url}
+{assign $view_url = 'IDF_Views_Source::treeBase'}
+{/if}
+<div class="expander">
+<div class="gradient"></div>
+<h3>
+  {trans 'Branches'}
+  <span class="input-with-delete">
+    <input type="text" rel="branch-list" class="filter-list"  title="{trans 'filter branches'}" />
+    <span></span>
+  </span>
+</h3>
+<ul id="branch-list">
+{foreach $branches as $selector => $branch}
+{aurl 'url', $view_url, array($project.shortname, $selector)}
+<li class="{if in_array($selector, $tree_in)}active{/if}">
+  <a href="{$url}" class="label">{$branch}</a>
+</li>
+{/foreach}
+</ul>
+{if $tags}
+<h3>
+  {trans 'Tags'}
+  <span class="input-with-delete">
+    <input type="text" rel="tag-list" class="filter-list"  title="{trans 'filter tags'}" />
+    <span></span>
+  </span>
+</h3>
+<ul id="tag-list">
+{foreach $tags as $selector => $tag}
+{aurl 'url', $view_url, array($project.shortname, $selector)}
+<li class="{if in_array($selector, $tags_in)}active{/if}">
+  <a href="{$url}" class="label">{$tag}</a>
+</li>
+{/foreach}
+</ul>
+{/if}
+</div>
+

src/IDF/templates/idf/source/mtn/changelog.html

@@ -1,32 +1,5 @@
 {extends "idf/source/changelog.html"}
 {block context}
-<div class="expander">
-<div class="gradient"></div>
-<h1>
-  {trans 'Branches'}
-  <input type="text" rel="branch-list" class="filter-list"  title="{trans 'filter branches'}" />
-</h1>
-<ul id="branch-list">
-{foreach $branches as $selector => $branch}
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $selector)}
-<li class="{if in_array($selector, $tree_in)}active{/if}">
-  <a href="{$url}" class="label">{$branch}</a>
-</li>
-{/foreach}
-</ul>
-{if $tags}
-<h1>
-  {trans 'Tags'}
-  <input type="text" rel="tag-list" class="filter-list" title="{trans 'filter tags'}" />
-</h1>
-<ul id="tag-list">
-{foreach $tags as $selector => $tag}
-{aurl 'url', 'IDF_Views_Source::changeLog', array($project.shortname, $selector)}
-<li class="{if in_array($selector, $tags_in)}active{/if}">
-  <a href="{$url}" class="label">{$tag}</a>
-</li>
-{/foreach}
-</ul>
-{/if}
-</div>
+{assign $view_url = 'IDF_Views_Source::changeLog'}
+{include 'idf/source/mtn/branch_tag_list.html'}
 {/block}

src/IDF/templates/idf/source/mtn/commit.html

@@ -1,32 +1,4 @@
 {extends "idf/source/commit.html"}
 {block context}
-<div class="expander">
-<div class="gradient"></div>
-<h1>
-  {trans 'Branches'}
-  <input type="text" rel="branch-list" class="filter-list"  title="{trans 'filter branches'}" />
-</h1>
-<ul id="branch-list">
-{foreach $branches as $selector => $branch}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
-<li class="{if in_array($branch, $tree_in)}active{/if}">
-  <a href="{$url}" class="label">{$branch}</a>
-</li>
-{/foreach}
-</ul>
-{if $tags}
-<h1>
-  {trans 'Tags'}
-  <input type="text" rel="tag-list" class="filter-list" title="{trans 'filter tags'}" />
-</h1>
-<ul id="tag-list">
-{foreach $tags as $selector => $tag}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
-<li class="{if in_array($tag, $tags_in)}active{/if}">
-  <a href="{$url}" class="label">{$tag}</a>
-</li>
-{/foreach}
-</ul>
-{/if}
-</div>
+{include 'idf/source/mtn/branch_tag_list.html'}
 {/block}

src/IDF/templates/idf/source/mtn/file.html

@@ -19,33 +19,12 @@
 </table>
 {aurl 'url', 'IDF_Views_Source::getFile', array($project.shortname, $commit, $fullpath)}
 <p class="right soft"><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/package-grey.png'}" alt="{trans 'Archive'}" align="bottom" /></a> <a href="{$url}">{trans 'Download this file'}</a></p>
-
-{/block}
-{block context}
-<p><strong>{trans 'Branches:'}</strong><br/>
-{foreach $branches as $selector => $branch}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
-<span class="label{if in_array($branch, $tree_in)} active{/if}">
-    <a href="{$url}" class="label" title="{$branch}">
-        {$branch|shorten:25}
-    </a>
-</span><br/>
-{/foreach}
-</p>
-{if $tags}
-<p><strong>{trans 'Tags:'}</strong><br/>
-{foreach $tags as $selector => $tag}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
-<span class="label{if in_array($tag, $tags_in)} active{/if}">
-    <a href="{$url}" class="label" title="{$tag}">
-        {$tag|shorten:25}
-    </a>
-</span><br/>
-{/foreach}
-</p>
-{/if}
 {/block}
 {block javascript}
 <script type="text/javascript" src="{media '/idf/js/prettify.js'}"></script>
 <script type="text/javascript">prettyPrint();</script>
 {/block}
+{block context}
+{include 'idf/source/mtn/branch_tag_list.html'}
+{/block}
+

src/IDF/templates/idf/source/mtn/tree.html

@@ -51,37 +51,8 @@
 <a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/package-grey.png'}" alt="{trans 'Archive'}" align="bottom" /></a> <a href="{$url}">{trans 'Download this version'}</a> {trans 'or'}
 <kbd>mtn clone {$project.getSourceAccessUrl($user, $commit)}</kbd> <a href="{url 'IDF_Views_Source::help', array($project.shortname)}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/help.png'}" alt="{trans 'Help'}" /></a>
 </p>
-
-
 {/block}
 {block context}
-<div class="expander">
-<div class="gradient"></div>
-<h1>
-  {trans 'Branches'}
-  <input type="text" rel="branch-list" class="filter-list"  title="{trans 'filter branches'}" />
-</h1>
-<ul id="branch-list">
-{foreach $branches as $selector => $branch}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
-<li class="{if in_array($selector, $tree_in)}active{/if}">
-  <a href="{$url}" class="label">{$branch}</a>
-</li>
-{/foreach}
-</ul>
-{if $tags}
-<h1>
-  {trans 'Tags'}
-  <input type="text" rel="tag-list" class="filter-list"  title="{trans 'filter tags'}" />
-</h1>
-<ul id="tag-list">
-{foreach $tags as $selector => $tag}
-{aurl 'url', 'IDF_Views_Source::treeBase', array($project.shortname, $selector)}
-<li class="{if in_array($selector, $tags_in)}active{/if}">
-  <a href="{$url}" class="label">{$tag}</a>
-</li>
-{/foreach}
-</ul>
-{/if}
-</div>
+{include 'idf/source/mtn/branch_tag_list.html'}
 {/block}
+

www/media/idf/css/style.css

@@ -863,7 +863,7 @@ ol > li {
  */
 .context {}
 
-.context h1 {
+.context h3 {
   font-size: 13px;
   font-weight: bold;
   margin: 10px 0 5px;
@@ -918,24 +918,79 @@ ol > li {
   display: none;
 }
 
-.context > .expander input.filter-list {
+.context > .expander span.input-with-delete {
+  padding: 1px;
+  border: 1px dotted #474747;
+  display: none;
+  float: right;
+  margin-left: 10px;
+  margin-top: -3px;
+}
+
+.context > .expander span.input-with-delete * {
+  vertical-align: middle;
+}
+
+.context > .expander span.input-with-delete span {
+  display: inline-block;
+  width: 13px;
+  height: 12px;
+  background: url(../img/clear.png) left top no-repeat;
+  cursor: pointer;
+}
+
+.context > .expander span.input-with-delete input.filter-list {
   font-size: 11px;
   font-weight: normal;
   color: #333;
-  border: 1px dotted #474747;
-  margin-left: 10px;
-  padding: 2px;
-  width: 80px;
-  display: none;
-  float: right;
+  border: 0;
+  width: 100px;
+  height: 11px;
 }
 
-.context > .expander:hover input.filter-list.activated,
-.context > .expander.activated input.filter-list.activated {
+.context > .expander:hover span.input-with-delete.activated,
+.context > .expander.activated span.input-with-delete.activated {
   display: block;
 }
 
-.context > .expander input.filter-list.default {
-  color: #aaa;
-  border-color: #aaa;
+.context > .expander div.input-with-delete.default {
+  opacity: 0.5;
+}
+
+/**
+ * SCM action icons in the commit view
+ */
+span.scm-action {
+  display: inline-block;
+  line-height: 9px;
+  font-size: 9px;
+  text-align: center;
+  padding: 2px;
+  width: 9px;
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  border-radius: 3px;
+  color: white;
+  cursor: default;
+  margin-top: 2px;
+}
+
+span.scm-action.added {
+  background-color: darkgreen;
+}
+
+span.scm-action.deleted {
+  background-color: darkred;
+}
+
+span.scm-action.patched {
+  background-color: orange;
+}
+
+span.scm-action.renamed {
+  background-color: purple;
+}
+
+span.scm-action.property-changed {
+  background-color: blue;
 }