settings.PUBLIC_SITE, login required if public for logbook entry, CRCF middleware

2 files changed, 6 insertions, 3 deletions

diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index 19b8a30..04229fb 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -5,7 +5,9 @@
 {% block editLink %}<a href={{logbookentry.get_admin_url}}>Edit logbook entry {{logbookentry|wiki_to_html_short}}</a>{% endblock %}

 {% block content %}

 

-<h2>{{logbookentry.title|safe}}</h2>

+{% block related %}{% endblock %}

+{% block nav %}{% endblock %}

+<h2>{{logbookentry.title}}</h2>

 

 <div id="related">

 <p><a href="{{ logbookentry.expedition.get_absolute_url }}">{{logbookentry.expedition.name}}</a></p>

@@ -69,6 +71,7 @@
 </div>

 </div>

 

-{% if logbookentry.filename %}<a href="{% url editlogbookentry year=logbookentry.year pdate=logbookentry.date pslug=logbookentry.slug %}">Edit</a> <a href="{% url deletelogbookentry year=logbookentry.year date=logbookentry.date slug=logbookentry.slug %}">Delete</a>{%endif%}

+{% if logbookentry.filename %}<a href="{% url editLogBookEntry expeditionyear=logbookentry.expedition.year pdate=logbookentry.date pslug=logbookentry.slug %}">Edit</a> <a href="{% url deleteLogBookEntry expeditionyear=logbookentry.expedition.year date=logbookentry.date slug=logbookentry.slug %}">Delete</a>{%endif%}

+

 

 {% endblock %}

diff --git a/templates/registration/login.html b/templates/registration/login.html
index 04b5074..2d49395 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -6,7 +6,7 @@
 <p>Your username and password didn't match. Please try again.</p>

 {% endif %}

 

-<form method="post" action=".">

+<form method="post" action=".">{% csrf_token %}

 <table>

 <tr><td>{{ form.username.label_tag }}</td><td>{{ form.username }}</td></tr>

 <tr><td>{{ form.password.label_tag }}</td><td>{{ form.password }}</td></tr>