# HG changeset patch # User Brian Neal # Date 1299210607 0 # Node ID 768e3568addf08dd6fab5ff0731a3e4c1542ffe8 # Parent 8e3f252e4fbb3340b1a1f5691f3f3b92b885ec0c Fixing #172; add a forums jump box. diff -r 8e3f252e4fbb -r 768e3568addf gpp/templates/forums/forum_index.html --- a/gpp/templates/forums/forum_index.html Fri Mar 04 02:41:49 2011 +0000 +++ b/gpp/templates/forums/forum_index.html Fri Mar 04 03:50:07 2011 +0000 @@ -2,9 +2,10 @@ {% load url from future %} {% load forum_tags %} {% block custom_head %} -{% if feed %} - -{% endif %} + {% if feed %} + + {% endif %} + {% include "forums/jump_box.js" %} {% endblock %} {% block title %}Forums: {{ forum.name }}{% endblock %} {% block content %} @@ -55,6 +56,7 @@ {{ page_nav }} +{% include 'forums/jump_box.html' %} {% if user.is_authenticated %} New Topic
{% csrf_token %} diff -r 8e3f252e4fbb -r 768e3568addf gpp/templates/forums/jump_box.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gpp/templates/forums/jump_box.html Fri Mar 04 03:50:07 2011 +0000 @@ -0,0 +1,19 @@ +{% load url from future %} + + + +
diff -r 8e3f252e4fbb -r 768e3568addf gpp/templates/forums/jump_box.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/gpp/templates/forums/jump_box.js Fri Mar 04 03:50:07 2011 +0000 @@ -0,0 +1,11 @@ + diff -r 8e3f252e4fbb -r 768e3568addf gpp/templates/forums/topic.html --- a/gpp/templates/forums/topic.html Fri Mar 04 02:41:49 2011 +0000 +++ b/gpp/templates/forums/topic.html Fri Mar 04 03:50:07 2011 +0000 @@ -2,7 +2,10 @@ {% load url from future %} {% load forum_tags %} {% block title %}Forums: {{ topic.name }}{% endblock %} -{% block custom_js %}{{ form.media }}{% endblock %} +{% block custom_js %} + {{ form.media }} + {% include "forums/jump_box.js" %} +{% endblock %} {% block content %} {% forum_navigation topic %} @@ -30,6 +33,7 @@ {% endfor %} {{ page_nav }} +{% include 'forums/jump_box.html' %} {% if can_moderate %}
{% csrf_token %} diff -r 8e3f252e4fbb -r 768e3568addf static/css/base.css --- a/static/css/base.css Fri Mar 04 02:41:49 2011 +0000 +++ b/static/css/base.css Fri Mar 04 03:50:07 2011 +0000 @@ -358,6 +358,11 @@ #forum-query-form { text-align:right; } +#forum-jumpbox-form { + text-align:right; + margin-top:0.5em; + margin-bottom:0.5em; +} #forums-post-list dt { margin-top: 0.5em; padding: 3px 0 3px 0;