Merge branch 'master' into contest-access-lock

packages/ui-default/templates/layout/basic.html

@@ -7,7 +7,7 @@
   {% if UserContext %}{% include "partials/header_mobile.html" %}{% endif %}
   <div class="main">
     {% for item in ui.getNodes('Notification').concat(notification or []) %}{% if item.checker(handler) %}
-      <div class="row"><blockquote class="{{ item.args.type }}">{{ _(item.name).format(item.args.args or []) }}</blockquote></div>
+      <div class="row typo"><blockquote class="{{ item.args.type }}">{{ _(item.name).format(item.args.args or [])|nl2br|safe }}</blockquote></div>
     {% endif %}{% endfor %}
     {% block content %}{% endblock %}
   </div>

packages/ui-default/templates/user_detail.html

@@ -5,7 +5,7 @@
 {{ set(UiContext, 'udoc', udoc) }}
 <style>
   .user-profile-bg {
-    background-image : url("{{ udoc.backgroundImage }}");
+    background-image: url("{{ udoc.backgroundImage }}"), url("/components/profile/backgrounds/1.jpg");
   }
 </style>
 <div class="row">