Mercurial > public > sg101
changeset 1074:650ab160cbb9
Convert Member List to V3 design.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Wed, 13 Apr 2016 21:02:09 -0500 |
parents | 19d34242473e |
children | 5bba39fafad8 |
files | bio/views.py sg101/templates/bio/members.html sg101/templates/core/v3/pagination.html |
diffstat | 3 files changed, 63 insertions(+), 41 deletions(-) [+] |
line wrap: on
line diff
--- a/bio/views.py Tue Apr 12 19:49:47 2016 -0500 +++ b/bio/views.py Wed Apr 13 21:02:09 2016 -0500 @@ -55,6 +55,7 @@ 'page': the_page, 'type': type, 'num_members': num_members, + 'V3_DESIGN': True, }) #######################################################################
--- a/sg101/templates/bio/members.html Tue Apr 12 19:49:47 2016 -0500 +++ b/sg101/templates/bio/members.html Wed Apr 13 21:02:09 2016 -0500 @@ -1,56 +1,58 @@ -{% extends 'bio/base.html' %} +{% extends 'v3/base.html' %} {% load static from staticfiles %} {% load bio_tags %} {% load messages_tags %} {% block title %}Member List{% endblock %} -{% block bio_css %} -<link rel="stylesheet" type="text/css" href="{% static "css/tab-nav.css" %}" /> -<link rel="stylesheet" type="text/css" href="{% static "css/pagination.css" %}" /> -{% endblock %} {% block content %} -<h2>Member List</h2> +<h2>Member List <small>{% if type == 'user' %}Alphabetical{% else %}Chronological{%endif %}</small></h2> <p>Surfguitar101.com currently has {{ num_members }} active members. Looking for a particular user? Try our <a href="{% url 'bio-member_search' %}">member search</a>, or you can use our <a href="{% url 'haystack_search' %}">search function</a> to search user profiles. </p> +<p> +Here is a directory of all members. You can view in alphabetical order or by +date they joined the site. +</p> {% if page.object_list %} -<ul class="tab-nav"> - <li><a href="{% url 'bio-member_list' type='user' %}" - {% ifequal type "user" %}class="active" {% endifequal %}>User</a></li> - <li><a href="{% url 'bio-member_list' type='date' %}" - {% ifequal type "date" %}class="active" {% endifequal %}>Date</a></li> +<ul class="menu"> + <li{% if type == 'user' %} class="active"{% endif %}> + <a href="{% url 'bio-member_list' type='user' %}">Alphabetical</a></li> + <li{% if type == 'date' %} class="active"{% endif %}> + <a href="{% url 'bio-member_list' type='date' %}">Chronological</a></li> </ul> +<br> +{% include 'core/v3/pagination.html' %} +<table class="stack"> + <thead> + <tr> + <th>Avatar</th> + <th>Username</th> + <th>Full Name</th> + <th>Location</th> + <th>Date Joined</th> + <th>Contact</th> + </tr> + </thead> + <tbody> + {% for u in page.object_list %} + <tr> + <td>{% avatar u %}</td> + <td>{% profile_link u.username %}</td> + <td>{{ u.get_full_name }}</td> + <td>{{ u.profile.location }}</td> + <td>{{ u.date_joined|date:"M. d, Y" }}</td> + <td> + {% ifnotequal user u %}<a href="{% send_pm_url u.username %}"> + <i class="fi-comment size-21" title="Send private message"></i></a>{% endifnotequal %} + {% if not u.profile.hide_email %}<a href="mailto:{{ u.email }}"> + <i class="fi-mail size-21" title="Send Email"></i></a>{% endif %} + </td> + </tr> + {% endfor %} + </tbody> +</table> -{% include 'core/pagination.html' %} -<div class="members-list"> -<table> -<tr> -<th>Avatar</th> -<th>Username</th> -<th>Full Name</th> -<th>Location</th> -<th>Date Joined</th> -<th>Contact</th> -</tr> -{% for u in page.object_list %} -<tr class="{% cycle 'even' 'odd' %}"> - <td>{% avatar u %}</td> - <td>{% profile_link u.username %}</td> - <td>{{ u.get_full_name }}</td> - <td>{{ u.profile.location }}</td> - <td>{{ u.date_joined|date:"M. d, Y" }}</td> - <td> - {% ifnotequal user u %}<a href="{% send_pm_url u.username %}"> - <img src="{% static "icons/note.png" %}" alt="PM" title="Send private message" /></a>{% endifnotequal %} - {% if not u.profile.hide_email %}<a href="mailto:{{ u.email }}"> - <img src="{% static "icons/email.png" %}" alt="Email" title="Send Email" /></a>{% endif %} - </td> -</tr> -{% endfor %} -</table> -</div> - -{% include 'core/pagination.html' %} +{% include 'core/v3/pagination.html' %} {% endif %} {% endblock %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sg101/templates/core/v3/pagination.html Wed Apr 13 21:02:09 2016 -0500 @@ -0,0 +1,19 @@ +<ul class="pagination text-center" role="navigation" aria-label="Pagination"> + <li class="pagination-previous{% if not page.has_previous %} disabled{% endif %}"> + {% if page.has_previous %}<a href="./?page={{ page.previous_page_number }}">{% endif %}Previous + {% if page.has_previous %}</a>{% endif %}</li> + {% for num in page.page_range %} + {% if num %} + {% if num == page.number %} + <li class="current"><span class="show-for-sr">You're on page</span> {{ num }}</li> + {% else %} + <li><a href="./?page={{ num }}" aria-label="Page {{ num }}">{{ num }}</a></li> + {% endif %} + {% else %} + <li class="ellipsis" aria-hidden="true"></li> + {% endif %} + {% endfor %} + <li class="pagination-next{% if not page.has_next %} disabled{% endif %}"> + {% if page.has_next %}<a href="./?page={{ page.next_page_number }}">{% endif %}Next + {% if page.has_next %}</a>{% endif %}</li> +</ul>