Changeset 326:b95215b73b3b
- Timestamp:
- 25.02.2011 16:17:20 (15 months ago)
- Branch:
- default
- Location:
- djangobb
- Files:
-
- 12 edited
-
djangobb_forum/settings.py (modified) (2 diffs)
-
djangobb_forum/templates/forum/base.html (modified) (1 diff)
-
djangobb_forum/templates/forum/forum.html (modified) (2 diffs)
-
djangobb_forum/templates/forum/index.html (modified) (4 diffs)
-
djangobb_forum/templates/forum/search_form.html (modified) (1 diff)
-
djangobb_forum/templates/forum/topic.html (modified) (6 diffs)
-
djangobb_forum/templates/forum/user.html (modified) (2 diffs)
-
djangobb_forum/templates/forum/users.html (modified) (3 diffs)
-
djangobb_forum/templatetags/forum_extras.py (modified) (3 diffs)
-
static/forum/themes/base.css (modified) (1 diff)
-
templates/authopenid/signin.html (modified) (1 diff)
-
templates/registration/registration_form.html (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
djangobb/djangobb_forum/settings.py
r256 r326 1 # -*- coding: utf-8 -*- 1 2 from django.conf import settings 2 3 import re … … 62 63 # SMILE Extension 63 64 SMILES_SUPPORT = get('DJANGOBB_SMILES_SUPPORT', True) 64 EMOTION_SMILE = get('DJANGOBB_EMOTION_SMILE', '<img src="%sforum/img/smilies/smile.png" >' % settings.MEDIA_URL)65 EMOTION_NEUTRAL = get('DJANGOBB_EMOTION_NEUTRAL', '<img src="%sforum/img/smilies/neutral.png" >' % settings.MEDIA_URL)66 EMOTION_SAD = get('DJANGOBB_EMOTION_SAD', '<img src="%sforum/img/smilies/sad.png" >' % settings.MEDIA_URL)67 EMOTION_BIG_SMILE = get('DJANGOBB_EMOTION_BIG_SMILE', '<img src="%sforum/img/smilies/big_smile.png" >' % settings.MEDIA_URL)68 EMOTION_YIKES = get('DJANGOBB_EMOTION_YIKES', '<img src="%sforum/img/smilies/yikes.png" >' % settings.MEDIA_URL)69 EMOTION_WINK = get('DJANGOBB_EMOTION_WINK', '<img src="%sforum/img/smilies/wink.png" >' % settings.MEDIA_URL)70 EMOTION_HMM = get('DJANGOBB_EMOTION_HMM', '<img src="%sforum/img/smilies/hmm.png" >' % settings.MEDIA_URL)71 EMOTION_TONGUE = get('DJANGOBB_EMOTION_TONGUE', '<img src="%sforum/img/smilies/tongue.png" >' % settings.MEDIA_URL)72 EMOTION_LOL = get('DJANGOBB_EMOTION_LOL', '<img src="%sforum/img/smilies/lol.png" >' % settings.MEDIA_URL)73 EMOTION_MAD = get('DJANGOBB_EMOTION_MAD', '<img src="%sforum/img/smilies/mad.png" >' % settings.MEDIA_URL)74 EMOTION_ROLL = get('DJANGOBB_EMOTION_ROLL', '<img src="%sforum/img/smilies/roll.png" >' % settings.MEDIA_URL)75 EMOTION_COOL = get('DJANGOBB_EMOTION_COOL', '<img src="%sforum/img/smilies/cool.png" >' % settings.MEDIA_URL)65 EMOTION_SMILE = get('DJANGOBB_EMOTION_SMILE', '<img src="%sforum/img/smilies/smile.png" />' % settings.MEDIA_URL) 66 EMOTION_NEUTRAL = get('DJANGOBB_EMOTION_NEUTRAL', '<img src="%sforum/img/smilies/neutral.png" />' % settings.MEDIA_URL) 67 EMOTION_SAD = get('DJANGOBB_EMOTION_SAD', '<img src="%sforum/img/smilies/sad.png" />' % settings.MEDIA_URL) 68 EMOTION_BIG_SMILE = get('DJANGOBB_EMOTION_BIG_SMILE', '<img src="%sforum/img/smilies/big_smile.png" />' % settings.MEDIA_URL) 69 EMOTION_YIKES = get('DJANGOBB_EMOTION_YIKES', '<img src="%sforum/img/smilies/yikes.png" />' % settings.MEDIA_URL) 70 EMOTION_WINK = get('DJANGOBB_EMOTION_WINK', '<img src="%sforum/img/smilies/wink.png" />' % settings.MEDIA_URL) 71 EMOTION_HMM = get('DJANGOBB_EMOTION_HMM', '<img src="%sforum/img/smilies/hmm.png" />' % settings.MEDIA_URL) 72 EMOTION_TONGUE = get('DJANGOBB_EMOTION_TONGUE', '<img src="%sforum/img/smilies/tongue.png" />' % settings.MEDIA_URL) 73 EMOTION_LOL = get('DJANGOBB_EMOTION_LOL', '<img src="%sforum/img/smilies/lol.png" />' % settings.MEDIA_URL) 74 EMOTION_MAD = get('DJANGOBB_EMOTION_MAD', '<img src="%sforum/img/smilies/mad.png" />' % settings.MEDIA_URL) 75 EMOTION_ROLL = get('DJANGOBB_EMOTION_ROLL', '<img src="%sforum/img/smilies/roll.png" />' % settings.MEDIA_URL) 76 EMOTION_COOL = get('DJANGOBB_EMOTION_COOL', '<img src="%sforum/img/smilies/cool.png" />' % settings.MEDIA_URL) 76 77 SMILES = ((r'(:|=)\)', EMOTION_SMILE), #:), =) 77 78 (r'(:|=)\|', EMOTION_NEUTRAL), #:|, =| -
djangobb/djangobb_forum/templates/forum/base.html
r318 r326 55 55 <div id="brdfooter" class="block"> 56 56 <h2><span>{% trans "Board footer" %}</span></h2> 57 <div class="box"> 58 <div class="inbox"> 59 {% block controls %} 60 {% endblock %} 61 <p class="conr">Powered by <a href="http://djangobb.org/">DjangoBB</a></p> 62 <div class="clearer"></div> 63 </div> 64 </div> 57 <div class="box"> 58 <div class="inbox"> 59 {% block controls %} 60 {% endblock %} 61 <p class="conr">Powered by <a href="http://djangobb.org/">DjangoBB</a></p> 62 <div class="clearer"></div> 63 {% block lofi %} 64 {% endblock %} 65 </div> 66 </div> 67 </div> 68 </div> 65 69 </div> 66 70 </body> -
djangobb/djangobb_forum/templates/forum/forum.html
r279 r326 73 73 </div> 74 74 </div> 75 {% if forum_settings.LOFI_SUPPORT %}76 <div id="brdfooter" class="block">77 <div class="box">78 <div class="inbox" align="center">79 <a href="{{ forum.get_absolute_url }}lofi/">Lo-Fi Version</a>80 <div class="clearer"></div>81 </div>82 </div>83 </div>84 {% endif %}85 75 {% endblock %} 86 76 {% block controls %} … … 106 96 </div> 107 97 {% endblock %} 98 99 {% block lofi %} 100 {% if forum_settings.LOFI_SUPPORT %} 101 <p class="lofi"> 102 <a href="{{ forum.get_absolute_url }}lofi/">Lo-Fi Version</a> 103 </p> 104 {% endif %} 105 {% endblock %} -
djangobb/djangobb_forum/templates/forum/index.html
r259 r326 6 6 <script type="text/javascript" src="{{ MEDIA_URL }}forum/js/jquery.cookie.js"></script> 7 7 <script type="text/javascript"> 8 8 9 9 function set_collapser(cat_id) { 10 10 category_body_id = "category_body_" + cat_id; 11 11 if($.cookie(category_body_id)){ 12 item_id = "#" + category_body_id; 12 item_id = "#" + category_body_id; 13 13 head_id = item_id.replace("body", "head"); 14 14 $(head_id).addClass("collapsed"); … … 16 16 } 17 17 } 18 $(document).ready(function(){ 18 $(document).ready(function(){ 19 19 $("a.toggle").click(function(){ 20 20 header_id = $(this).parent().attr('id'); … … 84 84 <dd>{% trans "Guests online:" %} <strong>{{ guest_count }}</strong></dd> 85 85 </dl> 86 <dl id="onlinelist" class= "clearb"> 87 {% if online_count %} 88 89 90 <dd>{{ online|profile_link }}</dd> 91 92 {% endif %} 93 </dl> 86 {% if online_count %} 87 <dl id="onlinelist" class= "clearb"> 88 <dt><strong>{% trans "Online:" %} </strong></dt> 89 {% for online in users_online %} 90 <dd>{{ online|profile_link }}</dd> 91 {% endfor %} 92 </dl> 93 {% endif %} 94 94 </div> 95 95 </div> 96 96 </div> 97 98 {% if forum_settings.LOFI_SUPPORT %}99 <div id="brdfooter" class="block">100 <div class="box">101 <div class="inbox" align="center">102 <a href="{% url djangobb:lofi_index %}">Lo-Fi Version</a>103 <div class="clearer"></div>104 </div>105 </div>106 </div>107 {% endif %}108 97 {% endblock %} 109 98 … … 119 108 </dl> 120 109 {% endblock %} 110 111 {% block lofi %} 112 {% if forum_settings.LOFI_SUPPORT %} 113 <p class="lofi"> 114 <a href="{% url djangobb:lofi_index %}">Lo-Fi Version</a> 115 </p> 116 {% endif %} 117 {% endblock %} -
djangobb/djangobb_forum/templates/forum/search_form.html
r288 r326 7 7 <h2><span>{% trans "Search" %}</span></h2> 8 8 <div class="box"> 9 <form id="search" method="get"> 10 <input type="hidden" name="action" value="search" /> 9 <form id="search" method="get" action=""> 11 10 <div class="inform"> 11 <input type="hidden" name="action" value="search" /> 12 12 <fieldset> 13 13 <legend>{% trans "Enter your search criteria" %}</legend> -
djangobb/djangobb_forum/templates/forum/topic.html
r279 r326 55 55 {% endif %} 56 56 {% if forum_settings.REPUTATION_SUPPORT %} 57 <dd><a href="{% url djangobb:reputation post.user %}">{% trans "Reputation" %}</a>: 57 <dd><a href="{% url djangobb:reputation post.user %}">{% trans "Reputation" %}</a>: 58 58 {% if request.user != post.user %} {# TODO: and user.is_authenticated #} 59 <a href="{% url djangobb:reputation post.user %}?action=plus& post_id={{ post.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_add.gif" alt="+" border="0"></a> <strong>{{ post.user.forum_profile.reply_total }} </strong><a href="{% url djangobb:reputation post.user %}?action=minus&post_id={{ post.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_minus.gif" alt="-" border="0"></a>59 <a href="{% url djangobb:reputation post.user %}?action=plus&post_id={{ post.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_add.gif" alt="+" /></a> <strong>{{ post.user.forum_profile.reply_total }} </strong><a href="{% url djangobb:reputation post.user %}?action=minus&post_id={{ post.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_minus.gif" alt="-" /></a> 60 60 {% else %} 61 61 <strong>{{ post.user.forum_profile.reply_total }}</strong> … … 95 95 {% if post.attachments.all %} 96 96 {% for attach in post.attachments.all %} 97 <p class="postedit"><em>{% trans "Attachments:" %} < div>{{ attach|attachment_link }}</div></em></p>97 <p class="postedit"><em>{% trans "Attachments:" %} <br />{{ attach|attachment_link }}</em></p> 98 98 {% endfor %} 99 99 {% endif %} … … 110 110 <div class="postfootright"> 111 111 <ul> 112 <li class="postreport"><a href="{% url djangobb:misc %}?action=report& post_id={{ post.id }}">{% trans "Report" %}</a> </li>112 <li class="postreport"><a href="{% url djangobb:misc %}?action=report&post_id={{ post.id }}">{% trans "Report" %}</a> </li> 113 113 {% if moderator or post|forum_equal_to:last_post %} 114 114 {% if moderator or post.user|forum_equal_to:user %} 115 | <li class="postdelete"><a onclick="return confirm('{% trans "Are you sure you want to delete this post?" %}')" href="{% url djangobb:delete_post post.id %}">{% trans "Delete" %}</a> </li>115 <li class="postdelete">| <a onclick="return confirm('{% trans "Are you sure you want to delete this post?" %}')" href="{% url djangobb:delete_post post.id %}">{% trans "Delete" %}</a> </li> 116 116 {% endif %} 117 117 {% endif %} 118 118 {% if moderator or post|forum_posted_by:user %} 119 | <li class="postedit"><a href="{% url djangobb:edit_post post.id %}">{% trans "Edit" %}</a> </li>120 {% endif %} 121 | <li class="postquote"><a href="{% url djangobb:add_post topic.id %}?post_id={{ post.id }}">{% trans "Reply" %}</a> </li>119 <li class="postedit">| <a href="{% url djangobb:edit_post post.id %}">{% trans "Edit" %}</a> </li> 120 {% endif %} 121 <li class="postquote">| <a href="{% url djangobb:add_post topic.id %}?post_id={{ post.id }}">{% trans "Reply" %}</a> </li> 122 122 {% if user.is_authenticated %} 123 | <li class="postquote"><a onmouseover="copyQ('{{ post.user }}');" href="javascript:pasteQ();">{% trans "Quote" %}</a></li>123 <li class="postquote">| <a onmouseover="copyQ('{{ post.user }}');" href="javascript:pasteQ();">{% trans "Quote" %}</a></li> 124 124 {% endif %} 125 125 </ul> … … 133 133 <p class="pagelink conl">{% pagination %}</p> 134 134 <p class="postlink conr"><a href="{% url djangobb:add_post topic.id %}">{% trans "Reply" %}</a></p> 135 <ul><li><a href="{% url djangobb:index %}">{% trans "Root" %} </a></li><li>» {% link topic.forum %} </li><li>» {{ topic }} 135 <ul><li><a href="{% url djangobb:index %}">{% trans "Root" %} </a></li><li>» {% link topic.forum %} </li><li>» {{ topic }} 136 136 <a href="{% url djangobb:forum_topic_feed topic.id %}"><img src="{{ MEDIA_URL }}/forum/img/feed-icon-small.png" alt="[RSS Feed]" title="[RSS Feed]" class="breadcrumb_rss" /></a> 137 137 </li></ul> … … 177 177 </div> 178 178 {% endif %} 179 180 {% if forum_settings.LOFI_SUPPORT %}181 <div id="brdfooter" class="block">182 <div class="box">183 <div class="inbox" align="center">184 <a href="{{ topic.get_absolute_url }}lofi/">Lo-Fi Version</a>185 <div class="clearer"></div>186 </div>187 </div>188 </div>189 {% endif %}190 179 {% endblock %} 191 180 192 181 {% block controls %} 193 182 <div class="conl"> 194 <form id="qjump" method=" GET" action="forum">183 <form id="qjump" method="get" action="forum"> 195 184 <div><label>{% trans "Jump to " %} 196 185 <br /> … … 222 211 {% endif %} 223 212 {% endif %} 213 </dl> 224 214 </div> 225 215 {% endblock %} 216 217 {% block lofi %} 218 {% if forum_settings.LOFI_SUPPORT %} 219 <p class="lofi"> 220 <a href="{{ topic.get_absolute_url }}lofi/">Lo-Fi Version</a> 221 </p> 222 {% endif %} 223 {% endblock %} -
djangobb/djangobb_forum/templates/forum/user.html
r270 r326 106 106 {% else %} 107 107 <dd>{% trans "(Unknown)" %}</dd> 108 {% endif %} </dd>108 {% endif %} 109 109 </dl> 110 110 <div class="clearer"></div> … … 118 118 <dl> 119 119 <dt>{% trans "Posts:" %} </dt> 120 <dd>{{ profile.forum_profile.post_count }} - <a href="{% url djangobb:search %}?action=show_user& user_id={{ profile.id }}">{% trans "Show all posts" %}</a></dd>120 <dd>{{ profile.forum_profile.post_count }} - <a href="{% url djangobb:search %}?action=show_user&user_id={{ profile.id }}">{% trans "Show all posts" %}</a></dd> 121 121 <dt>{% trans "Last post:" %} </dt> 122 122 {% if profile.forum_profile.last_post %} -
djangobb/djangobb_forum/templates/forum/users.html
r211 r326 7 7 <h2><span>{% trans "User search" %}</span></h2> 8 8 <div class="box"> 9 <form method="get" id="userlist" >9 <form method="get" id="userlist" action=""> 10 10 <div class="inform"> 11 11 <fieldset> … … 13 13 <div class="infldset"> 14 14 <label class="conl">{{ form.username.label }}<br />{{ form.username }}<br /></label> 15 15 16 16 <label class="conl">{{ form.sort_by.label }} 17 17 <br /> … … 26 26 </div> 27 27 </fieldset> 28 <input type="submit" value="{% trans "Search" %}" /> 28 29 </div> 29 <input type="submit" value="{% trans "Search" %}" />30 30 </form> 31 31 </div> -
djangobb/djangobb_forum/templatetags/forum_extras.py
r306 r326 206 206 posts = user.forum_profile.post_count 207 207 if posts >= forum_settings.AUTHORITY_STEP_10: 208 return mark_safe('<img src="%sforum/img/authority/vote10.gif" alt="" >' % (settings.MEDIA_URL))208 return mark_safe('<img src="%sforum/img/authority/vote10.gif" alt="" />' % (settings.MEDIA_URL)) 209 209 elif posts >= forum_settings.AUTHORITY_STEP_9: 210 return mark_safe('<img src="%sforum/img/authority/vote9.gif" alt="" >' % (settings.MEDIA_URL))210 return mark_safe('<img src="%sforum/img/authority/vote9.gif" alt="" />' % (settings.MEDIA_URL)) 211 211 elif posts >= forum_settings.AUTHORITY_STEP_8: 212 return mark_safe('<img src="%sforum/img/authority/vote8.gif" alt="" >' % (settings.MEDIA_URL))212 return mark_safe('<img src="%sforum/img/authority/vote8.gif" alt="" />' % (settings.MEDIA_URL)) 213 213 elif posts >= forum_settings.AUTHORITY_STEP_7: 214 return mark_safe('<img src="%sforum/img/authority/vote7.gif" alt="" >' % (settings.MEDIA_URL))214 return mark_safe('<img src="%sforum/img/authority/vote7.gif" alt="" />' % (settings.MEDIA_URL)) 215 215 elif posts >= forum_settings.AUTHORITY_STEP_6: 216 return mark_safe('<img src="%sforum/img/authority/vote6.gif" alt="" >' % (settings.MEDIA_URL))216 return mark_safe('<img src="%sforum/img/authority/vote6.gif" alt="" />' % (settings.MEDIA_URL)) 217 217 elif posts >= forum_settings.AUTHORITY_STEP_5: 218 return mark_safe('<img src="%sforum/img/authority/vote5.gif" alt="" >' % (settings.MEDIA_URL))218 return mark_safe('<img src="%sforum/img/authority/vote5.gif" alt="" />' % (settings.MEDIA_URL)) 219 219 elif posts >= forum_settings.AUTHORITY_STEP_4: 220 return mark_safe('<img src="%sforum/img/authority/vote4.gif" alt="" >' % (settings.MEDIA_URL))220 return mark_safe('<img src="%sforum/img/authority/vote4.gif" alt="" />' % (settings.MEDIA_URL)) 221 221 elif posts >= forum_settings.AUTHORITY_STEP_3: 222 return mark_safe('<img src="%sforum/img/authority/vote3.gif" alt="" >' % (settings.MEDIA_URL))222 return mark_safe('<img src="%sforum/img/authority/vote3.gif" alt="" />' % (settings.MEDIA_URL)) 223 223 elif posts >= forum_settings.AUTHORITY_STEP_2: 224 return mark_safe('<img src="%sforum/img/authority/vote2.gif" alt="" >' % (settings.MEDIA_URL))224 return mark_safe('<img src="%sforum/img/authority/vote2.gif" alt="" />' % (settings.MEDIA_URL)) 225 225 elif posts >= forum_settings.AUTHORITY_STEP_1: 226 return mark_safe('<img src="%sforum/img/authority/vote1.gif" alt="" >' % (settings.MEDIA_URL))227 else: 228 return mark_safe('<img src="%sforum/img/authority/vote0.gif" alt="" >' % (settings.MEDIA_URL))226 return mark_safe('<img src="%sforum/img/authority/vote1.gif" alt="" />' % (settings.MEDIA_URL)) 227 else: 228 return mark_safe('<img src="%sforum/img/authority/vote0.gif" alt="" />' % (settings.MEDIA_URL)) 229 229 230 230 … … 244 244 from django.template.defaultfilters import filesizeformat 245 245 if attach.content_type in ['image/png', 'image/gif', 'image/jpeg']: 246 img = '<img src="%sforum/img/attachment/image.png" alt="attachment" >' % (settings.MEDIA_URL)246 img = '<img src="%sforum/img/attachment/image.png" alt="attachment" />' % (settings.MEDIA_URL) 247 247 elif attach.content_type in ['application/x-tar', 'application/zip']: 248 img = '<img src="%sforum/img/attachment/compress.png" alt="attachment" >' % (settings.MEDIA_URL)248 img = '<img src="%sforum/img/attachment/compress.png" alt="attachment" />' % (settings.MEDIA_URL) 249 249 elif attach.content_type in ['text/plain']: 250 img = '<img src="%sforum/img/attachment/text.png" alt="attachment" >' % (settings.MEDIA_URL)250 img = '<img src="%sforum/img/attachment/text.png" alt="attachment" />' % (settings.MEDIA_URL) 251 251 elif attach.content_type in ['application/msword']: 252 img = '<img src="%sforum/img/attachment/doc.png" alt="attachment" >' % (settings.MEDIA_URL)253 else: 254 img = '<img src="%sforum/img/attachment/unknown.png" alt="attachment" >' % (settings.MEDIA_URL)252 img = '<img src="%sforum/img/attachment/doc.png" alt="attachment" />' % (settings.MEDIA_URL) 253 else: 254 img = '<img src="%sforum/img/attachment/unknown.png" alt="attachment" />' % (settings.MEDIA_URL) 255 255 attachment = '%s <a href="%s">%s</a> (%s)' % (img, attach.get_absolute_url(), attach.name, filesizeformat(attach.size)) 256 256 return mark_safe(attachment) … … 272 272 'default': forum_settings.GRAVATAR_DEFAULT, 273 273 }) 274 return url 274 return url.replace('&', '&') 275 275 else: 276 276 return '' -
djangobb/static/forum/themes/base.css
r177 r326 262 262 263 263 #djangobbredirect DIV.block, #djangobbmaint DIV.block {MARGIN: 50px 20% 12px 20%} 264 .lofi { text-align: center; } 264 265 265 266 /****************************************************************/ -
djangobb/templates/authopenid/signin.html
r177 r326 38 38 </fieldset> 39 39 </div> 40 <input type="hidden" name="next" value="{{ next }}" /> 41 <p><input type="submit" value="{% trans "Login" %}" /></p> 40 <p> 41 <input type="hidden" name="next" value="{{ next }}" /> 42 <input type="submit" value="{% trans "Login" %}" /> 43 </p> 42 44 </form> 43 45 44 <form id="openid_form" name="openid_form" action="." method="post"> 45 <input type="hidden" name="action" value="verify" /> 46 <input type="hidden" name="next" value="{{ next }}" /> 46 <form id="openid_form" action="." method="post"> 47 47 <fieldset> 48 <input type="hidden" name="action" value="verify" /> 49 <input type="hidden" name="next" value="{{ next }}" /> 48 50 <legend>{% trans "Sign In Using Your OpenID URL" %}</legend> 49 51 <div id="openid_choice"> -
djangobb/templates/registration/registration_form.html
r177 r326 7 7 <h2><span>{% trans "Register" %}</span></h2> 8 8 <div class="box"> 9 <form method="post" >9 <form method="post" action=""> 10 10 <div class="inform"> 11 11 <div class="forminfo">
Note: See TracChangeset
for help on using the changeset viewer.
