From f60444c231488bdc7cc8228b829272b8795399c0 Mon Sep 17 00:00:00 2001
From: Laurent Morvillier <lmorvill@gmail.com>
Date: Tue, 8 Oct 2019 16:26:31 +0200
Subject: [PATCH] various fixes and improvements

---
 news/models.py                                |  2 +-
 news/static/news/css/app.css                  |  8 ++--
 news/templates/base.html                      |  2 +-
 news/templates/news/post.html                 | 27 ++++++++---
 .../news/user/password_reset_confirm.html     | 45 +++++++++++++------
 .../news/user/password_reset_html_email.html  |  3 +-
 .../news/user/password_reset_subject.txt      |  1 +
 news/urls.py                                  |  7 +--
 pokercc/settings.py                           |  9 +++-
 9 files changed, 72 insertions(+), 32 deletions(-)
 create mode 100644 news/templates/news/user/password_reset_subject.txt

diff --git a/news/models.py b/news/models.py
index df6ab82..52e4525 100644
--- a/news/models.py
+++ b/news/models.py
@@ -30,7 +30,7 @@ class Post(models.Model):
         return string
 
     def top_comments(self):
-        return self.comment_set.order_by('-voters').all()[:1]
+        return self.comment_set.filter(Q(parent_comment=None)).order_by('-voters').all()[:1]
 
     def flat_comments(self, user):
         flat = []
diff --git a/news/static/news/css/app.css b/news/static/news/css/app.css
index 78986aa..b0655d2 100644
--- a/news/static/news/css/app.css
+++ b/news/static/news/css/app.css
@@ -180,14 +180,14 @@ a h1 {
 .imgcontainer {
   position: relative;
   color: white;
-  border-bottom: 10px solid #111;
-  border-top: 10px solid #111;
+  /* border-bottom: 0px solid #111; */
+  border-top: 20px solid #111;
 }
 @media print, screen and (min-width: 40em) {
   .imgcontainer {
     width: 600px;
-    border-bottom: 10px solid #111;
-    border-top: 10px solid #111;
+    /* border-bottom: 10px solid #111; */
+    border-top: 20px solid #111;
   }
 }
 
diff --git a/news/templates/base.html b/news/templates/base.html
index a761eb5..49a5f9f 100644
--- a/news/templates/base.html
+++ b/news/templates/base.html
@@ -61,7 +61,7 @@
   <footer>
 
     <a href="{% url 'news:contact' %}">Contact</a>
-    <p>Copyright © 2019 Stax River</p>
+    <p>Copyright © 2019 Poker Rumble</p>
 
   </footer>
 
diff --git a/news/templates/news/post.html b/news/templates/news/post.html
index ea06802..4739df5 100644
--- a/news/templates/news/post.html
+++ b/news/templates/news/post.html
@@ -36,14 +36,20 @@
 {% endif %}
   <br/>
 
-  <form action="{% url 'news:comment' post.id %}" method="post">
-    {% csrf_token %}
-    <p>Add comment</p>
+  {% if user.is_authenticated %}
+    <form action="{% url 'news:comment' post.id %}" method="post">
+      {% csrf_token %}
+      <p>Add comment</p>
+      <p>
+        <textarea name="body" rows="3" cols="50"></textarea>
+      </p>
+      <button class="primary_button" type="submit">Submit</button>
+    </form>
+  {% else %}
     <p>
-      <textarea name="body" rows="3" cols="50"></textarea>
+      Please <a href="{% url 'news:signin' %}">login</a> to comment the post
     </p>
-    <button class="primary_button" type="submit">Submit</button>
-  </form>
+  {% endif %}
 
   <script type="text/javascript">
     function myFunction(divID) {
@@ -69,7 +75,7 @@
       {{ comment.body }}
 
       <div>
-        {% if comment.upvoted == False %}
+        {% if comment.upvoted == False and user.is_authenticated %}
         <form action="{% url 'news:upvote' comment.id %}" method="post" class="inline">
           {% csrf_token %}
           <button class="primary_button" type="submit">+1</button>
@@ -86,11 +92,18 @@
         <button class="secondary_button inline" onclick="myFunction('{{ comment.id }}')">reply</button>
 
         <div id="div_{{ comment.id }}" class="inline reply_form" style="display:none">
+          {% if user.is_authenticated %}
           <form action="{% url 'news:comment_with_parent' post.id comment.id %}" method="post">
             {% csrf_token %}
             <textarea id="text_{{ comment.id}}" name="body" rows="3" cols="50"></textarea>
             <button id="sub_{{ comment.id}}" class="primary_button" type="submit">Submit</button>
           </form>
+          {% else %}
+            <p>
+              Please <a href="{% url 'news:signin' %}">login</a> to reply
+            </p>
+          {% endif %}
+
         </div>
 
       </div>
diff --git a/news/templates/news/user/password_reset_confirm.html b/news/templates/news/user/password_reset_confirm.html
index fa5e045..1ff69c9 100644
--- a/news/templates/news/user/password_reset_confirm.html
+++ b/news/templates/news/user/password_reset_confirm.html
@@ -1,17 +1,34 @@
-{% extends 'base.html' %}
 
+{% extends "base.html" %}
+
+{% block title %}{{ title }}{% endblock %}
+{% block content_title %}<h1>{{ title }}</h1>{% endblock %}
 {% block content %}
-  {% if validlink %}
-    <h3>Change password</h3>
-    <form method="post">
-      {% csrf_token %}
-      {{ form.as_p }}
-      <button class="primary_button" type="submit">Change password</button>
-    </form>
-  {% else %}
-    <p>
-      The password reset link was invalid, possibly because it has already been used.
-      Please request a new password reset.
-    </p>
-  {% endif %}
+
+{% if validlink %}
+
+<p>Please enter your new password twice so we can verify you typed it in correctly.</p>
+
+<form method="post">{% csrf_token %}
+<fieldset class="module aligned">
+    <div class="form-row field-password1">
+        {{ form.new_password1.errors }}
+        <label for="id_new_password1">New password:</label>
+        {{ form.new_password1 }}
+    </div>
+    <div class="form-row field-password2">
+        {{ form.new_password2.errors }}
+        <label for="id_new_password2">Confirm password:</label>
+        {{ form.new_password2 }}
+    </div>
+    <input type="submit" value="Change my password">
+</fieldset>
+</form>
+
+{% else %}
+
+<p>The password reset link was invalid, possibly because it has already been used.  Please request a new password reset.</p>
+
+{% endif %}
+
 {% endblock %}
diff --git a/news/templates/news/user/password_reset_html_email.html b/news/templates/news/user/password_reset_html_email.html
index d159c9c..234bfef 100644
--- a/news/templates/news/user/password_reset_html_email.html
+++ b/news/templates/news/user/password_reset_html_email.html
@@ -1,2 +1,3 @@
-Someone asked for password reset for email {{ email }}. Follow the link below:
+Someone asked for password reset for email {{ email }}.
+Follow the link below:
 {{ protocol}}://{{ domain }}{% url 'news:password_reset_confirm' uidb64=uid token=token %}
diff --git a/news/templates/news/user/password_reset_subject.txt b/news/templates/news/user/password_reset_subject.txt
new file mode 100644
index 0000000..af8f5ff
--- /dev/null
+++ b/news/templates/news/user/password_reset_subject.txt
@@ -0,0 +1 @@
+Password reset request
diff --git a/news/urls.py b/news/urls.py
index 486f0da..f8f4936 100644
--- a/news/urls.py
+++ b/news/urls.py
@@ -27,11 +27,12 @@ urlpatterns = [
       template_name='news/user/password_reset_form.html',
       email_template_name='news/user/password_reset_email.html',
       html_email_template_name='news/user/password_reset_html_email.html',
+      subject_template_name='news/user/password_reset_subject.txt',
       success_url='../password-reset/done'
     ), name='password_reset'),
     path('password-reset/done', auth_views.PasswordResetDoneView.as_view(template_name='news/user/password_reset_done.html'), name='password_reset_done'),
-    path('reset/<uidb64>/<token>', auth_views.PasswordResetConfirmView.as_view(
+    path('reset/<uidb64>/<token>/', auth_views.PasswordResetConfirmView.as_view(
         template_name='news/user/password_reset_confirm.html',
-        success_url='../password-change/done'), name='password_reset_confirm'),
-    path('password-change/done', auth_views.PasswordResetCompleteView.as_view(template_name='news/user/password_reset_complete.html'), name='password_change_done'),
+        success_url='password-change/done'), name='password_reset_confirm'),
+    path('reset/Mg/set-password/password-change/done', auth_views.PasswordResetCompleteView.as_view(template_name='news/user/password_reset_complete.html'), name='password_change_done'),
 ]
diff --git a/pokercc/settings.py b/pokercc/settings.py
index fa35a01..fbd9485 100644
--- a/pokercc/settings.py
+++ b/pokercc/settings.py
@@ -29,7 +29,14 @@ DEBUG = True
 
 ALLOWED_HOSTS = ['ssh-stax.alwaysdata.net', 'www.pokerrumble.net']
 
-EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+#EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+
+EMAIL_HOST = 'smtp-stax.alwaysdata.net'
+EMAIL_PORT = 587
+EMAIL_HOST_USER = 'automatic@pokerrumble.net'
+EMAIL_HOST_PASSWORD = 'StaxKikoo12'
+EMAIL_USE_TLS = True
+DEFAULT_FROM_EMAIL = 'Poker Rumble <automatic@pokerrumble.net>'
 
 # Application definition