Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 6 files changed
  • 0 commit comments
  • 1 contributor
View
13 forum/skins/default/media/style/style.css
@@ -66,6 +66,10 @@ a {
height: 0px;
}
+.hidden {
+ visibility: hidden;
+}
+
.badges a {
color: #763333;
text-decoration: underline;
@@ -367,6 +371,15 @@ blockquote {
color: #FFFFFF;
}
+#indicator {
+ float: left;
+ display: inline-block;
+ background-image: url("../images/indicator.gif");
+ width: 24px;
+ height: 24px;
+ margin-top: 2px;
+}
+
#searchBar {
float: left;
margin-left: 8px;
View
6 forum/skins/default/templates/base_content.html
@@ -74,8 +74,10 @@
/* bind to all anchors */
$('a').pjax('#wrapper');
- /* scroll to the top after a pjax event */
- $('#wrapper').bind('pjax:end', function() {
+ $('#wrapper').on('pjax:start', function() {
+ $('#indicator').toggleClass('hidden', false);
+ }).on('pjax:end', function() {
+ $('#indicator').toggleClass('hidden', true);
$(window).scrollTop(0);
});
})
View
4 forum/skins/default/templates/header.html
@@ -36,7 +36,9 @@
{% loopregistry page_top_tabs %}{% spaceless %}
<a id="nav_{{ tab_name }}"{% ifequal tab tab_name %} class="on"{% endifequal %} href="{{ tab_url }}" >{{ tab_title }}</a>
{% endspaceless %}{% endloopregistry %}
- </div>
+ </div>
+ <div id="indicator" class="hidden">
+ </div>
<div id="searchBar">
<form action="{% url search %}" method="get">
{% csrf_token %}
View
2  forum/skins/default/templates/osqaadmin/base.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends parent_template %}
{% load i18n extra_tags general_sidebar_tags %}
View
12 forum/views/admin.py
@@ -2,10 +2,9 @@
import time
from django.views.decorators.csrf import csrf_exempt
-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import get_object_or_404
from django.core.urlresolvers import reverse
from django.http import HttpResponseRedirect, HttpResponse, Http404
-from django.template import RequestContext
from django.utils.translation import ugettext as _
from django.utils import simplejson
from django.db import models
@@ -19,6 +18,7 @@
from forum.models import Question, Answer, User, Node, Action, Page, NodeState, Tag
from forum.models.node import NodeMetaClass
from forum.actions import NewPageAction, EditPageAction, PublishAction, DeleteAction, UserJoinsAction, CloseAction
+from forum.views.render import render_response
from forum import settings
TOOLS = {}
@@ -64,7 +64,7 @@ def admin_page_wrapper(fn, request, *args, **kwargs):
unsaved = request.session.get('previewing_settings', {})
context['unsaved'] = set([getattr(settings, s).set.name for s in unsaved.keys() if hasattr(settings, s)])
- return render_to_response(template, context, context_instance=RequestContext(request))
+ return render_response(template, context, request, parent_template="base.html")
def admin_page(fn):
@super_user_required
@@ -586,8 +586,8 @@ def test_email_settings(request):
send_template_email([user,], 'osqaadmin/mail_test.html', { 'user' : user })
- return render_to_response(
+ return render_response(
'osqaadmin/test_email_settings.html',
{ 'user': user, },
- RequestContext(request)
- )
+ request, parent_template="base.html")
+
View
2  forum/views/readers.py
@@ -96,7 +96,7 @@ def unanswered(request):
def questions(request):
return question_list(request, Question.objects.all(), _('questions'), show_summary=True)
-@decorators.render('questions.html')
+@decorators.render('questions.html', page_template='questions_page.html', parent_template='base.html')
def tag(request, tag):
try:
tag = Tag.active.get(name=unquote(tag))

No commit comments for this range

Something went wrong with that request. Please try again.