jeff/umap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Activate login / logout links / list available users for demo

Browse source
This commit is contained in:
Yohan Boniface 2012-12-12 13:13:14 +01:00
parent 214921bdea
commit e4339ff9d4
5 changed files with 29 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
youmap/settings/base.py
View file

@ -25,7 +25,6 @@ LANGUAGES = (
SECRET_KEY = 'j6fly6aomgo6!3_$v#9kvhw-%wgs1@1l6x+4nr73tmn40=&_@&' SECRET_KEY = 'j6fly6aomgo6!3_$v#9kvhw-%wgs1@1l6x+4nr73tmn40=&_@&'
INSTALLED_APPS = ( INSTALLED_APPS = (
# 'youmap.apps.',
'chickpea', 'chickpea',
'foundation', 'foundation',
'endless_pagination', 'endless_pagination',

2
youmap/templates/base.html
View file

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>{% block head_title %}YouMap{% endblock %}</title> <title>{% block head_title %}u{Map}{% endblock %}</title>
<meta charset="utf-8"> <meta charset="utf-8">
<!-- Included CSS Files (Compressed) --> <!-- Included CSS Files (Compressed) -->
<link rel="stylesheet" href="{{ STATIC_URL }}foundation/stylesheets/foundation.css"> <link rel="stylesheet" href="{{ STATIC_URL }}foundation/stylesheets/foundation.css">

25
youmap/templates/youmap/home.html
View file

@ -53,8 +53,6 @@
<div class="four columns hide-for-small"> <div class="four columns hide-for-small">
<h4>Action!</h4><hr/>
<a href="{% url map_add %}" class="reveal"> <a href="{% url map_add %}" class="reveal">
<div class="panel radius callout" align="center"> <div class="panel radius callout" align="center">
<strong>Test it and create a map</strong> <strong>Test it and create a map</strong>
@ -66,6 +64,11 @@
<strong>Fork it</strong> <strong>Fork it</strong>
</div> </div>
</a> </a>
<div class="panel">
<p>
Users to play with (password: <span class="label">123123</span>): {% for u in users %}<a href="{% url user_maps u.username %}">{{ u }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
</p>
</div>
</div> </div>
@ -118,5 +121,21 @@
{% block bottom_js %} {% block bottom_js %}
{{ block.super }} {{ block.super }}
<script>$.endlessPaginate({paginateOnScroll: true});</script> <script type="text/javascript">
$.endlessPaginate({paginateOnScroll: true});
$(document).ready(function(e){
$('a.login_button').click(function (e) {
e.preventDefault();
var $this = $(this);
L.Util.Xhr.login({"login_required": $this.attr('href')});
});
});
$(document).ready(function(e){
$('a.logout_button').click(function (e) {
e.preventDefault();
var $this = $(this);
L.Util.Xhr.logout($this.attr('href'));
});
});
</script>
{% endblock bottom_js %} {% endblock bottom_js %}

6
youmap/templates/youmap/navigation.html
View file

@ -7,10 +7,10 @@
<section> <section>
<ul class="left"> <ul class="left">
{% if user.is_authenticated %} {% if user.is_authenticated %}
<li><a href="{% url user_maps user.username %}">My maps</a></li> <li><a href="{% url user_maps user.username %}">My maps ({{ user }})</a></li>
<li><a href="#">Log out</a></li> <li><a href="{% url logout %}" class="logout_button">Log out</a></li>
{% else %} {% else %}
<li><a href="#">Log in</a></li> <li><a href="{% url login %}" class="login_button">Log in</a></li>
{% endif %} {% endif %}
</ul> </ul>

4
youmap/views.py
View file

@ -11,8 +11,10 @@ class Home(TemplateView):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
maps = Map.objects.order_by('-modified_at')[:100] maps = Map.objects.order_by('-modified_at')[:100]
users = User.objects.filter(is_staff=False)[:10]
return { return {
"maps": maps "maps": maps,
"users": users
} }
def get_template_names(self): def get_template_names(self):