mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-13 05:06:58 +03:00
Fix some minor issues
This commit is contained in:
parent
1946ba7256
commit
e98855723b
|
@ -147,7 +147,7 @@ DJANGO_APPS = (
|
||||||
THIRD_PARTY_APPS = (
|
THIRD_PARTY_APPS = (
|
||||||
'south', # Database migration helpers:
|
'south', # Database migration helpers:
|
||||||
'crispy_forms', # Form layouts
|
'crispy_forms', # Form layouts
|
||||||
# 'avatar', # for user avatars
|
'avatar', # for user avatars
|
||||||
)
|
)
|
||||||
|
|
||||||
# Apps specific for this project go here.
|
# Apps specific for this project go here.
|
||||||
|
|
|
@ -26,7 +26,7 @@ urlpatterns = patterns('',
|
||||||
url(r'^accounts/', include('allauth.urls')),
|
url(r'^accounts/', include('allauth.urls')),
|
||||||
|
|
||||||
# Uncomment the next line to enable avatars
|
# Uncomment the next line to enable avatars
|
||||||
#url(r'^avatar/', include('avatar.urls')),
|
url(r'^avatar/', include('avatar.urls')),
|
||||||
|
|
||||||
# Your stuff: custom urls go here
|
# Your stuff: custom urls go here
|
||||||
|
|
||||||
|
|
|
@ -7,34 +7,29 @@
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="container">
|
<div class="container">
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-lg-3">
|
<div class="col-sm-12">
|
||||||
|
|
||||||
<h2>{{ object.username }}
|
|
||||||
|
|
||||||
</h2>
|
|
||||||
<p>{{ object.tagline }}</p>
|
|
||||||
|
|
||||||
{% if object == request.user %}
|
|
||||||
<!-- Action buttons -->
|
|
||||||
<div class="well">
|
|
||||||
<div class="row">
|
|
||||||
|
|
||||||
<div class="col-6">
|
|
||||||
<a class="btn btn-primary btn-block" href="{% url 'users:update' %}">My Info</a>
|
|
||||||
<a class="btn btn-primary btn-block" href="{% url 'account_email' %}">E-Mail</a>
|
|
||||||
</div>
|
|
||||||
<div class="col-6">
|
|
||||||
<a class="btn btn-info btn-block" href="">Avatar</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<!-- End Action buttons -->
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
|
|
||||||
|
<h2>{{ object.username }}</h2>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{% if object == request.user %}
|
||||||
|
<!-- Action buttons -->
|
||||||
|
<div class="row">
|
||||||
|
|
||||||
|
<div class="col-sm-12 ">
|
||||||
|
<a class="btn btn-primary" href="{% url 'users:update' %}">My Info</a>
|
||||||
|
<a class="btn btn-primary" href="{% url 'account_email' %}">E-Mail</a>
|
||||||
|
<a class="btn btn-info" href="{% url 'avatar_change' %}">Avatar</a>
|
||||||
|
<!-- Your Stuff: Custom user template urls -->
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<!-- End Action buttons -->
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
{% endblock content %}
|
{% endblock content %}
|
||||||
{% endraw %}
|
{% endraw %}
|
Loading…
Reference in New Issue
Block a user