Commit 4e8110d6 authored by Simon Daron's avatar Simon Daron
Browse files

img & placeholder emission

parent 6fc2882f
...@@ -20,7 +20,7 @@ urlpatterns = patterns('', ...@@ -20,7 +20,7 @@ urlpatterns = patterns('',
url(r'^get$', 'panikweb.views.get', name='get'), url(r'^get$', 'panikweb.views.get', name='get'),
url(r'^listen$', 'panikweb.views.listen', name='listen'), url(r'^listen$', 'panikweb.views.listen', name='listen'),
url(r'^news/$', 'panikweb.views.news', name='news'), url(r'^news/$', 'panikweb.views.news', name='news'),
url(r'^news/(?P<slug>[\w,-]+)$', 'panikweb.views.newsitem', name='newsitem'), url(r'^news/(?P<slug>[\w,-]+)$', 'panikweb.views.newsitem', name='news-view'),
url(r'^search/', 'panikweb.search.view', name='search'), url(r'^search/', 'panikweb.search.view', name='search'),
......
...@@ -343,35 +343,22 @@ body{ ...@@ -343,35 +343,22 @@ body{
margin-bottom:1.5em; margin-bottom:1.5em;
} }
/**** Inline ****/ /**** Inline ****/
.emission-inline { .emission.inline, .emission.resume {
padding:1em 0 1em 0; padding:1em 0 1em 0;
} }
.emission-inline div.date { .emission.inline div.date {
min-height: 3em; min-height: 3em;
text-align: center; text-align: center;
display:inline-block; display:inline-block;
float:left; float:left;
margin-right:1em; margin-right:1em;
} }
.emission-inline .controls { .emission .archived *{
margin-top:0px;
text-align: center;
float:right;
}
.emission-inline .controls .symbol {
margin-right:5px;
float:left;
}
.emission-inline .link {
display:block;
}
.emission-inline .archived *{
color:#aaa; color:#aaa;
} }
.emission-inline .link .description { .emission. .link .description {
margin: 0px 0 5px 0; margin: 0px 0 5px 0;
font-family: "RegloMedium"; font-family: "RegloMedium";
} }
......
...@@ -8,7 +8,16 @@ ...@@ -8,7 +8,16 @@
</div> </div>
{% endif %} {% endif %}
<a class="block" href="{% url 'emission-view' slug=emission.slug %}"> <a class="block" href="{% url 'emission-view' slug=emission.slug %}">
{% if emission.image %}
<div class="logo left">
{% if model = "inline" %}
<img width="50" height="50" src="{{ emissionimage|thumbnail:'50x50' }}"/>
{% else %}
<img src="http://placehold.it/50x50">
{% endif %}
</div>
{% endif %}
<h5 class="title ellipsis">{{ emission.title }}</h5> <h5 class="title ellipsis">{{ emission.title }}</h5>
{% if emission.description %} {% if emission.description %}
<div class="description ellipsis"> <div class="description ellipsis">
......
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
{% block nav %} {% block nav %}
<div class="news"> <div class="news">
<div class="wrapper newsRoll"> <div class="wrapper newsRoll">
<h2>News</h2>
<ul class="custom inline ellipsis center"> <ul class="custom inline ellipsis center">
{% for content in news %} {% for content in news %}
<li class="item"> <li class="item">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment