diff --git a/hiboo/account/templates/account_signin.html b/hiboo/account/templates/account_signin.html
index b1da81df7bc770f7ec610edc360644dff66ddb1f..7b6aba709872c711253f9cd8281cca1ce0b94025 100644
--- a/hiboo/account/templates/account_signin.html
+++ b/hiboo/account/templates/account_signin.html
@@ -1,17 +1,17 @@
-{% extends "form.html" %}
+{% extends "base.html" %}
{% block title %}{% trans %}Sign in{% endtrans %}{% endblock %}
{% block subtitle %}{% trans %}to access your account{% endtrans %}{% endblock %}
-{% block help_title %}{% trans %}Welcome to Hiboo!{% endtrans %}{% endblock %}
+{% block content %}
-{% block help_body %}
-<p>{% trans %}<strong>You were directed to Hiboo for authentication</strong>. Hiboo is our account manager, made so you only have to remember one password.{% endtrans %}</p>
-<p>{% trans %}Hiboo handles accounts for our services and allows you to own multiple profiles on each service.{% endtrans %}</p>
-<p>{% trans %}You can now sign in to your Hiboo account. If you do not own one already (which is very probable if this is your first time here), please sign up first.<{% endtrans %}/p>
-<p>{% trans %}If you already have a profile on the service you are authenticating for, no panic necessary: you will be able to claim it once logged into Hiboo!{% endtrans %}</p>
-{% endblock %}
+{% call macros.help(_("Welcome to Hiboo"), auto=utils.display_help("main")) %}
+ <p>{% trans %}<strong>You were directed to Hiboo for authentication</strong>. Hiboo is our account manager, made so you only have to remember a single password.{% endtrans %}</p>
+ <p>{% trans %}Hiboo handles accounts for our services and allows you to own multiple profiles on each service.{% endtrans %}</p>
+ <p>{% trans %}You can now sign in to your Hiboo account. If you do not own one already (which is very probable if this is your first time here), please sign up first.{% endtrans %}</p>
+ <p>{% trans %}If you already have a profile on the service you are authenticating for, no panic necessary: you will be able to claim it once logged into Hiboo!{% endtrans %}</p>
+{% endcall %}
+
+{{ macros.form(form) }}
-{% block help_buttons %}
-<a href="{{ utils.url_for("account.signup") }}" class="btn btn-primary">{% trans %}Sign up{% endtrans %}</a>
{% endblock %}
diff --git a/hiboo/account/templates/account_signup.html b/hiboo/account/templates/account_signup.html
index 472412b0d0a67cdc9839f72a884a47e3af7d1a13..837601cbdbce507959415a8c513600ab6fccf094 100644
--- a/hiboo/account/templates/account_signup.html
+++ b/hiboo/account/templates/account_signup.html
@@ -3,12 +3,16 @@
{% block title %}{% trans %}Sign up{% endtrans %}{% endblock %}
{% block subtitle %}{% trans %}for a new account{% endtrans %}{% endblock %}
-{% block help_title %}{% trans %}I want a new account!{% endtrans %}{% endblock %}
-
-{% block help_body %}
-<p>{% trans %}You are about to sign up for a new Hiboo account.{% endtrans %}</p>
-<p>{% trans %}First, please note that you should only need one Hiboo account. If you own one already, please use it. If you need a profile with a different username, Hiboo makes it possible with a single account! Please contact us if you are having trouble.{% endtrans %}</p>
-<p>{% trans %}The username that you are about to choose will be your Hiboo username and cannot be changed later. It does not have to be identical to your name on every service, you will be free to create profiles under any pseudonyme you want (if avaiable).{% endtrans %}</p>
-<p>{% trans %}Please (please!) use a decent password and memorize it. We do not wish to collect data on who you are. That also means it is dificult for us to verify who you are and reset your password.{% endtrans %}</p>
-<p>{% trans %}This username might be used directly on certain services though (where you are only allowed a single profile), in which case you will be notified first.{% endtrans %}</p>
+{% block content %}
+
+{% call macros.help(_("I want a new account!"), auto=utils.display_help("main")) %}
+ <p>{% trans %}You are about to sign up for a new Hiboo account.{% endtrans %}</p>
+ <p>{% trans %}First, please note that you should only need one Hiboo account. If you own one already, please use it. If you need a profile with a different username, Hiboo makes it possible with a single account! Please contact us if you are having trouble.{% endtrans %}</p>
+ <p>{% trans %}The username that you are about to choose will be your Hiboo username and cannot be changed later. It does not have to be identical to your name on every service, you will be free to create profiles under any pseudonyme you want (if avaiable).{% endtrans %}</p>
+ <p>{% trans %}Please (please!) use a decent password and memorize it. We do not wish to collect data on who you are. That also means it is dificult for us to verify who you are and reset your password.{% endtrans %}</p>
+ <p>{% trans %}This username might be used directly on certain services though (where you are only allowed a single profile), in which case you will be notified first.{% endtrans %}</p>
+{% endcall %}
+
+{{ macros.form(form) }}
+
{% endblock %}
diff --git a/hiboo/account/templates/profile_create.html b/hiboo/account/templates/profile_create.html
index 39f38841558cd2901cf51c71965511c193b2a29f..6d5e26fc3db74e6cec0c9ea194cdfec52e5ca7c8 100644
--- a/hiboo/account/templates/profile_create.html
+++ b/hiboo/account/templates/profile_create.html
@@ -1,13 +1,17 @@
{% extends "base.html" %}
+{% set service_name = service.name %}
{% block title %}{% trans %}New profile{% endtrans %}{% endblock %}
-{% block subtitle %}{% trans %}for the service {{ service.name }}{% endtrans %}{% endblock %}
+{% block subtitle %}{% trans service_name %}for the service {{ service_name }}{% endtrans %}{% endblock %}
{% block content %}
-<div class="box">
- <div class="box-body">
- <p>{% trans %}Your profile username does not need to be identical to your account name. Every user is free to pick what profile name they wish for each service.{% endtrans %}</p>
- </div>
-</div>
+
+{% call macros.help(_("Create a new profile"), auto=utils.display_help("main")) %}
+ <p>{% trans %}You are about to create your first profile.{% endtrans %}</p>
+ <p>{% trans %}Please choose a username wisely, you will not be able to change it later. You may pick anything that is valid for the service, as long as it is available.{% endtrans %}</p>
+ <p>{% trans %}If your profile request is submitted for validation, please add a useful comment that will help us validate (describe shortly what your profile is for or why you need one).{% endtrans %}</p>
+{% endcall %}
+
{{ macros.form(form) }}
+
{% endblock %}
diff --git a/hiboo/account/templates/profile_pick.html b/hiboo/account/templates/profile_pick.html
index f729b65650f1422092155f861d37adebc25f0a72..ed86316812a5bfb351c6e601f3cf8d80dd2b7cac 100644
--- a/hiboo/account/templates/profile_pick.html
+++ b/hiboo/account/templates/profile_pick.html
@@ -2,25 +2,11 @@
{% set colors = ['blue', 'green', 'orange', 'teal', 'red', 'purple', 'maroon'] %}
+{% set service_name = service.name %}
{% block title %}{% trans %}Pick a profile{% endtrans %}{% endblock %}
-{% block subtitle %}{% trans %}for the service {{ service.name }}{% endtrans %}{% endblock %}
+{% block subtitle %}{% trans service_name %}for the service {{ service_name }}{% endtrans %}{% endblock %}
{% block content %}
-{% if not profiles %}
-<div class="box">
- <div class="box-body">
- {% trans %}You currently have no profile for this service. You can create a new profile by clicking the follwing button.{% endtrans %}
- <a href="{{ action_create }}" class="btn btn-flat">{% trans %}New profile{% endtrans %}</a>
- </div>
-</div>
-{% elif profiles.__len__() < service.max_profiles %}
-<div class="box">
- <div class="box-body">
- {% trans %}You are allowed to create up to {{ service.max_profiles }} profiles for this service. You can create a new profile by clicking the following button.{% endtrans %}
- <a href="{{ action_create }}" class="btn btn-flat">{% trans %}New profile{% endtrans %}</a>
- </div>
-</div>
-{% endif %}
<div class="row">
{% for profile in profiles %}
<div class="col-md-4 col-s-6 col-xs-12">
@@ -42,7 +28,8 @@
</div>
<div class="box-footer no-padding">
<ul class="nav nav-stacked">
- <li><a href="#">{% trans %}Created on {{ profile.created_at.date() }}{% endtrans %}</a></li>
+ {% set created_on = profile.created_at.date() %}
+ <li><a href="#">{% trans %}Created on {{ created_on }}{% endtrans %}</a></li>
<li><a href="#">{% trans %}Not shared with anyone{% endtrans %}</a></li>
</ul>
</div>
@@ -50,4 +37,35 @@
</div>
{% endfor %}
</div>
+
+{% call macros.help(_("Here come profiles!"), auto=utils.display_help("main")) %}
+ {% set max_profiles = service.max_profiles %}
+ <p>{% trans %}This service relies on profiles, which are just as many identities that you can have with your single Hiboo account.{% endtrans %}</p>
+ <p>{% trans %}You may think of profiles as a way to have both a personal and an organization account, or to use the service under different identities for diffrent activities.{% endtrans %}</p>
+ <p>{% trans %}Profiles were introduced in order to offer flexibility and security against stalkers and other sorts of online violence.{% endtrans %}</p>
+ <div class="text-bold">
+ {% if service.policy == "locked" %}
+ <p>{% trans %}However, profile creation on this services are currently locked down. You may only use existing profiles if you have some.{% endtrans %}</p>
+ {% elif service.policy == "reserved" %}
+ <p>{% trans %}This service is not currently open for profile registration. In order to get new profiles, you must ask a service administrator.{% endtrans %}</p>
+ {% elif service.policy == "managed" %}
+ <p>{% trans %}You may request new profiles. Your requests will be submitted to validation.{% endtrans %}</p>
+ {% elif service.policy == "burst" %}
+ <p>{% trans %}You may create up to {{ max_profiles }} profiles. Further profile requests will be submitted to validation.{% endtrans %}</p>
+ {% elif service.policy == "open" %}
+ <p>{% trans %}You may create up to {{ max_profiles }} profiles. Please contact the service administrator if you have any specific needs.{% endtrans %}</p>
+ {% endif %}
+ </div>
+{% endcall %}
+
+{% endblock %}
+
+{% block actions %}
+{% if service.policy in ("open", "burst") and profiles.__len__() < service.max_profiles %}
+<a href="{{ utils.url_for(".create_profile") }}" class="btn btn-primary">Create profile</a>
+{% elif service.policy in ("managed", "burst") %}
+<a href="{{ utils.url_for(".create_profile") }}" class="btn btn-warning">Request profile</a>
+{% else %}
+<a href="#" class="btn btn-primary" disabled>Create profile</a>
+{% endif %}
{% endblock %}
diff --git a/hiboo/service/templates/service_details.html b/hiboo/service/templates/service_details.html
index fd849f39896239cbb8208303d4347799ef30cd4f..8ccae60a81ab7fa0d52eb97e3182556810746692 100644
--- a/hiboo/service/templates/service_details.html
+++ b/hiboo/service/templates/service_details.html
@@ -6,8 +6,8 @@
{% block content %}
<div class="row">
- <div class="col-12">
- <div class="box box-solid">
+ <div class="col-xs-12">
+ <div class="box">
<div class="box-body">
<dl class="dl-horizontal">
<dt>{% trans %}Service name{% endtrans %}</dt>
@@ -26,3 +26,8 @@
</div>
</div>
{% endblock %}
+
+{% block actions %}
+<a href="{{ url_for(".create") }}" class="btn btn-primary">{% trans %}Edit this service{% endtrans %}</a>
+<a href="{{ url_for(".create") }}" class="btn btn-danger">{% trans %}Delete this service{% endtrans %}</a>
+{% endblock %}
diff --git a/hiboo/service/templates/service_list.html b/hiboo/service/templates/service_list.html
index 114988f086b5508f7524974c3f6ccaa87c7232d2..d1f13db4e0bc297b977d081f0a2f460792818812 100644
--- a/hiboo/service/templates/service_list.html
+++ b/hiboo/service/templates/service_list.html
@@ -29,3 +29,7 @@
</div>
</div>
{% endblock %}
+
+{% block actions %}
+<a href="{{ url_for(".create") }}" class="btn btn-primary">{% trans %}Create a service{% endtrans %}</a>
+{% endblock %}