From 8887848bb7e73ddc5c3be6315e2f95eb1e88ef86 Mon Sep 17 00:00:00 2001 From: Sanj Date: Tue, 14 Aug 2012 16:23:01 +0530 Subject: [PATCH] innertab for script; emailer changes; --- itf/static/js/innertabs.js | 29 +++++++++++++++++++ itf/templates/emailer/email.html | 7 +++-- itf/templates/modules/festival/meeting.html | 30 +------------------- itf/templates/modules/scriptbank/script.html | 21 ++++++++++++++ 4 files changed, 56 insertions(+), 31 deletions(-) create mode 100644 itf/static/js/innertabs.js diff --git a/itf/static/js/innertabs.js b/itf/static/js/innertabs.js new file mode 100644 index 0000000..bcd25a7 --- /dev/null +++ b/itf/static/js/innertabs.js @@ -0,0 +1,29 @@ + + $(function() { + //On Click Event + $("ul.tabsInnerRight li").click(function() { + $(".active").removeClass("active"); //Remove any "active" class + $(this).addClass("active"); //Add "active" class to selected tab + $(".tab_content").hide(); //Hide all tab content + var activeTab = $(this).find("a").attr("href"); //Find the href attribute value to identify the active tab + content + $(activeTab).fadeIn(); //Fade in the active ID content + return false; + // var queryData = {}; + }); +/* + + if (queryData.hasOwnProperty("innertab")) { + if ($('#' + queryData.innertab).length > 0) { + $('a[href=#' + queryData.innertab + "]").click(); + } else { + $('ul.tabsInnerRight li:first').click(); + } + } else { + $('ul.tabsInnerRight li:first').click(); //Show first tab content + } +*/ + //When page loads... + $(".tab_content").hide(); //Hide all content + $("ul.tabsInnerRight li:first").click() //addClass("active").show(); //Activate first tab + + }); diff --git a/itf/templates/emailer/email.html b/itf/templates/emailer/email.html index a09ace1..f5d72a5 100755 --- a/itf/templates/emailer/email.html +++ b/itf/templates/emailer/email.html @@ -68,7 +68,7 @@ - +
@@ -92,8 +92,11 @@ {{ article.author_bio|markdown }} +
{% if article.main_image %} @@ -78,7 +78,7 @@ {% endthumbnail %} {% endif %} -

{{ article.subtitle|markdown }}

+

{{ article.subtitle|markdown|removetags:"p" }}

{% endfor %} + {% if weblinks %} +
diff --git a/itf/templates/modules/festival/meeting.html b/itf/templates/modules/festival/meeting.html index 4a0cb10..dcaa108 100755 --- a/itf/templates/modules/festival/meeting.html +++ b/itf/templates/modules/festival/meeting.html @@ -216,38 +216,10 @@ - - $(function() { - //On Click Event - $("ul.tabsInnerRight li").click(function() { - $(".active").removeClass("active"); //Remove any "active" class - $(this).addClass("active"); //Add "active" class to selected tab - $(".tab_content").hide(); //Hide all tab content - var activeTab = $(this).find("a").attr("href"); //Find the href attribute value to identify the active tab + content - $(activeTab).fadeIn(); //Fade in the active ID content - return false; - // var queryData = {}; - }); -/* - - if (queryData.hasOwnProperty("innertab")) { - if ($('#' + queryData.innertab).length > 0) { - $('a[href=#' + queryData.innertab + "]").click(); - } else { - $('ul.tabsInnerRight li:first').click(); - } - } else { - $('ul.tabsInnerRight li:first').click(); //Show first tab content - } -*/ - //When page loads... - $(".tab_content").hide(); //Hide all content - $("ul.tabsInnerRight li:first").click() //addClass("active").show(); //Activate first tab - }); -