Episode/emission

diff --git a/panikweb/paniktags/templatetags/paniktags.py b/panikweb/paniktags/templatetags/paniktags.py
index 42071e76360cab8e918233da6374e12782aa2a81..e90725d093447e16b09f064edd616887c32c7eeb 100644 (file)
--- a/panikweb/paniktags/templatetags/paniktags.py
+++ b/panikweb/paniktags/templatetags/paniktags.py
@@ -123,6 +123,19 @@ def jsonify(object):
         return serialize('json', object)
     return simplejson.dumps(object)
 
+@register.filter
+def strreplace ( string, args ): 
+    find  = args.split(',')[0]
+    replace = args.split(',')[1]
+    return string.replace(find,replace)
+
+@register.filter
+def replace ( string, args ): 
+    search  = args.split(args[0])[1]
+    replace = args.split(args[0])[2]
+
+    return re.sub( search, replace, string )
+
 @register.filter
 def remove_tag_facet(url, facet):
     facet = urllib2.quote(facet.encode('utf-8'), safe='')

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 51dfe11b297d620b3c292560e302fb80c307c057..5f5fdf5d543756c2137416ad43132a5e1ade975a 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -39,7 +39,7 @@
        padding: 0.2em 0 0.2em 0;
        margin: 0.2em 0 0.2em 0;
 }
-#Main .label{
+#Main .sectionLabel{
        color:#003446;
        border-left:1.5em solid #003446;
        border-bottom:2px solid #003446;
@@ -65,7 +65,7 @@
 .symbol.big{   font-size: 400%;}   
 .symbol.huge{  font-size: 800%;}
 
-.label {
+.sectionLabel, .label {
     text-transform: uppercase;
     font-family: "Reglo";
     letter-spacing:1px;

diff --git a/panikweb_templates/templates/emissions/detail.html b/panikweb_templates/templates/emissions/detail.html
index fb24160044775c4025307e207afb77aedbcf8f7a..db65dcab93e1d20df287ba28fa1348cc3853fae1 100644 (file)
--- a/panikweb_templates/templates/emissions/detail.html
+++ b/panikweb_templates/templates/emissions/detail.html
@@ -1,4 +1,5 @@
 {% load i18n %}
+{% load paniktags %}
 <div class="emission emission-detail cf">
        <div class="metas">
                {% if schedules %}
@@ -19,12 +20,6 @@
                        {{ emission.description|safe|striptags }}
                </div>
                {% endif %}
-               {% if emission.email %}
-                       <div class="email ellipsis">{{ emission.email}}</div>
-               {% endif %}
-               {% if emission.website %}
-                       <div class="contact ellipsis"><a href="{{ emission.website}}">{{ emission.website}}</a></div>
-               {% endif %}
        </div>
 
        {% if emission.image %}
@@ -36,5 +31,11 @@
                {{ emission.text|safe}}
        </article>
        {% endif %}
+               {% if emission.email %}
+                       <div class="email ellipsis">{{ emission.email|strreplace:"@, (AT) "}}</div>
+               {% endif %}
+               {% if emission.website %}
+                       <div class="contact ellipsis"><a href="{{ emission.website}}">{{ emission.website}}</a></div>
+               {% endif %}
 </div>
 

diff --git a/panikweb_templates/templates/emissions/emission_detail.html b/panikweb_templates/templates/emissions/emission_detail.html
index 840faf2662146aa2bfce1e85f17a913fb184be57..ccf07eb46f03d3bbba94dd70e5512f841fe2ef17 100644 (file)
--- a/panikweb_templates/templates/emissions/emission_detail.html
+++ b/panikweb_templates/templates/emissions/emission_detail.html
@@ -14,12 +14,12 @@
                {% endif %}
                <div data-tabbed="true" id="Emission-tabs-default">
                        <div id="Emission-tabs-detail">
-                               <h5 class="label">A propos</h5>
+                               <h5 class="sectionLabel">A propos</h5>
                                {% emission_detail %}
                        </div>
                        {% if episodes %}
                        <div id="Emission-tabs-last" class="episodes">
-                                       <h5 class="label">Derniers épisodes</h5>
+                                       <h5 class="sectionLabel">Derniers épisodes</h5>
                                {% with episodes|slice:"0:3" as episodes %}
                                        {% for episode in episodes %}
                                                <div class="legend">{{ episode.first_diffusion|date:"F Y" }}</div>