Changeset 383:60b74ba08e2c


Ignore:
Timestamp:
Nov 9, 2011 4:22:58 PM (19 months ago)
Author:
slav0nic <slav0nic0@…>
Branch:
default
Message:

added django 1.3 statifiles support; rename media/forum -> media/djangobb_forum

Files:
185 added
13 edited

Legend:

Unmodified
Added
Removed

  • .hgsubstate

    r372 r383  
    1 4143fc5c29e6fdc96ac121759d7fc299c37b4690 projects 
     176482633dc52faeac2191f853b32a16307be2697 projects 

  • djangobb_forum/models.py

    r370 r383  
    4949    pass 
    5050 
    51 path = os.path.join(settings.MEDIA_ROOT, 'forum', 'themes') 
    52 THEME_CHOICES = [(theme, theme) for theme in os.listdir(path)  
    53                  if os.path.isdir(os.path.join(path, theme))] 
     51path = os.path.join(settings.STATIC_ROOT, 'forum', 'themes') 
     52if os.path.exists(path): 
     53    # fix for collectstatic 
     54    THEME_CHOICES = [(theme, theme) for theme in os.listdir(path)  
     55                     if os.path.isdir(os.path.join(path, theme))] 
     56else: 
     57    THEME_CHOICES = [] 
    5458 
    5559class Category(models.Model): 
    … …  
    252256    def summary(self): 
    253257        LIMIT = 50 
    254         tail = len(self.body) > LIMIT and '...' or ''  
     258        tail = len(self.body) > LIMIT and '...' or '' 
    255259        return self.body[:LIMIT] + tail 
    256260 

  • djangobb_forum/settings.py

    r366 r383  
    1313SEARCH_PAGE_SIZE = get('DJANGOBB_SEARCH_PAGE_SIZE', 20) 
    1414USERS_PAGE_SIZE = get('DJANGOBB_USERS_PAGE_SIZE', 20) 
    15 AVATARS_UPLOAD_TO = get('DJANGOBB_AVATARS_UPLOAD_TO', 'forum/avatars') 
     15AVATARS_UPLOAD_TO = get('DJANGOBB_AVATARS_UPLOAD_TO', 'djangobb_forum/avatars') 
    1616AVATAR_WIDTH = get('DJANGOBB_AVATAR_WIDTH', 60) 
    1717AVATAR_HEIGHT = get('DJANGOBB_AVATAR_HEIGHT', 60) 
    … …  
    5757# ATTACHMENT Extension 
    5858ATTACHMENT_SUPPORT = get('DJANGOBB_ATTACHMENT_SUPPORT', True) 
    59 ATTACHMENT_UPLOAD_TO = get('DJANGOBB_ATTACHMENT_UPLOAD_TO', 'forum/attachments') 
     59ATTACHMENT_UPLOAD_TO = get('DJANGOBB_ATTACHMENT_UPLOAD_TO', 'djangobb_forum/attachments') 
    6060ATTACHMENT_SIZE_LIMIT = get('DJANGOBB_ATTACHMENT_SIZE_LIMIT', 1024 * 1024) 
    6161 
    6262# SMILE Extension 
    6363SMILES_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) 
     64EMOTION_SMILE = get('DJANGOBB_EMOTION_SMILE', '<img src="%sdjangobb_forum/img/smilies/smile.png" />' % settings.STATIC_URL) 
     65EMOTION_NEUTRAL = get('DJANGOBB_EMOTION_NEUTRAL', '<img src="%sdjangobb_forum/img/smilies/neutral.png" />' % settings.STATIC_URL) 
     66EMOTION_SAD = get('DJANGOBB_EMOTION_SAD', '<img src="%sdjangobb_forum/img/smilies/sad.png" />' % settings.STATIC_URL) 
     67EMOTION_BIG_SMILE = get('DJANGOBB_EMOTION_BIG_SMILE', '<img src="%sdjangobb_forum/img/smilies/big_smile.png" />' % settings.STATIC_URL) 
     68EMOTION_YIKES = get('DJANGOBB_EMOTION_YIKES', '<img src="%sdjangobb_forum/img/smilies/yikes.png" />' % settings.STATIC_URL) 
     69EMOTION_WINK = get('DJANGOBB_EMOTION_WINK', '<img src="%sdjangobb_forum/img/smilies/wink.png" />' % settings.STATIC_URL) 
     70EMOTION_HMM = get('DJANGOBB_EMOTION_HMM', '<img src="%sdjangobb_forum/img/smilies/hmm.png" />' % settings.STATIC_URL) 
     71EMOTION_TONGUE = get('DJANGOBB_EMOTION_TONGUE', '<img src="%sdjangobb_forum/img/smilies/tongue.png" />' % settings.STATIC_URL) 
     72EMOTION_LOL = get('DJANGOBB_EMOTION_LOL', '<img src="%sdjangobb_forum/img/smilies/lol.png" />' % settings.STATIC_URL) 
     73EMOTION_MAD = get('DJANGOBB_EMOTION_MAD', '<img src="%sdjangobb_forum/img/smilies/mad.png" />' % settings.STATIC_URL) 
     74EMOTION_ROLL = get('DJANGOBB_EMOTION_ROLL', '<img src="%sdjangobb_forum/img/smilies/roll.png" />' % settings.STATIC_URL) 
     75EMOTION_COOL = get('DJANGOBB_EMOTION_COOL', '<img src="%sdjangobb_forum/img/smilies/cool.png" />' % settings.STATIC_URL) 
    7676SMILES = ((r'(:|=)\)', EMOTION_SMILE), #:), =) 
    7777          (r'(:|=)\|',  EMOTION_NEUTRAL), #:|, =|  

  • djangobb_forum/templates/djangobb_forum/base.html

    r372 r383  
    1515        <link rel="alternate" type="application/atom+xml" href="{% url djangobb:forum_topics_feed %}" title="{% trans "Latest topics on forum" %}" /> 
    1616 
    17         <link rel="shortcut icon" href="{{ MEDIA_URL }}forum/favicon.png" type="image/png" /> 
     17        <link rel="shortcut icon" href="{{ STATIC_URL }}djangobb_forum/favicon.png" type="image/png" /> 
    1818        <script type="text/javascript"> 
    19                 var MEDIA_URL = "{{ MEDIA_URL }}"; 
     19                var STATIC_URL = "{{ STATIC_URL }}"; 
    2020                var POST_PREVIEW_URL = "{% url djangobb:post_preview %}"; 
    2121        </script> 
    … …  
    3535 
    3636    <!-- Highlightjs goodies --> 
    37         <link type="text/css" rel="stylesheet" href="{{ MEDIA_URL }}forum/css/pygments.css" /> 
     37        <link type="text/css" rel="stylesheet" href="{{ STATIC_URL }}djangobb_forum/css/pygments.css" /> 
    3838        {% if highlight_word %} 
    39                 <script type="text/javascript" src="{{ MEDIA_URL }}forum/js/jquery.highlight-3.pack.js"></script> 
     39                <script type="text/javascript" src="{{ STATIC_URL }}djangobb_forum/js/jquery.highlight-3.pack.js"></script> 
    4040                <script type="text/javascript"> 
    4141                        $(document).ready(function(){ 

  • djangobb_forum/templates/djangobb_forum/delete_posts.html

    r372 r383  
    88                <p class="pagelink conl">{% pagination %}</p> 
    99                                <ul><li><a href="{% url djangobb:index %}">{% trans "Root" %} </a></li><li>&raquo; {% link topic.forum %} </li><li>&raquo; {{ topic }}  
    10                                 <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]" style="vertical-align:middle;" /></a> 
     10                                <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]" style="vertical-align:middle;" /></a> 
    1111                                </li></ul> 
    1212                <div class="clearer"></div> 

  • djangobb_forum/templates/djangobb_forum/forum.html

    r372 r383  
    1717<div id="vf" class="blocktable"> 
    1818        <h2> 
    19                 <a href="{% url djangobb:forum_forum_feed forum.id %}"><img src="{{ MEDIA_URL }}/forum/img/feed-icon-small.png"  alt="[RSS Feed]" title="[RSS Feed]" class="rss" /></a> 
     19                <a href="{% url djangobb:forum_forum_feed forum.id %}"><img src="{{ STATIC_URL }}djangobb_forum/img/feed-icon-small.png"  alt="[RSS Feed]" title="[RSS Feed]" class="rss" /></a> 
    2020                <b><span>{{ forum.name }}</span></b> 
    2121        </h2> 

  • djangobb_forum/templates/djangobb_forum/forum_row.html

    r372 r383  
    1414                        </div> 
    1515                        <div class="tclcon"> 
    16                                 <h3>{% link forum %} <a href="{% url djangobb:forum_forum_feed forum.id %}"><img src="{{ MEDIA_URL }}forum/img/feed-icon-small.png"  alt="[RSS Feed]" title="[RSS Feed]" class="rss" /></a></h3> 
    17                                 {{ forum.description|safe }}                             
     16                                <h3>{% link forum %} <a href="{% url djangobb:forum_forum_feed forum.id %}"><img src="{{ STATIC_URL }}djangobb_forum/img/feed-icon-small.png"  alt="[RSS Feed]" title="[RSS Feed]" class="rss" /></a></h3> 
     17                                {{ forum.description|safe }} 
    1818                                <p> 
    1919                                {% cache 6000 moderators forum.id %} 

  • djangobb_forum/templates/djangobb_forum/index.html

    r372 r383  
    44 
    55{% block extra_meta %} 
    6 <script type="text/javascript" src="{{ MEDIA_URL }}forum/js/jquery.cookie.js"></script> 
     6<script type="text/javascript" src="{{ STATIC_URL }}djangobb_forum/js/jquery.cookie.js"></script> 
    77<script type="text/javascript"> 
    88 

  • djangobb_forum/templates/djangobb_forum/lofi/base.html

    r372 r383  
    33        <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> 
    44        <meta name="robots" content="index,follow" /> 
    5         <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}forum/css/lofi/lofiscreen.css"  media="screen" /> 
    6         <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}forum/css/lofi/lofihandheld.css"  media="handheld" /> 
    7         <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}forum/css/lofi/lofiprint.css"  media="print" /> 
     5        <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}djangobb_forum/css/lofi/lofiscreen.css"  media="screen" /> 
     6        <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}djangobb_forum/css/lofi/lofihandheld.css"  media="handheld" /> 
     7        <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}djangobb_forum/css/lofi/lofiprint.css"  media="print" /> 
    88        <title>DjangoBB LoFi version</title> 
    99</head> 

  • djangobb_forum/templates/djangobb_forum/post_preview.html

    r371 r383  
    11<head> 
    2 <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}forum/css/pygments.css" /> 
     2<link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}djangobb_forum/css/pygments.css" /> 
    33</head> 
    44<body> 

  • djangobb_forum/templates/djangobb_forum/reputation.html

    r372 r383  
    3838                                                <td style="text-align: center;"> 
    3939                                                {% if reputation.sign == 1 %} 
    40                                                         <img src="{{ MEDIA_URL }}forum/img/reputation/warn_add.gif" alt="+" border="0"> 
     40                                                        <img src="{{ STATIC_URL }}djangobb_forum/img/reputation/warn_add.gif" alt="+" border="0"> 
    4141                                                {% else %} 
    42                                                         <img src="{{ MEDIA_URL }}forum/img/reputation/warn_minus.gif" alt="+" border="0"> 
     42                                                        <img src="{{ STATIC_URL }}djangobb_forum/img/reputation/warn_minus.gif" alt="+" border="0"> 
    4343                                                {% endif %} 
    4444                                                </td> 

  • djangobb_forum/templates/djangobb_forum/topic.html

    r376 r383  
    1414                        <li> 
    1515                        <a href="{% url djangobb:index %}">{% trans "Root" %} </a></li><li>&raquo; {% link topic.forum %} </li><li>&raquo; {{ topic.name }} 
    16                         <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> 
     16                        <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> 
    1717                        </li> 
    1818                </ul> 
    … …  
    6161                                                                <dd><a href="{% url djangobb:reputation post.user.username %}">{% trans "Reputation" %}</a>: 
    6262                                                                {% if request.user != post.user %} {# TODO: and user.is_authenticated #} 
    63                                                                         <a href="{% url djangobb:reputation post.user.username %}?action=plus&amp;post_id={{ post.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_add.gif" alt="+" /></a>&nbsp;&nbsp;<strong>{{ post.user.forum_profile.reply_total }}&nbsp;&nbsp;</strong><a href="{% url djangobb:reputation post.user.username %}?action=minus&amp;post_id={{ post.id }}"><img src="{{ MEDIA_URL }}forum/img/reputation/warn_minus.gif" alt="-" /></a> 
     63                                                                        <a href="{% url djangobb:reputation post.user.username %}?action=plus&amp;post_id={{ post.id }}"><img src="{{ STATIC_URL }}djangobb_forum/img/reputation/warn_add.gif" alt="+" /></a>&nbsp;&nbsp;<strong>{{ post.user.forum_profile.reply_total }}&nbsp;&nbsp;</strong><a href="{% url djangobb:reputation post.user.username %}?action=minus&amp;post_id={{ post.id }}"><img src="{{ STATIC_URL }}djangobb_forum/img/reputation/warn_minus.gif" alt="-" /></a> 
    6464                                                                {% else %} 
    6565                                                                        <strong>{{ post.user.forum_profile.reply_total }}</strong> 
    … …  
    138138                <p class="postlink conr"><a href="{% url djangobb:add_post topic.id %}">{% trans "Reply" %}</a></p> 
    139139                                <ul><li><a href="{% url djangobb:index %}">{% trans "Root" %} </a></li><li>&raquo; {% link topic.forum %} </li><li>&raquo; {{ topic }} 
    140                                 <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> 
     140                                <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> 
    141141                                </li></ul> 
    142142                {% if user.is_authenticated %} 

  • djangobb_forum/templatetags/forum_extras.py

    r372 r383  
    200200    posts = user.forum_profile.post_count 
    201201    if posts >= forum_settings.AUTHORITY_STEP_10:  
    202         return mark_safe('<img src="%sforum/img/authority/vote10.gif" alt="" />' % (settings.MEDIA_URL)) 
     202        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote10.gif" alt="" />' % (settings.STATIC_URL)) 
    203203    elif posts >= forum_settings.AUTHORITY_STEP_9:  
    204         return mark_safe('<img src="%sforum/img/authority/vote9.gif" alt="" />' % (settings.MEDIA_URL)) 
     204        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote9.gif" alt="" />' % (settings.STATIC_URL)) 
    205205    elif posts >= forum_settings.AUTHORITY_STEP_8:  
    206         return mark_safe('<img src="%sforum/img/authority/vote8.gif" alt="" />' % (settings.MEDIA_URL)) 
     206        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote8.gif" alt="" />' % (settings.STATIC_URL)) 
    207207    elif posts >= forum_settings.AUTHORITY_STEP_7:  
    208         return mark_safe('<img src="%sforum/img/authority/vote7.gif" alt="" />' % (settings.MEDIA_URL)) 
     208        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote7.gif" alt="" />' % (settings.STATIC_URL)) 
    209209    elif posts >= forum_settings.AUTHORITY_STEP_6:  
    210         return mark_safe('<img src="%sforum/img/authority/vote6.gif" alt="" />' % (settings.MEDIA_URL)) 
     210        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote6.gif" alt="" />' % (settings.STATIC_URL)) 
    211211    elif posts >= forum_settings.AUTHORITY_STEP_5:  
    212         return mark_safe('<img src="%sforum/img/authority/vote5.gif" alt="" />' % (settings.MEDIA_URL)) 
     212        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote5.gif" alt="" />' % (settings.STATIC_URL)) 
    213213    elif posts >= forum_settings.AUTHORITY_STEP_4:  
    214         return mark_safe('<img src="%sforum/img/authority/vote4.gif" alt="" />' % (settings.MEDIA_URL)) 
     214        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote4.gif" alt="" />' % (settings.STATIC_URL)) 
    215215    elif posts >= forum_settings.AUTHORITY_STEP_3:  
    216         return mark_safe('<img src="%sforum/img/authority/vote3.gif" alt="" />' % (settings.MEDIA_URL)) 
     216        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote3.gif" alt="" />' % (settings.STATIC_URL)) 
    217217    elif posts >= forum_settings.AUTHORITY_STEP_2:  
    218         return mark_safe('<img src="%sforum/img/authority/vote2.gif" alt="" />' % (settings.MEDIA_URL)) 
     218        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote2.gif" alt="" />' % (settings.STATIC_URL)) 
    219219    elif posts >= forum_settings.AUTHORITY_STEP_1:  
    220         return mark_safe('<img src="%sforum/img/authority/vote1.gif" alt="" />' % (settings.MEDIA_URL)) 
    221     else: 
    222         return mark_safe('<img src="%sforum/img/authority/vote0.gif" alt="" />' % (settings.MEDIA_URL)) 
     220        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote1.gif" alt="" />' % (settings.STATIC_URL)) 
     221    else: 
     222        return mark_safe('<img src="%sdjangobb_forum/img/authority/vote0.gif" alt="" />' % (settings.STATIC_URL)) 
    223223 
    224224     
    … …  
    231231    from django.template.defaultfilters import filesizeformat 
    232232    if attach.content_type in ['image/png', 'image/gif', 'image/jpeg']: 
    233         img = '<img src="%sforum/img/attachment/image.png" alt="attachment" />' % (settings.MEDIA_URL) 
     233        img = '<img src="%sdjangobb_forum/img/attachment/image.png" alt="attachment" />' % (settings.STATIC_URL) 
    234234    elif attach.content_type in ['application/x-tar', 'application/zip']: 
    235         img = '<img src="%sforum/img/attachment/compress.png" alt="attachment" />' % (settings.MEDIA_URL) 
     235        img = '<img src="%sdjangobb_forum/img/attachment/compress.png" alt="attachment" />' % (settings.STATIC_URL) 
    236236    elif attach.content_type in ['text/plain']: 
    237         img = '<img src="%sforum/img/attachment/text.png" alt="attachment" />' % (settings.MEDIA_URL) 
     237        img = '<img src="%sdjangobb_forum/img/attachment/text.png" alt="attachment" />' % (settings.STATIC_URL) 
    238238    elif attach.content_type in ['application/msword']: 
    239         img = '<img src="%sforum/img/attachment/doc.png" alt="attachment" />' % (settings.MEDIA_URL) 
    240     else: 
    241         img = '<img src="%sforum/img/attachment/unknown.png" alt="attachment" />' % (settings.MEDIA_URL) 
     239        img = '<img src="%sdjangobb_forum/img/attachment/doc.png" alt="attachment" />' % (settings.STATIC_URL) 
     240    else: 
     241        img = '<img src="%sdjangobb_forum/img/attachment/unknown.png" alt="attachment" />' % (settings.STATIC_URL) 
    242242    attachment = '%s <a href="%s">%s</a> (%s)' % (img, attach.get_absolute_url(), attach.name, filesizeformat(attach.size)) 
    243243    return mark_safe(attachment) 
    … …  
    268268    if user.is_authenticated(): 
    269269        selected_theme = user.forum_profile.theme 
    270         theme_style = '<link rel="stylesheet" type="text/css" href="%(media_url)sforum/themes/%(theme)s/style.css" />'  
    271     else: 
    272         theme_style = '<link rel="stylesheet" type="text/css" href="%(media_url)sforum/themes/default/style.css" />' 
     270        theme_style = '<link rel="stylesheet" type="text/css" href="%(static_url)sdjangobb_forum/themes/%(theme)s/style.css" />'  
     271    else: 
     272        theme_style = '<link rel="stylesheet" type="text/css" href="%(static_url)sdjangobb_forum/themes/default/style.css" />' 
    273273         
    274274    return theme_style % dict( 
    275         media_url=settings.MEDIA_URL, 
     275        static_url=settings.STATIC_URL, 
    276276        theme=selected_theme 
    277277    ) 
    … …  
    282282    if user.is_authenticated(): 
    283283        markup_style = ''' 
    284             <link rel="stylesheet" type="text/css" href="%(media_url)sforum/js/markitup/skins/markitup/style.css" /> 
    285             <link rel="stylesheet" type="text/css" href="%(media_url)sforum/js/markitup/sets/%(markup)s/style.css" /> 
    286             <script type="text/javascript" src="%(media_url)sforum/js/markitup/jquery.markitup.pack.js"></script> 
    287             <script type="text/javascript" src="%(media_url)sforum/js/markitup/sets/%(markup)s/set.js"></script> 
    288             <script type="text/javascript" src="%(media_url)sforum/js/markup/%(markup)s/board.js"></script> 
     284            <link rel="stylesheet" type="text/css" href="%(static_url)sdjangobb_forum/js/markitup/skins/markitup/style.css" /> 
     285            <link rel="stylesheet" type="text/css" href="%(static_url)sdjangobb_forum/js/markitup/sets/%(markup)s/style.css" /> 
     286            <script type="text/javascript" src="%(static_url)sdjangobb_forum/js/markitup/jquery.markitup.pack.js"></script> 
     287            <script type="text/javascript" src="%(static_url)sdjangobb_forum/js/markitup/sets/%(markup)s/set.js"></script> 
     288            <script type="text/javascript" src="%(static_url)sdjangobb_forum/js/markup/%(markup)s/board.js"></script> 
    289289        ''' % dict( 
    290             media_url=settings.MEDIA_URL, 
     290            static_url=settings.STATIC_URL, 
    291291            markup=markup if markup else user.forum_profile.markup 
    292292        ) 
Note: See TracChangeset for help on using the changeset viewer.