commit f7e05b588a3c4675f93285236682588f08402391
Author: Pili Guerra <pili(a)piliguerra.com>
Date: Wed Jan 22 17:29:04 2020 +0100
Refining model
---
content/gsoc/privacy-friendly-web/contents.lr | 4 ++++
content/gsoc/tor-weather/contents.lr | 6 +++++-
models/project.ini | 8 ++++++++
templates/layout.html | 9 ---------
templates/project.html | 16 ++++++++++++++++
5 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/content/gsoc/privacy-friendly-web/contents.lr b/content/gsoc/privacy-friendly-web/contents.lr
index c37fbbe..da9cc13 100644
--- a/content/gsoc/privacy-friendly-web/contents.lr
+++ b/content/gsoc/privacy-friendly-web/contents.lr
@@ -14,6 +14,10 @@ key: 1
---
languages: javascript
---
+mentors: hiro
+---
+difficulty: medium
+---
title: Privacy Friendly Web
---
summary:
diff --git a/content/gsoc/tor-weather/contents.lr b/content/gsoc/tor-weather/contents.lr
index f1bebd7..9c7faa6 100644
--- a/content/gsoc/tor-weather/contents.lr
+++ b/content/gsoc/tor-weather/contents.lr
@@ -14,6 +14,10 @@ key: 2
---
languages: TBD
---
+mentors: karsten
+---
+difficulty: medium
+---
title: Tor Weather
---
summary:
@@ -23,4 +27,4 @@ Summary of project
---
description:
-Longer description
\ No newline at end of file
+Longer description
diff --git a/models/project.ini b/models/project.ini
index a926b5c..8b286a0 100644
--- a/models/project.ini
+++ b/models/project.ini
@@ -32,4 +32,12 @@ type = string
[fields.languages]
label = Languages
+type = string
+
+[fields.mentors]
+label = Mentors
+type = string
+
+[fields.difficulty]
+label = Difficulty Level
type = string
\ No newline at end of file
diff --git a/templates/layout.html b/templates/layout.html
index 9ab5aa1..663c51b 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -10,16 +10,7 @@
<div class="container-fluid">
<div class="row flex-xl-nowrap">
<main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
- {% if this.parent.path == "/gsoc" %}
- <div class="container py-3 mt-5">
- {{ this.summary }}
- </div>
- <div class="container py-3">
- {{ this.description }}
- </div>
- {% else %}
{% include this.html %}
- {% endif %}
</main>
</div>
</div>
diff --git a/templates/project.html b/templates/project.html
index 7d16334..1aaed71 100644
--- a/templates/project.html
+++ b/templates/project.html
@@ -11,10 +11,26 @@
<div class="row flex-xl-nowrap">
<main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}">
<div class="container py-3 mt-5">
+ <h4>Project Title: {{ this.title }}</h4>
+ <span class="badge badge-primary">{{ this.languages }}</span> <span class="badge badge-secondary">{{ this.difficulty }}</span>
+ </div>
+ <div class="container py-3 mt-5">
+ <h4>Project Summary:</h4>
+ <p>
{{ this.summary }}
+ </p>
</div>
<div class="container py-3">
+ <h4>Project Description:</h4>
+ <p>
{{ this.description }}
+ </p>
+ </div>
+ <div class="container py-3">
+ <h4>Mentors:</h4>
+ <p>
+ {{ this.mentors }}
+ </p>
</div>
</main>
</div>