From 0f6961df27ea691dfcffa80f00652cd26ada1441 Mon Sep 17 00:00:00 2001
From: meskio <meskio@sindominio.net>
Date: Sat, 20 Nov 2021 18:49:09 +0100
Subject: [PATCH] Usability improvements for the collective view

---
 tmpl/collective.html | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/tmpl/collective.html b/tmpl/collective.html
index 11ef40f..91185c7 100644
--- a/tmpl/collective.html
+++ b/tmpl/collective.html
@@ -2,16 +2,30 @@
 {{template "header_close.html"}}
 {{template "navbar.html" .}}
 
+{{$isAdmin := .IsAdmin }}
 {{with .Data}}
 <br />
 <div class="row justify-content-center">
     <dl>
-        <dt>Nombre</dt><dd>{{.Name}}</dd>
+        <dt>Nombre del colectivo</dt><dd>{{.Name}}</dd>
         <dt>Descripcion</dt><dd>{{.Description}}</dd>
         <dt>Cuentas</dt><dd>
-	    {{range .Members}}
-	    <a href="/users/{{.}}">{{.}}</a>,
-	    {{end}}
+	    <ul>
+		    {{$name := .Name}}
+		    {{range .Members}}
+		    <li>
+			<form class="inline-form" action="/collective/{{$name}}/del/" method="post" onsubmit="return confirm('¿segura que quieres quitar a {{.}} del colectivo {{$name}}?');">
+				{{if $isAdmin}}
+					<a href="/users/{{.}}">{{.}}</a>
+				{{else}}
+					{{.}}
+				{{end}}
+				<input type="hidden" class="form-control" id="user" name="user" value="{{.}}">
+				<button type="submit" class="btn btn-danger btn-sm">X</button>
+			</form>
+		    </li>
+		    {{end}}
+	    </ul>
 	</dd>
     </dl>
 </div>
@@ -27,26 +41,12 @@
             <input type="text" class="form-control" id="user" name="user" placeholder="Cuenta">
 	  </div>
           <div class="col">
-            <button type="submit" class="btn btn-primary">Enviar</button>
-          </div>
-          </div>
-        </form>
-      </div>
-      <div class="row justify-content-center">
-	 <form action="/collective/{{.Name}}/del/" method="post">
-          <div class="row">
-          <div class="col">
-            <label for="user">Elimina cuenta:</label>
-	  </div>
-          <div class="col">
-            <input type="text" class="form-control" id="user" name="user" placeholder="Cuenta">
-	  </div>
-          <div class="col">
-            <button type="submit" class="btn btn-primary">Enviar</button>
+            <button type="submit" class="btn btn-primary">Añadir</button>
           </div>
           </div>
         </form>
       </div>
+      <br />
       <div class="row justify-content-center">
 	 <form action="/collective/{{.Name}}/description/" method="post">
           <div class="row">
@@ -57,7 +57,7 @@
             <textarea class="form-control" id="description" name="description">{{.Description}}</textarea>
 	  </div>
           <div class="col">
-            <button type="submit" class="btn btn-primary">Enviar</button>
+            <button type="submit" class="btn btn-primary">Actualizar</button>
           </div>
           </div>
         </form>
@@ -67,7 +67,7 @@
 	<form action="/collective/del/" method="post" onsubmit="return confirm('¿de verdad quieres borrar la colectivo {{.Name}}?');">
 		  <input type="hidden" class="form-control" id="collective" name="collective" value="{{.Name}}">
           <div class="row">
-		  <button type="submit" class="btn btn-lg btn-block btn-danger">Elimina el colectivo {{.Name}}</button>
+		  <button type="submit" class="btn btn-block btn-danger">Elimina el colectivo {{.Name}}</button>
           </div>
         </form>
       </div>