From 31d47cfb35d54fed66e7851cb880718b1e1b026d Mon Sep 17 00:00:00 2001
From: Joseph Cohen <joseph.cohen@dinkbit.com>
Date: Thu, 26 May 2016 00:50:23 -0500
Subject: [PATCH] Remove subscribers modal

---
 resources/assets/js/app.js                    | 17 ------------
 resources/views/index.blade.php               |  1 -
 resources/views/partials/footer.blade.php     |  2 +-
 resources/views/subscribe/subscribe.blade.php | 26 +++++++++++--------
 4 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js
index 42f63f0c..c82a55c2 100755
--- a/resources/assets/js/app.js
+++ b/resources/assets/js/app.js
@@ -377,23 +377,6 @@ $(function() {
             }
         });
     }
-
-    // Open a modal.
-    $('#subscribe-modal')
-        .on('show.bs.modal', function (event) {
-            var $button = $(event.relatedTarget);
-            var $modal = $(this);
-            $modal.find('#subscribe-modal-id').val($button.data('component-id'));
-        })
-        .on('hidden.bs.modal', function (event) {
-            var $modal = $(this);
-            $modal.find('#subscribe-modal-id').val('');
-        });
-
-    // Focus on any modals.
-    $('.modal').on('shown.bs.modal', function () {
-        $(this).find('input[type=text]').focus();
-    });
 });
 
 function askConfirmation(callback) {
diff --git a/resources/views/index.blade.php b/resources/views/index.blade.php
index 682b4f44..bed06e33 100644
--- a/resources/views/index.blade.php
+++ b/resources/views/index.blade.php
@@ -57,5 +57,4 @@
 </nav>
 @endif
 
-@include('partials.modals.subscribe')
 @stop
diff --git a/resources/views/partials/footer.blade.php b/resources/views/partials/footer.blade.php
index 5219c620..220f68ba 100644
--- a/resources/views/partials/footer.blade.php
+++ b/resources/views/partials/footer.blade.php
@@ -29,7 +29,7 @@
                     </li>
                     @if(subscribers_enabled())
                     <li>
-                        <a class="btn btn-success btn-outline" href="#" data-toggle="modal" data-target="#subscribe-modal">{{ trans('cachet.subscriber.button') }}</a>
+                        <a class="btn btn-success btn-outline" href="{{ route('subscribe.subscribe') }}">{{ trans('cachet.subscriber.button') }}</a>
                     </li>
                     @endif
                 </ul>
diff --git a/resources/views/subscribe/subscribe.blade.php b/resources/views/subscribe/subscribe.blade.php
index 5a688397..ba222b1f 100644
--- a/resources/views/subscribe/subscribe.blade.php
+++ b/resources/views/subscribe/subscribe.blade.php
@@ -9,18 +9,22 @@
 
 @include('dashboard.partials.errors')
 
-<div class="panel panel-meassage">
-    <div class="panel-heading">
-        <strong>{{ trans('cachet.subscriber.subscribe') }}</strong>
-    </div>
-    <div class="panel-body">
-        <form action="{{ route('subscribe.subscribe', [], false) }}" method="post" class="form">
-            <input type="hidden" name="_token" value="{{ csrf_token() }}">
-            <div class="form-group">
-                <input class="form-control" type="email" name="email">
+<div class="row">
+    <div class="col-xs-12 col-lg-offset-2 col-lg-8">
+        <div class="panel panel-meassage">
+            <div class="panel-heading">
+                <h2>{{ trans('cachet.subscriber.subscribe') }}</h2>
             </div>
-            <button type="submit" class="btn btn-success">{{ trans('cachet.subscriber.button') }}</button>
-        </form>
+            <div class="panel-body">
+                <form action="{{ route('subscribe.subscribe', [], false) }}" method="post" class="form">
+                    <input type="hidden" name="_token" value="{{ csrf_token() }}">
+                    <div class="form-group">
+                        <input class="form-control" type="email" name="email">
+                    </div>
+                    <button type="submit" class="btn btn-success">{{ trans('cachet.subscriber.button') }}</button>
+                </form>
+            </div>
+        </div>
     </div>
 </div>
 @stop