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

fix smilie bug and jquery bug

Browse source
This commit is contained in:
Chinua Shaw 2012-10-22 15:18:32 -04:00
parent 4258b047a5
commit be869dd7a2
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
djangobb_forum/settings.py
View file

@ -78,13 +78,13 @@ EMOTION_LOL = get('DJANGOBB_EMOTION_LOL', '<img src="%sdjangobb_forum/img/smilie
EMOTION_MAD = get('DJANGOBB_EMOTION_MAD', '<img src="%sdjangobb_forum/img/smilies/mad.png" />' % settings.STATIC_URL)
EMOTION_ROLL = get('DJANGOBB_EMOTION_ROLL', '<img src="%sdjangobb_forum/img/smilies/roll.png" />' % settings.STATIC_URL)
EMOTION_COOL = get('DJANGOBB_EMOTION_COOL', '<img src="%sdjangobb_forum/img/smilies/cool.png" />' % settings.STATIC_URL)
SMILES = ((r'(:|=)\)', EMOTION_SMILE), #:), =)
SMILES = ((r':/', EMOTION_HMM), #:/
(r'(:|=)\)', EMOTION_SMILE), #:), =)
(r'(:|=)\|', EMOTION_NEUTRAL), #:|, =|
(r'(:|=)\(', EMOTION_SAD), #:(, =(
(r'(:|=)D', EMOTION_BIG_SMILE), #:D, =D
(r':o', EMOTION_YIKES), # :o, :O
(r';\)', EMOTION_WINK), # ;\
(r':/', EMOTION_HMM), #:/
(r':P', EMOTION_TONGUE), # :P
(r':lol:', EMOTION_LOL),
(r':mad:', EMOTION_MAD),

2
djangobb_forum/templates/djangobb_forum/base.html
View file

@ -38,11 +38,13 @@
var MEDIA_URL = "{{ MEDIA_URL }}";
var POST_PREVIEW_URL = "{% url djangobb:post_preview %}";
</script>
{% comment %}
{% if DEBUG %}
<script type="text/javascript" src="{{ STATIC_URL }}/admin/js/jquery.js" onerror="JavaScript:alert('Error loading file [' + this.src + '] !');" ></script>
{% else %}
<script type="text/javascript" src="{{ STATIC_URL }}/admin/js/jquery.min.js" onerror="JavaScript:alert('Error loading file [' + this.src + '] !');" ></script>
{% endif %}
{% endcomment %}
{% if user.is_authenticated %}
{% if post %}
{% with markup=post.markup %}