Week program: non ellipsis & nonstop view

diff --git a/panikweb_templates/static/css/reset.css b/panikweb_templates/static/css/reset.css
index 267dbeb79b2573ee8f014a41c1f673fb38e4c223..3b2a505da0cd24bec066c5f78b49fc600245c676 100644 (file)
--- a/panikweb_templates/static/css/reset.css
+++ b/panikweb_templates/static/css/reset.css
@@ -20,7 +20,7 @@ time, mark, audio, video {
     border: 0;
     font-size: 100%;
     /*font: inherit;*/
-    vertical-align: middle;
+       vertical-align:baseline !important;
 }
 /* HTML5 display-role reset for older browsers */
 article, aside, details, figcaption, figure,

diff --git a/panikweb_templates/static/css/specifics.css b/panikweb_templates/static/css/specifics.css
index 02e4cd6e4ab1bbe4f39be2ded1040dc5cb735003..c9dac7e9cd6ce93632c7d8a097905c9296c77ad8 100644 (file)
--- a/panikweb_templates/static/css/specifics.css
+++ b/panikweb_templates/static/css/specifics.css
@@ -643,31 +643,6 @@ body{
        -webkit-box-shadow: 0px 0px 100px rgb(0, 0, 0) inset;
        box-shadow: 0px 0px 100px rgb(0, 0, 0) inset;
 }
-.list.news li {
-}
-.news li a{padding:1em;}
-
-.news .logo{
-       display:block;
-       border-style:solid;
-       border-width:2px;
-}
-@media only screen and (max-width: 600px) {
-       .news .columns.by3{column-count: 1;     -webkit-column-count: 1;        -moz-column-count: 1;}
-       .news .columns.by3 .logo {
-               float:right;
-               max-width:50%;
-       }
-}
-@media (min-width: 800px) {
-}
-.news.detail .description{
-       margin-top:1em;
-}
-
-/****************************************************/
-/**** Home ****/
-/****************************************************/
 
 .newsRoll li{
        background:black;
@@ -703,6 +678,35 @@ body{
        margin:0 0 0 0 !important;
        padding:0 0 0 0 !important;
 }
+.list.news li {
+}
+.news li a{padding:1em;}
+
+.news .logo{
+       display:block;
+       border-style:solid;
+       border-width:2px;
+}
+ul.newsSpecial{
+       border-bottom:2px solid #ccc;
+}
+@media only screen and (max-width: 600px) {
+       .news .columns.by3{column-count: 1;     -webkit-column-count: 1;        -moz-column-count: 1;}
+       .news .columns.by3 .logo {
+               float:right;
+               max-width:50%;
+       }
+}
+@media (min-width: 800px) {
+}
+.news.detail .description{
+       margin-top:1em;
+}
+
+/****************************************************/
+/**** Home & ****/
+/****************************************************/
+
 #Home #Nav .wrapper{
        max-width:auto !important;
        width:auto !important;
@@ -737,7 +741,9 @@ body{
 .program ul .schedule {
        margin-left:5em;
 }
-
+.program .nonstop {
+       text-align:right;
+}
 .search a.icon-check-empty.count-0{
        display:none !important;
 }
@@ -778,7 +784,6 @@ body{
        padding:1em 0 1em 0;
 }
 #grid .nonstop {
-       color:#CCC;
 }
 #grid .item{
        padding:0.5em 0.2em 0.5em 0.2em;
@@ -861,10 +866,6 @@ body { font-size: 16px;}
                float:right;
        }
 }
-div.program span.nonstop {
-       font-size: 80%;
-       color:#CCC;
-}
 
 #subscribe-form {
   position: relative;

diff --git a/panikweb_templates/static/css/type.css b/panikweb_templates/static/css/type.css
index b27bf2438c3a86c462c97d9458725464483d077a..93908ea5f2cfc11268d68e1d4e731bdbda8a5e77 100644 (file)
--- a/panikweb_templates/static/css/type.css
+++ b/panikweb_templates/static/css/type.css
@@ -65,7 +65,7 @@
        /*font-size:1.3em;*/
 }
 .resymbol{
-       vertical-align:middle !important;
+       vertical-align:baseline !important;
        display:inline-block !important;
        font-family: 'Symbols' !important;
        line-height:50% !important;

diff --git a/panikweb_templates/templates/includes/week.html b/panikweb_templates/templates/includes/week.html
index efcfad0f6c8f7492910740286da8e3d6a694241c..c1b907f907d03c6351adc9557c4b20f0184482ed 100644 (file)
--- a/panikweb_templates/templates/includes/week.html
+++ b/panikweb_templates/templates/includes/week.html
@@ -16,30 +16,40 @@
                <ul class="custom emission-list list">
                {% if day.cells %}
                {% for cell in day.cells %}
-                       <li class="ellipsis" >
+                       <li >
                                {% if cell.episode %}
-                               <strong>{{ cell.datetime|date:"H:i" }}</strong>&nbsp;-&nbsp;
                                        <a href="{% url 'episode-view' emission_slug=cell.episode.emission.slug slug=cell.episode.slug %}">
-                                               <span><em>{{ cell.episode.emission.title }}</em>&nbsp;-&nbsp;{{ cell.episode.title }}</span>
+                                               <div>
+                                                       <strong>{{ cell.datetime|date:"H:i" }}</strong> &nbsp;-&nbsp;                   
+                                                       <strong>{{ cell.episode.emission.title }}</strong>
+                                                       <em>{{ cell.episode.title }}</em>
+                                                       {% for category in cell.emission.categories.all %}<span class="icon-{{category|slugify}}"></span>{% endfor%}
+                                               </div>
                                                {% if cell.episode.subtitle %}
-                                                       <span class="smooth">&nbsp;|&nbsp;{{ cell.episode.subtitle|safe|truncatewords:50 }}</span>
+                                                       <span class="smooth">{{ cell.episode.subtitle|safe|truncatewords:50 }}</span>
                                                {% elif cell.episode.emission.subtitle %}
-                                                       <span class="smooth">&nbsp;|&nbsp;{{ cell.episode.emission.subtitle|safe|truncatewords:50 }}</span>
+                                                       <span class="smooth">{{ cell.episode.emission.subtitle|safe|truncatewords:50 }}</span>
                                                {% endif %}
                                        </a>
                                {% elif cell.emission %}
-                               <strong>{{ cell.datetime|date:"H:i" }}</strong>&nbsp;-&nbsp;
+                               
                                        <a href="{% url 'emission-view' slug=cell.emission.slug %}">
-                                               <span><em>{{ cell.emission.title }}</em></span>
+                                               <div>
+                                                       <strong>{{ cell.datetime|date:"H:i" }}</strong> &nbsp;-&nbsp;           
+                                                       <strong>{{ cell.emission.title }}</strong>
+                                                       {% for category in cell.emission.categories.all %}<span class="icon-{{category|slugify}}"></span>{% endfor%}    
+                                               </div>
                                                {% if  cell.emission.subtitle %}
-                                                       <span class="smooth">&nbsp;|&nbsp;{{ cell.emission.subtitle|safe|truncatewords:50 }}</span>
+                                                       <span class="smooth">{{ cell.emission.subtitle|safe|truncatewords:50 }}</span>
                                                {% elif cell.emission.text %}
-                                                       <span class="smooth">&nbsp;|&nbsp;{{ cell.emission.text|safe|striptags|truncatewords:50 }}</span>
+                                                       <span class="smooth">{{ cell.emission.text|safe|striptags|truncatewords:50 }}</span>
                                                {% endif %}
                                        </a>
                                {% else %}
-                               <strong style="visibility: hidden">{{ cell.datetime|date:"H:i" }}</strong><span style="visibility: hidden">&nbsp;-&nbsp;</span>
-                               <span class="nonstop">{{ cell.label }}</span>
+                               <em class="block nonstop ellipsis">
+                                       <strong class="" style="visibility:hidden;">{{ cell.datetime|date:"H:i" }}</strong>
+                                       <span>{{ cell.label }}</span>
+                               </em>
                                {% endif %}
                        </li>
                {% endfor %}

diff --git a/panikweb_templates/templates/news.html b/panikweb_templates/templates/news.html
index 58d04adb49bff138356b9c0473420908c4fbe80f..e6f97ace954cce65f20c4b4fd85b8b1a8e81ce34 100644 (file)
--- a/panikweb_templates/templates/news.html
+++ b/panikweb_templates/templates/news.html
@@ -11,7 +11,7 @@
 <div class="news">
        {% with news|slice:"0:3" as news %}
        <div class="wrapper">
-               <ul class="custom columns news cf by3">
+               <ul class="custom columns news newsSpecial cf by3">
                {% for content in news %}
                        <li class="item">
                                {% news_inline klass="special"%}