From 662257ff3ecef739375524649265a3938a81faf8 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 21 Sep 2018 17:16:16 -0400
Subject: [PATCH] Polish up some loose ends

---
 gitsrht/app.py                  |  4 +++-
 gitsrht/templates/repo.html     | 12 +++++++-----
 gitsrht/templates/settings.html | 14 +++++++-------
 gitsrht/templates/summary.html  | 12 ++++++++++--
 gitsrht/templates/tree.html     |  4 +---
 5 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/gitsrht/app.py b/gitsrht/app.py
index a0704cb..34c5207 100644
--- a/gitsrht/app.py
+++ b/gitsrht/app.py
@@ -1,3 +1,4 @@
+import stat
 from flask import session
 from srht.flask import SrhtFlask
 from srht.config import cfg
@@ -40,8 +41,9 @@ class GitApp(SrhtFlask):
             if notice:
                 del session["notice"]
             return {
-                "trim_commit": trim_commit,
                 "commit_time": commit_time,
+                "trim_commit": trim_commit,
+                "stat": stat,
                 "notice": notice
             }
 
diff --git a/gitsrht/templates/repo.html b/gitsrht/templates/repo.html
index 1f3c855..3539105 100644
--- a/gitsrht/templates/repo.html
+++ b/gitsrht/templates/repo.html
@@ -16,14 +16,14 @@
       {% endmacro %}
       <ul class="nav nav-tabs">
         <li class="nav-item">
-          {{ link(url_for("repo.summary",
+          {{link(url_for("repo.summary",
             owner=repo.owner.canonical_name,
-            repo=repo.name), "summary") }}
+            repo=repo.name), "summary")}}
         </li>
         <li class="nav-item">
-          {{ link(url_for("repo.tree",
+          {{link(url_for("repo.tree",
             owner=repo.owner.canonical_name,
-            repo=repo.name), "tree") }}
+            repo=repo.name), "tree")}}
         </li>
         <li class="nav-item">
           <a class="nav-link" href="#">log</a>
@@ -32,7 +32,9 @@
           <a class="nav-link" href="#">refs</a>
         </li>
         <li class="nav-item">
-          <a class="nav-link" href="#">settings</a>
+          {{link(url_for("manage.settings_info",
+            owner_name=repo.owner.canonical_name,
+            repo_name=repo.name), "settings")}}
         </li>
       </ul>
       {% endblock %}
diff --git a/gitsrht/templates/settings.html b/gitsrht/templates/settings.html
index 1a6085a..b76a48b 100644
--- a/gitsrht/templates/settings.html
+++ b/gitsrht/templates/settings.html
@@ -1,21 +1,21 @@
 {% extends "layout.html" %}
 {% block body %} 
-<div class="container">
+<div class="container-fluid">
   <div class="row">
-    <div class="col-md-12">
+    <div class="col-md-12 header-tabbed">
       <h2>
         <a
           href="/{{ owner.canonical_name }}"
         >{{ owner.canonical_name }}</a>/{{ repo.name }}
       </h2>
+      <ul class="nav nav-tabs">
+        {% block tabs %}
+        {% include "tabs.html" %}
+        {% endblock %}
+      </ul>
     </div>
   </div>
 </div>
-<ul class="nav nav-tabs">
-  {% block tabs %}
-  {% include "tabs.html" %}
-  {% endblock %}
-</ul>
 <div class="container">
   {% block content %}{% endblock %}
 </div>
diff --git a/gitsrht/templates/summary.html b/gitsrht/templates/summary.html
index 30b095f..38a8df7 100644
--- a/gitsrht/templates/summary.html
+++ b/gitsrht/templates/summary.html
@@ -1,5 +1,12 @@
 {% extends "repo.html" %}
 {% block content %}
+{% if repo.description %}
+<div class="header-extension">
+  <div class="container">
+    {{ repo.description }}
+  </div>
+</div>
+{% endif %}
 <div class="container">
   <div class="row" style="margin-bottom: 1rem">
     <div class="col-md-6">
@@ -26,15 +33,16 @@
         {% if default_branch %}
         <dt>{{default_branch.name[len("refs/heads/"):]}}</dt>
         <dd>
-          <a href="#">log {{icon("caret-right")}}</a>
           <a href="#">browse {{icon("caret-right")}}</a>
+          <a href="#">log {{icon("caret-right")}}</a>
         </dd>
         {% endif %}
         {% if latest_tag %}
         <dt>{{ latest_tag[0][len("refs/tags/"):] }}</dt>
         <dd>
-          <a href="#">log {{icon("caret-right")}}</a>
+          <a href="#">browse {{icon("caret-right")}}</a>
           <a href="#">.tar.gz {{icon("caret-right")}}</a>
+          <a href="#">announcement {{icon("caret-right")}}</a>
         </dd>
         {% endif %}
       </dl>
diff --git a/gitsrht/templates/tree.html b/gitsrht/templates/tree.html
index db11622..3e79a26 100644
--- a/gitsrht/templates/tree.html
+++ b/gitsrht/templates/tree.html
@@ -20,10 +20,8 @@
     <div class="col-md-12">
       <div class="tree-list">
       {% for entry in tree %}
-      {# TODO: Decode the mode #}
       <div class="mode">
-        {#{{"{0:o}".format(entry.filemode)}}#}
-        -rw-r--r--
+        {{stat.filemode(entry.filemode)}}
       </div>
       <div class="name {{entry.type}}">
         <a href="#">{{entry.name}}{% if entry.type == "tree" %}/{% endif %}</a>
-- 
2.38.4