gergely/calendar-social
1
0
Fork 2
Code Issues 24 Pull Requests 3 Releases Wiki Activity

Move account related views to a separate blueprint

Browse Source
This commit is contained in:
Gergely Polonkai
2018-07-17 15:21:12 +02:00
parent 8d45611e35
commit bcb7b524f3
12 changed files with 225 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
calsocial/templates/first-steps.html → calsocial/templates/account/first-steps.html
View File

2
calsocial/templates/follow-requests.html → calsocial/templates/account/follow-requests.html
View File

@@ -7,7 +7,7 @@
{% for req in requests %}
<li>
{{ req.follower }}
<a href="{{ url_for('accept_follow', follower_id=req.follower_id) }}" class="ui button">{% trans %}Accept{% endtrans %}</a>
<a href="{{ url_for('account.accept_follow', follower_id=req.follower_id) }}" class="ui button">{% trans %}Accept{% endtrans %}</a>
</li>
{% endfor %}
</ul>

0
calsocial/templates/notifications.html → calsocial/templates/account/notifications.html
View File

2
calsocial/templates/profile-edit.html → calsocial/templates/account/profile-edit.html
View File

@@ -1,4 +1,4 @@
{% extends 'settings-base.html' %}
{% extends 'account/settings-base.html' %}
{% from '_macros.html' import field %}
{% block settings_content %}

0
calsocial/templates/registration.html → calsocial/templates/account/registration.html
View File

15
calsocial/templates/account/settings-base.html Normal file
View File

@@ -0,0 +1,15 @@
{% extends 'base.html' %}
{% block content %}
<div class="ui grid">
<div class="four wide column">
<div class="ui secondary pointing vertical menu">
<a class="item{% if request.endpoint == 'account.edit_profile' %} active{% endif %}" href="{{ url_for('account.edit_profile') }}">{% trans %}Edit profile{% endtrans %}</a>
<a class="item{% if request.endpoint == 'account.settings' %} active{% endif %}" href="{{ url_for('account.settings') }}">{% trans %}Settings{% endtrans %}</a>
</div>
</div>
<div class="twelve wide stretched column">
{% block settings_content %}{% endblock %}
</div>
</div>
{% endblock %}

2
calsocial/templates/user-settings.html → calsocial/templates/account/user-settings.html
View File

@@ -1,4 +1,4 @@
{% extends 'settings-base.html' %}
{% extends 'account/settings-base.html' %}
{% from '_macros.html' import field %}
{% block settings_content %}

6
calsocial/templates/base.html
View File

@@ -34,8 +34,8 @@
{%- endtrans %}
</div>
<a class="item" href="{{ url_for('hello') }}">{% trans %}Calendar view{% endtrans %}</a>
<a class="item" href="{{ url_for('notifications') }}">{% trans %}Notifications{% endtrans %}</a>
<a class="item" href="{{ url_for('settings') }}">{% trans %}Settings{% endtrans %}</a>
<a class="item" href="{{ url_for('account.notifications') }}">{% trans %}Notifications{% endtrans %}</a>
<a class="item" href="{{ url_for('account.settings') }}">{% trans %}Settings{% endtrans %}</a>
<a class="item" href="{{ url_for('security.logout') }}">{% trans %}Logout{% endtrans %}</a>
{% endif %}
</div>
@@ -50,6 +50,6 @@
</footer>
{% block scripts %}{% endblock %}
<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha256-hVVnYaiADRTO2PzUGmuLJr8BLUSjGIZsDYGmIJLv2b8=" crossorigin="anonymous"></script>
<script src="{{ url_for('static', filename='semantic/semantic.min.js') }}"></script> <link rel="stylesheet" href="{{ url_for('static', filename='css/style.css') }}" type="text/css">
<script src="{{ url_for('static', filename='semantic/semantic.min.js') }}"></script>
</body>
</html>

15
calsocial/templates/settings-base.html
View File

@@ -1,15 +0,0 @@
{% extends 'base.html' %}
{% block content %}
<div class="ui grid">
<div class="four wide column">
<div class="ui secondary pointing vertical menu">
<a class="item{% if request.endpoint == 'edit_profile' %} active{% endif %}" href="{{ url_for('edit_profile') }}">{% trans %}Edit profile{% endtrans %}</a>
<a class="item{% if request.endpoint == 'settings' %} active{% endif %}" href="{{ url_for('settings') }}">{% trans %}Settings{% endtrans %}</a>
</div>
</div>
<div class="twelve wide stretched column">
{% block settings_content %}{% endblock %}
</div>
</div>
{% endblock %}

2
calsocial/templates/welcome.html
View File

@@ -18,7 +18,7 @@
<div class="ui horizontal divider">
{% trans %}Or{% endtrans %}
</div>
<a href="{{ url_for('register' ) }}" class="fluid ui button">{% trans %}Register an account{% endtrans %}</a>
<a href="{{ url_for('account.register_account' ) }}" class="fluid ui button">{% trans %}Register an account{% endtrans %}</a>
{% endif %}
<div class="ui horizontal divider"></div>
{% endif %}