From 803e33fa6ad1b210c4d43533d6cbdec2671a2aa0 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 18 Nov 2016 10:25:02 -0500 Subject: [PATCH 01/22] Moved views from .php extension to .twig --- app/views/about.twig | 14 +++++++------- app/views/contact.twig | 4 ++-- app/views/home.twig | 2 +- app/views/music.twig | 2 +- app/views/shows.twig | 4 ++-- app/views/templates/{default.php => default.twig} | 6 +++--- .../templates/partials/{footer.php => footer.twig} | 0 .../templates/partials/{header.php => header.twig} | 0 8 files changed, 16 insertions(+), 16 deletions(-) rename app/views/templates/{default.php => default.twig} (90%) rename app/views/templates/partials/{footer.php => footer.twig} (100%) rename app/views/templates/partials/{header.php => header.twig} (100%) diff --git a/app/views/about.twig b/app/views/about.twig index a1c1bf2..6ef1f05 100755 --- a/app/views/about.twig +++ b/app/views/about.twig @@ -1,4 +1,4 @@ -{% extends 'templates/default.php' %} +{% extends 'templates/default.twig' %} {% block title %}About Us{% endblock %} @@ -9,7 +9,7 @@

About the Band


- +

When one thinks of pioneers in rock music, Beethoven might not be the first name to roll off the tongue. However, as a 12 year old Wyatt Hamilton (Lead Vocals/Guitar) jammed out “Ode to Joy” in his middle school guitar class, he set the course for the inception of Halftone. Joining up with Andrew Hall (Bass/Vocals), Greg Ballantine (Drums/Vocals) and Zakk Vigneri (Guitar/Vocals), this alternative and punk rock influenced quartet has already made an impact in the Maryland music scene.


@@ -19,15 +19,15 @@


- Halftone has already played to large crowds at venues such as Rams Head Live, Ottobar and Fish Head Cantina. They also participated in the 16th annual Anne Arundel County High School Battle of the Bands at Maryland Hall, and returned the following year to perform as the showcase act. + Halftone has already played to large crowds at venues such as Rams Head Live, Ottobar and Fish Head Cantina. They also participated in the 16th annual Anne Arundel County High School Battle of the Bands at Maryland Hall, and returned the following year to perform as the showcase act.


- +

Their debut EP, “Opting Out”, was produced by Jerome Maffeo (Jimmie’s Chicken Shack) and singer/songwriter, Eric James (formerly of vs. The Earth) and is available now on iTunes. Their single “Elsewhere” has received radio airplay on WIYY (98 Rock, Baltimore).


- +

- “It’s refreshing to find a young band that strikes such a perfect balance between showmanship and musicianship and that understands what it means to work hard to build a following”, remarks co-producer Eric James. + “It’s refreshing to find a young band that strikes such a perfect balance between showmanship and musicianship and that understands what it means to work hard to build a following”, remarks co-producer Eric James.


@@ -35,7 +35,7 @@

- +
diff --git a/app/views/contact.twig b/app/views/contact.twig index 708eb0a..f448d9a 100755 --- a/app/views/contact.twig +++ b/app/views/contact.twig @@ -1,4 +1,4 @@ -{% extends 'templates/default.php' %} +{% extends 'templates/default.twig' %} {% block title %}Contact Us{% endblock %} @@ -6,7 +6,7 @@

Contact Us

- +

For booking, press, promotion, or just to say "what's up?", you can shoot us an email at:

diff --git a/app/views/home.twig b/app/views/home.twig index 5f8d190..c16d597 100755 --- a/app/views/home.twig +++ b/app/views/home.twig @@ -1,4 +1,4 @@ -{% extends 'templates/default.php' %} +{% extends 'templates/default.twig' %} {% block title %}Home{% endblock %} diff --git a/app/views/music.twig b/app/views/music.twig index 19f4471..e290685 100755 --- a/app/views/music.twig +++ b/app/views/music.twig @@ -1,4 +1,4 @@ -{% extends 'templates/default.php' %} +{% extends 'templates/default.twig' %} {% block javascripts %} diff --git a/app/views/shows.twig b/app/views/shows.twig index b318be8..3be4892 100755 --- a/app/views/shows.twig +++ b/app/views/shows.twig @@ -1,4 +1,4 @@ -{% extends 'templates/default.php' %} +{% extends 'templates/default.twig' %} {% block title %}Show Schedule{% endblock %} @@ -50,6 +50,6 @@
- + {% endblock %} diff --git a/app/views/templates/default.php b/app/views/templates/default.twig similarity index 90% rename from app/views/templates/default.php rename to app/views/templates/default.twig index 907fa2b..a458b0b 100755 --- a/app/views/templates/default.php +++ b/app/views/templates/default.twig @@ -16,12 +16,12 @@
- {% include 'templates/partials/header.php' %} + {% include 'templates/partials/header.twig' %} {% block content %}{% endblock %}
- - {% include 'templates/partials/footer.php' %} + + {% include 'templates/partials/footer.twig' %} diff --git a/app/views/templates/partials/footer.php b/app/views/templates/partials/footer.twig similarity index 100% rename from app/views/templates/partials/footer.php rename to app/views/templates/partials/footer.twig diff --git a/app/views/templates/partials/header.php b/app/views/templates/partials/header.twig similarity index 100% rename from app/views/templates/partials/header.php rename to app/views/templates/partials/header.twig From 4a9d40004c36c9f8f5cd6e9afe65ed21e0fb4f2a Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 18 Nov 2016 10:26:57 -0500 Subject: [PATCH 02/22] Commented out the music page from the site for the album release --- app/routes.php | 2 +- app/views/templates/partials/header.twig | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/routes.php b/app/routes.php index 8cb4c0b..ecb31d4 100755 --- a/app/routes.php +++ b/app/routes.php @@ -5,5 +5,5 @@ require 'routes/index.php'; require 'routes/about.php'; require 'routes/contact.php'; require 'routes/home.php'; -require 'routes/music.php'; +//require 'routes/music.php'; require 'routes/shows.php'; diff --git a/app/views/templates/partials/header.twig b/app/views/templates/partials/header.twig index 5265761..c626de4 100755 --- a/app/views/templates/partials/header.twig +++ b/app/views/templates/partials/header.twig @@ -19,11 +19,13 @@
  • Shows
    • +
  • Contact
    • - \ No newline at end of file + From 72117915da465c624e6bdc03cf4c614dfc37b4b3 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 18 Nov 2016 10:30:04 -0500 Subject: [PATCH 03/22] Completely removed music page so that site actually works now --- app/routes.php | 1 - app/views/music.twig | 71 ------------------------ app/views/templates/partials/header.twig | 5 -- 3 files changed, 77 deletions(-) delete mode 100755 app/views/music.twig diff --git a/app/routes.php b/app/routes.php index ecb31d4..dd61d3c 100755 --- a/app/routes.php +++ b/app/routes.php @@ -5,5 +5,4 @@ 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 deleted file mode 100755 index e290685..0000000 --- a/app/views/music.twig +++ /dev/null @@ -1,71 +0,0 @@ -{% extends 'templates/default.twig' %} - -{% 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 c626de4..cd3fd2d 100755 --- a/app/views/templates/partials/header.twig +++ b/app/views/templates/partials/header.twig @@ -19,11 +19,6 @@
  • Shows
    • -
  • Contact
    • From b36bd1d8dc8cadeaf98a15fe5c92a1d8c950560d Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 18 Nov 2016 10:43:09 -0500 Subject: [PATCH 04/22] Added Font Awesome icons and changed the Bootstrap and jQuery CDN links --- app/views/templates/default.twig | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/app/views/templates/default.twig b/app/views/templates/default.twig index a458b0b..7f94ac9 100755 --- a/app/views/templates/default.twig +++ b/app/views/templates/default.twig @@ -5,11 +5,12 @@ {% block title %}{% endblock %} | Halftone - - + + + {% block stylesheets %}{% endblock %} - - + + {% block javascripts %}{% endblock %} @@ -17,7 +18,7 @@
    {% include 'templates/partials/header.twig' %} - + {% block content %}{% endblock %}
    From 036deef69fcbeadf7784ad501c0b75102efaed71 Mon Sep 17 00:00:00 2001 From: Gregory Ballantine Date: Fri, 18 Nov 2016 10:43:21 -0500 Subject: [PATCH 05/22] Added a hamburger menu for the navigation menu --- app/views/templates/partials/header.twig | 49 ++++++++++++++---------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/app/views/templates/partials/header.twig b/app/views/templates/partials/header.twig index cd3fd2d..f95b992 100755 --- a/app/views/templates/partials/header.twig +++ b/app/views/templates/partials/header.twig @@ -1,26 +1,35 @@ -