This commit is contained in:
Sanj 2011-10-26 01:05:59 +01:00
parent 61b9334345
commit 325a94338f
5 changed files with 10 additions and 6 deletions

View File

@ -145,6 +145,7 @@ INSTALLED_APPS = (
'django.contrib.sites', 'django.contrib.sites',
'django.contrib.admin', 'django.contrib.admin',
'django.contrib.comments', 'django.contrib.comments',
'django.contrib.markup',
'registration', 'registration',
# 'itfcore', # 'itfcore',
'festival', 'festival',

View File

@ -21,6 +21,7 @@ $('#listLeft ul li a').live("click", function() {
var url = location.protocol + "//" + location.hostname + location.pathname + "?tab=" + $('.innerSelected').attr("data-slug") + "&object_id=" + objId; var url = location.protocol + "//" + location.hostname + location.pathname + "?tab=" + $('.innerSelected').attr("data-slug") + "&object_id=" + objId;
var fb_url = url.replace("&", "&"); var fb_url = url.replace("&", "&");
$('#fb_like').attr("data-href", fb_url); $('#fb_like').attr("data-href", fb_url);
$('#permalinkBtn').attr("href", url);
var searchTerm = $('.searchListField').val(); var searchTerm = $('.searchListField').val();
var html = data.html; var html = data.html;
if (searchTerm != '') { if (searchTerm != '') {

View File

@ -1,7 +1,8 @@
{% load thumbnail %} {% load thumbnail %}
{% load markup %}
<div class="itfInfo"> <div class="itfInfo">
{% for s in stories %} {% for s in stories %}
<span class="orange">Situation: </span><span class="ifInfoInfo">{{ s.text|safe|linebreaksbr }}</span> <span class="orange">Situation: </span><span class="ifInfoInfo">{{ s.text|safe|markdown }}</span>
{% if s.image %} {% if s.image %}
{% thumbnail s.image "164x114" crop="center" as im %} {% thumbnail s.image "164x114" crop="center" as im %}
<img class="itfInfoImg" src="{{ im.url }}" /> <img class="itfInfoImg" src="{{ im.url }}" />
@ -18,7 +19,7 @@
</div> </div>
<span class="orange">Law: </span><span class="itfInfoInfo">{{ law }}</span> <span class="orange">Law: </span><span class="itfInfoInfo">{{ law|markdown }}</span>
{% if law_image %} {% if law_image %}
{% thumbnail law_image "164x114" crop="center" as im %} {% thumbnail law_image "164x114" crop="center" as im %}
<img class="itfInfoImg" src="{{ im.url }}" /> <img class="itfInfoImg" src="{{ im.url }}" />
@ -26,17 +27,17 @@
{% endif %} {% endif %}
<br /><br /> <br /><br />
{% if theatre %} {% if theatre %}
<span class="orange">Spotlight on Theatre: </span><span class="itfInfoInfo">{{ theatre|safe|linebreaksbr }}</span> <br /><br /> <span class="orange">Spotlight on Theatre: </span><span class="itfInfoInfo">{{ theatre|safe|markdown }}</span> <br /><br />
{% endif %} {% endif %}
{% if quick_howto %} {% if quick_howto %}
<span class="orange">Best Practices or Quick, Tell Me How to Avoid Conflict! </span><span class="itfInfoInfo">{{ quick_howto|safe|linebreaksbr }}</span><br /><br /> <span class="orange">Best Practices or Quick, Tell Me How to Avoid Conflict! </span><span class="itfInfoInfo">{{ quick_howto|safe|markdown }}</span><br /><br />
{% endif %} {% endif %}
{% if links %} {% if links %}
<span class="orange">Links:</span><br /> <span class="orange">Links:</span><br />
{% for l in links %} {% for l in links %}
<a href="{{ l.url }}" class="bpRelated">{{ l.url }}</a> <br /> <a href="{{ l.url }}" class="bpRelated">{{ l.url }}</a> <br />
{{ l.text|linebreaksbr }} {{ l.text|markdown }}
<br /><br /> <br /><br />
{% endfor %} {% endfor %}
{% endif %} {% endif %}

View File

@ -183,7 +183,7 @@
<!-- <img src="/static/images/noel/facebook.png" width="18" height="18" alt="facebook" class="iconImages"> --> <!-- <img src="/static/images/noel/facebook.png" width="18" height="18" alt="facebook" class="iconImages"> -->
<!-- <iframe src="http://www.facebook.com/plugins/like.php?href=www.theatreforum.in&amp;send=false&amp;layout=button_count&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=arial&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:21px;" allowTransparency="true"></iframe>--> <!-- <iframe src="http://www.facebook.com/plugins/like.php?href=www.theatreforum.in&amp;send=false&amp;layout=button_count&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=arial&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:21px;" allowTransparency="true"></iframe>-->
<img src="/static/images/noel/download.jpg" width="18" height="18" alt="download" title="Download" class="iconImages"> <a href="" id="permalinkBtn" title="Permalink"><img src="/static/images/noel/download.jpg" width="18" height="18" alt="permalink" title="Permalink" class="iconImages"></a>
</div> </div>
</div> </div>

View File

@ -14,3 +14,4 @@ django-ckeditor
django-registration django-registration
Whoosh Whoosh
django-haystack django-haystack
Markdown