From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 19 Nov 2020 16:53:56 +0000 (+0000)
Subject: people: Drop custom base template
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3c39f076db5b6b249385df1ee2ee46e431d8b2e3;p=ipfire.org.git

people: Drop custom base template

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

diff --git a/Makefile.am b/Makefile.am
index 98da5371..39c95346 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -268,7 +268,6 @@ templates_nopaste_modules_DATA = \
 templates_nopaste_modulesdir = $(templates_nopastedir)/modules
 
 templates_people_DATA = \
-	src/templates/people/base.html \
 	src/templates/people/conferences.html \
 	src/templates/people/call.html \
 	src/templates/people/calls.html \
diff --git a/src/templates/people/base.html b/src/templates/people/base.html
deleted file mode 100644
index 34b56a55..00000000
--- a/src/templates/people/base.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{% extends "../base.html" %}
-
-{% block title %}{{ account }}{% end block %}
-
-{% block content %}
-	<div class="row">
-		{% block sidebar %}
-			<div class="col-12 col-md-3">
-				<img class="img-fluid rounded-circle my-2" src="{{ account.avatar_url(512) }}" alt="{{ account }}" />
-
-				<div class="my-3">
-					<h3 class="mb-0">
-						<a class="text-white" href="/users/{{ account.uid }}">{{ account }}</a>
-					</h3>
-					<span class="text-monospace">{{ account.uid }}</span>
-				</div>
-
-				<div class="btn-toolbar mb-3">
-					{% if account.has_shell() %}
-						<a class="btn btn-light btn-sm btn-block" href="/~{{ account.uid }}/">
-							<span class="fas fa-home mr-2"></span> {{ _("Home Directory") }}
-						</a>
-					{% end %}
-
-					{% if account.can_be_managed_by(current_user) %}
-						{% if account.has_sip() %}
-							<a class="btn btn-light btn-sm btn-block" href="/users/{{ account.uid }}/calls">
-								<span class="fas fa-phone mr-2"></span> {{ _("Calls") }}
-
-								{% if account.sip_channels %}
-									<span class="badge badge-success ml-1">{{ len(account.sip_channels) }}</span>
-								{% end %}
-							</a>
-						{% end %}
-
-						<a class="btn btn-warning btn-sm btn-block" href="/users/{{ account.uid }}/edit">
-							<span class="fas fa-edit mr-2"></span> {{ _("Edit") }}
-						</a>
-
-						<a class="btn btn-light btn-sm btn-block" href="/users/{{ account.uid }}/passwd">
-							{{ _("Change Password") }}
-						</a>
-					{% end %}
-				</div>
-			</div>
-		{% end %}
-
-		<div class="col-12 col-md-8 offset-md-1">
-			{% block main %}{% end block %}
-		</div>
-	</div>
-{% end block %}
diff --git a/src/templates/people/call.html b/src/templates/people/call.html
index 3fb4b090..12d5fd78 100644
--- a/src/templates/people/call.html
+++ b/src/templates/people/call.html
@@ -1,8 +1,8 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ account }} - {{ _("Call") }}{% end block %}
 
-{% block main %}
+{% block content %}
 	<div class="card">
 		<div class="card-body">
 			<h4 class="card-title mb-1">
diff --git a/src/templates/people/calls.html b/src/templates/people/calls.html
index 5c3f41bd..f4059ca5 100644
--- a/src/templates/people/calls.html
+++ b/src/templates/people/calls.html
@@ -1,8 +1,8 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ account }} - {{ _("Calls") }}{% end block %}
 
-{% block main %}
+{% block content %}
 	<h1>{{ _("Calls") }}</h1>
 
 	{% module Channels(current_user) %}
diff --git a/src/templates/people/group.html b/src/templates/people/group.html
index d2d966f5..359ae38e 100644
--- a/src/templates/people/group.html
+++ b/src/templates/people/group.html
@@ -1,7 +1,8 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ group }}{% end block %}
 
+{# WHERE DOES THIS GO ??? #}
 {% block sidebar %}
 	<div class="col-12 col-md-3">
 		<h3 class="my-3">
@@ -10,7 +11,7 @@
 	</div>
 {% end block %}
 
-{% block main %}
+{% block content %}
 	<div class="card mb-3">
 		{% if group.email %}
 			<div class="card-body">
diff --git a/src/templates/people/passwd.html b/src/templates/people/passwd.html
index 8285e71b..405dad37 100644
--- a/src/templates/people/passwd.html
+++ b/src/templates/people/passwd.html
@@ -1,8 +1,8 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ account }} - {{ _("Change Password") }}{% end block %}
 
-{% block main %}
+{% block content %}
 	<div class="row justify-content-center">
 		<div class="col col-md-8">
 			<h4 class="mb-4">{{ _("Change Password") }}</h4>
diff --git a/src/templates/people/sip.html b/src/templates/people/sip.html
index 9379f328..b9f30b5f 100644
--- a/src/templates/people/sip.html
+++ b/src/templates/people/sip.html
@@ -1,8 +1,8 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ account }} - {{ _("SIP Status") }}{% end block %}
 
-{% block main %}
+{% block content %}
 	<h1>{{ _("SIP Status") }}</h1>
 
 	{% module Channels(account) %}
diff --git a/src/templates/people/user-edit.html b/src/templates/people/user-edit.html
index c9322bf2..1e05d0ae 100644
--- a/src/templates/people/user-edit.html
+++ b/src/templates/people/user-edit.html
@@ -1,8 +1,8 @@
-{% extends "base.html" %}
+{% extends "../base.html" %}
 
 {% block title %}{{ account }} - {{ _("Edit") }}{% end block %}
 
-{% block main %}
+{% block content %}
 	<h4 class="mb-4">{{ _("Edit") }}</h4>
 
 	<form method="POST" action="" enctype="multipart/form-data">