diff --git a/migrations/20180902183258_add_extra_user_fields.php b/migrations/20180902183258_add_extra_user_fields.php new file mode 100644 index 000000000..7815a510d --- /dev/null +++ b/migrations/20180902183258_add_extra_user_fields.php @@ -0,0 +1,36 @@ +table('users') + ->addColumn('dietary_preference', 'string', ['limit' => 50, 'default' => 'nopref', 'null' => false]) + ->addColumn('food_allergies', 'string', ['default' => '', 'null' => false]) + ->update(); + } +} diff --git a/phinx.php b/phinx.php index a04c9c283..d9a467445 100644 --- a/phinx.php +++ b/phinx.php @@ -23,6 +23,7 @@ return [ 'paths' => [ 'migrations' => '%%PHINX_CONFIG_DIR%%/migrations', + 'seeds' => '%%PHINX_CONFIG_DIR%%/seeds', ], 'environments' => [ 'default_migration_table' => 'phinxlog', diff --git a/resources/config/routing.yml b/resources/config/routing.yml index c80ad5027..1c79478a2 100644 --- a/resources/config/routing.yml +++ b/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 + diff --git a/resources/views/_cookies.twig b/resources/views/_cookies.twig new file mode 100644 index 000000000..e277e430a --- /dev/null +++ b/resources/views/_cookies.twig @@ -0,0 +1,26 @@ +{% if not app.request.cookies.get('accept_cookie') %} + +{% endif %} \ No newline at end of file diff --git a/resources/views/_footer.twig b/resources/views/_footer.twig new file mode 100644 index 000000000..e4ee5b1d7 --- /dev/null +++ b/resources/views/_footer.twig @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/resources/views/_google_analytics.twig b/resources/views/_google_analytics.twig new file mode 100644 index 000000000..d057c6d63 --- /dev/null +++ b/resources/views/_google_analytics.twig @@ -0,0 +1,13 @@ +{% if site.google_analytics_id is defined and site.google_analytics_id is not empty %} + + + +{% else %} + +{% endif %} diff --git a/resources/views/_marketing.twig b/resources/views/_marketing.twig index 4fb709c82..f49e2f546 100644 --- a/resources/views/_marketing.twig +++ b/resources/views/_marketing.twig @@ -21,7 +21,7 @@

Diversity Matters!

{{ 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.

We are also committed to ensuring the conference is a place diff --git a/resources/views/forms/_user.twig b/resources/views/forms/_user.twig index ab24ee879..0cf9632d8 100644 --- a/resources/views/forms/_user.twig +++ b/resources/views/forms/_user.twig @@ -46,6 +46,20 @@ {% endif %} + + + + + +

Speaker notes can be written using markdown to support links

diff --git a/resources/views/home.twig b/resources/views/home.twig index 8676e0e65..a19c60e0a 100644 --- a/resources/views/home.twig +++ b/resources/views/home.twig @@ -33,7 +33,9 @@ {% else %}

For More Information About The Conference

{% endif %} - Visit Conference Site + {% if site.eventurl is defined and site.eventurl != "http://localhost" %} + Visit Conference Site + {% endif %} {% endblock %} diff --git a/resources/views/layouts/default.twig b/resources/views/layouts/default.twig index d0655542a..aebea7759 100644 --- a/resources/views/layouts/default.twig +++ b/resources/views/layouts/default.twig @@ -4,13 +4,13 @@ {% block title %}{{ site.title }}{% endblock %} +