Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
panikweb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
radiopanik
panikweb
Commits
fb504721
Commit
fb504721
authored
Sep 08, 2013
by
fred
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update to reflect the change from newsitem datetime to a simple date
parent
4dba776c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
15 deletions
+15
-15
panikweb/views.py
panikweb/views.py
+7
-7
panikweb_templates/templates/emissions/newsitem_detail.html
panikweb_templates/templates/emissions/newsitem_detail.html
+2
-2
panikweb_templates/templates/news.html
panikweb_templates/templates/news.html
+1
-1
panikweb_templates/templates/news/inline.html
panikweb_templates/templates/news/inline.html
+2
-2
panikweb_templates/templates/news/roll.html
panikweb_templates/templates/news/roll.html
+1
-1
panikweb_templates/templates/news/search_result.html
panikweb_templates/templates/news/search_result.html
+2
-2
No files found.
panikweb/views.py
View file @
fb504721
...
...
@@ -68,7 +68,7 @@ class EmissionDetailView(DetailView, EmissionMixin):
context
=
super
(
EmissionDetailView
,
self
).
get_context_data
(
**
kwargs
)
context
[
'sectionName'
]
=
"Emissions"
context
[
'schedules'
]
=
Schedule
.
objects
.
select_related
().
filter
(
emission
=
self
.
object
).
order_by
(
'datetime'
)
context
[
'news'
]
=
NewsItem
.
objects
.
all
().
filter
(
emission
=
self
.
object
.
id
).
order_by
(
'-date
time
'
)[:
3
]
context
[
'news'
]
=
NewsItem
.
objects
.
all
().
filter
(
emission
=
self
.
object
.
id
).
order_by
(
'-date'
)[:
3
]
context
.
update
(
self
.
get_emission_context
(
self
.
object
))
return
context
emission
=
EmissionDetailView
.
as_view
()
...
...
@@ -376,7 +376,7 @@ class Home(TemplateView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
Home
,
self
).
get_context_data
(
**
kwargs
)
context
[
'sectionName'
]
=
"Home"
context
[
'focus'
]
=
list
(
NewsItem
.
objects
.
all
().
filter
(
focus
=
True
).
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date
time
'
)[
0
:
5
])
context
[
'focus'
]
=
list
(
NewsItem
.
objects
.
all
().
filter
(
focus
=
True
).
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date'
)[
0
:
5
])
context
[
'emissions'
]
=
list
(
Emission
.
objects
.
filter
(
archived
=
False
).
order_by
(
'title'
))
schedules
=
Schedule
.
objects
.
select_related
().
order_by
(
'datetime'
)
days
=
[]
...
...
@@ -415,7 +415,7 @@ class NewsItemView(DetailView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
NewsItemView
,
self
).
get_context_data
(
**
kwargs
)
context
[
'sectionName'
]
=
"News"
context
[
'focus'
]
=
list
(
NewsItem
.
objects
.
all
().
filter
(
focus
=
True
).
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date
time
'
)[
0
:
9
])
context
[
'focus'
]
=
list
(
NewsItem
.
objects
.
all
().
filter
(
focus
=
True
).
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date'
)[
0
:
9
])
context
[
'categories'
]
=
NewsCategory
.
objects
.
all
()
return
context
newsitemview
=
NewsItemView
.
as_view
()
...
...
@@ -425,8 +425,8 @@ class News(TemplateView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
News
,
self
).
get_context_data
(
**
kwargs
)
context
[
'sectionName'
]
=
"News"
context
[
'focus'
]
=
list
(
NewsItem
.
objects
.
all
().
filter
(
focus
=
True
).
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date
time
'
)[
0
:
9
])
context
[
'news'
]
=
list
(
NewsItem
.
objects
.
all
().
exclude
(
focus
=
True
).
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date
time
'
)[
3
:
45
])
context
[
'focus'
]
=
list
(
NewsItem
.
objects
.
all
().
filter
(
focus
=
True
).
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date'
)[
0
:
9
])
context
[
'news'
]
=
list
(
NewsItem
.
objects
.
all
().
exclude
(
focus
=
True
).
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date'
)[
3
:
45
])
context
[
'categories'
]
=
NewsCategory
.
objects
.
all
()
return
context
...
...
@@ -437,8 +437,8 @@ class NewsArchives(TemplateView):
def
get_context_data
(
self
,
**
kwargs
):
context
=
super
(
NewsArchives
,
self
).
get_context_data
(
**
kwargs
)
context
[
'sectionName'
]
=
"News"
context
[
'focus'
]
=
list
(
NewsItem
.
objects
.
all
().
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date
time
'
)[
0
:
6
])
context
[
'news'
]
=
list
(
NewsItem
.
objects
.
all
().
order_by
(
'-date
time
'
)[
0
:
600
])
context
[
'focus'
]
=
list
(
NewsItem
.
objects
.
all
().
exclude
(
image__isnull
=
True
).
exclude
(
image__exact
=
''
).
order_by
(
'-date'
)[
0
:
6
])
context
[
'news'
]
=
list
(
NewsItem
.
objects
.
all
().
order_by
(
'-date'
)[
0
:
600
])
context
[
'categories'
]
=
NewsCategory
.
objects
.
all
()
return
context
...
...
panikweb_templates/templates/emissions/newsitem_detail.html
View file @
fb504721
...
...
@@ -7,8 +7,8 @@
<div
class=
"wrapper text"
>
<div
class=
"leftPart"
>
<header>
{% if newsitem.date
time
%}
<div
class=
"date cf center label"
>
{{ newsitem.date
time
|date:"D m/M" }}
</div>
{% if newsitem.date %}
<div
class=
"date cf center label"
>
{{ newsitem.date|date:"D m/M" }}
</div>
{% endif %}
<h3
class=
"squashed title"
>
{{ newsitem.title }}
...
...
panikweb_templates/templates/news.html
View file @
fb504721
...
...
@@ -40,7 +40,7 @@
{% for NewsItem in newsAll %}
<li
class=
"item ellipsis small "
>
<a
href=
"{% url 'news-view' slug=NewsItem.slug %}"
>
<span
class=
"title"
><strong>
{{ NewsItem.date
time
|date:"D m/M" }}
</strong>
-
{{ NewsItem.title }}
</span>
<span
class=
"title"
><strong>
{{ NewsItem.date|date:"D m/M" }}
</strong>
-
{{ NewsItem.title }}
</span>
</a>
</li>
{% endfor %}
...
...
panikweb_templates/templates/news/inline.html
View file @
fb504721
...
...
@@ -9,8 +9,8 @@
{% else %}
<img
class=
"logo left"
width=
"60"
height=
"60"
src=
"{% static "
img
/
defaultLogo.png
"
%}"
/>
{% endif %}
{% if content.date
time
%}
<div
class=
"smooth {% if class == "
special
"
%}
center
marged
{%
endif
%}"
>
{{ content.date
time
|date:"D m/M"|lower }}
</div>
{% if content.date %}
<div
class=
"smooth {% if class == "
special
"
%}
center
marged
{%
endif
%}"
>
{{ content.date|date:"D m/M"|lower }}
</div>
{% endif %}
<div
class=
"content"
>
<h5
class=
"title {% if not class %}ellipsis{% endif %}"
>
{{ content.title }}
</h5>
...
...
panikweb_templates/templates/news/roll.html
View file @
fb504721
...
...
@@ -10,7 +10,7 @@
<a
title=
"{{content.title|striptags|addslashes}}"
class=
"block news relative"
href=
"{% url 'news-view' slug=content.slug %}"
>
{% if content.image %}
<div
class=
"absolute"
>
<h5
class=
"title ellipsis"
>
{{ content.date
time
|date:"D m/m" }}
</h5>
<h5
class=
"title ellipsis"
>
{{ content.date|date:"D m/m" }}
</h5>
</div>
<img
class=
"logo"
src=
"{{ content.image|thumbnail:'240x320' }}"
/>
{% endif %}
...
...
panikweb_templates/templates/news/search_result.html
View file @
fb504721
<a
href=
"{% url 'news-view' slug=result.object.slug %}"
>
<span
class=
"icon-bullhorn"
></span>
<strong>
{{ result.object.title }}
</strong>
{% if result.object.date
time
%}
<div
class=
"smooth"
>
{{ result.object.date
time
|date:"D m/M"|lower }}
</div>
{% if result.object.date %}
<div
class=
"smooth"
>
{{ result.object.date|date:"D m/M"|lower }}
</div>
{% endif %}
</a>
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