From 0ebf804976019bab3e09376325b15d1da0b48741 Mon Sep 17 00:00:00 2001
From: ix <0x00fi@protonmail.com>
Date: Thu, 3 Feb 2022 20:49:02 +0100
Subject: [PATCH] Fix resources page

---
 src/resources/templates/resources/42ctf.html  |  5 +-
 .../templates/resources/create_challenge.html |  5 +-
 src/resources/templates/resources/donate.html |  6 +--
 src/resources/templates/resources/edit.html   |  6 +--
 .../templates/resources/resources.html        | 53 +++++++------------
 src/resources/templates/resources/tools.html  |  5 +-
 .../templates/resources/translate.html        |  5 +-
 7 files changed, 25 insertions(+), 60 deletions(-)

diff --git a/src/resources/templates/resources/42ctf.html b/src/resources/templates/resources/42ctf.html
index 6959f65..a0010fe 100644
--- a/src/resources/templates/resources/42ctf.html
+++ b/src/resources/templates/resources/42ctf.html
@@ -1,9 +1,7 @@
-{% extends 'base.html' %}
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
-<div class="row">
-    <div class="col-sm-12 col-md-9">
+    <div class="col-sm-12 col-md-6">
         <div class="ctf-block">
             <div class="ctf-head">
             <h3>{% trans "What is 42CTF ?" %}</h3>
@@ -30,5 +28,4 @@
         </div>
     </div>
 
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/resources/templates/resources/create_challenge.html b/src/resources/templates/resources/create_challenge.html
index 4ffd16a..bec182b 100644
--- a/src/resources/templates/resources/create_challenge.html
+++ b/src/resources/templates/resources/create_challenge.html
@@ -1,9 +1,7 @@
-{% extends 'base.html' %}
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
-<div class="row">
-    <div class="col-sm-12 col-md-9">
+    <div class="col-sm-12 col-md-6">
         <div class="ctf-block">
             <div class="ctf-head">
             <h3>{% trans "Create new challenges" %}</h3>
@@ -18,5 +16,4 @@
         </div>
     </div>
 
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/resources/templates/resources/donate.html b/src/resources/templates/resources/donate.html
index 0b3cb83..ce26d06 100644
--- a/src/resources/templates/resources/donate.html
+++ b/src/resources/templates/resources/donate.html
@@ -1,9 +1,7 @@
-{% extends 'base.html' %}
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
-<div class="row">
-    <div class="col-sm-12 col-md-9">
+    <div class="col-sm-12">
         <div class="ctf-block">
             <div class="ctf-head">
             <h3>{% trans "Donate" %}</h3>
@@ -48,6 +46,4 @@
             </div>
         </div>
     </div>
-
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/resources/templates/resources/edit.html b/src/resources/templates/resources/edit.html
index c2c0a08..33e4feb 100644
--- a/src/resources/templates/resources/edit.html
+++ b/src/resources/templates/resources/edit.html
@@ -1,9 +1,7 @@
-{% extends 'base.html' %}
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
-<div class="row">
-    <div class="col-sm-12 col-md-9">
+    <div class="col-sm-12 col-md-6">
         <div class="ctf-block">
             <div class="ctf-head">
             <h3>{% trans "Edit this page" %}</h3>
@@ -13,6 +11,4 @@
             </div>
         </div>
     </div>
-
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/resources/templates/resources/resources.html b/src/resources/templates/resources/resources.html
index 6e7b096..2d863be 100644
--- a/src/resources/templates/resources/resources.html
+++ b/src/resources/templates/resources/resources.html
@@ -3,38 +3,23 @@
 {% load i18n %}
 {% get_current_language as lang %}
 <div class="row">
-        <div class="col-lg-9 col-sm-12 news-card">
-
-                <div class="card news-card">
-                                <ul class="list-group">
-                                        <li class="list-group-item active">{% trans "Getting started" %}</li>
-                                        <li class="list-group-item">
-                                                <a href="{% url 'resources:42ctf' %}">{% trans "What is 42CTF ?" %}</a></br>
-                                                <a href="{% url 'resources:tools' %}">{% trans "Recommended Tools" %}</a>
-                                        </li>
-                                </ul>
-                </div>
-
-                <div class="card news-card">
-                                <ul class="list-group">
-                                        <li class="list-group-item active">{% trans "Technical documentation" %}</li>
-                                        <li class="list-group-item">{% trans "No docs available, contact us if you want to write some :)" %}</li>
-                                </ul>
-                </div>
-                <div class="card news-card">
-                        <ul class="list-group">
-                                <li class="list-group-item active">{% trans "Contribute" %}</li>
-                                <li class="list-group-item">
-                                        <a href="{% url 'resources:create_challenge' %}">{% trans "Create new challenges" %}</a></br>
-                                        <a href="{% url 'resources:translate' %}">{% trans "Translate 42CTF" %}</a></br>
-                                        <a href="{% url 'resources:edit' %}">{% trans "Edit this page" %}</a></br>
-                                        <a href="{% url 'resources:donate' %}">{% trans "Donate" %}</a>
-                                </li>
-                        </ul>
-        </div>
-                
-        </div>
-        
+        {% block 42ctf %}
+                {% include "./42ctf.html" %}
+        {% endblock %}
+        {% block tools %}
+                {% include "./tools.html" %}
+        {% endblock %}
+        {% block translate %}
+                {% include "./translate.html" %}
+        {% endblock %}
+        {% block create_challenge %}
+                {% include "./create_challenge.html" %}
+        {% endblock %}
+        {% block edit %}
+                {% include "./edit.html" %}
+        {% endblock %}
+        {% block donate %}
+                {% include "./donate.html" %}
+        {% endblock %}
 </div>
-{% endblock %}
-
+{% endblock %}
\ No newline at end of file
diff --git a/src/resources/templates/resources/tools.html b/src/resources/templates/resources/tools.html
index ba07b1d..18d269c 100644
--- a/src/resources/templates/resources/tools.html
+++ b/src/resources/templates/resources/tools.html
@@ -1,9 +1,7 @@
-{% extends 'base.html' %}
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
-<div class="row">
-    <div class="col-sm-12 col-md-9">
+    <div class="col-sm-12 col-md-6">
         <div class="ctf-block">
             <div class="ctf-head">
             <h3>{% trans "Recommended Tools" %}</h3>
@@ -31,5 +29,4 @@
         </div>
     </div>
 
-</div>
 {% endblock %}
\ No newline at end of file
diff --git a/src/resources/templates/resources/translate.html b/src/resources/templates/resources/translate.html
index 9d992ee..06c5726 100644
--- a/src/resources/templates/resources/translate.html
+++ b/src/resources/templates/resources/translate.html
@@ -1,9 +1,7 @@
-{% extends 'base.html' %}
 {% block content %}
 {% load i18n %}
 {% get_current_language as lang %}
-<div class="row">
-    <div class="col-sm-12 col-md-9">
+    <div class="col-sm-12">
         <div class="ctf-block">
             <div class="ctf-head">
             <h3>{% trans "Translate 42CTF" %}</h3>
@@ -19,5 +17,4 @@
         </div>
     </div>
 
-</div>
 {% endblock %}
\ No newline at end of file