diff --git a/src/main/webapp/css/new-life-songs.scss b/src/main/webapp/css/new-life-songs.scss index 6799787..cdf5b82 100644 --- a/src/main/webapp/css/new-life-songs.scss +++ b/src/main/webapp/css/new-life-songs.scss @@ -6,52 +6,127 @@ $dark: #333; +$monoFont: 'Anonymous Pro'; +$headFont: 'Roboto Condensed'; +$bodyFont: 'Cantarell'; + @import "forSize.mixin.scss"; @import "reset.scss"; body { color: $dark; - font-family: Cantarell; - margin: 2rem auto; - width: 60rem; } + font-family: $bodyFont; } header { - position: relative; - & > h1, & > h2 { - font-family: "Roboto Condensed"; - margin-bottom: 1.5em; } - - nav { - position: absolute; - top: 0; - right: 0; - - ul { - list-style: none; - - li { - display: block; - float: right; - padding: 0.4rem 0.6rem; + & > h1 > a { + color: $dark; + text-decoration: none; } - a { - color: $dark; - display: block; - padding: 0.1rem 0.4rem; - text-decoration: none; } + &> h1, & > h2 { font-family: $headFont; } - a:hover { - background-color: $dark; - border-radius: 3px; - color: white; - } - } } } } + nav > ul > li > a { + color: $dark; + display: block; + padding: 0.1rem 0.4rem; + text-decoration: none; + + &:hover, &.current { + background-color: $dark; + border-radius: 3px; + color: white; } } +} + +p { margin-top: 1rem; } + +section { + margin-bottom: 2rem; + + & > ul { + padding: 1rem 2rem; + + a { color: $dark; } + a:visited { color: $dark; } } } + +section#welcome { padding: 1rem; } table { - th { font-family: "Roboto Condensed"; } + th { font-family: $headFont; } td a { color: $dark; display: block; text-decoration: none; } } + +.api-doc { + pre, code { + background-color: #EEE; + font-family: $monoFont; } + + pre { margin-left: 1rem; } + + h3 { margin: 1rem 0; } + + dl { + margin: 1rem; + + & > dt { + background-color: #EEE; + font-family: $monoFont; + font-weight: bold; } + + & > dd { padding: 0 0 0.5rem 1rem; } } } + +@include forSize(notSmall) { + + body { margin: 2rem auto; } + + header { + position: relative; + + & > h1, & > h2 { margin-bottom: 1.5em; } + + nav { + position: absolute; + top: 0; + right: 0; + + ul { + list-style: none; + + li { + display: block; + float: right; + padding: 0.4rem 0.6rem; + + } } } } + +} + +@include forSize(small) { + header { + margin-bottom: 1rem; + text-align: center; + + & > h2 { display: none; } + & > h2.song-name, & > h2.service-date { display: block; } + + & > nav > ul > li { + display: inline-block; + font-size: 125%; + width: 32%; + } } + + section { font-size: 125%; } + + .dataTables_length { display: none; } + + table#songs-table { + td.artists, th.artists { display: none; } } + + .not-small { display: none; } +} + +@include forSize(medium) { body { width: 40rem; } } + +@include forSize(large) { body { width: 60rem; } } diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html new file mode 100644 index 0000000..e9d2d03 --- /dev/null +++ b/src/main/webapp/index.html @@ -0,0 +1,36 @@ + + + + + + + + + New Life Songs Database + + + + +
+

New Life Songs

+ +
+
+ This is Jonathan's database of worship songs performed at New Life + Austin. Please feel free to take a look around: + + +

If you run across any problems, feel free to send me an email at + jdbernard@gmail.com +

+ + + diff --git a/src/main/webapp/service/index.gsp b/src/main/webapp/service/index.gsp index 4f0a284..e51a252 100644 --- a/src/main/webapp/service/index.gsp +++ b/src/main/webapp/service/index.gsp @@ -18,6 +18,8 @@ if (!service) { response.sendError(response.SC_NOT_FOUND); return } + + <%= service.@date.toString("yyyy-MM-dd") @@ -28,7 +30,8 @@ if (!service) { response.sendError(response.SC_NOT_FOUND); return } <script type="application/javascript" src="https://cdn.datatables.net/1.10.5/js/jquery.dataTables.js"></script> <!--<script type="application/javascript" src="https://cdn.datatables.net/1.10.5/js/jquery.dataTables.min.js"></script>--> <!--<script type="application/javascript" src="../js/new-life-songs-@version@.js"></script>--> - <link href='http://fonts.googleapis.com/css?family=Roboto+Condensed|Roboto|Lato|Cuprum|Dosis|Cantarell' rel='stylesheet' type='text/css'> + <link href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.3.0/css/font-awesome.css' rel='stylesheet' type='text/css'> + <link href='http://fonts.googleapis.com/css?family=Roboto+Condensed|Cantarell' rel='stylesheet' type='text/css'> <link href='http://cdn.datatables.net/1.10.5/css/jquery.dataTables.css' rel='stylesheet' type='text/css'> <link href='../css/new-life-songs-@version@.css' rel='stylesheet' type='text/css'> </head> @@ -48,44 +51,37 @@ if (!service) { response.sendError(response.SC_NOT_FOUND); return } <h2>Performances</h2> <table id=performances-table class="row-border dataTable hover compact" cellspacing=0> <thead><tr> - <th class="dt-left">Song</th> - <th class="dt-left">Artists</th> - <th class="dt-left">Worship Leader</th> - <th class="dt-left">Piano</th> - <th class="dt-left">Organ</th> - <th class="dt-left">Bass</th> - <th class="dt-left">Drums</th> - <th class="dt-left">Guitar</th> + <th class=actions /> + <th class="dt-left song-name">Song</th> + <th class="dt-left artists">Artists</th> + <th class="dt-left not-small">Worship Leader</th> + <th class="dt-left not-small">Piano</th> + <th class="dt-left not-small">Organ</th> + <th class="dt-left not-small">Bass</th> + <th class="dt-left not-small">Drums</th> + <th class="dt-left not-small">Guitar</th> </tr></thead> <tbody> <% songsDB.findPerformancesForServiceId(service.id). collect { [perf: it, song: songsDB.findSong(it.songId)] }. sort { it.song.name }.each { row -> %> - <tr><td><a href='../song/<%= row.song.id %>'><%= + <tr><td class=actions><a href="<%= NLSongsContext.makeUrl(service, row.song) %>"><i class="fa fa-download"></i></a></td> + <td class=song-name><a href='../song/<%= row.song.id %>'><%= row.song.name %></a></td> - <td><%= row.song.artists.join(", ") %></td> - <td><%= row.perf.leader ?: "" %></td> - <td><%= row.perf.pianist ?: "" %></td> - <td><%= row.perf.organist ?: "" %></td> - <td><%= row.perf.bassist ?: "" %></td> - <td><%= row.perf.drummer ?: "" %></td> - <td><%= row.perf.guitarist ?: "" %></td></tr><% } %> + <td class=artists><%= row.song.artists.join(", ") %></td> + <td class=not-small><%= row.perf.leader ?: "" %></td> + <td class=not-small><%= row.perf.pianist ?: "" %></td> + <td class=not-small><%= row.perf.organist ?: "" %></td> + <td class=not-small><%= row.perf.bassist ?: "" %></td> + <td class=not-small><%= row.perf.drummer ?: "" %></td> + <td class=not-small><%= row.perf.guitarist ?: "" %></td></tr><% } %> </tbody> - <tfoot><tr> - <th class="dt-left">Song</th> - <th class="dt-left">Artists</th> - <th class="dt-left">Worship Leader</th> - <th class="dt-left">Piano</th> - <th class="dt-left">Organ</th> - <th class="dt-left">Bass</th> - <th class="dt-left">Drums</th> - <th class="dt-left">Guitar</th> - </tr></tfoot> </table> </section> <script type="application/javascript"> - window.onload = function() { \$("#performances-table").dataTable(); }; + window.onload = function() { \$("#performances-table"). + dataTable({ "paging": false }); }; </script> </body> diff --git a/src/main/webapp/services/index.gsp b/src/main/webapp/services/index.gsp index 68248fb..d279599 100644 --- a/src/main/webapp/services/index.gsp +++ b/src/main/webapp/services/index.gsp @@ -9,6 +9,8 @@ songsDB = NLSongsContext.songsDB <html> <head> <meta charset="UTF-8"> + <meta name="viewport" content="width=device-width, user-scalable=no"> + <meta name="referrer" content="origin"> <link rel="shortcut icon" href="../images/favicon.ico"> <title>Services - New Life Songs Database @@ -18,26 +20,26 @@ songsDB = NLSongsContext.songsDB - +
-

New Life Songs

+

New Life Songs

Services

- - + + <% songsDB.findAllServices().sort { it.date }.reverse().each { service -> %> @@ -45,15 +47,16 @@ songsDB = NLSongsContext.songsDB service.@date.toString("yyyy-MM-dd") %><% } %> - +
DateService TypeDateService Type
<%= service.serviceType.displayName %>
diff --git a/src/main/webapp/song/index.gsp b/src/main/webapp/song/index.gsp index a73e65f..9ebba64 100644 --- a/src/main/webapp/song/index.gsp +++ b/src/main/webapp/song/index.gsp @@ -18,6 +18,8 @@ if (!song) { response.sendError(response.SC_NOT_FOUND); return } + + <%= song.name %> - New Life Songs Database @@ -27,14 +29,15 @@ if (!song) { response.sendError(response.SC_NOT_FOUND); return } - + +
-

New Life Songs

-

<%= song.name %>

<% +

New Life Songs

+

<%= song.name %>

<% if (song.artists.findAll().size() > 0) { %>

by <%= song.artists.join(", ") %>

<% } %> @@ -48,48 +51,37 @@ if (!song) { response.sendError(response.SC_NOT_FOUND); return }

Performances

- - - - - - - - + + + + + + + + <% songsDB.findPerformancesForSongId(song.id). collect { [perf: it, svc: songsDB.findService(it.serviceId)] }. sort { it.svc.date }.each { row -> %> - + - - - - - - - <% } %> + + + + + + + <% } %> - - - - - - - - - -
DateService TypeWorship LeaderPianoOrganBassDrumsGuitar + DateService TypeWorship LeaderPianoOrganBassDrumsGuitar
<%= +
<%= row.svc.@date.toString("yyyy-MM-dd") %><% switch (row.svc.serviceType) { - case SUN_PM: out.print("Sunday PM"); break - case SUN_AM: out.print("Sunday AM"); break - case WED: out.print("Wednesday"); break } - %><%= row.perf.leader ?: "" %><%= row.perf.pianist ?: "" %><%= row.perf.organist ?: "" %><%= row.perf.bassist ?: "" %><%= row.perf.drummer ?: "" %><%= row.perf.guitarist ?: "" %>
<%= row.svc.serviceType.displayName %><%= row.perf.leader ?: "" %><%= row.perf.pianist ?: "" %><%= row.perf.organist ?: "" %><%= row.perf.bassist ?: "" %><%= row.perf.drummer ?: "" %><%= row.perf.guitarist ?: "" %>
DateService TypeWorship LeaderPianoOrganBassDrumsGuitar
diff --git a/src/main/webapp/songs/index.gsp b/src/main/webapp/songs/index.gsp index 9cca315..4fcd5cf 100644 --- a/src/main/webapp/songs/index.gsp +++ b/src/main/webapp/songs/index.gsp @@ -8,6 +8,8 @@ songsDB = NLSongsContext.songsDB + + Songs - New Life Songs Database @@ -17,41 +19,42 @@ songsDB = NLSongsContext.songsDB - +
-

New Life Songs

+

New Life Songs

Songs

- - + + <% songsDB.findAllSongs().sort { it.name }.each { song -> %> - - <% } %> + + <% } %> - +
NameArtistsNameArtists
<%= song.name %><%= song.artists.join(", ") %>
<%= song.name %><%= song.artists.join(", ") %>