diff --git a/app/Http/Controllers/PollController.php b/app/Http/Controllers/PollController.php index e440bb9..cf3c971 100644 --- a/app/Http/Controllers/PollController.php +++ b/app/Http/Controllers/PollController.php @@ -19,9 +19,6 @@ class PollController extends Controller return view('create_poll'); } - //TODO: Close polls - //TODO: Implement poll editing - public function create(Request $request) { if($request->has('options')) { @@ -268,7 +265,7 @@ class PollController extends Controller $extraCodes = $request->session()->pull('extraCodes', null); if($poll->admin_password == null || $request->query('password') != $poll->admin_password) { - return redirect()->action('PollController@view', ['poll' => $poll]); + return redirect()->action('PollController@viewResults', ['poll' => $poll]); } return view('edit_poll')->with('poll', $poll)->with('changed', $changed)->with('extraCodes', $extraCodes); diff --git a/resources/views/edit_poll.blade.php b/resources/views/edit_poll.blade.php index 3bca455..489bf2c 100644 --- a/resources/views/edit_poll.blade.php +++ b/resources/views/edit_poll.blade.php @@ -100,7 +100,7 @@ - + diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 0a37e2f..afa6333 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -17,12 +17,24 @@ .some-more-bottom-margin { margin-bottom: 2.0rem; } .inline-block { display: inline-block; } .text-browser { display: none; } + .huge-button { width: 100%; } + .float-right { float: right; } .primary-box { padding: 1rem 1rem 1rem 1rem!important; border: 2px solid #e83fb8; } + .vote-bar { + background-color: #e83fb8; + height: 2rem; + } + + img.centered-image { + display: block; + margin: 0 auto; + } + .copyarea { user-select: all; width: calc(100% - 0.4rem); diff --git a/resources/views/view_poll_results.blade.php b/resources/views/view_poll_results.blade.php index 30bb20d..3ca3dff 100644 --- a/resources/views/view_poll_results.blade.php +++ b/resources/views/view_poll_results.blade.php @@ -38,10 +38,10 @@
{{ $option->text }} : - {{ $votes }} votes + {{ $votes }} votes
-
+
{{ $total == 0 ? 0 : round($votes / $total * 100, 2) }}% of votes

@@ -60,14 +60,14 @@ @if ($total != 0)
- +

@foreach ($nonZeroOptions as $option) - + {{ $option->text }}