From 38d34169573c3ecdb53fb4ed2859f398f21ac2b7 Mon Sep 17 00:00:00 2001 From: Khedesh Date: Thu, 4 Aug 2016 16:26:50 +0430 Subject: [PATCH] =?UTF-8?q?Issue=20#2=20-=20=D8=A7=D8=AE=D8=A8=D8=A7=D8=B1?= =?UTF-8?q?=20=D9=85=D8=B1=D8=A8=D9=88=D8=B7=20=D8=A8=D9=87=20=D8=B4=D9=88?= =?UTF-8?q?=D8=B1=D8=A7=20some=20minor=20changes=20added,=20Announcement?= =?UTF-8?q?=20is=20now=20ready=20to=20use.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- base/views.py | 12 ++++++-- event/models.py | 2 +- static/css/style.css | 10 +----- templates/announcements/announcements.html | 29 ++++++++++------- templates/base.html | 2 +- templates/index.html | 36 ++++++++++++++++++++-- 6 files changed, 63 insertions(+), 28 deletions(-) diff --git a/base/views.py b/base/views.py index dc29566..2a33687 100644 --- a/base/views.py +++ b/base/views.py @@ -12,7 +12,8 @@ from base.forms import * from base.models import Member - +from announcements.models import Announcement +from shamsi.templatetags.shamsi_template_tags import pdatetime def home(request): go_course = False @@ -30,8 +31,14 @@ def home(request): return HttpResponseRedirect(reverse('requests')) return HttpResponseRedirect(reverse('issues')) + def index(request): - return render(request, 'index.html') + announcements = Announcement.objects.order_by('-date')[:5] + for an in announcements: + an.date = pdatetime(an.date) + return render(request, 'index.html', { + 'announcements': announcements, + }) def logout(request): @@ -148,4 +155,3 @@ def password_reset_change(request): 'form': form, 'sent': sent, }) - diff --git a/event/models.py b/event/models.py index 1cdee66..b7e2db2 100644 --- a/event/models.py +++ b/event/models.py @@ -20,7 +20,7 @@ def active(self): return datetime.datetime.now() < self.reg_end.replace(tzinfo=None) def get_end(self): - return unicode(self.reg_end.replace(tzinfo=None)) + return str(self.reg_end.replace(tzinfo=None)) def get_count(self): return EventRegister.objects.filter(event=self).count() diff --git a/static/css/style.css b/static/css/style.css index b7001e3..a51d9cc 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -240,6 +240,7 @@ header { height: 60px; font-size: 14px; padding: 10px 50px; + } .normal-p { @@ -474,15 +475,6 @@ header .panel-heading { margin-right: auto; } -.bigtile { - background: #3982c1; - text-align: center; - margin: 2px; - border-width: thick; - border-color: #EEBB44; - border-style: solid; -} - .bigtile a { font-family: Raleway, IranSans, BRoya, 'B roya', Tahoma, Arial, sans-serif; color: #FFFFFF; diff --git a/templates/announcements/announcements.html b/templates/announcements/announcements.html index fce399b..cfefd52 100644 --- a/templates/announcements/announcements.html +++ b/templates/announcements/announcements.html @@ -10,26 +10,33 @@ {% block size3 %}col-lg-6 col-md-6{% endblock %} {% block body %} -
-
اطلاعیه‌ها
-
- {% for announcement in announcements %} -
-
- - +
+
+
+ +
اطلاعیه‌ها
+
+ {% for announcement in announcements %} +
+
+ + {{ announcement.title }} - + {{ announcement.date }} +
+ {% endfor %}
- {% endfor %}
+
+
{% endblock %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index 670163d..2ea42a8 100644 --- a/templates/base.html +++ b/templates/base.html @@ -118,7 +118,7 @@ {% block body %}{% endblock %}
{% block footer %} -