add option local_only to branch block

Author: alexandresalome

src/Gitonomy/Browser/Resources/views/git/default_theme.html.twig

@@ -105,33 +105,37 @@
 
 {% block branches %}
 {% spaceless %}
-    {% for branch in branches %}
-        <li>
-            <a href="{{ path('reference', {fullname: branch.fullname}) }}">
-                <strong>{{ branch.name }}</strong>
-            </a>
-            <small>
-                {{ git_author(branch.commit) }}
-                {{ branch.commit.authorDate.format('d/m/Y') }}
-            </small>
-        </li>
-    {% endfor %}
+    <ul>
+        {% for branch in branches %}
+            <li>
+                <a href="{{ git_url(branch) }}">
+                    <strong>{{ branch.name }}</strong>
+                </a>
+                <small>
+                    {{ git_author(branch.commit) }}
+                    {{ branch.commit.authorDate.format('d/m/Y') }}
+                </small>
+            </li>
+        {% endfor %}
+    </ul>
 {% endspaceless %}
 {% endblock %}
 
 {% block tags %}
 {% spaceless %}
-    {% for tag in tags %}
-        <li>
-            <a href="{{ path('reference', {fullname: tag.fullname}) }}">
-                <strong>{{ tag.name }}</strong>
-            </a>
-            <small>
-                {{ git_author(tag.commit) }}
-                {{ tag.commit.authorDate.format('d/m/Y') }}
-            </small>
-        </li>
-    {% endfor %}
+    <ul>
+        {% for tag in tags %}
+            <li>
+                <a href="{{ git_url(tag) }}">
+                    <strong>{{ tag.name }}</strong>
+                </a>
+                <small>
+                    {{ git_author(tag.commit) }}
+                    {{ tag.commit.authorDate.format('d/m/Y') }}
+                </small>
+            </li>
+        {% endfor %}
+    </ul>
 {% endspaceless %}
 {% endblock %}
 

src/Gitonomy/Browser/Resources/views/repository.html.twig

@@ -1,12 +1,12 @@
 {% extends "layout.html.twig" %}
 
 {% block content %}
-    <h2>Branches</h2>
+    <h3>Branches</h3>
     {{ git_branches(repository) }}
 
-    <h2>Tags</h2>
+    <h3>Tags</h3>
     {{ git_tags(repository) }}
 
-    <h2>Logs</h2>
+    <h3>Logs</h3>
     {{ git_log(repository.log.setLimit(30), {query_url: path('log_ajax')}) }}
 {% endblock %}

src/Gitonomy/Browser/Resources/views/repository_list.html.twig

@@ -2,25 +2,11 @@
 
 {% block content %}
     {% for repository in repositories %}
-        <h2>
+        <h3>
             <a href="{{ path('repository', {repository: repository}) }}">
                 {{ repository }}
             </a>
-        </h2>
-        <ul>
-            {% for branch in repository.references.localBranches %}
-                <li>
-                    {% spaceless %}
-                        <a href="{{ path('reference', {repository: repository, fullname: branch.fullname}) }}">
-                            <strong>{{ branch.name }}</strong>
-                        </a>
-                    {% endspaceless %}
-                    <small>
-                        {{ git_author(branch.commit) }}
-                        {{ branch.commit.authorDate.format('d/m/Y') }}
-                    </small>
-                </li>
-            {% endfor %}
-        </ul>
+        </h3>
+        {{ git_branches(repository, {local_only: true}) }}
     {% endfor %}
 {% endblock %}

src/Gitonomy/Browser/Twig/GitExtension.php

@@ -123,10 +123,18 @@ public function renderDiff(\Twig_Environment $env, Diff $diff, array $options =
         ));
     }
 
-    public function renderBranches(\Twig_Environment $env, Repository $repository)
+    public function renderBranches(\Twig_Environment $env, Repository $repository, array $options = array())
     {
+        $options = array_merge(array('local_only' => false), $options);
+
+        if (!$options['local_only']) {
+            $branches = $repository->getReferences()->getBranches();
+        } else {
+            $branches = $repository->getReferences()->getLocalBranches();
+        }
+
         return $this->renderBlock($env, 'branches', array(
-            'branches' => $repository->getReferences()->getBranches(),
+            'branches' => $branches,
         ));
     }
 
@@ -152,11 +160,6 @@ public function renderAuthor(\Twig_Environment $env, Commit $commit, array $opti
         ));
     }
 
-    public function getName()
-    {
-        return 'git';
-    }
-
     public function addThemes($themes)
     {
         $themes = reset($themes);
@@ -179,4 +182,12 @@ public function renderBlock(\Twig_Environment $env, $block, $context = array())
 
         throw new \InvalidArgumentException('Unable to find block '.$block);
     }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getName()
+    {
+        return 'git';
+    }
 }

web/css/layout.css

@@ -1,8 +1,12 @@
-h1, h2, h3, p, body {
+h1, h2, h3, p, body, ul, li {
     margin: 0;
     padding: 0;
 }
 
+li {
+    list-style-type: none;
+}
+
 body {
     margin: 0;
     font-family: sans-serif;
@@ -72,9 +76,17 @@ body {
 }
 
 .gitonomy-browser h2 {
+    font-weight: normal;
+    font-size: 2em;
+    line-height: 2em;
+    color: #333;
+}
+
+.gitonomy-browser h3 {
     font-weight: normal;
     font-size: 1.3em;
     padding-top: 1em;
+    margin-bottom: 0.3em;
     color: #333;
     border-bottom: 1px solid #ddd;
 }