Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Simon Daron
panikweb
Commits
9abec7c7
Commit
9abec7c7
authored
Sep 08, 2013
by
Simon Daron
Browse files
fixing size & title/metas order in emission episode resume
parent
69d3feb7
Changes
3
Hide whitespace changes
Inline
Side-by-side
panikweb_templates/static/css/specifics.css
View file @
9abec7c7
...
...
@@ -588,7 +588,7 @@ body{
float
:
right
;
}
.episode.inline
.logo
{
min-height
:
7
5px
;
min-height
:
5
0
px
;
float
:
left
;
margin-right
:
1em
;
}
...
...
@@ -775,7 +775,7 @@ ul.newsSpecial{
}
.program-week
.inline
,
.program-week
.resume
{
padding
:
0
;}
.program-week
.description
{
color
:
#aaa
;}
.program-week
.metas
{
display
:
inline-block
;}
/****************************************************/
/**** SEARCH ****/
...
...
panikweb_templates/templates/emissions/resume.html
View file @
9abec7c7
...
...
@@ -10,16 +10,20 @@
<img
class=
"smooth"
width=
"50"
height=
"50"
src=
"{% static "
img
/
defaultLogo.png
"
%}"
/>
{% endif %}
</div>
{% if emission.categories %}
<div
class=
"categories smooth ellipsis"
>
{% for category in emission.categories.all %}
{% if forloop.counter > 1 %} - {% endif %}
<em><span
class=
"inBlock icon-{{category|slugify}}"
></span>
{{category}}
</em>
{% endfor%}
<div
class=
"title ellipsis"
>
<h5
class=
"inBlock"
>
{{ emission.title }}
</h5>
<div
class=
"smooth metas"
>
{% if emission.categories %}
<span
class=
"categories ellipsis"
>
{% for category in emission.categories.all %}
{% if forloop.counter > 1 %} - {% endif %}
<span
class=
"category"
><span
class=
"inBlock icon-{{category|slugify}}"
>
</span>
{{category}}
</span>
{% endfor%}
</span>
{% endif %}
</div>
{% endif %}
<h5
class=
"title ellipsis"
>
{{ emission.title }}
</h5>
</div>
{% if emission.subtitle %}
<div
class=
"description ellipsis"
>
{{ emission.subtitle }}
...
...
panikweb_templates/templates/episodes/resume.html
View file @
9abec7c7
...
...
@@ -42,23 +42,26 @@
{% if episode.main_sound and model != "inline"%}
<div
class=
"sound right"
>
{% audio sound=episode.main_sound %}
</div>
{% endif %}
{% if class = "standalone" %}
<div
class=
"metas smooth ellipsis"
>
<div
class=
"title ellipsis"
>
<h5
class=
" inBlock title {% if model = "
inline
"
%}
ellipsis
{%
endif
%}"
>
<a
href=
"{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}"
>
{{ episode.title }}
</a>
</h5>
<div
class=
"smooth metas"
>
{% if class = "standalone" %}
<h5
class=
"title inBlock"
>
<a
href=
"{% url 'emission-view' slug=episode.emission.slug %}"
>
{{ episode.emission.title }}
</a>
</h5>
{% if episode.emission.categories %}
<span
class=
"categories"
>
{% for category in episode.emission.categories.all %}
{% if forloop.counter > 1 %} - {% endif %}
<
em
><span
class=
"inBlock icon-{{category|slugify}}"
></span>
{{category}}
</
em
>
{% if forloop.counter > 1 %} - {% endif %}
<
span
class=
"category"
><span
class=
"inBlock icon-{{category|slugify}}"
>
</span>
{{category}}
</
span
>
{% endfor%}
</span>
{% endif %}
{% endif %}
</div>
{% endif %}
<h5
class=
"title {% if model = "
inline
"
%}
ellipsis
{%
endif
%}"
>
<a
href=
"{% url 'episode-view' emission_slug=episode.emission.slug slug=episode.slug %}"
>
{{ episode.title }}
</a>
</h5>
</div>
{% if model = "inline" %}
{% if episode.subtitle %}
<div
class=
"description ellipsis"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment