From 761b84207d54ff102ee9c448983ffe35d08cef5b Mon Sep 17 00:00:00 2001 From: James Titcumb Date: Mon, 28 Nov 2016 09:43:53 +0000 Subject: [PATCH 1/8] Minor modifications and tidy up --- templates/_marketing.twig | 2 +- web/htaccess.dist | 13 ------------- web/index_dev.php | 8 -------- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 web/htaccess.dist delete mode 100644 web/index_dev.php diff --git a/templates/_marketing.twig b/templates/_marketing.twig index b8ee4e5c5..015ea385b 100755 --- a/templates/_marketing.twig +++ b/templates/_marketing.twig @@ -27,7 +27,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 United Kingdom and welcome international submissions as well.

We are also committed to ensuring the conference is a place diff --git a/web/htaccess.dist b/web/htaccess.dist deleted file mode 100644 index 108d3d3e7..000000000 --- a/web/htaccess.dist +++ /dev/null @@ -1,13 +0,0 @@ - - Options -MultiViews - - RewriteEngine On - - RewriteCond %{HTTP:Authorization} ^(.*) - RewriteRule .* - [e=HTTP_AUTHORIZATION:%1] - - RewriteCond %{REQUEST_FILENAME} !-f - RewriteRule ^ index.php [QSA,L] - - -SetEnv CFP_ENV development diff --git a/web/index_dev.php b/web/index_dev.php deleted file mode 100644 index 0955fbebc..000000000 --- a/web/index_dev.php +++ /dev/null @@ -1,8 +0,0 @@ - Date: Mon, 28 Nov 2016 11:15:59 +0000 Subject: [PATCH 2/8] Add production config with sensitive stuff removed --- config/production.phpsc.yml | 62 +++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) create mode 100644 config/production.phpsc.yml diff --git a/config/production.phpsc.yml b/config/production.phpsc.yml new file mode 100644 index 000000000..aa3fc1f73 --- /dev/null +++ b/config/production.phpsc.yml @@ -0,0 +1,62 @@ +application: + title: PHP South Coast 2017 + url: https://cfp.phpsouthcoast.co.uk + email: info@phpsouthcoast.co.uk + eventurl: https://2017.phpsouthcoast.co.uk/ + event_location: Portsmouth, UK + enddate: Jan. 31st, 2017 + show_submission_count: false + airport: SOU + arrival: 2017-06-09 + departure: 2017-06-10 +# secure_ssl: true + online_conference: false + date_format: d/m/Y + date_timezone: "UTC" + coc_link: https://2017.phpsouthcoast.co.uk/code-of-conduct/ + +api: + enabled: false + +cache: + enabled: false + +database: + host: REPLACE-THIS + database: REPLACE-THIS + dsn: REPLACE-THIS + user: REPLACE-THIS + password: REPLACE-THIS + +log: + level: error + +mail: + host: REPLACE-THIS + port: REPLACE-THIS + username: REPLACE-THIS + password: REPLACE-THIS + encryption: REPLACE-THIS + auth_mode: ~ + +talk: + categories: + api: APIs (REST, SOAP, etc.) + continuousdelivery: Continuous Delivery + database: Database + development: Development + devops: Devops + framework: Framework + javascript: JavaScript + security: Security + testing: Testing + uiux: UI/UX + other: Other + levels: + entry: Entry level + mid: Mid-level + advanced: Advanced + types: + lightning: Lightning (20 mins, including questions) + regular: Regular (50 mins, including questions) + keynote: Keynote (40 mins) From 6e720bd53da8c58fe789ad491cc35d90a69dce83 Mon Sep 17 00:00:00 2001 From: Gary Hockin Date: Mon, 28 Nov 2016 11:55:12 +0000 Subject: [PATCH 3/8] Updated copy --- .gitignore | 1 + templates/_marketing.twig | 49 +++++++++++++++++++++++++++++++-------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 39c15f268..7582afbba 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ deployment.xml /web/.htaccess phinx.yml /phpunit.xml +/web/index_dev.php diff --git a/templates/_marketing.twig b/templates/_marketing.twig index 015ea385b..34ac92054 100755 --- a/templates/_marketing.twig +++ b/templates/_marketing.twig @@ -1,23 +1,35 @@

-

Got a talk idea? We want to see it!

+

Got a talk idea? We'd LOVE to see it!

- We’re pleased to announce our conference, {{ site.title }} should be - one of the best PHP conferences where community members from around - the world come together to learn and share information about the latest - trends and technologies in professional PHP development. + The dates are set, the venue is booked. All that we are missing to make + {{ site.title }} the best event yet is the speakers. We're really keen to + read your submissions, and even if you've never spoken at a conference + before, don't be afraid to submit. PHP South Coast prides itself on being + a platform to allow brand new speakers to thrive. +

+

+ We don't cover travel expenses unless its absolutely necessary, but please, + don't be afraid to ask.

Speaker Package

- We know speakers are key to the success of a conference and hope - you will submit a talk. In appreciation of your efforts, our speaker - compensation package includes: + We appreciate the time and energy all our speakers contribute to make the + event happen, and we'll try our best to make the event as painless as + possible. -

View Full Speaker Package

+
    +
  • 3 Nights Accomodation
    • +
  • Enjoyable Speaker's Dinner
    • +
  • Collection and Delivery to Local Airport
    • +

+ +

View Full Speaker Package

+
@@ -27,7 +39,14 @@

Diversity Matters!

{{ site.title }} is committed to creating a conference that is as inclusive as possible. - We want to showcase talent available around the United Kingdom and welcome international submissions as well. + We want to showcase talent available around the United Kingdom and welcome international + submissions as well. +

+

+ We'll be asking speakers to sign a Speaker Agreement if they are selected. This only confirms + that the speaker will adhere to our code of conduct, and sets out some reimbursement policies + should the speaker be unable to attend at short notice. Please ask if you'd like to see + the policy before submitting.

We are also committed to ensuring the conference is a place @@ -38,3 +57,13 @@

+ +
+
+
+

speakers@phpsouthcoast.co.uk

+

Please, drop us a line if you have any queries or questions. We're committed to making + {{ site.title }} easy and enjoyable for speakers new and old alike.

+
+
+
From 3bc6143b3b2a5ebfa3d914ba80baccf401ab2e33 Mon Sep 17 00:00:00 2001 From: Gary Hockin Date: Mon, 28 Nov 2016 11:56:30 +0000 Subject: [PATCH 4/8] Updated config to remove boring categories --- config/production.phpsc.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/config/production.phpsc.yml b/config/production.phpsc.yml index aa3fc1f73..1c2c1c4ef 100644 --- a/config/production.phpsc.yml +++ b/config/production.phpsc.yml @@ -41,17 +41,7 @@ mail: talk: categories: - api: APIs (REST, SOAP, etc.) - continuousdelivery: Continuous Delivery - database: Database - development: Development - devops: Devops - framework: Framework - javascript: JavaScript - security: Security - testing: Testing - uiux: UI/UX - other: Other + everything: Everything levels: entry: Entry level mid: Mid-level From 0b8a63590a9dd332a11e8866b7bbdec81df18eb4 Mon Sep 17 00:00:00 2001 From: Gary Hockin Date: Mon, 28 Nov 2016 12:25:19 +0000 Subject: [PATCH 5/8] Updated the ideas page --- templates/ideas.twig | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/templates/ideas.twig b/templates/ideas.twig index 48395bbc5..75ec3008d 100644 --- a/templates/ideas.twig +++ b/templates/ideas.twig @@ -3,35 +3,29 @@

Call for Papers Talk Ideas

- {{ site.title }} is not limited to just PHP-related talks. There have been - sessions covering a wide range of topics supporting PHP developers and DevOps - as well, and we encourage you to "think outside the box" to come up with your - own unique topics. + At {{ site.title }} we're keen to receive your submissions, any we're + already looking forward to reviewing the talks. Don't be afraid to submit + multiple talks as we may find something appealing that you think is a + weaker submission.

- Due to financial constraints most conferences tend to pick speakers to present - multiple talks. Therefore it is advisable to submit a few talk ideas, not just one. - By submitting a single talk you may lessen your chances of being selected. + We would like to allow all of our speakers the opportunity to enjoy the + event, and so we're going to try to limit each speaker to only one talk, + however, never say never! If a speaker submits two talks that make it + impossible to choose, we may select both.

- To get the ideas flowing, here's a few suggestions: + We're also really interested in non-PHP technologies with a PHP slant + this year, and personal stories always go down well. For example:

    -
  • Virtualization and environments
    • -
  • Javascript
    • -
  • Alternate PHP run-times
    • -
  • PHP internals
    • -
  • Development principles
    • -
  • Security
    • -
  • Mobile-first design
    • -
  • Testing (unit, functional, etc.)
    • -
  • Version control
    • -
  • User Experience/Usability
    • -
  • Building APIs (REST, SOAP, whatever)
    • -
  • Continuous Integration
    • -
  • Framework-related topics
    • -
  • Professional development
    • +
  • Go/Swift/Rust/Kotlin/$language for the PHP Developer
    • +
  • How We Saved Christmas With Scala
    • +
  • Why we switched to $javascript_framework
    • +
  • When PHP Wasn't the Answer
+

Of course, we're also interested in the typical PHP talks, so don't be afraid + to submit those style abstracts too.

{% endblock %} From 7a7ce6e27d932ada355b896e8c5f8d34d3299189 Mon Sep 17 00:00:00 2001 From: Gary Hockin Date: Mon, 28 Nov 2016 13:00:42 +0000 Subject: [PATCH 6/8] Added some rudenmentary styling --- templates/_header.twig | 49 ++++++++++++++--------------- templates/layouts/default.twig | 4 ++- web/assets/css/site.css | 12 ++++++- web/assets/img/action-stations.jpg | Bin 0 -> 556639 bytes web/assets/img/phpsc-logo.png | Bin 0 -> 5620 bytes 5 files changed, 37 insertions(+), 28 deletions(-) create mode 100644 web/assets/img/action-stations.jpg create mode 100644 web/assets/img/phpsc-logo.png diff --git a/templates/_header.twig b/templates/_header.twig index b39dd8e7b..f69c7bbb3 100644 --- a/templates/_header.twig +++ b/templates/_header.twig @@ -1,28 +1,25 @@ -
-
-
-
- -
-
- {% if cfp_open %} -

Call For Papers Now Open!

-

Submissions accepted until {{ site.enddate }}

- {% else %} -

- {% if site.show_submission_count %} - Call for Papers ended with {{ number_of_talks }} Submissions! - {% else %} - Call for Papers has ended! - {% endif %} -

-

Submissions were accepted until {{ site.enddate }}

- {% endif %} -

- {% if cfp_open %}Register Now{% endif %} - View Submissions -

-
+
+
+
+ +
+ {% if cfp_open %} +

Call For Papers Now Open!

+

Submissions accepted until {{ site.enddate }}

+ {% else %} +

+ {% if site.show_submission_count %} + Call for Papers ended with {{ number_of_talks }} Submissions! + {% else %} + Call for Papers has ended! + {% endif %} +

+

Submissions were accepted until {{ site.enddate }}

+ {% endif %} +

+ {% if cfp_open %}Register Now{% endif %} + View Submissions +

@@ -40,4 +37,4 @@
Visit Conference Site
- \ No newline at end of file + diff --git a/templates/layouts/default.twig b/templates/layouts/default.twig index d77c6be7a..f813d1241 100755 --- a/templates/layouts/default.twig +++ b/templates/layouts/default.twig @@ -11,7 +11,9 @@