diff --git a/hiboo/account/templates/account_home.html b/hiboo/account/templates/account_home.html
index 7ad0f159a81246fa8f7badca013db61aa27dfea1..bb324b85650cbb03201cf61fd55eedc68dc03150 100644
--- a/hiboo/account/templates/account_home.html
+++ b/hiboo/account/templates/account_home.html
@@ -5,27 +5,27 @@
{% block content %}
<div class="row">
- <div class="col-md-6 col-s-12">
+ <div class="col-md-6 col">
<section class="content">
<div class="row">
- <div class="col-md-6 col-xs-12">
+ <div class="col-md-6 col">
{{ macros.infobox(_("Account age"), "{} days".format((current_user.created_at.today() - current_user.created_at).total_seconds() // 86400), "blue", "calendar") }}
</div>
- <div class="col-md-6 col-xs-12">
+ <div class="col-md-6 col">
{{ macros.infobox(_("Profile count"), current_user.profiles.filter_by(status="active").count(), "red", "users") }}
</div>
</div>
<div class="row">
- <div class="col-md-6 col-xs-12">
+ <div class="col-md-6 col">
{{ macros.infobox(_("Pending requests"), current_user.profiles.filter_by(status="request").count(), "green", "hourglass") }}
</div>
- <div class="col-md-6 col-xs-12">
+ <div class="col-md-6 col">
{{ macros.infobox(_("Role"), _("administrator") if current_user.is_admin else _("registered user"), "yellow", "lock") }}
</div>
</div>
</section>
</div>
- <div class="col-md-6 col-s-12">
+ <div class="col-md-6 col">
{{ macros.timeline(current_user.history) }}
</div>
</div>
diff --git a/hiboo/account/templates/account_profiles.html b/hiboo/account/templates/account_profiles.html
index 68e52afc461f863da1fa9f9f0550cb548145702e..e66e4070ea245ad3a1dc84a60cec4af26d354e1f 100644
--- a/hiboo/account/templates/account_profiles.html
+++ b/hiboo/account/templates/account_profiles.html
@@ -8,43 +8,43 @@
{% for service, profile in profiles %}
{% set service = profile.service %}
{% set status = profile.STATUSES[profile.status] %}
- <div class="col-md-4 col-s-6 col-xs-12">
- <div class="box box-widget widget-user-2">
+ <div class="col-md-4 col-s-6 col">
+ <div class="card card-widget widget-user-2">
<div class="widget-user-header bg-{{ macros.colors[loop.index0 % 7] }}">
<span class="btn btn-lg btn-flat bg-gray }} text-black pull-right">{{ status[1] | capitalize }}</span>
<h3 class="widget-header-username">{{ service.name }} / {{ profile.username }}</h3>
<h5 class="widget-header-desc">{{ profile.comment or "No profile description" }} </h5>
</div>
- <div class="box-footer no-padding">
- <ul class="nav nav-stacked">
+ <div class="card-footer no-padding">
+ <ul class="nav flex-column nav-pills nav-fill">
{% if not service.single_profile %}
{% if service.policy in ("open", "burst") and profile.__class__.filter(service, current_user).count() < service.max_profiles %}
- <li>
- <a href="{{ utils.url_for("profile.create", service_uuid=service.uuid) }}">
- <i class="fa fa-user-plus"></i>
+ <li class="nav-item text-left">
+ <a class="nav-link" href="{{ utils.url_for("profile.create", service_uuid=service.uuid) }}">
+ <i class="fas fa-user-plus"></i>
{% trans %}Create another profile{% endtrans %}
</a>
</li>
{% elif service.policy in ("managed", "burst") %}
- <li><a href="{{ utils.url_for("profile.create", service_uuid=service.uuid) }}"><i class="fa fa-user-plus"></i> {% trans %}Request another profile{% endtrans %}</a></li>
+ <li class="nav-item text-left"><a class="nav-link" href="{{ utils.url_for("profile.create", service_uuid=service.uuid) }}"><i class="fas fa-user-plus"></i> {% trans %}Request another profile{% endtrans %}</a></li>
{% endif %}
{% if service.policy not in ("locked",) %}
- <li><a href="{{ utils.url_for("profile.claim", service_uuid=service.uuid) }}"><i class="fa fa-user-plus"></i> {% trans %}Claim another profile{% endtrans %}</a></li>
+ <li class="nav-item text-left"><a class="nav-link" href="{{ utils.url_for("profile.claim", service_uuid=service.uuid) }}"><i class="fas fa-user-plus"></i> {% trans %}Claim another profile{% endtrans %}</a></li>
{% endif %}
{% endif %}
{% if profile.transition %}
- {% set transition = profile.TRANSITIONS[profile.transition] %}
+ {% set transition = profile.TRANSITIONS[profile.transition] %}
{% set color, status = profile.STATUSES[transition.to] %}
{% set when = transition.delta(profile) %}
- <li>
- <a href="#">
- <i class="fa fa-clock-o"></i>
+ <li class="nav-item text-left">
+ <a class="nav-link" href="#">
+ <i class="fas fa-clock"></i>
{% trans status, when %}Profile will be {{ status }} in {{ when }}{% endtrans %}
</a>
</li>
{% endif %}
{% for action in common.get_actions(profile) %}
- <li><a href="{{ action.url(profile=profile) }}"><i class="fa fa-trash"></i> {{ action.description | capitalize }}</a></li>
+ <li class="nav-item text-left"><a class="nav-link" href="{{ action.url(profile=profile) }}"><i class="fas fa-trash"></i> {{ action.description | capitalize }}</a></li>
{% endfor %}
</ul>
</div>
@@ -52,4 +52,4 @@
</div>
{% endfor %}
</div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/hiboo/application/templates/application_pick.html b/hiboo/application/templates/application_pick.html
index 48ad5585026774d660cb91ada2c5f393faa45a1e..c1504e87a6ba74692ef9cf5c6668d94847b50f24 100644
--- a/hiboo/application/templates/application_pick.html
+++ b/hiboo/application/templates/application_pick.html
@@ -5,7 +5,7 @@
{% block content %}
<div class="row">
{% for application_id, application in applications.items() %}
- <div class="col-md-4 col-s-6 col-xs-12">
+ <div class="col-md-4 col-s-6 col">
<div class="card bg-{{ macros.colors[loop.index0 % 7] }}">
<div class="card-header">
<h3>{{ application.name }}</h3>
diff --git a/hiboo/profile/templates/profile_action.html b/hiboo/profile/templates/profile_action.html
index d146fc0832405579811b33c8d46f5944c27be35b..c636b7aeea7d58c78b31e2a65036014ed9a3f441 100644
--- a/hiboo/profile/templates/profile_action.html
+++ b/hiboo/profile/templates/profile_action.html
@@ -5,9 +5,9 @@
{% block content %}
<div class="row">
- <div class="col-xs-12">
- <div class="box">
- <div class="box-body">
+ <div class="col">
+ <div class="card">
+ <div class="card-body">
{{ result | safe }}
</div>
</div>
diff --git a/hiboo/profile/templates/profile_details.html b/hiboo/profile/templates/profile_details.html
index 5a96292ca517ff4156a0f7ddc72d281274e46bfb..622a1a09c0f6ba2942cce3f801a6178f2c600839 100644
--- a/hiboo/profile/templates/profile_details.html
+++ b/hiboo/profile/templates/profile_details.html
@@ -5,38 +5,38 @@
{% block content %}
<div class="row">
- <div class="col-md-6 col-xs-12">
- <div class="box">
- <div class="box-body">
- <dl class="dl-horizontal">
- <dt>{% trans %}Username{% endtrans %}</dt>
- <dd>{{ profile.username }}</dd>
+ <div class="col-md-6 col">
+ <div class="card">
+ <div class="card-body">
+ <dl class="row">
+ <dt class="col-3">{% trans %}Username{% endtrans %}</dt>
+ <dd class="col-9">{{ profile.username }}</dd>
- <dt>{% trans %}Owner{% endtrans %}</dt>
- <dd><a href="{{ url_for("user.details", user_uuid=profile.user_uuid) }}">{{ profile.user.username }}</a></dd>
+ <dt class="col-3">{% trans %}Owner{% endtrans %}</dt>
+ <dd class="col-9"><a href="{{ url_for("user.details", user_uuid=profile.user_uuid) }}">{{ profile.user.username }}</a></dd>
- <dt>{% trans %}UUID{% endtrans %}</dt>
- <dd><pre>{{ profile.uuid }}</pre></dd>
+ <dt class="col-3">{% trans %}UUID{% endtrans %}</dt>
+ <dd class="col-9"><pre>{{ profile.uuid }}</pre></dd>
- <dt>{% trans %}Status{% endtrans %}</dt>
- <dd>{{ macros.profile_status(profile) }}</dd>
+ <dt class="col-3">{% trans %}Status{% endtrans %}</dt>
+ <dd class="col-9">{{ macros.profile_status(profile) }}</dd>
- <dt>{% trans %}Created at{% endtrans %}</dt>
- <dd>{{ profile.created_at }}</dd>
+ <dt class="col-3">{% trans %}Created at{% endtrans %}</dt>
+ <dd class="col-9">{{ profile.created_at }}</dd>
</dl>
</div>
</div>
</div>
- <div class="col-md-6 col-xs-12">
- <div class="box">
- <div class="box-header">
+ <div class="col-md-6 col">
+ <div class="card">
+ <div class="card-header">
<h4>{% trans %}Actions{% endtrans %}</h4>
</div>
- <div class="box-body">
- <dl class="dl-horizontal">
+ <div class="card-body">
+ <dl class="row">
{% for action in actions %}
- <dt><a href="{{ action.url(profile) }}">{{ action.label | capitalize }}</a></dt>
- <dd>{{ action.description | capitalize }}</dd>
+ <dt class="col-3"><a href="{{ action.url(profile) }}">{{ action.label | capitalize }}</a></dt>
+ <dd class="col-9">{{ action.description | capitalize }}</dd>
{% endfor %}
</dl>
</div>
@@ -44,7 +44,7 @@
</div>
</div>
<div class="row">
- <div class="col-md-6 col-s-12">
+ <div class="col-md-6 col">
{{ macros.timeline(profile.history, public_only=False) }}
</div>
</div>
@@ -52,6 +52,6 @@
{% block actions %}
{% for action in actions %}
-<a href="{{ action.url(profile) }}" class="btn btn-info">{{ action.label | capitalize }}</a>
+<a href="{{ action.url(profile) }}" class="btn btn-warning">{{ action.label | capitalize }}</a>
{% endfor %}
{% endblock %}
diff --git a/hiboo/profile/templates/profile_pick.html b/hiboo/profile/templates/profile_pick.html
index a1ddb19a184c2dcf1ff3b8326d6bb1340dccbea1..85a8735dfe5a5cb17f31bcd6b71e3bc416485770 100644
--- a/hiboo/profile/templates/profile_pick.html
+++ b/hiboo/profile/templates/profile_pick.html
@@ -7,8 +7,8 @@
{% block content %}
<div class="row">
{% for profile in profiles %}
- <div class="col-md-4 col-s-6 col-xs-12">
- <div class="box box-widget widget-user-2">
+ <div class="col-md-4 col-s-6 col">
+ <div class="card card-widget widget-user-2">
<div class="widget-user-header bg-{{ macros.colors[loop.index0 % 7] }}">
{% if profile.status == profile.ACTIVE %}
<form method="POST" action="{{ utils.url_or_intent("account.home") }}" class="form">
@@ -22,7 +22,7 @@
<h3 class="widget-header-username">{{ profile.username }}</h3>
<h5 class="widget-header-desc">{{ profile.comment or "No profile description" }} </h5>
</div>
- <div class="box-footer no-padding">
+ <div class="card-footer no-padding">
<ul class="nav nav-stacked">
{% set created_on = profile.created_at.date() %}
<li><a href="#">{% trans %}Created on {{ created_on }}{% endtrans %}</a></li>
diff --git a/hiboo/profile/templates/profile_quick.html b/hiboo/profile/templates/profile_quick.html
index bf43826c53e0d3f6f6c57f81bead0c449d2f3b5e..2990ff9f2a941df1810348f4b8acf7156ea6d1e3 100644
--- a/hiboo/profile/templates/profile_quick.html
+++ b/hiboo/profile/templates/profile_quick.html
@@ -10,8 +10,8 @@
{% block content %}
<div class="row">
- <div class="col-md-4 col-s-6 col-xs-12">
- <div class="box box-widget widget-user-2">
+ <div class="col-md-4 col-s-6 col">
+ <div class="card card-widget widget-user-2">
<div class="widget-user-header bg-primary">
<form method="POST" class="form">
{{ form.hidden_tag() }}
@@ -21,10 +21,10 @@
<h3 class="widget-header-username">{{ form.username.data }}</h3>
<h5 class="widget-header-desc">{% trans service_name %}Your new {{ service_name }} profile{% endtrans %}</h5>
</div>
- <div class="box-footer">
+ <div class="card-footer">
<p>{% trans service_name %}Please click the "Sign up" button to initialize your {{ service_name }} account.{% endtrans %}</p>
{% if not service.single_profile %}
- <p>{% trans %}If you wish to pick a different username, please click the "Custom profile" button.{% endtrans %}</p>
+ <p>{% trans %}If you wish to pick a different username, please click the "Custom profile" button.{% endtrans %}</p>
{% endif %}
</div>
</div>
diff --git a/hiboo/service/templates/service_action.html b/hiboo/service/templates/service_action.html
index 20be71342def14de91449b2282880c8a5a3b77b3..ca67b628686488da61cdd6ec45f8725a267f791a 100644
--- a/hiboo/service/templates/service_action.html
+++ b/hiboo/service/templates/service_action.html
@@ -5,9 +5,9 @@
{% block content %}
<div class="row">
- <div class="col-xs-12">
- <div class="box">
- <div class="box-body">
+ <div class="col">
+ <div class="card">
+ <div class="card-body">
{{ result | safe }}
</div>
</div>
diff --git a/hiboo/service/templates/service_details.html b/hiboo/service/templates/service_details.html
index f81a9f7effd1d1baaf2b9e6eaad7ab530aeba644..5c990d416f01e42f86ffc1d48d0c7eb22da3c8c7 100644
--- a/hiboo/service/templates/service_details.html
+++ b/hiboo/service/templates/service_details.html
@@ -5,70 +5,70 @@
{% block content %}
<div class="row">
- <div class="col-md-6 col-xs-12">
- <div class="box">
- <div class="box-header">
+ <div class="col-md-6">
+ <div class="card">
+ <div class="card-header">
<h4>{% trans %}Attributes{% endtrans %}</h4>
</div>
- <div class="box-body">
- <dl class="dl-horizontal">
- <dt>{% trans %}Service name{% endtrans %}</dt>
- <dd>{{ service.name }}</dd>
+ <div class="card-body">
+ <dl class="row">
+ <dt class="col-3">{% trans %}Service name{% endtrans %}</dt>
+ <dd class="col-9">{{ service.name }}</dd>
- <dt>{% trans %}Description{% endtrans %}</dt>
- <dd>{{ service.description }}</dd>
+ <dt class="col-3">{% trans %}Description{% endtrans %}</dt>
+ <dd class="col-9">{{ service.description }}</dd>
- <dt>{% trans %}Provider{% endtrans %}</dt>
- <dd>{{ service.provider }}</dd>
+ <dt class="col-3">{% trans %}Provider{% endtrans %}</dt>
+ <dd class="col-9">{{ service.provider }}</dd>
- <dt>{% trans %}Application{% endtrans %}</dt>
- <dd>{{ application.name }}</dd>
+ <dt class="col-3">{% trans %}Application{% endtrans %}</dt>
+ <dd class="col-9">{{ application.name }}</dd>
- <dt>{% trans %}Application destriction{% endtrans %}</dt>
- <dd>{{ application.__doc__ }}</dd>
+ <dt class="col-3">{% trans %}Application destriction{% endtrans %}</dt>
+ <dd class="col-9">{{ application.__doc__ }}</dd>
- <dt>{% trans %}UUID{% endtrans %}</dt>
- <dd><pre>{{ service.uuid }}</pre></dd>
+ <dt class="col-3">{% trans %}UUID{% endtrans %}</dt>
+ <dd class="col-9"><pre>{{ service.uuid }}</pre></dd>
</dl>
</div>
- </div>
+ </div>
</div>
- <div class="col-md-6 col-xs-12">
- <div class="box">
- <div class="box-header">
+ <div class="col-md-6">
+ <div class="card">
+ <div class="card-header">
<h4>{% trans %}Actions{% endtrans %}</h4>
</div>
- <div class="box-body">
- <dl class="dl-horizontal">
+ <div class="card-body">
+ <dl class="row">
{% for action, (label, profile, _, function) in application.actions.items() %}
{% if not profile %}
- <dt><a href="{{ url_for(".action", service_uuid=service.uuid, action=action) }}">{{ label }}</a></dt>
- <dd>{{ function.__doc__ }}</dd>
+ <dt class="col-3"><a href="{{ url_for(".action", service_uuid=service.uuid, action=action) }}">{{ label }}</a></dt>
+ <dd class="col-9">{{ function.__doc__ }}</dd>
{% endif %}
{% endfor %}
</dl>
</div>
- </div>
+ </div>
</div>
</div>
<div class="row">
- <div class="col-xs-12">
- <div class="box">
- <div class="box-body">
+ <div class="col">
+ <div class="card">
+ <div class="card-body">
{{ application.render_details(service) | safe }}
</div>
+ </div>
</div>
-</div>
-{% endblock %}
+ {% endblock %}
-{% block actions %}
-{% for action, (label, profile, quick, function) in application.actions.items() %}
-{% if quick and not profile %}
-<a href="{{ url_for(".action", service_uuid=service.uuid, action=action) }}" class="btn btn-info">{{ label }}</a>
-{% endif %}
-{% endfor %}
-<a href="{{ url_for("profile.list_for_service", service_uuid=service.uuid) }}" class="btn btn-primary">{% trans %}View profiles{% endtrans %}</a>
-<a href="{{ url_for(".setapp_select", service_uuid=service.uuid) }}" class="btn btn-primary">{% trans %}Change application{% endtrans %}</a>
-<a href="{{ url_for(".edit", service_uuid=service.uuid) }}" class="btn btn-primary">{% trans %}Edit this service{% endtrans %}</a>
-<a href="{{ url_for(".delete", service_uuid=service.uuid) }}" class="btn btn-danger">{% trans %}Delete this service{% endtrans %}</a>
-{% endblock %}
+ {% block actions %}
+ {% for action, (label, profile, quick, function) in application.actions.items() %}
+ {% if quick and not profile %}
+ <a href="{{ url_for(".action", service_uuid=service.uuid, action=action) }}" class="btn btn-info">{{ label }}</a>
+ {% endif %}
+ {% endfor %}
+ <a href="{{ url_for("profile.list_for_service", service_uuid=service.uuid) }}" class="btn btn-primary">{% trans %}View profiles{% endtrans %}</a>
+ <a href="{{ url_for(".setapp_select", service_uuid=service.uuid) }}" class="btn btn-primary">{% trans %}Change application{% endtrans %}</a>
+ <a href="{{ url_for(".edit", service_uuid=service.uuid) }}" class="btn btn-primary">{% trans %}Edit this service{% endtrans %}</a>
+ <a href="{{ url_for(".delete", service_uuid=service.uuid) }}" class="btn btn-danger">{% trans %}Delete this service{% endtrans %}</a>
+ {% endblock %}
diff --git a/hiboo/user/templates/user_details.html b/hiboo/user/templates/user_details.html
index 2c9baee28c327162a008e7706b80ddfa9f9a88e4..ee1e049aa6751f8393e586ea39d6ee1d5c2e520a 100644
--- a/hiboo/user/templates/user_details.html
+++ b/hiboo/user/templates/user_details.html
@@ -5,28 +5,28 @@
{% block content %}
<div class="row">
- <div class="col-xs-12">
- <div class="box">
- <div class="box-body">
- <dl class="dl-horizontal">
- <dt>{% trans %}Username{% endtrans %}</dt>
- <dd>{{ user.username }}</dd>
+ <div class="col">
+ <div class="card">
+ <div class="card-body">
+ <dl class="row">
+ <dt class="col-sm-3">{% trans %}Username{% endtrans %}</dt>
+ <dd class="col-sm-9">{{ user.username }}</dd>
- <dt>{% trans %}UUID{% endtrans %}</dt>
- <dd>{{ user.uuid }}</dd>
+ <dt class="col-sm-3">{% trans %}UUID{% endtrans %}</dt>
+ <dd class="col-sm-9">{{ user.uuid }}</dd>
- <dt>{% trans %}Created at{% endtrans %}</dt>
- <dd>{{ user.created_at }}</dd>
+ <dt class="col-sm-3">{% trans %}Created at{% endtrans %}</dt>
+ <dd class="col-sm-9">{{ user.created_at }}</dd>
{% if user.contact %}
{% for name, value in user.contact.items() %}
- <dt>{{ name | capitalize }}</dt>
- <dd>{{ value }}</dd>
+ <dt class="col-sm-3">{{ name | capitalize }}</dt>
+ <dd class="col-sm-9">{{ value }}</dd>
{% endfor %}
{% endif %}
</dl>
</div>
- </div>
+ </div>
</div>
</div>
<div class="row">