Merge f235c5b into b913169

inveniosoftware · May 14, 2020 · e73b918 · e73b918
2 parents b913169 + f235c5b
commit e73b918
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 303 deletions.
diff --git a/docs/examplesapp.rst b/docs/examplesapp.rst
diff --git a/docs/index.rst b/docs/index.rst
@@ -18,7 +18,6 @@ Invenio-UserProfiles.
 
    installation
    configuration
-   examplesapp
 
 
 API Reference

diff --git a/examples/app-fixtures.sh b/examples/app-fixtures.sh
diff --git a/examples/app-setup.sh b/examples/app-setup.sh
diff --git a/examples/app-teardown.sh b/examples/app-teardown.sh
diff --git a/examples/app.py b/examples/app.py
diff --git a/examples/requirements.txt b/examples/requirements.txt
diff --git a/examples/templates/authenticated.html → ...emantic-ui/invenio_userprofiles/base.html b/examples/templates/authenticated.html → ...emantic-ui/invenio_userprofiles/base.html
@@ -12,7 +12,6 @@
     <meta charset="utf-8" />
   </head>
   <body>
-    You are logged in.
-    <a href="{{url_for_security('logout')}}">Log out</a>
+    {%- block page_body %}{%- endblock page_body %}
   </body>
 </html>
diff --git a/invenio_userprofiles/templates/semantic-ui/invenio_userprofiles/register_user.html b/invenio_userprofiles/templates/semantic-ui/invenio_userprofiles/register_user.html
@@ -0,0 +1,19 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2016-2018 CERN.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{%- extends config.USERPROFILES_REGISTER_USER_BASE_TEMPLATE %}
+
+{% from "invenio_accounts/_macros.html" import render_field %}
+
+{% block registration_form_fields %}
+{%- with form = register_user_form %}
+{{ render_field(form.profile, icon="lock icon", errormsg=False) }}
+{%- endwith %}
+{{ super() }}
+{% endblock %}
diff --git a/invenio_userprofiles/templates/semantic-ui/invenio_userprofiles/settings/_macros.html b/invenio_userprofiles/templates/semantic-ui/invenio_userprofiles/settings/_macros.html
@@ -0,0 +1,29 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2015-2018 CERN.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+
+{% macro render_field(field, icon="", placeholder='', autofocus=False) %}
+  <div class="field {% if field.errors %}error{% endif %}">
+    {{ field.label }}
+    {%- set extras = dict(autofocus="") if autofocus else dict() %}
+    {{field(class_="form-control", placeholder=placeholder, **extras)}}
+    {%- if icon %}
+    <i class="{{icon}}" aria-hidden="true" ></i>
+    {%- endif %}
+    {%- if field.description %}
+    <small>{{ field.description }}</small>
+    {%- endif %}
+    {%- if field.errors %}
+    <div class="ui negative message" role="alert">
+    {%- for error in field.errors %}
+    <p>{{error}}</p>
+    {% endfor %}
+    </div>
+    {%- endif %}
+  </div>
+{% endmacro %}
diff --git a/examples/templates/anonymous.html → ...i/invenio_userprofiles/settings/base.html b/examples/templates/anonymous.html → ...i/invenio_userprofiles/settings/base.html
@@ -6,13 +6,8 @@
   Invenio is free software; you can redistribute it and/or modify it
   under the terms of the MIT License; see LICENSE file for more details.
 #}
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-  </head>
-  <body>
-    You are not logged in.
-    <a href="{{url_for_security('login')}}">Login</a>
-  </body>
-</html>
+{%- extends "invenio_userprofiles/base.html" %}
+
+{%- block page_body %}
+{%- block settings_form %}{%- endblock settings_form %}
+{%- endblock page_body %}
diff --git a/invenio_userprofiles/templates/semantic-ui/invenio_userprofiles/settings/profile.html b/invenio_userprofiles/templates/semantic-ui/invenio_userprofiles/settings/profile.html
@@ -0,0 +1,40 @@
+{# -*- coding: utf-8 -*-
+
+  This file is part of Invenio.
+  Copyright (C) 2015-2018 CERN.
+
+  Invenio is free software; you can redistribute it and/or modify it
+  under the terms of the MIT License; see LICENSE file for more details.
+#}
+{%- extends config.USERPROFILES_SETTINGS_TEMPLATE %}
+
+{% from "invenio_userprofiles/settings/_macros.html" import render_field, form_errors %}
+
+{% set panel_title = _("Profile") %}
+{% set panel_icon = "user icon" %}
+
+{%- block settings_form %}
+{%- if security.confirmable and not current_user.confirmed_at %}
+<form method="POST" role="form">
+  {{ verification_form.csrf_token }}
+  <div class="ui warning message">
+    {{ _("You have not yet verified your email address.") }} {{ verification_form.send_verification_email(class_="compact ui small basic button") }}
+  </div>
+  <input type="hidden" name="submit" value="verification" />
+</form>
+{%- endif %}
+{%- set form = profile_form %}
+<form method="POST" name="profile_form" class="ui form">
+  {%- for field in form %}
+  {%- if field.widget.input_type == 'hidden' %}
+  {{ field() }}
+  {%- else %}
+  {{ render_field(field, autofocus=True, placeholder=field.label.text) }}
+  {%- endif %}
+  {%- endfor %}
+  <div class="form-actions">
+    <a href="." class="ui secondary basic button"><i class="close icon"></i> {{ _('Cancel') }}</a>
+    <button type="submit" name="submit" value="profile" class="ui primary button"><i class="close icon"></i> {{ _('Update profile') }}</button>
+  </div>
+</form>
+{%- endblock settings_form %}