Merge branch 'master' of Halftone/halftone into development

This commit is contained in:
Gregory Ballantine 2016-11-18 12:45:33 -05:00 committed by Gogs
commit d251662c2e
16 changed files with 156 additions and 842 deletions

5
.gitignore vendored
View File

@ -6,6 +6,11 @@
app/config/production.php app/config/production.php
app/config/development.php app/config/development.php
# Application mode #
####################
# webiste mode settings
mode.php
# Vendor packages # # Vendor packages #
################### ###################
# we don't need to sync these everywhere # we don't need to sync these everywhere

View File

@ -5,5 +5,4 @@ require 'routes/index.php';
require 'routes/about.php'; require 'routes/about.php';
require 'routes/contact.php'; require 'routes/contact.php';
require 'routes/home.php'; require 'routes/home.php';
require 'routes/music.php';
require 'routes/shows.php'; require 'routes/shows.php';

View File

@ -1,4 +1,4 @@
{% extends 'templates/default.php' %} {% extends 'templates/default.twig' %}
{% block title %}About Us{% endblock %} {% block title %}About Us{% endblock %}

View File

@ -1,4 +1,4 @@
{% extends 'templates/default.php' %} {% extends 'templates/default.twig' %}
{% block title %}Contact Us{% endblock %} {% block title %}Contact Us{% endblock %}

View File

@ -1,4 +1,4 @@
{% extends 'templates/default.php' %} {% extends 'templates/default.twig' %}
{% block title %}Home{% endblock %} {% block title %}Home{% endblock %}

View File

@ -1,71 +0,0 @@
{% extends 'templates/default.php' %}
{% block javascripts %}
<script type="text/javascript" src="/js/modules/music-player.js"></script>
<script type="text/javascript" src="/js/music.js"></script>
{% endblock %}
{% block title %}Music{% endblock %}
{% block content %}
<header id="music-header" class="row">
<h1>Music</h1>
</header>
<!-- music player -->
<section class="row">
<!-- no javascript warning -->
<noscript class="card">Woah there, lassy! You will need to enable Javascript to use this page!</noscript>
<!-- left album stuff -->
<article class="col-sm-5 col-xs-12">
<div class="thumbnail shadow-1">
<img class="image-responsive" src="{{ albums[0].album_art }}" alt="{{ albums[0].title }}">
<div class="caption">
<h3>{{ albums[0].title }}</h3>
{% if albums[0].description %}
<hr />
<p>{{ albums[0].description }}</p>
{% endif %}
</div>
</div>
</article>
<!-- right album stuff -->
<div class="col-sm-7 col-xs-12">
<article id="music-player-card" class="card">
<audio id="music-player" controls>
<source src="{{ songs[0].audio_file }}.ogg" type="audio/ogg" />
<source src="{{ songs[0].audio_file }}.mp3" type="audio/mpeg" />
</audio>
</article>
<article class="card">
<ul class="now-playing-list">
{% for song in songs %}
<li class="music-track" data-title="{{ song.title }}" data-album="{{ song.album_id }}" data-order="{{ song.track_order }}" data-path="{{ song.audio_file }}">
<span>{{ song.track_order }}. {{ song.title }}</span>
</li>
{% endfor %}
</ul>
</article>
</div>
</section>
<!-- available albums -->
<section class="row">
{% for album in albums %}
<!-- album details -->
<div class="music-album col-sm-3 col-xs-6">
<div class="thumbnail shadow-1">
<img src="{{ album.album_art }}" alt="{{ album.title }}">
<div class="caption">
<h5>{{ album.title }}</h5>
</div>
</div>
</div>
{% endfor %}
</section>
{% endblock %}

View File

@ -1,4 +1,4 @@
{% extends 'templates/default.php' %} {% extends 'templates/default.twig' %}
{% block title %}Show Schedule{% endblock %} {% block title %}Show Schedule{% endblock %}

View File

@ -1,27 +0,0 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<!--Let browser know website is optimized for mobile-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<title>{% block title %}{% endblock %} | Halftone</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
<link rel="stylesheet" href="/css/main.css" media="screen,projection"/>
{% block stylesheets %}{% endblock %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<!--<script type="text/javascript" src="/js/modules/awesome-form.js"></script>-->
<script type="text/javascript" src="/js/main.js"></script>
{% block javascripts %}{% endblock %}
</head>
<body>
<div id="wrapper">
<div class="container">
{% include 'templates/partials/header.php' %}
{% block content %}{% endblock %}
</div>
</div>
{% include 'templates/partials/footer.php' %}
</body>
</html>

View File

@ -0,0 +1,28 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<!--Let browser know website is optimized for mobile-->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<title>{% block title %}{% endblock %} | Halftone</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/css/bootstrap.min.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="/css/main.css" media="screen,projection"/>
{% block stylesheets %}{% endblock %}
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="/js/main.js"></script>
{% block javascripts %}{% endblock %}
</head>
<body>
<div id="wrapper">
<div class="container">
{% include 'templates/partials/header.twig' %}
{% block content %}{% endblock %}
</div>
</div>
{% include 'templates/partials/footer.twig' %}
</body>
</html>

View File

@ -1,29 +0,0 @@
<!-- header -->
<header id="header" class="row">
<div class="col-sm-2"></div>
<div class="col-sm-8 col-xs-12">
<img class="band-logo" src="/img/logo-white.png" />
</div>
<div class="col-sm-2"></div>
</header>
<!-- nav bar -->
<nav id="nav" class="row">
<ul class="col-sm-12">
<li class="nav_item">
<a href="{{ urlFor('home') }}">Home</a>
</li>
<li class="nav_item">
<a href="{{ urlFor('about') }}">About</a>
</li>
<li class="nav_item">
<a href="{{ urlFor('shows') }}">Shows</a>
</li>
<li class="nav_item">
<a href="{{ urlFor('music') }}">Music</a>
</li>
<li class="nav_item">
<a href="{{ urlFor('contact') }}">Contact</a>
</li>
</ul>
</nav>

View File

@ -0,0 +1,37 @@
<!-- header -->
<header id="header" class="row">
<div class="col-sm-2"></div>
<div class="col-sm-8 col-xs-12">
<img class="band-logo" src="/img/logo-white.png" />
</div>
<div class="col-sm-2"></div>
</header>
<!-- nav bar -->
<nav id="nav" class="navbar" class="row">
<div class="container-fluid">
<div class="navbar-header">
<button id="navbar-collapse-button" type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<i class="fa fa-bars" aria-hidden="true"></i>
</button>
</div>
<div class="collapse navbar-collapse" id="navbar-collapse">
<ul class="nav navbar-nav">
<li class="nav_item">
<a href="{{ urlFor('home') }}">Home</a>
</li>
<li class="nav_item">
<a href="{{ urlFor('about') }}">About</a>
</li>
<li class="nav_item">
<a href="{{ urlFor('shows') }}">Shows</a>
</li>
<li class="nav_item">
<a href="{{ urlFor('contact') }}">Contact</a>
</li>
</ul>
</div>
</div>
</nav>

View File

@ -1,4 +1,5 @@
#contact-header #contact-header
margin-top: -20px
text-align: center text-align: center
h1 h1

View File

@ -1,6 +1,16 @@
#nav #nav
margin-bottom: 20px margin-bottom: 20px
.navbar-nav
display: inline-block
.navbar-nav
float: none
.navbar-collapse,
.navbar-header
text-align: center
ul ul
list-style: none list-style: none
text-align: center text-align: center
@ -24,7 +34,33 @@
+transition(color, 200ms) +transition(color, 200ms)
&:hover &:hover
background-color: transparent
border-color: rgba($main-color, 1) border-color: rgba($main-color, 1)
a a
background-color: transparent
color: $main-color color: $main-color
#navbar-collapse-button.navbar-toggle
float: none
margin: 0
color: $main-color
font-size: 32px
+transition(color, 200ms)
&:hover,
&:active
background-color: transparent
&.collapsed
color: #fff
&:hover
color: $main-color
@media (max-width: 767px)
.navbar-collapse
background: #212121
border-radius: 5px
border: 1px solid #212121
box-shadow: inset 0 0 6px #212121

View File

@ -1 +0,0 @@
development

File diff suppressed because one or more lines are too long