From f5815915217ab217d4d1aa5db592d24c2a2744a9 Mon Sep 17 00:00:00 2001
From: Sunil Mohan Adapa <sunil@medhas.org>
Date: Sat, 19 Oct 2019 15:29:32 -0700
Subject: [PATCH] gitweb: Minor visual changes to templates

- Remove cancel button in favor of back button.

- In create/edit form, make the form full width to make it consistent with other
  forms. The styling for all the forms can be changed together, if desired.

- Remove dead HTML code outside block context in inherited template.

- Add missing 'list-group' parent for repository list as suggested by bootstrap.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
---
 .../gitweb/templates/gitweb_configure.html    | 47 ++++++++++---------
 .../gitweb/templates/gitweb_create_edit.html  |  4 +-
 .../gitweb/templates/gitweb_delete.html       |  3 --
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/plinth/modules/gitweb/templates/gitweb_configure.html b/plinth/modules/gitweb/templates/gitweb_configure.html
index d48780a62..84b615f33 100644
--- a/plinth/modules/gitweb/templates/gitweb_configure.html
+++ b/plinth/modules/gitweb/templates/gitweb_configure.html
@@ -44,8 +44,6 @@
   </a>
 {% endblock %}
 
-<h2>{{ title }}</h2>
-
 {% block configuration %}
   {{ block.super }}
 
@@ -56,30 +54,35 @@
       {% if not repos %}
         <p>{% trans 'No repositories available.' %}</p>
       {% else %}
-        {% for repo in repos %}
-          <div class="list-group-item clearfix">
-            <a href="{% url 'gitweb:delete' repo.name %}"
-              class="btn btn-default btn-sm pull-right"
-              role="button"
-              title="{% blocktrans %}Delete repository {{ repo.name }}{% endblocktrans %}">
-              <span class="fa fa-trash-o" aria-hidden="true"></span>
-            </a>
-            <a class="repo-edit btn btn-sm btn-default pull-right"
-              href="{% url 'gitweb:edit' repo.name %}">
-              <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
-            </a>
+        <div class="list-group">
+          {% for repo in repos %}
+            <div class="list-group-item clearfix">
+              <a href="{% url 'gitweb:delete' repo.name %}"
+                class="btn btn-default btn-sm pull-right"
+                role="button"
+                title="{% blocktrans %}Delete repository {{ repo.name }}{% endblocktrans %}">
+                <span class="fa fa-trash-o" aria-hidden="true"></span>
+              </a>
+
+              <a class="repo-edit btn btn-sm btn-default pull-right"
+                href="{% url 'gitweb:edit' repo.name %}">
+                <span class="fa fa-pencil-square-o" aria-hidden="true"></span>
+              </a>
+
               {% if repo.access == 'private' %}
-                  <span class="repo-private-icon fa fa-lock pull-right" aria-label="private"></span></span>
+                <span class="repo-private-icon fa fa-lock pull-right"
+                      aria-label="private"></span>
               {% endif %}
-            <a class="repo-label" href="/gitweb/{{ repo.name }}.git"
-              title="{% blocktrans %}Go to repository {{ repo.name }}{% endblocktrans %}">
-              {{ repo.name }}
-            </a>
-          </div>
-        {% endfor %}
+
+              <a class="repo-label" href="/gitweb/{{ repo.name }}.git"
+                title="{% blocktrans %}Go to repository {{ repo.name }}{% endblocktrans %}">
+                {{ repo.name }}
+              </a>
+            </div>
+          {% endfor %}
+        </div>
       {% endif %}
     </div>
   </div>
-</div>
 
 {% endblock %}
diff --git a/plinth/modules/gitweb/templates/gitweb_create_edit.html b/plinth/modules/gitweb/templates/gitweb_create_edit.html
index b251e8ab3..9af6cb3af 100644
--- a/plinth/modules/gitweb/templates/gitweb_create_edit.html
+++ b/plinth/modules/gitweb/templates/gitweb_create_edit.html
@@ -25,7 +25,7 @@
 {% block content %}
 
   <h3>{{ title }}</h3>
-<div class="col-sm-6">
+
   <form class="form" method="post">
     {% csrf_token %}
 
@@ -34,5 +34,5 @@
     <input type="submit" class="btn btn-primary"
            value="{% trans "Submit" %}"/>
   </form>
-</div>
+
 {% endblock %}
diff --git a/plinth/modules/gitweb/templates/gitweb_delete.html b/plinth/modules/gitweb/templates/gitweb_delete.html
index c6d138e8b..b02e121bf 100644
--- a/plinth/modules/gitweb/templates/gitweb_delete.html
+++ b/plinth/modules/gitweb/templates/gitweb_delete.html
@@ -40,9 +40,6 @@
 
     <input type="submit" class="btn btn-md btn-danger"
            value="{% blocktrans %}Delete {{ name }}{% endblocktrans %}"/>
-
-    <a href="{% url 'gitweb:index' %}" role="button"
-       class="btn btn-md btn-primary">{% trans "Cancel" %}</a>
   </form>
 
 {% endblock %}