Frank Becker avatar Frank Becker committed 3b3db23

update to sync some minor fixes plus the whoosh search as on pentasubmitter

Comments (0)

Files changed (19)

+syntax: glob
+index.html_error_10521
+.idea
+3_rd_party

src/pentasubmitter/installer/pentasubmitter_requirements.txt

-Django==1.2.4
--e git://github.com/robhudson/django-debug-toolbar.git@98d919189d5b25057cb0cb7ee486a591a1f6cead#egg=django-debug-toolbar
+Django
+-e git://github.com/robhudson/django-debug-toolbar.git#egg=django-debug-toolbar
 -e svn+http://django-tagging.googlecode.com/svn/trunk@186#egg=django-tagging
 -e git://github.com/ericflo/django-pagination.git@1c414c8ed010359597b05dad1b41b65aeddfd1d7#egg=django-pagination
 -e git://github.com/pydanny/django-uni-form.git@ae767497cc69b34dc18847ece5c45f48f25f1f6f#egg=django-uni-form
 -e svn+http://django-voting.googlecode.com/svn/trunk@73#egg=django-voting
 -e hg+http://bitbucket.org/benoitc/django-authopenid/@8fa4626ed8d7#egg=django-authopenid
 -e git://github.com/ericflo/django-avatar.git@d60ac863e493a9a1cf908e28eb4548bd9bd33d86#egg=django-avatar
--e git://github.com/ericflo/django-threadedcomments.git@6eb4c09cfc43e2f939660525101a1a8fac9c4838#egg=django-threadedcomments
+#-e git://github.com/ericflo/django-threadedcomments.git@6eb4c09cfc43e2f939660525101a1a8fac9c4838#egg=django-threadedcomments
+django-threadedcomments
 # !
 -e svn+http://wadofstuff.googlecode.com/svn/trunk/python/serializer@55#egg=wadofstuff
 -e git://github.com/toastdriven/django-haystack.git@2a921b6d64a280216148116b356f61fafcd89f53#egg=django-haystack
 django-celery==2.0.3
+beautifulsoup
+markdown

src/pentasubmitter/settings.py

     'debug_toolbar',
     'tagging',
     'pagination',
+    'south',
     'uni_form',
     'submitter',
     'show',

src/pentasubmitter/templates/base.html

         <meta http-equiv="X-XRDS-Location" content="http://{{ request.get_host }}{% url oid_xrdf %}" />  
         {% endif %}
 
-        <link rel="stylesheet" href="{{ MEDIA_URL }}/css/base.css" />
-        <link rel="stylesheet" href="{{ MEDIA_URL }}/css/openid.css" />
+        <link rel="stylesheet" href="{{ MEDIA_URL }}css/base.css" />
+        <link rel="stylesheet" href="{{ MEDIA_URL }}css/openid.css" />
         {% block head %}
         {% endblock %}
     </head>
         
         {% block content %}{% endblock %}
         
-        <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery-1.3.2.min.js"></script>
+        <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery-1.3.2.min.js"></script>
 
     	{% block extra_scripts %}{% endblock %}
     	

src/pentasubmitter/templates/main-veryold.html

-{% load i18n %}
-{% load uni_form_tags %}
-{% load custom_templatetags %}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-    <!--  Template by <a href="http://demusdesign.com/">DemusDesign</a> -->
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta name="description" content="Submit the news you want to hear about at Pentaradio" />
-    <meta name="keywords" content="pentaradio pentasubmitter pentamedia pentacast pentamusic c3d2 ccc cccdd" />
-    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/green_muted.css" media="screen" title="style (screen)" />
-    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/default.css" media="screen" title="style (screen)" />
-    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/uni-form.css" media="screen" title="style (screen)" />
-    <link rel="stylesheet" type="text/css" href="{{ MEDIA_URL }}/css/uni-form.css" media="screen" title="style (screen)" />
-    <link href="{{ MEDIA_URL }}/css/jquery.autocomplete.css" type="text/css" media="all" rel="stylesheet" />
-    {% comment %}
-    <!-- FIXME (a8)>
-     The whole java script stuff has to be handled differently.
-     Has to be loaded at the end
-     Template has to have hooks for that.
-        * Loading of js
-        * ready function
-    </FIXME -->
-    {% endcomment %}
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.textarearesizer.compressed.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/uni-form.jquery.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/lib/jquery.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/lib/jquery.bgiframe.min.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/lib/jquery.ajaxQueue.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.autocomplete.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.spinner.js"></script>
-    <!-- script type="text/javascript" src="{{ MEDIA_URL }}/js/vote.js"></script -->
-    {% if not has_openids %}
-        <script type="text/javascript" src="{{ MEDIA_URL }}/js/openid-jquery.js"></script>
-    {% endif %}
-    <script type="text/javascript" >
-    // $(document).ready(function() {
-    $(document).ready(function() {
-            $("#news_form").hide();
-            $("#comment_form").hide();
-            // $('textarea:not(.processed)').TextAreaResizer();
-            setInterval("update()", 60000);
-            {% if not has_openids %}
-                openid.init('id_openid_url');
-            {% endif %}
-            });
-    function toggle_feature (id) {
-        $('#'+id).toggle('fast');
-    };
-    </script>
-    <!-- script type="text/javascript" >
-    $(function() {
-            $('#submit-id-add').click(function() {
-                var $this = $(this);
-                var opts = { position: 'center', hide: true };
-                $this.spinner(opts);
-                setTimeout(function() {
-                    $this.spinner('remove');
-                    }, 9000);
-                return false;
-                });
-    });
-    </script -->
-    <link rel="alternate" type="application/rss+xml" title="Last 23 news submissions" href="/submit/feeds/latest/" />
-    <link rel="alternate" type="application/rss+xml" title="Last 12 shows" href="/submit/feeds/latest_shows/" />
-    <link rel="alternate" type="application/rss+xml" title="Upcomming show news submissions" href="/submit/feeds/current_show/" />
-    <title>Pentamedia Universe</title>
-    {# <title>{{ title }}</title> #}
-    <!--[if IE]>
-
-    <script>
-        // allow IE to recognize HTMl5 elements
-        document.createElement('section');
-        document.createElement('article');
-        document.createElement('aside');
-        document.createElement('footer');
-        document.createElement('header');
-        document.createElement('nav');
-        document.createElement('time');
-
-    </script>
-    <![endif] -->
-    {% if request.is_secure %}
-        <meta http-equiv="X-XRDS-Location" content="https://{{ request.get_host }}{% url oid_xrdf %}" />
-    {% else %}
-        <meta http-equiv="X-XRDS-Location" content="http://{{ request.get_host }}{% url oid_xrdf %}" />  
-    {% endif %}
-
-    <link rel="stylesheet" href="{{ MEDIA_URL }}/css/openid.css" />
-    {% block head %}
-    {% endblock %}
-</head>
-
-<body>
-
-<div id="header_login">
-    {% block header %}
-    <p>
-    {% if user.is_authenticated %}
-        ({% trans "Logged in" %}: <a href="/account/user.html">{{ user.username }}</a> | 
-        <a href="{% url user_signout %}">{% trans "Log out" %}</a>)
-    {% else %}
-        (<a href="{% url user_signin %}">{% trans "Log in" %}</a> | 
-        <a href="{% url registration_register %}">{% trans "Register account" %}</a>)
-    {% endif %}
-    </p>
-    <div id="search-box">
-        <a href="/search">search</a>
-    </div>
-    {% endblock %}
-</div>
-
-<div id="header_logo">
-    <img src="{{ MEDIA_URL }}/images/Pentamedia.png" alt="" />
-</div>
-
-{% comment %}
-<!-- div id="nav">
-    <ul>
-            {% block mainmenu %}
-            {% endblock %}
-        <li><a href="index.html">HOME</a></li>
-        <li><a href="#">ABOUT</a></li>
-        <li><a href="#">CONTACT</a></li>
-    </ul>
-</div -->
-{% endcomment %}
-
-<div id="head">
-    <h1><a href="/">The Pentamedia Universe</a></h1>
-    <h2><a href="/submit/">Penta News Entry Submitter</a></h2>
-</div>
-
-<div class="main">
-    <div id="news_submission">
-    {% if not hide_quick_form %}
-            <a href="/nojavascripthere.html" class="exposed" onclick="toggle_feature('news_form'); return false">
-                {% trans "Submit news here." %}
-            </a>
-            <div id="news_form" class="content">
-            {% if user.is_authenticated %}
-                <p>
-                {% trans "For the impatient just fill out some fields on the form. If you got some more time and details please use the " %}
-                <a href="/submit/create/full">full form</a>.
-                <br />
-                The markup for excerpt and description is <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">markdown</a>.
-                Also enjoy the <a href="http://packetstormsecurity.org/papers/cheatsheets/Markdown.pdf">Cheat sheet</a>.
-                </p>
-                {% get_short_submitter_form %}
-                {% uni_form form_short helper %}
-                <br />
-            {% else %}
-                <em>You need to log in first:</em>
-                <a href="{% url user_signin %}">{% trans "Log in" %}</a> or 
-                <a href="{% url registration_register %}">{% trans "Register a an account" %}</a>
-            {% endif %}
-            </div>
-    {% else %}
-        <br />
-    {% endif %}
-    </div>
-    <div class="content">
-        <br />
-        <div class="right2">
-            <h3>Tag Cloud</h3>
-            {% tag_cloud_for_filtered_model submitter.NewsEntry as tags with steps=6 min_count=1 distribution=log filters=tag_filters %}
-            <div class="tag-cloud">
-                <p>
-                    {% for tag in tags %}
-                        <span class="tag-{{tag.font_size}}"><a href="/submit/tag/{{ tag }}">{{ tag }}</a></span>
-                    {% endfor %}
-                </p>
-            </div>
-        </div>
-        {% block content %}
-        {% endblock %}
-
-        <div id="content2">
-            {% if title_main %}
-                <h1 class="section">{{ title_main }}</h1>
-            {% endif %}
-            <!-- h2>here you go</h2 -->
-
-                {% block content2 %}
-                {% endblock %}
-        </div>
-    </div>
-</div>
-
-    {% block extra_scripts %}{% endblock %}
-
-<div id="foot">
-<p>
-    <a href="http://djangoproject.com"><img src="/static_media/images/pony.png" alt="" /></a>
-    &copy; 2010 <a href="http://www.c3d2.de">c3d2</a>
-    <a href="/about.html">(About|Impressum|Help)</a>
-</p>
-
-</div>
-
-</body>
-</html>
-

src/pentasubmitter/templates/main.html

 {% load avatar_tags %}
 {% load uni_form_tags %}
 {% load custom_templatetags %}
+{% load compress %}
 
 <!DOCTYPE HTML>
 <html lang="en" ><head>
     <meta name="description" content="Submit the news you want to hear about at Pentaradio" />
     <meta name="keywords" content="pentaradio pentasubmitter pentamedia pentacast pentamusic c3d2 ccc cccdd" >
 	<meta name="viewport" content="width=device-width, initial-scale=1.0" >
+	{% compress css %}
 	<!-- The 1140px Grid -->
-	<link rel="stylesheet" href="{{ MEDIA_URL }}/css/1140.css" type="text/css" media="screen" >
+	<link rel="stylesheet" href="{{ MEDIA_URL }}css/1140.css" type="text/css" media="screen" >
 	<!--[if lte IE 9]>
 	<link rel="stylesheet" href="{{ MEDIA_URL }}/css/ie.css" type="text/css" media="screen" />
 	<![endif]-->
-    <link rel="stylesheet" href="{{ MEDIA_URL }}/css/layout.css" type="text/css" media="screen" >
-	<link rel="stylesheet" href="{{ MEDIA_URL }}/css/typeimg.css" type="text/css" media="screen" >
-	<link rel="stylesheet" href="{{ MEDIA_URL }}/css/smallerscreen.css" media="only screen and (max-width: 1023px)" >
-	<link rel="stylesheet" href="{{ MEDIA_URL }}/css/mobile.css" media="handheld, only screen and (max-width: 767px)" >
-    <link href="{{ MEDIA_URL }}/css/uni-form.css" rel="stylesheet" type="text/css" media="screen"/>
-    <link href="{{ MEDIA_URL }}/css/jquery.css" type="text/css" rel="stylesheet" type="text/css" media="screen"/>
+	<link rel="stylesheet" href="{{ MEDIA_URL }}css/typeimg.css" type="text/css" media="screen" >
+	<link rel="stylesheet" href="{{ MEDIA_URL }}css/smallerscreen.css" media="only screen and (max-width: 1023px)" >
+	<link rel="stylesheet" href="{{ MEDIA_URL }}css/mobile.css" media="handheld, only screen and (max-width: 767px)" >
+    <link href="{{ MEDIA_URL }}css/uni-form.css" rel="stylesheet" type="text/css" media="screen"/>
+    <link href="{{ MEDIA_URL }}css/jquery.css" type="text/css" rel="stylesheet" type="text/css" media="screen"/>
+	{% endcompress %}
+    <link rel="stylesheet" href="{{ MEDIA_URL }}css/layout.css" type="text/css" media="screen" >
 
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.textarearesizer.compressed.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/uni-form.jquery.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/lib/jquery.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/lib/jquery.bgiframe.min.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/lib/jquery.ajaxQueue.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.autocomplete.js"></script>
-    <script type="text/javascript" src="{{ MEDIA_URL }}/js/jquery.spinner.js"></script>
+	{% compress js %}
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.textarearesizer.compressed.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/uni-form.jquery.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}lib/jquery.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}lib/jquery.bgiframe.min.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}lib/jquery.ajaxQueue.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.autocomplete.js"></script>
+    <script type="text/javascript" src="{{ MEDIA_URL }}js/jquery.spinner.js"></script>
     <!-- script type="text/javascript" src="{{ MEDIA_URL }}/js/vote.js"></script -->
+	{% endcompress %}
     {% if not has_openids %}
-        <script type="text/javascript" src="{{ MEDIA_URL }}/js/openid-jquery.js"></script>
+        <script type="text/javascript" src="{{ MEDIA_URL }}js/openid-jquery.js"></script>
     {% endif %}
     <script type="text/javascript" >
         // $(document).ready(function() {
         <meta http-equiv="X-XRDS-Location" content="http://{{ request.get_host }}{% url oid_xrdf %}" />
     {% endif %}
 
-    <link rel="stylesheet" href="{{ MEDIA_URL }}/css/openid.css" />
+    <link rel="stylesheet" href="{{ MEDIA_URL }}css/openid.css" />
     {% block head %}
     {% endblock %}
 </head>
                     {% endif %}
                 </div>
             {% endif %}
+            <a href="/" >
+                <img class="home-pix" src="{{ MEDIA_URL }}images/home.png" alt="home" >
+            </a>
 
             <a href="http://www.pentamedia.org/" >
-                <img class="header-pix" src="{{ MEDIA_URL }}/images/Pentamedia.png" alt="" >
+                <img class="header-pix" src="{{ MEDIA_URL }}images/Pentamedia.png" alt="" >
             </a>
             <br>
             <div id="tag-line">
 
         <div id="search-box" class="fourcol last">
             <div class="search-box-wrapper">
-                <form class="search-form">
-                <a href="http://pentamedia.c3d2.de/search" >
-                    <input class="search-field" type="text" value="Search..." onfocus="if (this.value == 'Search...')
+                <form class="search-form" method="get" action="/search/">
+                    <input class="search-field" type="text" name="q" value="Search..." onfocus="if (this.value == 'Search...')
                     {this.value = '';}" onblur="if (this.value == '') {this.value = 'Search...';}" />
-                    <input class="search-button" type="button" value="Go" />
-                </a>
+                    <input class="search-button" type="submit" value="Go" alt="search" />
                 </form>
                 <br />
                 </div>
                 <div class="news-entry-head" >
                     <div class="edit-entry">
                         <a href="http://pentamedia.c3d2.de/submit/update/814" >
-                            <img src="{{ MEDIA_URL }}/images/writing_file.png" alt="Edit entry" >
+                            <img src="{{ MEDIA_URL }}images/writing_file.png" alt="Edit entry" >
                         </a>
                     </div>
                     <a href="http://pentamedia.c3d2.de/static_media/page_shots/2011/02/01/googlebingischeatingcopyingoursearchresul.png" >
                         </ul>
                     </ol>
                 {% else %}
-                    <img src="{{ MEDIA_URL }}/images/anonymous_mask.png" alt="" >
+                    <img src="{{ MEDIA_URL }}images/anonymous_mask.png" alt="" >
                     <h1>Anonymous</h1>
                     <p>
                         <a href="{% url user_signin %}">{% trans "Log in" %}</a> or
     <div class="row footer" >
         <section>
             <p>
-                <a id="html5-pix" href="http://www.w3.org/html/" ><img src="{{ MEDIA_URL }}/images/html5.svg" alt="HTML5 powered" ></a>
-                <a id="pony-pix" href="http://djangoproject.com/" ><img src="{{ MEDIA_URL }}/images/pony.png" alt="Pony powered" ></a>
+                <a id="html5-pix" href="http://www.w3.org/html/" ><img src="{{ MEDIA_URL }}images/html5.svg" alt="HTML5 powered" ></a>
+                <a id="pony-pix" href="http://djangoproject.com/" ><img src="{{ MEDIA_URL }}images/pony.png" alt="Pony powered" ></a>
                 <span>
                     &nbsp;© 2011 <a href="http://www.c3d2.de/" >c3d2</a>
                     (<a href="http://pentamedia.c3d2.de/about.html" >About|Impressum|Help</a>)

src/pentasubmitter/templates/search/indexes/show/pentashow_text.txt

+{{ object.title }}
+{{ object.excerpt }}
+{{ object.description }}

src/pentasubmitter/templates/search/indexes/submitter/newsentry_text.txt

+{{ object.title }}                                                                                                                                            
+{{ object.excerpt }}                                                                                                                                          
+{{ object.body }}

src/pentasubmitter/templates/search/search.html

 {% block content2 %}
     <h2>Search</h2>
 
-    <form method="get" action=".">
-        <table>
-            {{ form.as_table }}
-            <tr>
-                <td>&nbsp;</td>
-                <td>
-                    <input type="submit" value="Search">
-                </td>
-            </tr>
-        </table>
-
         {% if query %}
             <h3>Results</h3>
 
             {% for result in page.object_list %}
                 <p>
-                    <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>
+                    <a href="{{ result.object.get_absolute_url }}">{{ result.object.title }}</a>,{{result.object.submit_date|date:"Y-m-d" }}
                 </p>
             {% empty %}
                 <p>No results found.</p>
             {% endfor %}
         {% else %}
             {# Show some example queries to run, maybe query syntax, something else? #}
+<p>
+            Nothing found.
+</p>
         {% endif %}
-    </form>
 {% endblock %}

src/pentasubmitter/templates/static/css/layout.css

 /* Layout for desktop version */
 
-/*
-body {
-	background-image:-webkit-gradient(linear, 0% 0%, 6% 90%, from(#666666), to(#666666), color-stop(.7,#333333),color-stop(.3,#999999));
-	background-repeat-x:no-repeat;
-	background-repeat-y:no-repeat;
-	background-repeat:no-repeat;
-	background-attachment:initial;
-	background-position:initial initial;
-	background-position-x:initial;
-	background-position-y:initial;
-	background-origin:initial;
-	background-clip:initial;
-	background-color:#000000;
-	background-image:-webkit-gradient(linear, 0% 0%, 6% 90%, from(#666666), to(#666666), color-stop(.7,#333333),color-stop(.3,#999999));
-}
-
-body {
-	-webkit-gradient(linear, 0% 0%, 0% 100%, from(#666666), to(#666666), color-stop(.6,#333333),color-stop(.4,#999999))
-}
-
-*/
-
 body {
 	background-repeat-x:no-repeat;
 	background-repeat-y:no-repeat;
     width:100%;
 }
 
+img.home-pix {
+	display:inline;
+	margin-left:55%;
+}
+
+
 img.header-pix {
 	float:right;
 	display:inline;
Add a comment to this file

src/pentasubmitter/templates/static/favicon.ico

Added
New image
Add a comment to this file

src/registration/__init__.pyc

Binary file removed.

Add a comment to this file

src/registration/signals.pyc

Binary file removed.

src/show/templates/show/list_entries.html

-<!--
-# vim: ts=4 et sw=4 fileencoding=utf-8 :
--->
-
 {% load i18n %}
 {% load pagination_tags %}
 {% load voting_tags %}

src/submitter/templates/submitter/list_entries.html

 {% load pagination_tags %}
 {% load voting_tags %}
 
-<script type="text/javascript" src="{{ MEDIA_URL }}/js/vote.js">
+<script type="text/javascript" src="{{ MEDIA_URL }}js/vote.js">
 </script >
 {% ifequal request.page 1 %}
-<script type="text/javascript" src="{{ MEDIA_URL }}/js/update.js">
+<script type="text/javascript" src="{{ MEDIA_URL }}js/update.js">
 </script>
 {% endifequal %}
 <div id="news_entries-list">
         <div class="news_entry {% cycle 'odd' 'even' %}" id="news{{ item.id }}">
             <p>
                 {% if item.page_screenshot %}
-                    <a href="{{ MEDIA_URL }}{{ item.page_screenshot.url }}">
-                    <img class="color" src="{{ MEDIA_URL }}{{ item.page_screenshot.url_120x80 }}" alt="" /></a>
+                    <a href="{{ item.page_screenshot.url }}">
+                    <img class="color" src="{{ item.page_screenshot.url_120x80 }}" alt="" /></a>
                 {% endif %}
             </p>
             <h2><a href="/submit/{{ item.submit_date|date:'Y/m/d' }}/{{ item.slug }}">{{ item.title }}</a></h2>

src/submitter/templates/submitter/list_entries_per_category.html

         <div class="news_entry {% cycle 'odd' 'even' %}" id="news{{ item.id }}">
             <p>
                 {% if item.page_screenshot %}
-                    <a href="{{ MEDIA_URL }}{{ item.page_screenshot.url }}">
-                    <img class="color" src="{{ MEDIA_URL }}{{ item.page_screenshot.url_120x80 }}" alt="" /></a>
+                    <a href="{{ item.page_screenshot.url }}">
+                    <img class="color" src="{{ item.page_screenshot.url_120x80 }}" alt="" /></a>
                 {% endif %}
             </p>
             <h2><a href="/submit/{{ item.submit_date|date:'Y/m/d' }}/{{ item.slug }}">{{ item.title }}</a></h2>

src/submitter/templates/submitter/list_shows.html

 {% load i18n %}
 {% load pagination_tags %}
 {% load voting_tags %}
-<script type="text/javascript" src="{{ MEDIA_URL }}/js/vote.js">
+<script type="text/javascript" src="{{ MEDIA_URL }}js/vote.js">
 </script >
 {% comment %}
 {% ifequal request.page 1 %}
-<script type="text/javascript" src="{{ MEDIA_URL }}/js/update.js">
+<script type="text/javascript" src="{{ MEDIA_URL }}js/update.js">
 </script>
 {% endifequal %}
 {% endcomment %}
             <div class="edit-entry">
                 {% url submitter.views.news_entry_create_and_update news_entry_id=item.id as update_url %}
                 <a href="{{ update_url }}">
-                        <img src="{{ MEDIA_URL }}/images/writing_file.png" alt="Edit entry" >
+                        <img src="{{ MEDIA_URL }}images/writing_file.png" alt="Edit entry" >
                 </a>
             </div>
             {% if item.page_screenshot %}
-                <a href="{{ MEDIA_URL }}{{ item.page_screenshot.url }}">
-                    <img class="color" src="{{ MEDIA_URL }}{{ item.page_screenshot.url_120x80 }}" alt="" />
+                <a href="{{ item.page_screenshot.url }}">
+                    <img class="color" src="{{ item.page_screenshot.url_120x80 }}" alt="" />
                 </a>
             {% endif %}
             <h2>
                 </a>
             </h2>
             <p>
-                {{ item.excerpt|truncatewords:23 }}
+                {{ item.excerpt_html|safe|truncatewords:23 }}
             </p>
             </div>
         <p>
             <strong>
                 Votes <span id="score{{item.id}}">{{ score.score }}</span> point{{ score.score|pluralize }}
                 after <span id="num_votes{{item.id}}">{{ score.num_votes }}</span> vote{{ score.num_votes|pluralize }}
-
-                    Votes <span id="score814" >0</span> points after <span id="num_votes814" >0</span> votes
             </strong>
             <br />
             <a href="#" onclick="vote('{{ item.id }}', 'up');">Vote up!</a>

src/submitter/templates/submitter/news_per_show_print.html

 {% endblock %}
 
 {% block content2 %}
-{% if count > 0 %}
+{% if count %}
 <p>{% trans 'Here are the ' %} {{ count }} {% trans 'entries for ' %}<em>{{ penta_show.title }}</em> {% trans 'for off-line storage and printing' %}.</p>
     {% include "submitter/list_shows_print.html" %}
 {% else %}

src/submitter/templates/submitter/newsentry_detail.html

 <h3>Screenshot</h3>
 <p>
 {% if object.page_screenshot %}
-    <a href="{{ MEDIA_URL }}{{ object.page_screenshot.url }}">
-    <img class="none" src="{{ MEDIA_URL }}{{ object.page_screenshot.url_120x80 }}" alt=""></a>
+    <a href="{{ object.page_screenshot.url }}">
+    <img class="none" src="{{ object.page_screenshot.url_120x80 }}" alt=""></a>
 {% endif %}
 </p>
 <h3>Tags</h3>
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.