Update logo with new correct logo

migrations/20180902183258_add_extra_user_fields.php

@@ -0,0 +1,36 @@
+<?php
+
+
+use Phinx\Migration\AbstractMigration;
+
+class AddExtraUserFields extends AbstractMigration
+{
+    /**
+     * Change Method.
+     *
+     * Write your reversible migrations using this method.
+     *
+     * More information on writing migrations is available here:
+     * http://docs.phinx.org/en/latest/migrations.html#the-abstractmigration-class
+     *
+     * The following commands can be used in this method and Phinx will
+     * automatically reverse them when rolling back:
+     *
+     *    createTable
+     *    renameTable
+     *    addColumn
+     *    renameColumn
+     *    addIndex
+     *    addForeignKey
+     *
+     * Remember to call "create()" or "update()" and NOT "save()" when working
+     * with the Table class.
+     */
+    public function change()
+    {
+        $this->table('users')
+            ->addColumn('dietary_preference', 'string', ['limit' => 50, 'default' => 'nopref', 'null' => false])
+            ->addColumn('food_allergies', 'string', ['default' => '', 'null' => false])
+            ->update();
+    }
+}

phinx.php

@@ -23,6 +23,7 @@
 return [
     'paths' => [
         'migrations' => '%%PHINX_CONFIG_DIR%%/migrations',
+        'seeds' => '%%PHINX_CONFIG_DIR%%/seeds',
     ],
     'environments' => [
         'default_migration_table' => 'phinxlog',

resources/config/routing.yml

@@ -258,3 +258,8 @@ privacy:
    methods: [GET]
    controller: OpenCFP\Http\Action\Signup\PrivacyAction
 
+terms:
+   path: /terms
+   methods: [GET]
+   controller: OpenCFP\Http\Action\Signup\TermsAction
+

resources/views/_cookies.twig

@@ -0,0 +1,26 @@
+{% if not app.request.cookies.get('accept_cookie') %}
+<div id="cookie_notice" class="position-fixed fixed-bottom">
+    <div id="cookie_banner" class="py-4 bg-brand-t text-white">
+        <div class="container mx-auto flex justify-between">
+            <p class="mr-2">We use cookies to offer you a better browsing experience, analyse site traffic, personalise content,
+                and serve targeted advertisements. Read about how we use cookies by reading our "<a href="{{ url('privacy') }}"
+                 title="Privacy Statement" class="text-white underline">Privacy Statement</a>". If you continue to use this site, you
+                consent to our use of cookies.</p>
+            <div class="flex">
+                <a id="accept_cookies" class="btn btn-white" title="Accept our cookie usage">Accept</a>
+            </div>
+        </div>
+    </div>
+    <script type="application/javascript">
+        var cookies = document.cookie;
+        if (cookies.includes("accept_cookie=1")) {
+            $( "#cookie_banner" ).hide();
+        }
+        $( "#accept_cookies" ).on("click", function ( event ) {
+            event.preventDefault();
+            document.cookie = "accept_cookie=1; expires={{ "+1 year"|date("r") }}; path=/";
+            document.location.href = '{{ url("homepage") }}';
+        });
+    </script>
+</div>
+{% endif %}

resources/views/_footer.twig

@@ -0,0 +1,11 @@
+<div class="footer-bar bg-brand text-white">
+    <div class="container mx-auto flex justify-between">
+        <p>
+            <a class="text-white underline" href="{{ url("privacy") }}" title="Privacy Statement">Privacy Statement</a> |
+            <a class="text-white underline" href="{{ url("terms") }}" title="Terms and conditions">Terms &amp; Conditions</a>
+        </p>
+        <div class="flex">
+            <p>Powered by <a class="text-white underline" href="https://github.com/opencfp/opencfp" target="_blank" title="OpenCFP" rel="nofollow">OpenCFP</a></p>
+        </div>
+    </div>
+</div>

resources/views/_google_analytics.twig

@@ -0,0 +1,13 @@
+{% if site.google_analytics_id is defined and site.google_analytics_id is not empty %}
+    <!-- Global site tag (gtag.js) - Google Analytics -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=UA-27359351-2"></script>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+
+        gtag('config', '{{ site.google_analytics_id }}');
+    </script>
+{% else %}
+    <!-- No Google Analytics set up -->
+{% endif %}

resources/views/_marketing.twig

@@ -21,7 +21,7 @@
     <h2>Diversity Matters!</h2>
     <p>
         {{ site.title }} is committed to creating a conference that is as inclusive as possible.
-        We want to showcase talent available around the U.S. and welcome international submissions as well.
+        We want to showcase talent available around the EU and welcome international submissions as well.
     </p>
     <p>
         We are also committed to ensuring the conference is a place

resources/views/forms/_user.twig

@@ -46,6 +46,20 @@
                 <input id="form-user-airport" type="text" name="airport" placeholder="3 Characters" value="{{ airport | default('') }}">
             {% endif %}
 
+            <label for="form-user-dietary">Dietary Preferences</label>
+            <select id="form-user-dietary" name="dietary_preference">
+                {% for value, text in {"nopref": "No preference", "vegetarian": "Vegetarian", "vegan": "Vegan"} %}
+                    {% if dietary_preference == value %}
+                        <option value="{{ value }}" selected="selected">{{ text }}</option>
+                    {% else %}
+                        <option value="{{ value }}">{{ text }}</option>
+                    {% endif %}
+                {% endfor %}
+            </select>
+
+            <label for="form-user-allergies">Food Allergies</label>
+            <textarea id="form-user-allergies" name="food_allergies" placeholder="Do you have any food allergies?" rows="5">{{ food_allergies | default('') }}</textarea>
+
             <label for="form-user-notes">Additional Notes</label>
             <textarea id="form-user-notes" name="speaker_info" placeholder="Any other information you feel the organizers should be aware of ..." rows="5">{{ speaker_info | default('') }}</textarea>
             <p class="text-xs text-em mb-2 text-dark-soft">Speaker notes can be written using <a href="https://daringfireball.net/projects/markdown/basics" target="_blank" class="text-underline" rel="noopener noreferrer">markdown</a> to support links</p>

resources/views/home.twig

@@ -33,7 +33,9 @@
             {%  else %}
                 <p>For More Information About The Conference</p>
             {% endif %}
-            <a href="{{ site.eventurl }}" class="btn btn-brand-o">Visit Conference Site</a>
+            {% if site.eventurl is defined and site.eventurl != "http://localhost" %}
+                <a href="{{ site.eventurl }}" class="btn btn-brand-o">Visit Conference Site</a>
+            {% endif %}
         </div>
     </div>
 {% endblock %}

resources/views/layouts/default.twig

@@ -4,13 +4,13 @@
         <title>{% block title %}{{ site.title }}{% endblock %}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="{{ assets('css/app.css') }}" rel="stylesheet" media="screen">
+        <link href="{{ assets('css/site.css') }}" rel="stylesheet" media="screen">
     </head>
     <body class="border-t-4 border-brand">
         <nav class="{% if not active('homepage') %}border-b border-white{% endif %}">
             <div class="container mx-auto flex justify-between">
                 <a class="font-serif flex items-center" href="{{ url('homepage') }}">
-                    <img class="w-10 mr-2" src="{{ assets('img/logo.svg') }}" alt="OpenCFP">
-                    <h1 class="font-normal m-0">Open<span class="text-brand font-bold">CFP</span></h1>
+                    <img class="w-10 mr-2" src="{{ assets('img/phpbenelux_logo.svg') }}" alt="PHPBenelux">
                 </a>
                 <div class="flex">
                     <a href="{{ url('homepage') }}" class="mr-8 py-6 {% if active('homepage') %}border-b-4 border-brand{% else %}text-soft{% endif %}">Home</a>
@@ -53,5 +53,8 @@
         {% if site.show_contrib_banner %}
         {% include "_forkme.twig" %}
         {% endif %}
+        {% include "_footer.twig" %}
+        {% include "_cookies.twig" %}
+        {% include "_google_analytics.twig" %}
     </body>
 </html>

resources/views/layouts/splash.twig

@@ -4,6 +4,7 @@
         <title>{% block title %}{{ site.title }}{% endblock %}</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <link href="{{ assets('css/app.css') }}" rel="stylesheet" media="screen">
+        <link href="{{ assets('css/site.css') }}" rel="stylesheet" media="screen">
     </head>
     <body class="h-full border-t-4 border-brand bg-cover flex items-center justify-center" style="background:linear-gradient(rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.7)), url({{ site.venue_image_path }}) no-repeat center center / cover fixed;">
 

resources/views/package.twig

@@ -8,16 +8,32 @@
         accommodation package to all selected speakers to help make this possible.
     </p>
     <h3>About the event</h3>
+    <p>
+        PHPBenelux crew will arrange pickup and drop off rides for speakers from Brussels
+        Airport Zaventem (BRU) or Antwerp Central Train Station.
+    </p>
     <p>
         Speakers will be provided with a projector, a wireless lapel microphone and a screen
         for their presentation (size depends on the room). Speakers should bring any equipment
-        they need to connect to projectors (VGA). It is also suggested that you reduce your
-        dependency on the in-house internet connection as possible.
+        they need to connect to projectors (VGA &amp; HDMI). It is also suggested that you reduce your
+        dependency on the in-house internet connection as much as possible.
     </p>
     <p>
         When the Call for Papers closes, the organizers will sort through the submissions, making
         their selections. Speakers will be notified as soon as the selection process has been completed.
     </p>
+
+    <section class="section section--primary">
+        <div class="section-block section-border bg-brand text-white">
+            <h4 class="headline headline--alpha">More diversity only possible with your help!</h4>
+            <p>
+                We want to ensure that all speakers have an equal opportunity to share their knowledge at our conference and
+                this is <strong>only possible if you submit your ideas</strong>! We will make sure that PHPBenelux Conference is a safe
+                and encouraging event where you're valued as an expert.
+            </p>
+        </div>
+    </section>
+
     <h3>This year's package</h3>
     <p>
         You are eligible for the speaker package if your topic is chosen for our conference. Our speaker package includes:
@@ -27,7 +43,7 @@
         <li>For speakers remote to the Area:</li>
         <ul>
             <li>Complimentary airfare/travel</li>
-            <li>2 complimentary hotel nights</li>
+            <li>Full complimentary hotel nights</li>
         </ul>
         <li>Lunch, receptions and activities included in regular conference</li>
         <li>We'll pick you up and drop you off to/from the airport so you don't have to worry about it.</li>
@@ -50,5 +66,9 @@
         define the exact topic you want to talk about and what you hope people will learn from the session. In previous
         years, some submissions sounded interesting but we just didn't have enough detail for them to make the final cut.
     </p>
+    <p>
+        Please look at our <a href="/ideas">talk ideas</a> to find out what talks we would love to receive. If your talk
+        doesn't fit in our provided list of subjects, please make sure you check <i>other</i>.
+    </p>
 </div>
 {% endblock %}

resources/views/security/forgot_password.twig

@@ -2,8 +2,7 @@
 {% block content %}
     <div class="text-light w-1/6">
         <a class="font-serif flex items-center justify-center mb-4" href="{{ url('homepage') }}">
-            <img class="w-10 mr-2" src="{{ assets('img/logo.svg') }}" alt="OpenCFP">
-            <h1 class="font-normal text-white m-0">Open<span class="text-brand font-bold">CFP</span></h1>
+            <img class="w-10 mr-2" src="{{ assets('img/phpbenelux_logo.svg') }}" alt="PHPBenelux">
         </a>
 
         {% include "_flash.twig" %}

resources/views/security/login.twig

@@ -2,8 +2,7 @@
 {% block content %}
   <div class="opencfp-login">
     <a class="font-serif flex items-center justify-center mb-4" href="{{ url('homepage') }}">
-      <img class="w-10 mr-2" src="{{ assets('img/logo.svg') }}" alt="OpenCFP">
-      <h1 class="font-normal text-white m-0">Open<span class="text-brand font-bold">CFP</span></h1>
+      <img class="w-10 mr-2" src="{{ assets('img/phpbenelux_logo.svg') }}" alt="PHPBenelux">
     </a>
 
     {% include "_flash.twig" %}

resources/views/security/signup.twig

@@ -2,8 +2,7 @@
 {% block content %}
     <div class="opencfp-signup">
         <a class="font-serif flex items-center justify-center mb-4" href="{{ url('homepage') }}">
-            <img class="w-10 mr-2" src="{{ assets('img/logo.svg') }}" alt="OpenCFP">
-            <h1 class="font-normal text-white m-0">Open<span class="text-brand font-bold">CFP</span></h1>
+            <img class="w-10 mr-2" src="{{ assets('img/phpbenelux_logo.svg') }}" alt="PHPBenelux">
         </a>
 
         {% include "_flash.twig" %}

resources/views/user/privacy.twig

@@ -1,26 +1,34 @@
 {% extends "layouts/splash.twig" %}
 {% block content %}
-    <div class="opencfp-signup">
-        <a class="font-serif flex items-center justify-center mb-4" href="{{ url('homepage') }}">
-            <img class="w-10 mr-2" src="{{ assets('img/logo.svg') }}" alt="OpenCFP">
-            <h1 class="font-normal text-white m-0">Open<span class="text-brand font-bold">CFP</span></h1>
-        </a>
-        <h1>Privacy Policy</h1>
-        <p>
-            This OpenCFP installation will collect personal information from you for the purpose of managing talk submissions
-            for a conference. The lead developer for the OpenCFP project recommends that conference organizers delete
-            all records from the database being used with this installation within 15 months of accepting submissions for
-            the event associated with this OpenCFP installation.
-        </p>
-        <p>
-            In future releases tools will be provided to allow OpenCFP installations to more easily comply with the European
-            General Data Protection Regulation that comes into effect on May 25, 2018. This OpenCFP installation
-            currently does not provide a way to download all the information created by users of the application.
-        </p>
-        <p>
-            This OpenCFP installation currently does not provide a mechanism to allow users to explicitly give
-            permission for the information they have submitted to be shared with third parties or to be used
-            for purposes other than managing conference speakers and conference sessions.
-        </p>
+    <div class="opencfp-legal text-white">
+        <div class="container">
+            <a class="font-serif flex items-center justify-center mb-4" href="{{ url('homepage') }}">
+                <img class="w-10 mr-2" src="{{ assets('img/phpbenelux_logo.svg') }}" alt="PHPBenelux">
+            </a>
+            <h1>Privacy Policy</h1>
+            <p>
+                This OpenCFP installation will collect personal information from you for the purpose of managing talk submissions
+                for a conference. The lead developer for the OpenCFP project recommends that conference organizers delete
+                all records from the database being used with this installation within 15 months of accepting submissions for
+                the event associated with this OpenCFP installation.
+            </p>
+            <p>
+                We're also using <a class="text-white underline" href="https://marketingplatform.google.com/about/analytics/" title="Google Analytics" target="_blank" rel="nofollow">Google Analytics</a> to get
+                visitor information and to measure anonymous activity on our website. Please read the <a class="text-white underline" href="https://policies.google.com/privacy?hl=en"
+                 title="Google Analytics Privacy Statement" target="_blank" rel="nofollow">Google Analytics Privacy Statement</a>
+                to learn how Google is protecting your privacy.
+            </p>
+            <p>
+                In future releases tools will be provided to allow OpenCFP installations to more easily comply with the European
+                General Data Protection Regulation that comes into effect on May 25, 2018. This OpenCFP installation
+                currently does not provide a way to download all the information created by users of the application.
+            </p>
+            <p>
+                This OpenCFP installation currently does not provide a mechanism to allow users to explicitly give
+                permission for the information they have submitted to be shared with third parties or to be used
+                for purposes other than managing conference speakers and conference sessions.
+            </p>
+            <p>For all your questions, please contact the organisation at <a class="text-white underline" href="mailto:{{ site.email }}">{{ site.email }}</a>.</p>
+        </div>
     </div>
 {% endblock %}

resources/views/user/terms.twig

@@ -0,0 +1,38 @@
+{% extends "layouts/splash.twig" %}
+{% block content %}
+    <div class="opencfp-legal text-white">
+        <div class="container">
+            <a class="font-serif flex items-center justify-center mb-4" href="{{ url('homepage') }}">
+                <img class="w-10 mr-2" src="{{ assets('img/phpbenelux_logo.svg') }}" alt="PHPBenelux">
+            </a>
+            <h1>Terms &amp; Conditions</h1>
+            <p>
+                These are the terms and conditions of usage of this OpenCFP installation, used for requesting
+                proposals for {{ site.title }}.
+            </p>
+            <h2>1. Definitions</h2>
+            <ul>
+                <li><strong>OpenCFP</strong>: An installation of <a class="text-white underline" href="" title="OpenCFP" target="_blank" rel="nofollow">OpenCFP</a>,
+                    an open source platform used to request talk and workshop proposals for conferences and events, here referred to
+                    by "platform".</li>
+                <li><strong>{{ site.organisation }}</strong>: The organisation making use of OpenCFP, here referred to by "us", "we" and "organisation".</li>
+                <li><strong>{{ site.title }}</strong>: The event you're sending us proposals for, here referred to by "conference" and "event".</li>
+                <li><strong>Speaker</strong>: The person submitting proposals of talks and/or workshops to this platform, here referred to by "you", "them" and "they".</li>
+            </ul>
+            <h2>2. General terms</h2>
+            <p>By making use of this platform, you're implicitly give us your intention to speak at
+            {{ site.title }} and therefor we will use your provided details, if selected as speaker, to be published
+            for the conference. This can be digital (on our website, social media channels, in conversations with
+            sponsors) or in print (signages, schedules, booklets) during the conference at the venue.</p>
+            <h2>3. Usage of your information</h2>
+            <p>We have a strict policy to handle your personal information with the utmost care, ensuring only people of our
+            organisation has access to this information before, during and after our event.</p>
+            <p>Please review our <a class="text-white underline" href="{{ url("privacy") }}">Privacy Policy</a> to understand your rights and
+            how you can exercise your rights.</p>
+            <h2>4. Complaints, errors or suggestions</h2>
+            <p>We have taken utmost care to deliver you this platform, but chances are that we've missed something. Or you have questions about
+                usage of this platform. Please contact us at <a class="text-white underline" href="mailto:{{ site.email }}">{{ site.email }}</a>
+                so we can make your experience on this platform awesome.</p>
+        </div>
+    </div>
+{% endblock %}