4 files changed, 58 insertions(+), 50 deletions(-)

M gitsrht/blueprints/repo.py
A gitsrht/templates/repo-full.html
M gitsrht/templates/repo.html
M gitsrht/templates/tree.html

@@ 164,7 164,7 @@ def tree(owner, repo, ref, path):
                         data = blob.data.decode()
                     except:
                         data = '[unable to decode]'
-                return render_template("blob.html", view="tree",
+                return render_template("blob.html", view="blob",
                         owner=owner, repo=repo, ref=ref, path=path, entry=entry,
                         blob=blob, data=data, commit=commit,
                         highlight_file=_highlight_file,

@@ 0,0 1,6 @@
+{% extends "repo.html" %}
+{% block nav %}
+<nav class="navbar navbar-light navbar-expand-sm">
+  {% include 'nav.html' %}
+</nav>
+{% endblock %}

@@ 1,4 1,4 @@
-{% extends "layout-full.html" %}
+{% extends "layout.html" %}
 {% block head %}
 {% if repo.visibility.value =='unlisted' %}
 <meta name="robots" content="noindex">


@@ 8,9 8,19 @@
   content="{{domain}}/{{owner.canonical_name}}/{{repo.name}} git {{(repo | clone_urls)[0]}}">
 {% endblock %}
 {% block body %}
-<div class="container-fluid">
-  <div class="row">
-    <div class="col-md-12 header-tabbed">
+<div class="header-tabbed">
+  {% if view == "blob" %}
+  <div class="container-fluid">
+  {% else %}
+  <div class="container">
+  {% endif %}
+    {% block tabs %}
+    {% macro link(path, title, alternates) %}
+    <a
+      class="nav-link {% if view == title or view in alternates %}active{% endif %}"
+      href="{{ path }}">{{ title }}</a>
+    {% endmacro %}
+    <ul class="nav nav-tabs">
       <h2>
         <a href="{{ url_for("public.user_index",
           username=owner.username) }}"


@@ 19,50 29,42 @@
         <small class="text-muted">{{repo.visibility.value}}</small>
         {% endif %}
       </h2>
-      {% block tabs %}
-      {% macro link(path, title) %}
-      <a
-        class="nav-link {% if view == title %}active{% endif %}"
-        href="{{ path }}">{{ title }}</a>
-      {% endmacro %}
-      <ul class="nav nav-tabs">
-        <li class="nav-item">
-          {{link(url_for("repo.summary",
-            owner=repo.owner.canonical_name,
-            repo=repo.name), "summary")}}
-        </li>
-        <li class="nav-item">
-          {{link(url_for("repo.tree",
-            owner=repo.owner.canonical_name,
-            repo=repo.name), "tree")}}
-        </li>
-        <li class="nav-item">
-          {{link(url_for("repo.log",
-            owner=repo.owner.canonical_name,
-            repo=repo.name), "log")}}
-        </li>
-        <li class="nav-item">
-          {{link(url_for("repo.refs",
-            owner=repo.owner.canonical_name,
-            repo=repo.name), "refs")}}
-        </li>
-        <li class="nav-item">
-          {{link(url_for("stats.contributors",
-            owner=repo.owner.canonical_name,
-            repo=repo.name), "contributors")}}
-        </li>
-        {% if current_user.id == repo.owner_id %}
-        <li class="nav-item">
-          {{link(url_for("manage.settings_info",
-            owner_name=repo.owner.canonical_name,
-            repo_name=repo.name), "settings")}}
-        </li>
-        {% endif %}
-        {% block tabs_extra %}{% endblock %}
-      </ul>
-      {% endblock %}
-    </div>
+      <li class="nav-item">
+        {{link(url_for("repo.summary",
+          owner=repo.owner.canonical_name,
+          repo=repo.name), "summary")}}
+      </li>
+      <li class="nav-item">
+        {{link(url_for("repo.tree",
+          owner=repo.owner.canonical_name,
+          repo=repo.name), "tree", ["blob"])}}
+      </li>
+      <li class="nav-item">
+        {{link(url_for("repo.log",
+          owner=repo.owner.canonical_name,
+          repo=repo.name), "log")}}
+      </li>
+      <li class="nav-item">
+        {{link(url_for("repo.refs",
+          owner=repo.owner.canonical_name,
+          repo=repo.name), "refs")}}
+      </li>
+      <li class="nav-item">
+        {{link(url_for("stats.contributors",
+          owner=repo.owner.canonical_name,
+          repo=repo.name), "contributors")}}
+      </li>
+      {% if current_user.id == repo.owner_id %}
+      <li class="nav-item">
+        {{link(url_for("manage.settings_info",
+          owner_name=repo.owner.canonical_name,
+          repo_name=repo.name), "settings")}}
+      </li>
+      {% endif %}
+      {% block tabs_extra %}{% endblock %}
+    </ul>
   </div>
+{% endblock %}
 </div>
 {% block content %}{% endblock %}
 {% endblock %}

@@ 5,7 5,7 @@
 {% endblock %}
 {% block content %}
 <div class="header-extension">
-  <div class="container-fluid">
+  <div class="container">
     <span style="padding-left: 1rem">
       {{ utils.breadcrumb(ref, repo, path, path_join) }}
     </span>


@@ 31,7 31,7 @@
     <div class="clearfix"></div>
   </div>
 </div>
-<div class="container-fluid">
+<div class="container">
   <div class="row" style="margin-bottom: 1rem">
     <div class="col-md-12">
       {# chromium has a hard limit on 1000 rows per grid #}