Merge pull request #1835 from CachetHQ/subscribers

Remove subscribers modal
This commit is contained in:
James Brooks
2016-05-26 08:42:57 +01:00
4 changed files with 16 additions and 30 deletions

View File

@@ -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) {

View File

@@ -57,5 +57,4 @@
</nav>
@endif
@include('partials.modals.subscribe')
@stop

View File

@@ -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>

View File

@@ -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