diff --git a/pylab/website/static/img/code_sample.jpg b/pylab/website/static/img/code_sample.jpg new file mode 100644 index 0000000..7b84b58 Binary files /dev/null and b/pylab/website/static/img/code_sample.jpg differ diff --git a/pylab/website/static/img/dakis.png b/pylab/website/static/img/dakis.png new file mode 100644 index 0000000..5e81eba Binary files /dev/null and b/pylab/website/static/img/dakis.png differ diff --git a/pylab/website/static/img/dakis.svg b/pylab/website/static/img/dakis.svg new file mode 100644 index 0000000..e63f641 --- /dev/null +++ b/pylab/website/static/img/dakis.svg @@ -0,0 +1,416 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pylab/website/static/img/dummy_img2.png b/pylab/website/static/img/dummy_img2.png deleted file mode 100644 index 340e231..0000000 Binary files a/pylab/website/static/img/dummy_img2.png and /dev/null differ diff --git a/pylab/website/static/img/dummy_img3.png b/pylab/website/static/img/dummy_img3.png deleted file mode 100644 index fe98e2f..0000000 Binary files a/pylab/website/static/img/dummy_img3.png and /dev/null differ diff --git a/pylab/website/static/img/dummy_space.png b/pylab/website/static/img/dummy_space.png deleted file mode 100644 index d44b33f..0000000 Binary files a/pylab/website/static/img/dummy_space.png and /dev/null differ diff --git a/pylab/website/static/img/fb_logo.png b/pylab/website/static/img/fb_logo.png deleted file mode 100644 index db251cf..0000000 Binary files a/pylab/website/static/img/fb_logo.png and /dev/null differ diff --git a/pylab/website/static/img/glyder_snake.png b/pylab/website/static/img/glyder_snake.png new file mode 100644 index 0000000..533811b Binary files /dev/null and b/pylab/website/static/img/glyder_snake.png differ diff --git a/pylab/website/static/img/glyder_snake.svg b/pylab/website/static/img/glyder_snake.svg new file mode 100644 index 0000000..fac074b --- /dev/null +++ b/pylab/website/static/img/glyder_snake.svg @@ -0,0 +1,1176 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pylab/website/static/img/open_source_wolf.png b/pylab/website/static/img/open_source_wolf.png new file mode 100644 index 0000000..868e376 Binary files /dev/null and b/pylab/website/static/img/open_source_wolf.png differ diff --git a/pylab/website/static/img/open_source_wolf.svg b/pylab/website/static/img/open_source_wolf.svg new file mode 100644 index 0000000..821284b --- /dev/null +++ b/pylab/website/static/img/open_source_wolf.svg @@ -0,0 +1,75 @@ + + + + + + + + + + image/svg+xml + + + + + + + + Hack4LT + + diff --git a/pylab/website/static/img/pinterest_logo.png b/pylab/website/static/img/pinterest_logo.png deleted file mode 100644 index bb8bd57..0000000 Binary files a/pylab/website/static/img/pinterest_logo.png and /dev/null differ diff --git a/pylab/website/static/img/python_logo.png b/pylab/website/static/img/python_logo.png new file mode 100644 index 0000000..d0c039d Binary files /dev/null and b/pylab/website/static/img/python_logo.png differ diff --git a/pylab/website/static/img/python_logo.svg b/pylab/website/static/img/python_logo.svg new file mode 100644 index 0000000..116eaac --- /dev/null +++ b/pylab/website/static/img/python_logo.svg @@ -0,0 +1,269 @@ + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pylab/website/static/img/twitter_logo.png b/pylab/website/static/img/twitter_logo.png deleted file mode 100644 index 35b5f8e..0000000 Binary files a/pylab/website/static/img/twitter_logo.png and /dev/null differ diff --git a/pylab/website/templates/website/about.html b/pylab/website/templates/website/about.html index 0071731..5f11b5c 100644 --- a/pylab/website/templates/website/about.html +++ b/pylab/website/templates/website/about.html @@ -13,8 +13,6 @@ src="http://www.openstreetmap.org/export/embed.html?bbox=25.25760054588318%2C54.67979232084423%2C25.268651247024533%2C54.685194624174684&layer=mapnik&marker=54.682490461170204%2C25.263125896453857" class="border-1px"> - {% include "website/partials/event_list.html" %} -

{% trans "Python workshops policy" %}

{% blocktrans %}Each Python workshop starts with initial meeting, during diff --git a/pylab/website/templates/website/partials/event_list.html b/pylab/website/templates/website/event_list.html similarity index 89% rename from pylab/website/templates/website/partials/event_list.html rename to pylab/website/templates/website/event_list.html index 2c036d5..84070f7 100644 --- a/pylab/website/templates/website/partials/event_list.html +++ b/pylab/website/templates/website/event_list.html @@ -1,5 +1,7 @@ +{% extends "base.html" %} {% load trans from i18n %} +{% block content %} {% if events %}

{% trans "Events" %}

@@ -21,3 +23,5 @@

{% trans "Events" %}

{% trans "No events yet." %}

{% endif %} + +{% endblock %} diff --git a/pylab/website/templates/website/index.html b/pylab/website/templates/website/index.html index aa0be11..c352707 100644 --- a/pylab/website/templates/website/index.html +++ b/pylab/website/templates/website/index.html @@ -7,11 +7,12 @@
-
- -
+
+ +
+
+

Python Workshop

The main purposes of Python Workshops are:

+
@@ -37,7 +38,7 @@

Monday, September 14, 18:00 Python Workshop weekly meetup @Čiurlionio str. 13-1          - More info + More info

@@ -46,21 +47,21 @@

Monday, September 14, 18:00
-
+

Weekly meetups

See the description of the upcoming weekly meetups

- Read more + Read more
-
+

Open source projects

Open source philosophy is considered while creating projects on the meetups

Read more
-
+

Why Python?

We use Python as a powerful and fast language, easy to learn

Read more @@ -69,15 +70,6 @@

Why Python?

diff --git a/pylab/website/tests/test_about_page.py b/pylab/website/tests/test_event_list.py similarity index 64% rename from pylab/website/tests/test_about_page.py rename to pylab/website/tests/test_event_list.py index cc88880..454d433 100644 --- a/pylab/website/tests/test_about_page.py +++ b/pylab/website/tests/test_event_list.py @@ -3,16 +3,16 @@ from pylab.core.factories import EventFactory -class AboutPageTests(WebTest): +class EventListTest(WebTest): - def test_no_events_on_about_page(self): - resp = self.app.get('/about/') + def test_no_events_on_page(self): + resp = self.app.get('/events/') self.assertEqual(resp.status_int, 200) self.assertTrue(b'No events yet.' in resp.content) - def test_event_list_on_about_page(self): + def test_event_list_on_page(self): EventFactory(title='Summer Python workshop') - resp = self.app.get('/about/') + resp = self.app.get('/events/') self.assertEqual(resp.status_int, 200) self.assertTrue(b'Summer Python workshop' in resp.content) diff --git a/pylab/website/urls.py b/pylab/website/urls.py index 9daee91..327f5d8 100644 --- a/pylab/website/urls.py +++ b/pylab/website/urls.py @@ -13,6 +13,7 @@ url(r'^projects/create/$', views.project_create, name='create-project'), url(r'^projects/(?P%s)/$' % slug, views.project_details, name='project-details'), url(r'^projects/(?P%s)/update/$' % slug, views.project_update, name='project-update'), + url(r'^events/$', views.event_list, name='event-list'), url(r'^events/%s/$' % event, views.event_details, name='event-details'), url(r'^events/%s/create-next-weekly-event/$' % event, views.create_weekly_event, name='create-weekly-event'), url(r'^about/$', views.about, name='about'), diff --git a/pylab/website/views.py b/pylab/website/views.py index a3bba15..3c7082a 100644 --- a/pylab/website/views.py +++ b/pylab/website/views.py @@ -79,6 +79,12 @@ def about(request): }) +def event_list(request): + return render(request, 'website/event_list.html', { + 'events': Event.objects.all(), + }) + + def event_details(request, year, month, day, slug): event = get_object_or_404(Event, starts__year=year, starts__month=month, starts__day=day, slug=slug) attendances = Attendance.objects.filter(event=event, response__in=[1, 2]).order_by('-response')