From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 29 Oct 2019 15:40:32 +0000 (+0000)
Subject: people: Make space for a description
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c4522dc7cd32be3dc42f05582108b1bc1041b1e;p=ipfire.org.git

people: Make space for a description

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/backend/accounts.py b/src/backend/accounts.py
index 70b53acd..37eedd50 100644
--- a/src/backend/accounts.py
+++ b/src/backend/accounts.py
@@ -940,6 +940,18 @@ class Account(Object):
 
 		return ret
 
+	# Description
+
+	def get_description(self):
+		return self._get_string("description")
+
+	def set_description(self, description):
+		self._set_string("description", description)
+
+	description = property(get_description, set_description)
+
+	# Avatar
+
 	def has_avatar(self):
 		has_avatar = self.memcache.get("accounts:%s:has-avatar" % self.uid)
 		if has_avatar is None:
diff --git a/src/templates/people/user-edit.html b/src/templates/people/user-edit.html
index 28e548c0..d831ed2e 100644
--- a/src/templates/people/user-edit.html
+++ b/src/templates/people/user-edit.html
@@ -66,15 +66,28 @@
 			</select>
 		</div>
 
-		<div class="form-group">
-			<label>{{ _("Avatar") }}</label>
+		<fieldset>
+			<legend>{{ _("Tell Us Who You Are") }}</legend>
 
-			<input type="file" class="form-control-file" name="avatar">
+			<div class="form-group">
+				<textarea type="text" class="form-control" name="description" rows="5"
+					placeholder="{{ _("Tell Us Who You Are") }}">{{ account.description }}</textarea>
 
-			<small class="form-text text-muted">
-				{{ _("Upload a new avatar") }}
-			</small>
-		</div>
+				<small class="form-text text-muted">
+					{{ _("You can use Markdown syntax as you know it from the IPFire Wiki") }}
+				</small>
+			</div>
+
+			<div class="form-group">
+				<label>{{ _("Avatar") }}</label>
+
+				<input type="file" class="form-control-file" name="avatar">
+
+				<small class="form-text text-muted">
+					{{ _("Upload a new avatar") }}
+				</small>
+			</div>
+		</fieldset>
 
 		{% if account.has_mail() %}
 			<fieldset>
diff --git a/src/templates/people/user.html b/src/templates/people/user.html
index b2a6f32a..a94fbdf5 100644
--- a/src/templates/people/user.html
+++ b/src/templates/people/user.html
@@ -5,6 +5,14 @@
 
 	<div class="card mb-3">
 		<div class="card-body">
+			{% if account.description %}
+				<div class="row">
+					<div class="col">
+						{% module Markdown(account.description) %}
+					</div>
+				</div>
+			{% end %}
+
 			<div class="row">
 				<div class="col">
 					<a class="btn btn-dark btn-block" href="mailto:{{ account.email }}">
diff --git a/src/web/__init__.py b/src/web/__init__.py
index b40de815..c5527166 100644
--- a/src/web/__init__.py
+++ b/src/web/__init__.py
@@ -96,6 +96,7 @@ class Application(tornado.web.Application):
 				"WikiList"             : wiki.WikiListModule,
 
 				# Misc
+				"Markdown"             : ui_modules.MarkdownModule,
 				"Map"                  : ui_modules.MapModule,
 				"ProgressBar"          : ui_modules.ProgressBarModule,
 			},
diff --git a/src/web/people.py b/src/web/people.py
index fe167763..d1a9a1ac 100644
--- a/src/web/people.py
+++ b/src/web/people.py
@@ -220,6 +220,7 @@ class UserEditHandler(auth.CacheMixin, base.BaseHandler):
 			account.city         = self.get_argument("city", None)
 			account.postal_code  = self.get_argument("postal_code", None)
 			account.country_code = self.get_argument("country_code", None)
+			account.description  = self.get_argument("description", None)
 
 			# Avatar
 			try:
diff --git a/src/web/ui_modules.py b/src/web/ui_modules.py
index e50d1ac8..a0ae5e35 100644
--- a/src/web/ui_modules.py
+++ b/src/web/ui_modules.py
@@ -10,6 +10,11 @@ class UIModule(tornado.web.UIModule):
 		return self.handler.backend
 
 
+class MarkdownModule(UIModule):
+	def render(self, markdown):
+		return self.backend.blog._render_text(markdown)
+
+
 class MapModule(UIModule):
 	def render(self, latitude, longitude):
 		return self.render_string("modules/map.html", latitude=latitude, longitude=longitude)