From ed8d234975e3df79ab60cdc990f42856e5811d3f Mon Sep 17 00:00:00 2001
From: Zach DeCook <zachdecook@gmail.com>
Date: Thu, 27 Dec 2018 16:29:54 +0000
Subject: * Songs: Fix spacing for newly created songs

---
 laravel/app/Http/Controllers/SongController.php | 2 +-
 laravel/resources/views/playlist.blade.php      | 2 +-
 laravel/resources/views/song.blade.php          | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php
index 00216ce..8d6c497 100644
--- a/laravel/app/Http/Controllers/SongController.php
+++ b/laravel/app/Http/Controllers/SongController.php
@@ -16,7 +16,7 @@ class SongController extends Controller
         $newText = '';
         $transp = $_GET['transp'] ?? 0;
         foreach( $lines as $line ){
-            $line = htmlspecialchars( $line );
+            $line = trim(htmlspecialchars( $line ), "\n\t\r");
             if ( $this->chordline( $line ) ) {
                 if ( $transp != 0) {
                     $line = $this->z_transpose2( $line, $transp );
diff --git a/laravel/resources/views/playlist.blade.php b/laravel/resources/views/playlist.blade.php
index 856c81c..0793176 100644
--- a/laravel/resources/views/playlist.blade.php
+++ b/laravel/resources/views/playlist.blade.php
@@ -18,7 +18,7 @@
         <input name='key' placeholder='Key (e.g. Am)' type='text' />
         <input name='playlist' value='{{ $playlist->id }}' hidden/>
         <br/>
-        <textarea name='text' placeholder='song lyrics/chords' style='width: 100%; height: 200px;' ></textarea>
+        <textarea name='text' placeholder='song lyrics/chords' style='width: 100%; height: 200px; font-family: monospace;' ></textarea>
         <button type='submit'>Add song!</button>
     </form>
 @endsection
diff --git a/laravel/resources/views/song.blade.php b/laravel/resources/views/song.blade.php
index 6405b8a..7029871 100644
--- a/laravel/resources/views/song.blade.php
+++ b/laravel/resources/views/song.blade.php
@@ -29,9 +29,7 @@
     </noscript>
     </form>
     
-    <pre>
-    {!! $song['escapedText'] !!}
-    </pre>
+    <pre>{!! $song['escapedText'] !!}</pre>
     <div id="chordarea">
         <canvas id='guitarregion' width="100" height="100" onclick="cycle(guitarObj);"></canvas>
         <canvas id='ukuleleregion' width="100" height="100" onclick="cycle(ukeObj);"></canvas>
-- 
cgit 1.4.1