scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/lightnin/DjangoBB

Browse source 
Conflicts:
	djangobb_forum/scratchr2_settings.py
This commit is contained in:
Chinua Shaw 2012-10-23 06:28:48 -04:00
commit 0d193808da
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.hgsubstate
View file

@ -1 +1 @@
484f5a647751b168bb8459d17bbb1b8db95a46fe projects
548e4081d215fe2fd37253eb7465905cd6f47288 projects

7
djangobb_forum/scratchr2_settings.py
View file

@ -12,3 +12,10 @@ DJANGOBB_DISPLAY_PROFILE_MENU_OPTIONS = False
DJANGOBB_DISPLAY_AVATAR_OPTIONS = False
DJANGOBB_DISPLAY_USERTITLE = False
DJANGOBB_ALLOW_POLLS = False
DJANGOBB_TOPIC_PAGE_SIZE = 20
DKANGOBB_FORUM_PAGE_SIZE = 25
DJANGOBB_SIGNATURE_MAX_LINES = 10
DJANGOBB_SIGNATURE_MAX_LENGTH = 2000
DJANGOBB_AUTHORITY_SUPPORT = False

2
djangobb_forum/static/djangobb_forum/js/markup/bbcode/board.js
View file

@ -89,7 +89,7 @@ $(document).ready(function() {
}
// if nothing returned, browser leave the page without any message
};
$("form#post").bind("submit", function() {
$("form input[type=submit]").click(function() {
//log("unbind onbeforeunload");
window.onbeforeunload = null;
});

6
djangobb_forum/templates/djangobb_forum/includes/post_form.html
View file

@ -35,10 +35,8 @@
<label><strong>{% trans "Subject" %}</strong><br />{{ form.name.errors }}{{ form.name }}<br /></label>
{% endif %}
<label><strong>{% trans "Message" %}</strong><br />{{ form.body.errors }}{{ form.body }}</label>
<p>
Note: A list of all supported source code highlighter for [code <strong>XXX</strong>]...[/code] can be found here: <a href="http://pygments.org/docs/lexers/">pygments.org</a> (Use 'Short name')
</p>
<label>{{ form.subscribe }}<strong>{% trans "Subscribe this topic" %}</strong>{{ form.subscribe.errors }}<br /></label>
<!-- <label>{{ form.subscribe }}<strong>{% trans "Subscribe this topic" %}</strong>{{ form.subscribe.errors }}<br /></label>
-->
</div>
</fieldset>
</div>

5
djangobb_forum/templates/djangobb_forum/topic.html
View file

@ -184,14 +184,15 @@
&raquo; {{ topic }}<a href="{% url djangobb:forum_topic_feed topic.id %}"><img src="{{ STATIC_URL }}/djangobb_forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a>
</li>
</ul>
{% if user.is_authenticated %}
{% comment %} {% if user.is_authenticated %}
{% if subscribed %}
<a class="subscribelink clearb" href="{% url djangobb:forum_delete_subscription topic.id %}?from_topic">{% trans "Unsubscribe" %}</a>
{% else %}
<a class="subscribelink clearb" href="{% url djangobb:forum_add_subscription topic.id %}">{% trans "Subscribe" %}</a>
{% endif %}
{% endif %}
<div class="clearer"></div>
{% endcomment %}
<div class="clearer"></div>
</div>
</div>