From 9fcaf20b9c3129270442e37332bf35ab36bc4865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Rynning-T=C3=B8nnesen?= <kasper@kasperrt.no>
Date: Thu, 11 Feb 2016 15:30:56 +0100
Subject: [PATCH] Moved close buttons in some of the modals to create
 consistency

---
 index.php          | 12 ++++++------
 php/controller.php |  6 +++---
 php/footer.php     |  6 +++---
 php/nochan.php     |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/index.php b/index.php
index f604354b..de3ba268 100755
--- a/index.php
+++ b/index.php
@@ -139,9 +139,6 @@
         </nav>
       </div>
       <div id="help" class="modal">
-        <div class="modal-header-fixed">
-                <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
-            </div>
             <div class="modal-content">
                 <h4>So you need help?</h4>
                 <p>When listening on a channel, there are some different buttons you can click.</p>
@@ -151,16 +148,19 @@
                 <p>Clicking a song in the playlist, gives it a vote. If you're logged in, you'll have a delete button at your disposal.</p>
                 <p>Also, whenever you're logged in, you'll have two tabs in the top of the playlist thats called "Playlist" and "Suggested". The playlist obviously shows the playlist. But the suggested tab, shows 5 songs that YouTube recommends based on the current song. There might also be user recommended songs. To add any of these, just click them as you'd click a song to vote.</p>
             </div>
+            <div class="modal-footer">
+                <a href="#!" class=" modal-action modal-close waves-effect waves-green btn-flat">Close</a>
+            </div>
         </div>
         <div id="embed" class="modal">
-        <div class="modal-header-fixed">
-                <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
-            </div>
             <div class="modal-content">
               <h4>Embed code (in beta)</h4>
               <p>Copy the code in the textarea, and paste on your website. Remove the &amp; and autoplay, to prevent the player to autoplay.</p>
               <textarea id="embed-area"></textarea>
             </div>
+            <div class="modal-footer">
+                <a href="#!" class=" modal-action modal-close waves-effect waves-green btn-flat">Close</a>
+            </div>
         </div>
     </header>
      <div id="channel-load" class="progress">
diff --git a/php/controller.php b/php/controller.php
index 6528ab28..d0ffda2f 100755
--- a/php/controller.php
+++ b/php/controller.php
@@ -50,15 +50,15 @@
             </div>
         </div>
         <div id="help" class="modal">
-        <div class="modal-header-fixed">
-                <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
-            </div>
             <div class="modal-content">
                 <h4>So you need help?</h4>
                 <p>To remote-controll a computer, just type in the ID for that computer. (This can be found in the settings panel on the computer you want to remote controll. There is also a QR code for you to scan.</p>
                 <p>When you've entered the ID for the computer you want to controll, you'll be able to change the volume, have the controlled computer vote for skipping, pause the video or play the video.</p>
                 <p>The inputfield you used to enter the ID (if you entered it), has now changed some. If you type in something here now, the controlled computer will change channel!</p>
             </div>
+            <div class="modal-footer">
+                <a href="#!" class=" modal-action modal-close waves-effect waves-green btn-flat">Close</a>
+            </div>
         </div>
     </header>
 
diff --git a/php/footer.php b/php/footer.php
index 8ad0a447..9cf307f3 100755
--- a/php/footer.php
+++ b/php/footer.php
@@ -1,7 +1,4 @@
 <div id="contact" class="modal">
-            <div class="modal-header-fixed">
-                <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
-            </div>
             <div class="modal-content">
                 <h4>Want to contact us?</h4>
                 <div id="contact-container">
@@ -61,6 +58,9 @@
                     </form>
                 </div>  
             </div>
+            <div class="modal-footer">
+                <a href="#!" class=" modal-action modal-close waves-effect waves-green btn-flat">Close</a>
+            </div>
         </div>
 <footer class="page-footer cursor-default">
     <div class="container">
diff --git a/php/nochan.php b/php/nochan.php
index 09440834..7ef22e09 100755
--- a/php/nochan.php
+++ b/php/nochan.php
@@ -71,14 +71,14 @@ if(isset($_GET['chan'])){
             </div>
         </div>
         <div id="help" class="modal">
-            <div class="modal-header-fixed">
-                <a href="#!" class="modal-action modal-close waves-effect waves-green btn-flat">Close</a>
-            </div>
             <div class="modal-content">
                 <h4>So you need help?</h4>
                 <p>At the center of the site, you'll se a input field. This is meant to navigate to new or existing channels. If you input something here that already doesn't exist, a new channel will be create at the blink of an eye! Remember to put a password on the list you've created, so noone else takes it from you! (It's on a first come, first serve basis). When you're ready to proceed, just click the listen button!</p>
                 <p>Underneath the input fields, there are several tiles. These are channels that already exists, and they can be clicked! To enter one of these channels and listen to it's content, it is just to click the tile.</p>
             </div>
+            <div class="modal-footer">
+                <a href="#!" class=" modal-action modal-close waves-effect waves-green btn-flat">Close</a>
+            </div>
         </div>
         
     </header>