Add page for clubs and inactive clubs

core/templates/core/page.jinja

@@ -25,12 +25,16 @@
 <div class="tool_bar">
     <div class="tools">
         {% if page %}
+        {% if page.club %}
+        <a href="{{ url('club:club_view', club_id=page.club.id) }}">{% trans %}View{% endtrans %}</a>
+        {% else %}
         <a href="{{ url('core:page', page.get_full_name()) }}">{% trans %}View{% endtrans %}</a>
+        {% endif %}
         <a href="{{ url('core:page_hist', page_name=page.get_full_name()) }}">{% trans %}History{% endtrans %}</a>
         {% if can_edit(page, user) %}
         <a href="{{ url('core:page_edit', page_name=page.get_full_name()) }}">{% trans %}Edit{% endtrans %}</a>
         {% endif %}
-        {% if can_edit_prop(page, user) %}
+        {% if can_edit_prop(page, user) and not page.is_club_page %}
         <a href="{{ url('core:page_prop', page_name=page.get_full_name()) }}">{% trans %}Prop{% endtrans %}</a>
         {% endif %}
         {% endif %}

core/templates/core/page_prop.jinja

@@ -1,12 +1,18 @@
 {% extends "core/page.jinja" %}
 
 {% block content %}
+{% if page %}
+{{ super() }}
+{% endif %}
 <h2>{% trans %}Page properties{% endtrans %}</h2>
 <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p() }}
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
 </form>
+{% if page %}
+<a href="{{ url('core:page_delete', page_id=page.id)}}">{% trans %}Delete{% endtrans %}</a>
+{% endif %}
 {% endblock %}
 
 

core/templates/core/pagerev_edit.jinja

@@ -25,7 +25,6 @@ function make_preview() {
     <p><input type="button" value="{% trans %}Preview{% endtrans %}" onclick="javascript:make_preview();" /></p>
     <p><input type="submit" value="{% trans %}Save{% endtrans %}" /></p>
 </form>
-<a href="{{ url('core:page_delete', page_id=page.id)}}">{% trans %}Delete{% endtrans %}</a>
 <div id="preview" class="page_content">
 </div>
 {% endblock %}