From 4720b34021d03dd71d70bc1a47d61163b7682879 Mon Sep 17 00:00:00 2001
From: Thomas Steen Rasmussen <tykling@bornhack.org>
Date: Sun, 20 May 2018 21:32:05 +0200
Subject: [PATCH] link to detail view rather than update view in the tables,
 shine up the detail views a bit

---
 src/program/templates/eventproposal_detail.html          | 9 +++------
 src/program/templates/includes/event_proposal_table.html | 2 +-
 .../templates/includes/speaker_proposal_table.html       | 2 +-
 src/program/templates/speakerproposal_detail.html        | 8 ++------
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/program/templates/eventproposal_detail.html b/src/program/templates/eventproposal_detail.html
index 0f287656..943165bf 100644
--- a/src/program/templates/eventproposal_detail.html
+++ b/src/program/templates/eventproposal_detail.html
@@ -3,18 +3,15 @@
 
 {% block program_content %}
 
-<h2>{{ camp.title }} Event Proposal Details</h2>
-
-<ul>
-    <li class="list">Status: <span class="badge">{{ eventproposal.proposal_status }}</span></li>
-    <li class="list">ID: <span class="badge">{{ eventproposal.uuid }}</span></li>
-</ul>
+<h2>{{ eventproposal.title }} Details</h2>
 
 <div class="panel panel-default">
     <div class="panel-heading">{{ eventproposal.title }}</div>
     <div class="panel-body">
        {{ eventproposal.abstract|commonmark }}
+        <a href="{% url 'program:eventproposal_update' camp_slug=camp.slug pk=eventproposal.uuid %}" class="btn btn-primary btn-sm pull-right"><i class="fas fa-edit"></i><span class="h5"> Modify</span></a>
     </div>
+    <div class="panel-footer">Status: <span class="badge">{{ eventproposal.proposal_status }}</span> ID: <span class="badge">{{ eventproposal.uuid }}</span></div>
 </div>
 
 <div class="panel panel-default">
diff --git a/src/program/templates/includes/event_proposal_table.html b/src/program/templates/includes/event_proposal_table.html
index 6868e962..18696705 100644
--- a/src/program/templates/includes/event_proposal_table.html
+++ b/src/program/templates/includes/event_proposal_table.html
@@ -14,7 +14,7 @@
         <tr>
             <td><span class="h4">{{ eventproposal.title }}</span></td>
             <td><i class="fas fa-{{ eventproposal.event_type.icon }} fa-lg" style="color: {{ eventproposal.event_type.color }};"></i><span class="h4"> {{ eventproposal.event_type }}</span></td>
-            <td><span class="h4">{% for person in eventproposal.speakers.all %}<a href="{% url 'program:speakerproposal_update' camp_slug=camp.slug pk=person.uuid %}"><i class="fas fa-user" data-toggle="tooltip" title="{{ person.name }}"></i></a> {% endfor %}</span></td>
+            <td><span class="h4">{% for person in eventproposal.speakers.all %}<a href="{% url 'program:speakerproposal_detail' camp_slug=camp.slug pk=person.uuid %}"><i class="fas fa-user" data-toggle="tooltip" title="{{ person.name }}"></i></a> {% endfor %}</span></td>
             <td><span class="h4">{{ eventproposal.track.name }}</span></td>
             <td><span class="badge">{{ eventproposal.proposal_status }}</span></td>
             <td class='text-right'>
diff --git a/src/program/templates/includes/speaker_proposal_table.html b/src/program/templates/includes/speaker_proposal_table.html
index a9254133..8f960ad1 100644
--- a/src/program/templates/includes/speaker_proposal_table.html
+++ b/src/program/templates/includes/speaker_proposal_table.html
@@ -14,7 +14,7 @@
             <td class="text-center">
                 {% if speakerproposal.eventproposals.all %}
                     {% for ep in speakerproposal.eventproposals.all %}
-                        <a href="{% url 'program:eventproposal_update' camp_slug=camp.slug pk=ep.uuid %}"><i class="fas fa-{{ ep.event_type.icon }} fa-lg" style="color: {{ ep.event_type.color }};" data-toggle="tooltip" title="{{ ep.title }} ({{ ep.event_type.name }})"></i></a>
+                        <a href="{% url 'program:eventproposal_detail' camp_slug=camp.slug pk=ep.uuid %}"><i class="fas fa-{{ ep.event_type.icon }} fa-lg" style="color: {{ ep.event_type.color }};" data-toggle="tooltip" title="{{ ep.title }} ({{ ep.event_type.name }})"></i></a>
                     {% endfor %}
                 {% else %}
                     N/A
diff --git a/src/program/templates/speakerproposal_detail.html b/src/program/templates/speakerproposal_detail.html
index f7b1166f..3a44fdec 100644
--- a/src/program/templates/speakerproposal_detail.html
+++ b/src/program/templates/speakerproposal_detail.html
@@ -3,18 +3,14 @@
 
 {% block program_content %}
 
-<h2>{{ camp.title }} Speaker Proposal Details</h2>
-
-<ul>
-    <li class="list">Status: <span class="badge">{{ speakerproposal.proposal_status }}</span></li>
-    <li class="list">ID: <span class="badge">{{ speakerproposal.uuid }}</span></li>
-</ul>
+<h2>{{ speakerproposal.name }} Details</h2>
 
 <div class="panel panel-default">
     <div class="panel-heading">{{ speakerproposal.name }}</div>
     <div class="panel-body">
         {{ speakerproposal.biography|commonmark }}
     </div>
+    <div class="panel-footer">Status: <span class="badge">{{ speakerproposal.proposal_status }}</span> | ID: <span class="badge">{{ speakerproposal.uuid }}</span></div>
 </div>
 
 <div class="panel panel-default">