From b22f94f9d031267ade375130126d7c32cdf3368c Mon Sep 17 00:00:00 2001
From: Jess <jessicatz.fairymeadow@gmail.com>
Date: Sun, 21 Sep 2014 00:49:02 +0200
Subject: [PATCH] some beauty fixes

---
 data/db.sqlite3           | Bin 92160 -> 93184 bytes
 meta/static/js/main.js    |   2 +-
 meta/templates/base.html  |  11 +----------
 meta/templates/index.html |   6 ++++--
 meta/views.py             |  18 ++++++++++++++++--
 mlpccg-web/urls.py        |   5 +++--
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/data/db.sqlite3 b/data/db.sqlite3
index 511121df19e6a218408b01e27e55da267104cafc..2381d899d87911269e92ef0719c504e5631b5c35 100644
GIT binary patch
delta 3233
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
L@4mGezw3ViCEL&y

delta 2554
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

diff --git a/meta/static/js/main.js b/meta/static/js/main.js
index 8177d41..fbc9721 100644
--- a/meta/static/js/main.js
+++ b/meta/static/js/main.js
@@ -7,7 +7,7 @@ function rateDeck() {
 var tournaments = new Bloodhound({
     datumTokenizer: Bloodhound.tokenizers.obj.nonword('name'),
     queryTokenizer: Bloodhound.tokenizers.nonword,
-    prefetch: '/tournaments'
+    prefetch: '/tournaments_json'
 });
 
 tournaments.clearPrefetchCache()
diff --git a/meta/templates/base.html b/meta/templates/base.html
index 5ed434b..988e783 100644
--- a/meta/templates/base.html
+++ b/meta/templates/base.html
@@ -32,16 +32,7 @@
     <div class="navbar navbar-default navbar-fixed-top" role="navigation">
       <div class="container">
         <div class="navbar-header">
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="{% url 'meta.views.index' %}">meta is magic</a>
-        </div>
-        <div class="navbar-right">
-          <a class="navbar-brand" href="{% url 'meta.views.index' %}">BETA</a>
+          <a class="navbar-brand" href="{% url 'meta.views.index' %}">meta is magic BETA</a>
         </div>
         <!-- <div class="navbar-collapse collapse"> -->
         <!--   <form class="navbar-form navbar-right" role="form"> -->
diff --git a/meta/templates/index.html b/meta/templates/index.html
index 0d97cf3..af2c720 100644
--- a/meta/templates/index.html
+++ b/meta/templates/index.html
@@ -13,7 +13,7 @@
         {% csrf_token %}
         <div class="form-group">
           <label class="sr-only" for="ponyheadURL">ponyhead decklist url</label>
-          <input type="url" name="url" class="form-control input-lg" id="ponyheadURL" placeholder="Deck URL"/>
+          <input type="url" name="url" class="form-control input-lg" id="ponyheadURL" placeholder="PonyHead URL"/>
           <button type="submit" class="btn btn-lg btn-default btn-primary">Tell me!</button>
         </div>
       </form>
@@ -87,7 +87,9 @@
         {% csrf_token %}
         <div class="form-group">
           <label class="sr-only" for="ponyheadURL">ponyhead decklist url</label>
-          <input type="url" name="url" class="form-control input-lg" id="ponyheadURL" placeholder="Deck URL"/>
+          <input type="url" name="url" class="form-control input-lg" id="ponyheadURL" placeholder="PonyHead URL"/>
+          <label class="sr-only" for="decklistName">decklist name</label>
+          <input type="text" name="text" class="form-control input-lg" id="decklistName" placeholder="Deck name (optional)"/>
           <button type="submit" class="btn btn-lg btn-default btn-primary">Add me!</button>
         </div>
       </form>
diff --git a/meta/views.py b/meta/views.py
index 011eccf..d6d6eda 100644
--- a/meta/views.py
+++ b/meta/views.py
@@ -26,7 +26,7 @@ def index(request):
         'tournaments': tournament_data
     }, context_instance=RequestContext(request))
 
-def tournaments(request):
+def tournaments_json(request):
     return HttpResponse(json.dumps([{'name': t.name, 'id': t.id} for t in TournamentModel.objects.all()]),
                         content_type='application/json')
 
@@ -42,8 +42,22 @@ def tournaments_detail(request, tournament_id):
         'records': records,
         'tournament': tournament})
 
+def decklists(request):
+    decklists = DeckListModel.objects.all()
+
+    return render(request, 'decklists.html', {
+        'decklists': decklists})
+
+def decklists_detail(request, decklist_id):
+    decklist = get_object_or_404(DeckListModel, pk=decklist_id)
+
+    return render(request, 'decklists_detail.html', {
+        'decklist': decklist})
+
 def rate(request):
-    decklist = DeckList(url=request.POST['url'])
+    url = request.POST.get('url', 'v1code=%s' % request.GET.get('v1code'))
+
+    decklist = DeckList(url=url)
 
     if request.POST.get('d_name') and request.POST.get('t_date') and request.POST.get('t_name') and request.POST.get('t_placement'):
         try:
diff --git a/mlpccg-web/urls.py b/mlpccg-web/urls.py
index a0f9650..b6109fe 100644
--- a/mlpccg-web/urls.py
+++ b/mlpccg-web/urls.py
@@ -8,6 +8,7 @@ urlpatterns = patterns(
     url(r'^admin/', include(admin.site.urls)),
     url(r'^$', 'meta.views.index'),
     url(r'^rate$', 'meta.views.rate'),
-    url(r'^tournaments$', 'meta.views.tournaments'),
-    url(r'^tournaments/(?P<tournament_id>\d+)$', 'meta.views.tournaments_detail')
+    url(r'^tournaments_json$', 'meta.views.tournaments_json'),
+    url(r'^tournaments/(?P<tournament_id>\d+)$', 'meta.views.tournaments_detail'),
+    url(r'^decklists$', 'meta.views.decklists')
 )
-- 
2.30.2