edb/duskenweb
Archived
9
0 Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

More profile view templating

Browse Source
This commit is contained in:
nikolark committed 2013-12-26 03:16:17 +01:00
1 parent 0cbddf75b6
commit b874f1c83f
6 files changed
+105 -29
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

duskenweb/templates/account.html
+15
View File
@@ -0,0 +1,15 @@
{% extends "base.html" %}
{% block title %}Dusken - Account{% endblock %}
{% block content %}
<div class="container">
<div class="row">
<div class="col-md-12">
<h4><i class="glyphicon glyphicon-cog"></i> Account details</h4>
Payment history<br>
change password<br>
delete account?<br>
</div>
</div>
</div>
{% endblock %}
duskenweb/templates/membership_purchase.html
+15
View File
@@ -0,0 +1,15 @@
{% extends "base.html" %}
{% block title %}Dusken - Purchase membership{% endblock %}
{% block content %}
<div class="container">
<div class="row">
<div class="col-md-12">
<h4>New membership</h4>
what you get / incentives<br />
price<br />
terms<br />
purchase button (payex payment screen)<br />
</div>
</div>
</div>
{% endblock %}
duskenweb/templates/nav.html
+2 -2
View File
@@ -9,7 +9,7 @@
<span class="icon-bar"></span>
</button>
{% endif %}
<a class="navbar-brand" href="#">Dusken</a>
<a class="navbar-brand" href="/">Dusken</a>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
@@ -20,7 +20,7 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ user }} <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="{% url "profile" %}"><i class="glyphicon glyphicon-user"></i> Profile</a></li>
<li><a href="{% url "account" %}"><i class="glyphicon glyphicon-user"></i> Account</a></li>
<li><a href="{% url "account" %}"><i class="glyphicon glyphicon-cog"></i> Account</a></li>
<li class="divider"></li>
<li><a href="{% url "logout" %}"><i class="glyphicon glyphicon-log-out"></i> Logout</a></li>
</ul>
duskenweb/templates/profile.html
+61 -25
View File
@@ -4,19 +4,35 @@
<div class="container">
<div class="row">
<div class="col-md-12">
<h4>{{me.first_name}} {{me.last_name }}</h4>
<h4><i class="glyphicon glyphicon-user"></i> {{me.first_name}} {{me.last_name }}</h4>
<div class="row">
<div class="col-md-6">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title"><i class="glyphicon glyphicon-user"></i> Profile</h3>
<h3 class="panel-title">Profile</h3>
</div>
<ul class="list-group">
<li class="list-group-item">Name: {{me.first_name}} {{me.last_name}}</li>
<li class="list-group-item">Username: {{me.username}}</li>
<li class="list-group-item">Email: {{me.email}}</li>
<li class="list-group-item">Facebook <i class="glyphicon glyphicon-ok"></i> Google+ <i class="glyphicon glyphicon-ok"></i> </li>
</ul>
</div>
<div class="panel {% if me.has_valid_membership %}panel-success{%else%}panel-warning{%endif%}">
<div class="panel-heading">
<h3 class="panel-title">Membership</h3>
</div>
<div class="panel-body">
{% if me.has_valid_membership %}
{% for membership in me.memberships %}
<i class="glyphicon glyphicon-ok"></i> Valid until DATE
{% endfor %}
{% else %}
<p>Not valid (expired DATE)</p>
<a href="{% url 'membership-purchase' %}" class="btn btn-success btn-lg"><i class="glyphicon glyphicon-plus"></i> Purchase membership</a>
{% endif %}
</div>
</div>
{% if user.is_staff %}
<div class="panel panel-default">
<div class="panel-heading">
@@ -24,7 +40,7 @@
</div>
<div class="panel-body">
<ul>
<li><a href="{% url 'members_list' %}">List members</a></li>
<li><a href="{% url 'members-list' %}">List members</a></li>
<li><a href="/admin/">Django admin</a></li>
</ul>
<div class="">
@@ -34,32 +50,52 @@
{% endif %}
</div>
<div class="col-md-6">
<div class="panel {% if me.has_valid_membership %}panel-success{%else%}panel-warning{%endif%}">
<div class="panel-heading">
<h3 class="panel-title">Membership</h3>
</div>
<div class="panel-body">
{% if me.has_valid_membership %}
{% for membership in me.memberships %}
<i class="glyphicon glyphicon-ok"></i> Valid until {{ me.}}
{% endfor %}
{% else %}
Not valid (expired DATE)
{% endif %}
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Your Groups <span class="badge">{{ me.groups|length}}</span></h3>
</div>
{% if not me.groups %}
No groups
{% endif %}
<ul class="list-group">
{% for group in me.groups %}
<li class="list-group-item">{{ group }}</li>
{% endfor %}
</ul>
{% if not me.groups %}
<div class="panel-body">No groups</div>
{% endif %}
<ul class="list-group">
{% for group in me.groups %}
<li class="list-group-item">group-name-shows-up-here:{{ group }}</li>
{% endfor %}
</ul>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Your Divisions{% if me.divisions %} <span class="badge">{{ me.divisions|length}}</span>{% endif %}</h3>
</div>
{% if not me.visions %}
<div class="panel-body">
<p>
Not part of any divisions. <a href="https://studentersamfundet.no/bli-aktiv/" class="btn btn-default">How do I get involved?</a>
</p>
</div>
{% endif %}
<ul class="list-group">
{% for division in me.divisions %}
<li class="list-group-item">{{ division }}</li>
{% endfor %}
</ul>
</div>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Your Mailinglists{% if mailinglists_list %} <span class="badge">{{ mailinglist_lists|length}}</span>{% endif %}</h3>
</div>
{% if not mailinglists_list %}
<div class="panel-body">
<p>
Not on any mailinglists. <a href="#" class="btn btn-default">Subscribe</a>
</p>
</div>
{% endif %}
<ul class="list-group">
{% for mailinglist in mailinglists_list %}
<li class="list-group-item">{{ mailinglist }}</li>
{% endfor %}
</ul>
</div>
</div>
</div>
duskenweb/urls.py
+3 -2
View File
@@ -28,8 +28,9 @@ urlpatterns += patterns('duskenweb.views',
url(r'^$', 'home', name='home'),
url(r'^profile/$', 'profile', name='profile'),
url(r'^account/$', 'account', name='account'),
url(r'^members/$', 'members_list', name='members_list'),
url(r'^memberships/$', 'memberships_list', name='memberships_list'),
url(r'^members/$', 'members_list', name='members-list'),
url(r'^memberships/$', 'memberships_list', name='memberships-list'),
url(r'^membership/purchase$', 'membership_purchase', name='membership-purchase'),
)
duskenweb/views.py
+9
View File
@@ -18,6 +18,7 @@ def profile(request, template_name='profile.html'):
user_api_conn.set_access_token(request.user.duskenaccesstoken.access_token)
me = user_api_conn.members.me()['objects'][0]
# TODO remove debug
import pprint
pprint.pprint(me)
return render(request, template_name, locals())
@@ -50,3 +51,11 @@ def memberships_list(request, template_name='memberships_index.html'):
# show graph
memberships_list = user_api_conn.memberships.get_list()
return render(request, template_name, locals())
@login_required
def membership_purchase(request, template_name='membership_purchase.html'):
# TODO put these two lines somewhere else, on authenticate?
if not user_api_conn.is_authenticated() and request.user.duskenaccesstoken:
user_api_conn.set_access_token(request.user.duskenaccesstoken.access_token)
return render(request, template_name, locals())