Bojan p/info page (#118)

* info page - under construction

* small design changed; images for info page

* Email soical icon svg [fix]

* Info added

* info page --> travel section

* Organizers & CoC update for About us

* organizers added to about us page

* go to top button on info page

* [Speakers info] Icon for workshops

* robot.txt updated - allow indexing

* robots.txt file updated

* about: add joinn as a voluteer button in template

pyconbalkan/about/templates/about.html

@@ -1,20 +1,117 @@
 {% extends "base.html" %}
 
+{% load static %}
+
 {% block main_content %}
 
-    {# About #}
+   {# About #}
 
     {% if about %}
         <h1 class="title title--yellow mb-xs-20">{{ about.title|safe }}</h1>
-        <hr class="line line--blue line--short line--spaced">    
+        <hr class="line line--blue line--short line--spaced">
+        <p>
+             {{ about.description|safe }}
+        </p>
+    {% else %}
+        <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
+            <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
+        </h2>
+    {% endif %}
+
+    {# Organizers #}
+
+    <h1 class="title title--yellow mb-xs-20">Organizers</h1>
+    <hr class="line line--blue line--short line--spaced">
+
+    {% if organizers %}
+        <div class="card">
+            {% for organizer in organizers %}
+                <div class="card__item">
+                    <a href="{% url 'organizer_detail' slug=organizer.slug %}">
+                        <div class="card__image">
+                            <img src="{{ organizer.images.first.profile_picture.url }}">
+                        </div>
+                        <h2 class="card__name title--blue">
+                            {{ organizer.name }}
+                            {% if organizer.country %}
+                                <i class="flag em em-flag-{{ organizer.country.code|lower }}"></i>
+                            {% endif %}
+                        </h2>
+                    </a>
+                    {% if organizer.job %}
+                        <p class="card__job">
+                            {{ organizer.job }}
+                        </p>
+                    {% endif %}
+                </div>
+            {% endfor %}
+        </div>
+    {% else %}
+        <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
+            <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
+        </h2>
+    {% endif %}
+
+    <hr class="line long">
+
+    {# Volunteers #}
+
+    <h1 class="centered">Volunteers</h1>
+    <hr class="line line__centered">
+
+    <div class="card">
+        <a class="button button--yellow mb-xs-40 event-button" href="https://docs.google.com/forms/d/e/1FAIpQLSdJO6rP5jtHvpioYWMoimIRaQx-W7TR3uLmeu-hFg-ad4ZpgA/viewform" target="_blank">
+            Join PyCon Balkan as a Volunteer!
+        </a>
+    </div>
+
+    {% if volunteers %}
+        <div class="card">
+            {% for volunteer in volunteers %}
+                <div class="card__item">
+                    <div class="card__image">
+                        <img src="{{ volunteer.images.first.profile_picture.url }}">
+                    </div>
+                    <h2 class="card__name title--blue">
+                        {{ volunteer.name }}
+                        {% if volunteer.country %}
+                            <i class="flag em em-flag-{{ volunteer.country.code|lower }}"></i>
+                        {% endif %}
+                    </h2>
+                    {% if volunteer.job %}
+                        <p class="card__job">
+                            {{ volunteer.job }}
+                        </p>
+                    {% endif %}
+                </div>
+            {% endfor %}
+        </div>
+    {% else %}
+        <h2 class="title title--white title--medium title--uppercase mt-xs-20">
+            <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
+        </h2>
+    {% endif %}
+
+    {# Code of Conduct #}
+
+    {% if coc %}
+        <h1 class="title title--yellow mb-xs-20">{{ coc.title|safe }}</h1>
+        <hr class="line line--blue line--short line--spaced">
 
         <div class="long-text">
-             {{ about.description|safe }}
+             {{ coc.description|safe }}
         </div>
     {% else %}
         <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
             <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
         </h2>
     {% endif %}
 
+
+    {% if response_guide %}
+    <a href="{% url 'response_guide' slug=response_guide.slug %}">
+        <h1>{{ response_guide.title|safe }}</h1>
+    </a>
+    {% endif %}
+
 {% endblock %}

pyconbalkan/about/views.py

@@ -3,6 +3,8 @@
 
 from pyconbalkan.about.models import About
 from pyconbalkan.about.serializers import AboutSerializer
+from pyconbalkan.coc.views import coc_list
+from pyconbalkan.organizers.views import organizers_list
 
 
 class AboutViewSet(viewsets.ModelViewSet):
@@ -15,4 +17,10 @@ def about_view(request):
     context = {
         'about': about.first() if about else None,
     }
+
+    organizers_context = organizers_list(request)
+    coc_context = coc_list(request)
+    context.update(coc_context)
+    context.update(organizers_context)
+
     return render(request, 'about.html', context)

pyconbalkan/coc/views.py

@@ -10,14 +10,14 @@ class CodeOfConductViewSet(viewsets.ModelViewSet):
     serializer_class = CodeOfConductSerializer
 
 
-def coc_view(request):
+def coc_list(request):
     coc = CodeOfConduct.objects.filter(active=True)
     r_guide = ResponseGuide.objects.filter(active=True)
     context = {
         'coc': coc.first() if coc else None,
         'response_guide': r_guide.first() if r_guide else None,
     }
-    return render(request, 'coc.html', context)
+    return context
 
 
 def response_guide(request, slug):

pyconbalkan/core/static/css/components/person.css

@@ -38,6 +38,16 @@
         .organizer__image,
         .sponsor__image {
             margin: 0;
+            margin-top: 15px;
+        }
+        iframe {
+            width: 100%;
+        }
+        .line {
+            display: none;
+        }
+        .hide_on_mobile {
+            display: none;
         }
     }
 
@@ -163,6 +173,6 @@
             background-image: url(/static/img/instagram-dark.svg);
         }
 
-	.email {
-	    background-image: url(/static/img/email.svg)
+        .email {
+            background-image: url(/static/img/email.svg)
 	}

pyconbalkan/core/static/js/go_to_top.js

@@ -0,0 +1,4 @@
+function topFunction() {
+    document.body.scrollTop = 0;
+    document.documentElement.scrollTop = 0;
+}

pyconbalkan/core/templates/includes/header.html

@@ -11,13 +11,10 @@
                 <a class="menu__list__link {% if request.path == '/speakers' %}active{% endif %}" href="/speakers" role="button">Speakers</a>
             </li>
             <li class="menu__list__item">
-                <a class="menu__list__link {% if request.path == '/organizers' %}active{% endif %}" href="/organizers" role="button">Organizers</a>
-            </li>
-            <li class="menu__list__item">
-                <a class="menu__list__link {% if request.path == '/coc' %}active{% endif %}" href="/coc" role="button">CoC</a>
+                <a class="menu__list__link {% if request.path == '/about' %}active{% endif %}" href="/about" role="button">About Us</a>
             </li>
             <li class="menu__list__item">
-                <a class="menu__list__link {% if request.path == '/about' %}active{% endif %}" href="/about" role="button">About Us</a>
+                <a class="menu__list__link {% if request.path == '/info' %}active{% endif %}" href="/info" role="button">Info</a>
             </li>
             <li class="menu__list__item">
                 <a class="menu__list__link {% if request.path == '/cfp' %}active{% endif %}" href="/cfp" role="button">CFP</a>

pyconbalkan/core/templates/robots.txt

@@ -1,2 +1,4 @@
 User-agent: *
-Disallow: /
+Disallow: /timetable
+Disallow: /info
+Disallow: /admin