cleanup

Author: alexandresalome

Resources/doc/usage/blocks.rst

@@ -138,6 +138,11 @@ And your template:
 
     {{ git_tree(tree, revision, path) }}
 
+    {# or #}
+
+    {{ git_blob(blob) }}
+
+
 Another useful function when you're rendering a tree is what is called a "pathcrumb":
 a breadcrumb with all parent folders and links on them.
 

Resources/public/css/all.css

@@ -247,7 +247,7 @@ span.git-author {
     margin: 0;
     font-size;: 1.5em;
     line-heig;ht: 1.5em;
-    font-family: tellural;
+    display: inline-block;
 }
 
 .pathcrumb li {

Routing/GitUrlGenerator.php

@@ -16,7 +16,7 @@ class GitUrlGenerator extends AbstractGitUrlGenerator
      */
     public function getName(Repository $repository)
     {
-        $name = basename($repository->getGitDir());
+        $name = basename($repository->getPath());
 
         if (preg_match('/^(.*)\.git$/', $name, $vars)) {
             return $vars[1];

Twig/GitExtension.php

@@ -83,8 +83,6 @@ public function getFunctions()
             new \Twig_SimpleFunction('git_url',               array($this, 'getUrl')),
 
             new \Twig_SimpleFunction('git_status',            array($this, 'renderStatus'),           array('is_safe' => array('html'), 'needs_environment' => true)),
-            new \Twig_SimpleFunction('git_branches',          array($this, 'renderBranches'),         array('is_safe' => array('html'), 'needs_environment' => true)),
-            new \Twig_SimpleFunction('git_tags',              array($this, 'renderTags'),             array('is_safe' => array('html'), 'needs_environment' => true)),
 
             new \Twig_SimpleFunction('git_render',            array($this, 'renderBlock'),            array('is_safe' => array('html'), 'needs_environment' => true)),
         );
@@ -240,9 +238,18 @@ public function renderBlob($env, Blob $blob)
         return $this->renderBlock($env, $block, $args);
     }
 
-    public function renderLabel(\Twig_Environment $env, Revision $revision)
+    public function renderLabel(\Twig_Environment $env, $revisions)
     {
-        return $this->renderBlock($env, 'git_label_revision', array('revision' => $revision));
+        if (!is_array($revisions)) {
+            $revisions = array($revisions);
+        }
+
+        $result = '';
+        foreach ($revisions as $revision) {
+            $result .= $this->renderBlock($env, 'git_label_revision', array('revision' => $revision));
+        }
+
+        return $result;
     }
 
     /**