Merge branch 'master' into 'adminLTE3-corrections'

# Conflicts:
#   hiboo/account/templates/account_profiles.html
#   hiboo/application/templates/application_synapse/room.html
#   hiboo/application/templates/application_synapse/rooms.html
#   hiboo/application/templates/application_synapse/user.html
#   hiboo/profile/templates/profile_action.html
#   hiboo/profile/templates/profile_details.html
#   hiboo/profile/templates/profile_list.html
#   hiboo/profile/templates/profile_pick.html
#   hiboo/profile/templates/profile_quick.html
#   hiboo/service/templates/service_action.html
#   hiboo/service/templates/service_details.html
#   hiboo/service/templates/service_list.html
#   hiboo/templates/base.html
#   hiboo/user/templates/user_details.html
#   hiboo/user/templates/user_list.html
#   hiboo/user/templates/user_pick.html

assets/vendor.js

 // FA
-import 'admin-lte/plugins/fontawesome-free/css/all.min.css';
-
-// select2
-import 'admin-lte/plugins/select2/css/select2.min.css';
+import 'admin-lte/plugins/fontawesome-free/css/fontawesome.css';
+import 'admin-lte/plugins/fontawesome-free/css/regular.css';
+import 'admin-lte/plugins/fontawesome-free/css/solid.css';
 
 // AdminLTE
 import 'admin-lte/build/scss/adminlte.scss';

hiboo/application/templates/application_pick.html

@@ -14,7 +14,7 @@
         <p class="card-text">
           {{ application.__doc__ }}
         </p>
-        <a href="{{ url_for(route, application_id=application_id, **kwargs) }}" style="opacity: 0.8" class="btn btn-secondary">
+        <a href="{{ url_for(route, application_id=application_id, **kwargs) }}" class="btn btn-secondary">
           {% trans %}Select{% endtrans %}
         </a>
       </div>

hiboo/profile/templates/profile_pick.html

@@ -10,23 +10,25 @@
   <div class="col-xs col-md-6 col-lg-4">
     <div class="card card-widget widget-user-2">
       <div class="widget-user-header bg-{{ macros.colors[loop.index0 % 7] }}">
+        <div class="float-right">
         {% if profile.status == profile.ACTIVE %}
-        <form method="POST" action="{{ utils.url_or_intent("account.home") }}" class="form">
-            {{ form.hidden_tag() }}
-            <input type="hidden" name="profile_uuid" value="{{ profile.uuid }}">
-            <input type="submit" value="Sign in" style="opacity: 0.8" class="btn btn-lg btn-flat bg-gray text-black pull-right">
-        </form>
-        {% else %}
-        <span class="btn btn-lg btn-flat bg-gray text-black pull-right">{{ profile.STATUSES[profile.status][1] | capitalize }}</span>
-        {% endif %}
+          <form method="POST" action="{{ utils.url_or_intent("account.home") }}" class="form">
+              {{ form.hidden_tag() }}
+              <input type="hidden" name="profile_uuid" value="{{ profile.uuid }}">
+              <input type="submit" value="Sign in" class="btn btn-lg btn-flat bg-gray text-black">
+          </form>
+          {% else %}
+          <span class="btn btn-lg btn-flat bg-secondary text-black">{{ profile.STATUSES[profile.status][1] | capitalize }}</span>
+          {% endif %}
+        </div>
         <h3 class="widget-header-username">{{ profile.username }}</h3>
         <h5 class="widget-header-desc">{{ profile.comment or "No profile description" }}&nbsp;</h5>
       </div>
       <div class="card-footer p-0">
-        <ul class="nav nav-stacked">
+        <ul class="nav flex-column">
           {% 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>
+          <li class="nav-item"><a href="#" class="nav-link">{% trans %}Created on {{ created_on }}{% endtrans %}</a></li>
+          <li class="nav-item"><a href="#" class="nav-link">{% trans %}Not shared with anyone{% endtrans %}</a></li>
         </ul>
       </div>
     </div>

hiboo/profile/templates/profile_quick.html

@@ -13,11 +13,13 @@
     <div class="col-xs col-md-6 col-lg-4">
         <div class="card card-widget widget-user-2">
             <div class="widget-user-header bg-primary">
-            <form method="POST" class="form">
-                {{ form.hidden_tag() }}
-                <input type="hidden" name="username" value="{{ form.username.data }}">
-                <input type="submit" value="Sign up" style="opacity: 0.8" class="btn btn-lg btn-flat bg-gray text-black pull-right">
-            </form>
+                <div class="float-right">
+                    <form method="POST" class="form">
+                        {{ form.hidden_tag() }}
+                        <input type="hidden" name="username" value="{{ form.username.data }}">
+                        <input type="submit" value="Sign up" class="btn btn-lg btn-flat bg-gray text-black">
+                    </form>
+                </div>
             <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>

hiboo/sso/oidc.py

@@ -112,7 +112,7 @@ class Client(sqla_oauth2.OAuth2ClientMixin):
         self.client_secret = service.config["client_secret"]
         # Configuration is stored in a format compatible with authlib metadata
         # so it only needs to be passed to the authorization server object
-        self.client_metadata = service.config
+        self.__dict__["client_metadata"] = service.config
         self.authorization = flask_oauth2.AuthorizationServer(query_client=self.query_client, save_token=self.save_token)
         self.authorization.generate_token = self.generate_token
         # Register all grant types

hiboo/templates/macros.html

-{% set colors = ['blue', 'green', 'orange', 'teal', 'red', 'purple', 'maroon'] %}
+{% set colors = ['indigo', 'green', 'orange', 'teal', 'maroon', 'purple', 'olive'] %}
 
 {% macro timeline(events, public_only=True) %}
 <div class="timeline">