From 3eb6bc6340c7d92606bc5cb114d7e523dff3cb9b Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 18 Nov 2016 12:49:21 -0500 Subject: [PATCH 1/3] Added music page back to beta site --- app/routes.php | 1 + app/views/music.twig | 71 ++++++++++++++++++++++++ app/views/templates/partials/header.twig | 41 +++++++------- 3 files changed, 94 insertions(+), 19 deletions(-) create mode 100644 app/views/music.twig diff --git a/app/routes.php b/app/routes.php index dd61d3c..8cb4c0b 100755 --- a/app/routes.php +++ b/app/routes.php @@ -5,4 +5,5 @@ require 'routes/index.php'; require 'routes/about.php'; require 'routes/contact.php'; require 'routes/home.php'; +require 'routes/music.php'; require 'routes/shows.php'; diff --git a/app/views/music.twig b/app/views/music.twig new file mode 100644 index 0000000..7a80240 --- /dev/null +++ b/app/views/music.twig @@ -0,0 +1,71 @@ +{% extends 'templates/default.php' %} + +{% block javascripts %} + + +{% endblock %} + +{% block title %}Music{% endblock %} + +{% block content %} + +
+

Music

+
+ + +
+ + + + +
+
+ {{ albums[0].title }} +
+

{{ albums[0].title }}

+ {% if albums[0].description %} +
+

{{ albums[0].description }}

+ {% endif %} +
+
+
+ + +
+
+ +
+ +
+
    + {% for song in songs %} +
  • + {{ song.track_order }}. {{ song.title }} +
  • + {% endfor %} +
+
+
+
+ + +
+ {% for album in albums %} + +
+
+ {{ album.title }} +
+
{{ album.title }}
+
+
+
+ {% endfor %} +
+ +{% endblock %} diff --git a/app/views/templates/partials/header.twig b/app/views/templates/partials/header.twig index 9baad5d..5a88d9e 100755 --- a/app/views/templates/partials/header.twig +++ b/app/views/templates/partials/header.twig @@ -12,26 +12,29 @@
- +
From 27e3534b52f11ccc7d6db92e19fa41ad52dfaf10 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 18 Nov 2016 12:51:42 -0500 Subject: [PATCH 2/3] Fixed reading mode.php file for application mode --- app/start.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/start.php b/app/start.php index 7b85b42..1f10574 100755 --- a/app/start.php +++ b/app/start.php @@ -27,7 +27,7 @@ require INC_ROOT . '/vendor/autoload.php'; // Time to create our app $app = new Slim([ - 'mode' => file_get_contents(INC_ROOT . '/mode.php'), + 'mode' => trim(file_get_contents(INC_ROOT . '/mode.php')), 'view' => new Twig(), 'templates.path' => INC_ROOT . '/app/views' ]); From acf52bb1ec34404be8c40b21ee89baacfd150b20 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 18 Nov 2016 12:52:19 -0500 Subject: [PATCH 3/3] Fixed music page template --- app/views/music.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/music.twig b/app/views/music.twig index 7a80240..c5784b7 100644 --- a/app/views/music.twig +++ b/app/views/music.twig @@ -1,4 +1,4 @@ -{% extends 'templates/default.php' %} +{% extends 'templates/default.twig' %} {% block javascripts %}