update to reflect the change from newsitem datetime to a simple date

diff --git a/panikweb/views.py b/panikweb/views.py
index bdfcc414e93966c68ef45809ad6a0432944c0d3d..a95c527f097a30433823ca7fa11d12796ac06d6d 100644 (file)
--- a/panikweb/views.py
+++ b/panikweb/views.py
@@ -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('-datetime')[: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('-datetime')[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('-datetime')[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('-datetime')[0:9])
-        context['news'] = list(NewsItem.objects.all().exclude(focus=True).exclude(image__isnull=True).exclude(image__exact='').order_by('-datetime')[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('-datetime')[0:6])
-        context['news'] = list(NewsItem.objects.all().order_by('-datetime')[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
 

diff --git a/panikweb_templates/templates/emissions/newsitem_detail.html b/panikweb_templates/templates/emissions/newsitem_detail.html
index 6c03982f7bc2444e8b44d200c609c097f8d341bf..5a0e78527e2692f075d7501bd8ef06cbdc60bc8f 100644 (file)
--- a/panikweb_templates/templates/emissions/newsitem_detail.html
+++ b/panikweb_templates/templates/emissions/newsitem_detail.html
@@ -7,8 +7,8 @@
        <div class="wrapper text">
                <div class="leftPart">
                        <header>
-                               {% if newsitem.datetime %}
-                                       <div class="date cf center label">{{ newsitem.datetime|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 }}

diff --git a/panikweb_templates/templates/news.html b/panikweb_templates/templates/news.html
index e6f97ace954cce65f20c4b4fd85b8b1a8e81ce34..174b8144bbf2a35214c831e541eef5cb1e11e57a 100644 (file)
--- a/panikweb_templates/templates/news.html
+++ b/panikweb_templates/templates/news.html
@@ -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.datetime|date:"D m/M" }}</strong>&nbsp;-&nbsp;{{ NewsItem.title }}</span>
+                               <span class="title"><strong>{{ NewsItem.date|date:"D m/M" }}</strong>&nbsp;-&nbsp;{{ NewsItem.title }}</span>
                        </a>
                        </li>
                {% endfor %}

diff --git a/panikweb_templates/templates/news/inline.html b/panikweb_templates/templates/news/inline.html
index d3a94fecbabc8320f9ac3d257fb1ab4180958373..638172f8f2e970af0ae722d8ecc0f9b9122b4591 100644 (file)
--- a/panikweb_templates/templates/news/inline.html
+++ b/panikweb_templates/templates/news/inline.html
@@ -9,8 +9,8 @@
                {% else %}
                        <img class="logo left" width="60" height="60" src="{% static "img/defaultLogo.png" %}"/>
                {% endif %}
-               {% if content.datetime %}
-                       <div class="smooth {% if class == "special" %}center marged {% endif %}">{{ content.datetime|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>

diff --git a/panikweb_templates/templates/news/roll.html b/panikweb_templates/templates/news/roll.html
index b9d0ac09a6f29d6f697cd19399032fc672e90981..2679f41ab593472b9d65ba9abfe62762f7f23404 100644 (file)
--- a/panikweb_templates/templates/news/roll.html
+++ b/panikweb_templates/templates/news/roll.html
@@ -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.datetime|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 %}                             

diff --git a/panikweb_templates/templates/news/search_result.html b/panikweb_templates/templates/news/search_result.html
index 921b53bcf0bb5d4cee0388bb7213e6a9a2000fea..d046cc03938b704fb9a7ea597e3de9bee122a478 100644 (file)
--- a/panikweb_templates/templates/news/search_result.html
+++ b/panikweb_templates/templates/news/search_result.html
@@ -1,7 +1,7 @@
 <a href="{% url 'news-view' slug=result.object.slug %}">
        <span class="icon-bullhorn" ></span>
        <strong>{{ result.object.title }}</strong>
-       {% if result.object.datetime %}
-               <div class="smooth">{{ result.object.datetime|date:"D m/M"|lower }}</div>
+       {% if result.object.date %}
+               <div class="smooth">{{ result.object.date|date:"D m/M"|lower }}</div>
        {% endif %}
 </a>