From 0bb7cc9ae18faddfe429fda643f6b2a3340d6429 Mon Sep 17 00:00:00 2001
From: johanko <johan.kristian.olsen@gmail.com>
Date: Tue, 26 Jan 2016 23:45:55 +0100
Subject: [PATCH] Template changes

Moved searchform to navbar
---
 .../registered/corputilssearchview.html       | 95 ++++++++-----------
 1 file changed, 41 insertions(+), 54 deletions(-)

diff --git a/stock/templates/registered/corputilssearchview.html b/stock/templates/registered/corputilssearchview.html
index 42d882e8..78f2ec96 100644
--- a/stock/templates/registered/corputilssearchview.html
+++ b/stock/templates/registered/corputilssearchview.html
@@ -8,63 +8,50 @@
 {% block extra_css %}{% endblock extra_css %}
 
 {% block content %}
-    <div class="col-lg-12">
+    <div class="col-lg-8">
         {% if perms.auth.corputils %}
-            <h1 class="page-header text-center">Member Search Results
-                <div class="text-right">
-                    <!-- Button trigger modal -->
-                    <button type="button" class="btn btn-primary btn-sm" data-toggle="modal" data-target="#myModal">
-                        Search Members
-                    </button>
-                </div>
-            </h1>
-            <div class="container-fluid">
-                <table class="table table-bordered">
-                    <tr>
-                        <th class="text-center">Character</th>
-                        <th class="text-center">Main Character</th>
-                    </tr>
-                    {% for member in members %}
-                        <tr {% if  not member.api_registered%} bgcolor="#DD5500" {% endif %} >
-                            <td class="text-center">{{ member.name }}</td>
-                            <td class="text-center">
-                            {% if  member.api_registered%}
-                                {{ member.main }}
-                            {% else %}
-                                No API registered!
-                            {% endif %}
-                            </td>
-                        </tr>
-                    {% endfor %}
-                </table>
+         
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title">Search Results</h3>
             </div>
-        {% endif %}
-    </div>
-
-    {% if perms.auth.corputils %}
-        <!-- Modal -->
-        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"
-             aria-hidden="true">
-            <div class="modal-dialog">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span
-                                class="sr-only">Close</span></button>
-                        <h4 class="modal-title" id="myModalLabel">Member Search</h4>
-                    </div>
-                    <div class="modal-body">
-                        <form class="form-signin" role="form"
-                              action={% url 'auth_corputils_search' %} method="POST">
-                            {% csrf_token %}
-                            {{ search_form|bootstrap }}
-                            <br/>
-                            <button class="btn btn-lg btn-primary btn-block" type="submit">Search</button>
-                        </form>
-                    </div>
-                    <div class="modal-footer">
-                    </div>
+            <nav class="navbar navbar-default">
+                <div class="container-fluid">
+                    <ul class="nav navbar-nav">
+                        <li>
+                            <form class="navbar-form navbar-left" role="search" action={% url 'auth_corputils_search' %} method="POST">
+                                <div class="form-group">
+                                {% csrf_token %}
+                                {{ search_form.as_table }}
+                                </div>
+                                <button class="btn btn-default" type="submit">Search</button>
+                            </form>
+                        </li>
+                    </ul>
+                </div>
+            </nav>
+                <div class="panel-body">
+                    <table class="table table-condensed table-hover table-striped">
+                        <tr>
+                            <th>Character</th>
+                            <th>Main Character</th>
+                        </tr>
+                        {% for member in members %}
+                            <tr {% if  not member.api_registered%} {% endif %} >
+                                <td>{{ member.name }}{{ member.id }}</td>
+                                <td>
+                                {% if  member.api_registered%}
+                                    {{ member.main }}
+                                {% else %}
+                                    <span class="label label-danger">No API registered!</span>
+                                {% endif %}
+                                </td>
+                            </tr>
+                        {% endfor %}
+                    </table>
                 </div>
             </div>
         </div>
-    {% endif %}
+        {% endif %}
+    </div>
 {% endblock content %}