fmartingr
/
shelfzilla
Archived
1
0
Fork 0

Some fixes:

- Not using lazy gettext on views
- Fixed context for manga app doing queries even if the user wasn't logged in
- Removed HTML messages (can be updated using updateMessagesHTML() via javascript)
- Allowing /messages/ to non-beta users too
- Removed landing shitty text
This commit is contained in:
Felipe Martin 2014-04-02 17:38:05 +02:00
parent 13e0d56096
commit 12d293aa57
6 changed files with 9 additions and 16 deletions

View File

@ -3,7 +3,7 @@ from .models import UserHaveVolume, UserWishlistVolume
def user_have_volumes(request):
result = []
if request.user:
if request.user.is_authenticated():
result = UserHaveVolume.objects.filter(
user=request.user).values_list('volume', flat=True)
@ -12,7 +12,7 @@ def user_have_volumes(request):
def user_wishlisted_volumes(request):
result = []
if request.user:
if request.user.is_authenticated():
result = UserWishlistVolume.objects.filter(
user=request.user).values_list('volume', flat=True)

View File

@ -2,7 +2,7 @@ from django.views.generic import View
from django.template import RequestContext
from django.shortcuts import render_to_response
from django.contrib.auth import logout
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import ugettext as _
from django.http import HttpResponseRedirect
from django.contrib import messages
from django.contrib.auth import login

View File

@ -153,6 +153,7 @@ BETA_ACCESS_GROUP_ID = 1
BETA_ACCESS_ALLOW_URLS = (
'/landing/',
'/login/',
'/messages/',
)
# filer

View File

@ -1,7 +1,7 @@
NProgress.start()
window._updateMessages = false
window.updateMessagesHtml = ->
window.updateMessagesHTML = ->
$.pjax
url: '/messages/'
container: '[data-pjax-container="messages"]'
@ -16,6 +16,9 @@ window.updateMessages = ->
# Document ready
$ ->
# Update messages
window.updateMessages()
# Increment for document loaded
NProgress.inc(0.3)
# Background
$.vegas
@ -47,9 +50,6 @@ $ ->
if elem.is('[pjax-messages]')
window._updateMessages = true
# Update messages
window.updateMessages()
# Tooltips
$('[data-toggle="tooltip"]').tooltip();

View File

@ -51,13 +51,8 @@
</nav>
</div>
{% endblock %}
{% block messages %}
<div class="messages container" data-pjax-container="messages">
{% if messages %}
{% include "contrib/messages.html" %}
{% endif %}
</div>
<div class="messages container" data-pjax-container="messages"></div>
{% endblock %}
<div id="main_content" data-pjax-container="main">
{% block main_content %}{% endblock %}

View File

@ -1,12 +1,9 @@
{% extends "_layout.html" %}
{% block messages %}{% endblock %}
{% block navigation_bar %}{% endblock %}
{% block main_content %}
<div class="text-center">
<h1>ShelfZilla</h1>
<h3>Pronto. En una estantería cerca de tí.</h3>
</div>
{% endblock %}