diff --git a/public/css/style.css b/public/css/style.css
index 1d1ae7fa04fb289401aff7375d8995d1b233abc5..d4c921472cbbb2f3b0f0a5984117250c819c392a 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -110,6 +110,17 @@
margin-bottom: 10px;
}
+.body-article {
+ display: block;
+}
+
+.footer-article {
+ display: block;
+ clear: both;
+ padding-bottom: 2%;
+ padding-top: 2%;
+}
+
.bottomButton {
margin-top: 30px;
}
diff --git a/resources/views/admin/addCSV.blade.php b/resources/views/admin/addCSV.blade.php
index b2ff6a35435c7b4904084ababa3d5fc493c91780..cdbce1812fbcf6f85a961dd7d4d6f0160241a470 100644
--- a/resources/views/admin/addCSV.blade.php
+++ b/resources/views/admin/addCSV.blade.php
@@ -10,6 +10,9 @@
</div>
{{Form::hidden('_method', 'POST')}}
{{Form::submit('Submit', ['class' => 'btn btn-primary'])}}
+ <a onclick="return confirm('Are you sure you want to leave?')" class="btn btn-danger pull-right" href="/members">
+ Cancel
+ </a>
{!! Form::close() !!}
</div>
</div>
diff --git a/resources/views/admin/addmember.blade.php b/resources/views/admin/addmember.blade.php
index 3f40a3d58d902b18629a986702708965fb446f6d..c19925a5d0dc2bc898bb54a3491f25cf1adb5802 100644
--- a/resources/views/admin/addmember.blade.php
+++ b/resources/views/admin/addmember.blade.php
@@ -26,8 +26,8 @@
</div>
{{Form::hidden('_method', 'POST')}}
<div class="bottomButton">
- {{Form::submit('Submit', ['class' => 'btn btn-primary submitButton'])}}
- <a onclick="return confirm('Are you sure you want to leave?')" class="btn btn-primary cancelButton" href="/members">
+ {{Form::submit('Submit', ['class' => 'btn btn-primary'])}}
+ <a onclick="return confirm('Are you sure you want to leave?')" class="btn btn-danger pull-right" href="/members">
Cancel
</a>
</div>
diff --git a/resources/views/admin/createpost.blade.php b/resources/views/admin/createpost.blade.php
index 73074616172391e6318943a91e1fbe798b2ac563..d3128896d3ae602ec4e80e26149f7e2668a4648f 100644
--- a/resources/views/admin/createpost.blade.php
+++ b/resources/views/admin/createpost.blade.php
@@ -16,8 +16,8 @@
{{Form::file('cover_image')}}
</div>
<div class="bottomButton">
- {{Form::submit('Submit', ['class' => 'btn btn-primary submitButton'])}}
- <a onclick="return confirm('Are you sure you want to leave?')" class="pull-right onclick btn btn-primary cancelButton" href="/posts">
+ {{Form::submit('Submit', ['class' => 'btn btn-primary'])}}
+ <a onclick="return confirm('Are you sure you want to leave?')" class="pull-right onclick btn btn-danger" href="/posts">
Cancel
</a>
</div>
diff --git a/resources/views/admin/editpost.blade.php b/resources/views/admin/editpost.blade.php
index f81c85f787b60ec3b1e08778f7439972d204b41e..fc2a09fd036513aa660b55f1268595d375648483 100644
--- a/resources/views/admin/editpost.blade.php
+++ b/resources/views/admin/editpost.blade.php
@@ -17,8 +17,8 @@
</div>
{{Form::hidden('_method', 'PUT')}}
<div class="bottomButton">
- {{Form::submit('Submit', ['class' => 'btn btn-primary submitButton'])}}
- <a onclick="return confirm('Are you sure you want to leave?')" class="onclick btn btn-primary cancelButton pull-right" href="/posts">
+ {{Form::submit('Submit', ['class' => 'btn btn-primary'])}}
+ <a onclick="return confirm('Are you sure you want to leave?')" class="onclick btn btn-danger pull-right" href="/posts">
Cancel
</a>
</div>
diff --git a/resources/views/admin/showeachpost.blade.php b/resources/views/admin/showeachpost.blade.php
index cb68b53965588923e6bbdf7d2dce38955ee82a90..df9d1443bca35a17cf0a7cb5b3b80b1909e957d8 100644
--- a/resources/views/admin/showeachpost.blade.php
+++ b/resources/views/admin/showeachpost.blade.php
@@ -2,25 +2,33 @@
@section('content')
<h1>{{$post->title}}</h1>
- @if ($post->cover_image !== 'noimage.jpg')
+ <!--@if ($post->cover_image !== 'noimage.jpg')
<div class="row">
<div class="col-sm-6 col-md-6">
<img style="width:100%" src="/storage/cover_images/{{$post->cover_image}}">
</div>
</div>
<br><br>
- @endif
- <div>
+ @endif-->
+
+ <div class="body-article">
{!!$post->body!!}
</div>
- <hr>
- <small>Written on {{$post->created_at}} by {{$post->user->name}}</small>
- <hr>
- <a href="/posts/{{$post->id}}/edit" class="btn btn-warning">Edit</a>
- {!!Form::open(['action' => ['PostsController@destroy', $post->id], 'method' => 'POST', 'class' => 'pull-right'])!!}
- {{Form::hidden('_method', 'DELETE')}}
- {{Form::submit('Delete', ['class' => 'btn btn-danger', 'onclick' => "return confirm('Are you sure you want to delete?')"])}}
- {!!Form::close() !!}
- <br><br><br>
- <a href="/posts" class="btn btn-info pull-down">← Back</a>
+
+ <div class="footer-article">
+ <hr>
+ <small>Written on {{$post->created_at}} by {{$post->user->name}}</small>
+ <hr>
+
+ @if(!Auth::guest() && Auth::user()->IsAdmin == 1)
+ <a href="/posts/{{$post->id}}/edit" class="btn btn-warning">Edit</a>
+ {!!Form::open(['action' => ['PostsController@destroy', $post->id], 'method' => 'POST', 'class' => 'pull-right'])!!}
+ {{Form::hidden('_method', 'DELETE')}}
+ {{Form::submit('Delete', ['class' => 'btn btn-danger', 'onclick' => "return confirm('Are you sure you want to delete?')"])}}
+ {!!Form::close() !!}
+ @endif
+ <br><br><br>
+ <a href="/posts" class="btn btn-info pull-down">← Back</a>
+
+ </div>
@endsection
\ No newline at end of file
diff --git a/resources/views/inc/adminmenu.blade.php b/resources/views/inc/adminmenu.blade.php
index ce4e2fe199aede3e0bad451f3704062eed515186..b50c1092812bf1cf50643d3b02a1f2c41e5a090a 100644
--- a/resources/views/inc/adminmenu.blade.php
+++ b/resources/views/inc/adminmenu.blade.php
@@ -31,6 +31,7 @@
</div>
</nav>
<!-- Icons -->
+ <!--<script src="/vendor/unisharp/laravel-ckeditor/ckeditor.js"></script>-->
<script src="https://unpkg.com/feather-icons/dist/feather.min.js"></script>
<script>
feather.replace();
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 146b6f7f35a52c6d9f2fea803e95c58b685d9f10..d8a24722f8a157f88615c31cd33b28d8f74081e2 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -24,7 +24,7 @@
@yield('content')
</div>
- <script src="//cdn.ckeditor.com/4.4.7/standard/ckeditor.js"></script>
+ <script src="//cdn.ckeditor.com/4.7.2/standard/ckeditor.js"></script>
<script>
CKEDITOR.replace( 'article-ckeditor' );
</script>