From d67451ace0d3ee610ccda05e65a138a5b494fbed Mon Sep 17 00:00:00 2001
From: Conrad Kroone <ConradKroone@gmail.com>
Date: Fri, 8 Sep 2017 00:12:19 -0400
Subject: [PATCH] fixes

---
 website/templates/base.html  | 2 +-
 website/templates/index.html | 6 +++---
 website/views.py             | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/website/templates/base.html b/website/templates/base.html
index c6c0ae620..4579244be 100644
--- a/website/templates/base.html
+++ b/website/templates/base.html
@@ -58,7 +58,7 @@
                         <li><a href="https://chrome.google.com/webstore/detail/bugheist/bififchikfckcnblimmncopjinfgccme?hl=en" target="_new">{% trans "Add to chrome" %}</a></li>
                         <li><a href="/social">{% trans "Social" %}</a></li>
                         <li><a href="/report">{% trans "Report Bug" %}</a></li>
-                        <li><a href="/start" class="sponsor-hunt">{% trans "Bug Hunt" %}</a></li>
+                        <li><a href="/start" class="sponsor-hunt">{% trans "Start a Bug Hunt" %}</a></li>
 
                         {% if request.user.is_authenticated %}
                             <li class="dropdown user-menu">
diff --git a/website/templates/index.html b/website/templates/index.html
index d1f4952ff..143b9ad9a 100644
--- a/website/templates/index.html
+++ b/website/templates/index.html
@@ -122,7 +122,7 @@ <h1 class="page-sub-header">{% trans "Featured Bug Hunts" %}</h1>
                 </div>
             </div>
             <div class="row" data-intro="These are the lists of featured websites on BugHeist." data-step="2">
-            {# commment #}
+            {% comment %}
                  {% for hunt in hunts %}
                     <div class="col-lg-6 col-md-6">
                         <div class="panel" id="hunt_{{domain.id}}" style="background-color:{{domain.get_color}}">
@@ -149,7 +149,7 @@ <h1 class="page-sub-header">{% trans "Featured Bug Hunts" %}</h1>
                         </div>
                     </div>
                 {% endfor %}
-                {# endcomment #}
+                {% endcomment %}
 
                 <div class="col-lg-6 col-md-6">
                     <div class="panel owasp-panel">
@@ -158,7 +158,7 @@ <h1 class="page-sub-header">{% trans "Featured Bug Hunts" %}</h1>
                                 <div class="col-xs-3 image_container">
                                     <img src="https://www.owasp.org/images/thumb/2/2f/Owasp_logo_flat2_icon.jpg/100px-Owasp_logo_flat2_icon.jpg" width="75" height="75">
                                 </div>
-                                <div>
+                                <div class="col-xs-9 text-left">
                                 On OWASP.org - testing and reporting all of the salesforce integrations with webforms, and webform data on the website.
 
 Get a complete list of all of the forms in use which we can pull from the chapter (leaders) handbook, and the current site.
diff --git a/website/views.py b/website/views.py
index 68913347c..9689c60ff 100644
--- a/website/views.py
+++ b/website/views.py
@@ -66,7 +66,7 @@ def index(request, template="index.html"):
         'activities': Issue.objects.all()[0:10],
         'domains': domains,
         'hunts': Hunt.objects.exclude(txn_id__isnull=True)[:4],
-        'leaderboard': User.objects.filter(points__created__month=datetime.now().month).filter(points__created__year=datetime.now().year).annotate(
+        'leaderboard': User.objects.filter(points__created__month=datetime.now().month, points__created__year=datetime.now().year).annotate(
             total_score=Sum('points__score')).order_by('-total_score')[:10],
         'not_verified': show_message,
         'open_issue_owasp': open_issue_owasp,
@@ -304,7 +304,7 @@ def get_context_data(self, **kwargs):
         context = super(IssueCreate, self).get_context_data(**kwargs)
         context['activities'] = Issue.objects.all()[0:10]
         context['hunts'] = Hunt.objects.exclude(plan="Free")[:4]
-        context['leaderboard'] = User.objects.filter(points__created__month=datetime.now().month).filter(points__created__year=datetime.now().year).annotate(
+        context['leaderboard'] = User.objects.filter(points__created__month=datetime.now().month, points__created__year=datetime.now().year).annotate(
             total_score=Sum('points__score')).order_by('-total_score')[:10],
         return context