From 15b26b8b2af028ea30dc34f78ed5c6f3fcb0d547 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Mon, 5 Sep 2016 23:43:35 +0200
Subject: Suggest new verbs

---
 resources/views/layouts/master.blade.php |  1 +
 resources/views/suggest.blade.php        | 30 +++++++++++++++++++++---------
 resources/views/suggestions.blade.php    | 10 ++++------
 3 files changed, 26 insertions(+), 15 deletions(-)

(limited to 'resources/views')

diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php
index 199db2d..ad8056d 100644
--- a/resources/views/layouts/master.blade.php
+++ b/resources/views/layouts/master.blade.php
@@ -60,6 +60,7 @@ if (Auth::check()) {
 
 		<script src="{{ env('APP_URL') }}vendor/components/jquery/jquery.min.js"></script>
 		<script src="{{ env('APP_URL') }}vendor/twbs/bootstrap/dist/js/bootstrap.min.js"></script>
+		<script src="{{ env('APP_URL') }}public/js/alerts.js"></script>
 		<script src="{{ env('APP_URL') }}public/js/hebrewparsetrainer.js"></script>
 		@if(Auth::check())
 			<script src="{{ env('APP_URL') }}public/js/moderators.js"></script>
diff --git a/resources/views/suggest.blade.php b/resources/views/suggest.blade.php
index 6a1ebe8..1bc50f7 100644
--- a/resources/views/suggest.blade.php
+++ b/resources/views/suggest.blade.php
@@ -1,5 +1,6 @@
 <?php
 use HebrewParseTrainer\Root;
+use HebrewParseTrainer\Stem;
 use HebrewParseTrainer\Tense;
 use HebrewParseTrainer\Verb;
 ?>
@@ -8,19 +9,30 @@ use HebrewParseTrainer\Verb;
 		<h3 class="panel-title">Suggest a new verb</h3>
 	</div>
 	<div class="panel-body">
-		<form class="form-horizontal">
+		<form class="form-horizontal" id="suggest">
+			<div class="alerts"></div>
 			<div class="form-group">
 				<label for="suggest-verb" class="col-sm-2 control-label">Verb</label>
 				<div class="col-sm-10">
-					<input type="text" class="form-control" id="suggest-verb" placeholder="קָטַל"/>
+					<input type="text" class="form-control" id="suggest-verb" name="verb" placeholder="קָטַל"/>
 				</div>
 			</div>
 			<div class="form-group">
 				<label for="suggest-root" class="col-sm-2 control-label">Root</label>
 				<div class="col-sm-10">
-					<select id="suggest-root" class="form-control">
+					<select id="suggest-root" class="form-control" name="root">
 						@foreach(Root::all() as $root)
-							<option value="{{ $root->id }}">{{{ $root->root }}}</option>
+							<option value="{{ $root->root }}">{{{ $root->root }}}</option>
+						@endforeach
+					</select>
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="suggest-stem" class="col-sm-2 control-label">Stem</label>
+				<div class="col-sm-10">
+					<select id="suggest-stem" class="form-control" name="stem">
+						@foreach(Stem::all() as $stem)
+							<option value="{{ $stem->name }}">{{{ $stem->name }}}</option>
 						@endforeach
 					</select>
 				</div>
@@ -28,9 +40,9 @@ use HebrewParseTrainer\Verb;
 			<div class="form-group">
 				<label for="suggest-tense" class="col-sm-2 control-label">Tense</label>
 				<div class="col-sm-10">
-					<select id="suggest-tense" class="form-control">
+					<select id="suggest-tense" class="form-control" name="tense">
 						@foreach(Tense::all() as $tense)
-							<option value="{{ $tense->id }}">{{{ $tense->abbreviation }}}: {{{ $tense->name }}}</option>
+							<option value="{{ $tense->name }}">{{{ $tense->abbreviation }}}: {{{ $tense->name }}}</option>
 						@endforeach
 					</select>
 				</div>
@@ -38,7 +50,7 @@ use HebrewParseTrainer\Verb;
 			<div class="form-group">
 				<label for="suggest-person" class="col-sm-2 control-label">Person</label>
 				<div class="col-sm-10">
-					<select id="suggest-person" class="form-control">
+					<select id="suggest-person" class="form-control" name="person">
 						<option value="">(none)</option>
 						<option value="1">1</option>
 						<option value="2">2</option>
@@ -49,7 +61,7 @@ use HebrewParseTrainer\Verb;
 			<div class="form-group">
 				<label for="suggest-gender" class="col-sm-2 control-label">Gender</label>
 				<div class="col-sm-10">
-					<select id="suggest-gender" class="form-control">
+					<select id="suggest-gender" class="form-control" name="gender">
 						<option value="">(none)</option>
 						<option value="m">masculine</option>
 						<option value="f">feminine</option>
@@ -59,7 +71,7 @@ use HebrewParseTrainer\Verb;
 			<div class="form-group">
 				<label for="suggest-number" class="col-sm-2 control-label">Number</label>
 				<div class="col-sm-10">
-					<select id="suggest-number" class="form-control">
+					<select id="suggest-number" class="form-control" name="number">
 						<option value="">(none)</option>
 						<option value="s">singular</option>
 						<option value="p">plural</option>
diff --git a/resources/views/suggestions.blade.php b/resources/views/suggestions.blade.php
index dcec56a..e9b8efb 100644
--- a/resources/views/suggestions.blade.php
+++ b/resources/views/suggestions.blade.php
@@ -11,18 +11,16 @@ use HebrewParseTrainer\Verb;
 				<th>Verb</th>
 				<th>Root</th>
 				<th>Parsing</th>
-				<th>Votes</th>
+				<th colspan="3">Votes</th>
 			</tr>
 			@forelse(Verb::where('active', 0)->orderBy('verb')->get() as $verb)
 				<tr>
 					<td class="large">{{ $verb->verb }}</td>
 					<td class="large">{{ $verb->root }}</td>
 					<td>{{ $verb->stem }} {{ $verb->tense }} {{ $verb->person }}{{ $verb->gender }}{{ $verb->number }}</td>
-					<td>
-						<button data-vote="0" data-verb="{{ $verb->id }}" class="vote btn btn-{{ $verb->userVote(Auth::user()) < 0 ? 'danger' : 'default' }}">-</button>
-						<span class="vote-count btn">{{ $verb->voteCount() }}</span>
-						<button data-vote="1" data-verb="{{ $verb->id }}" class="vote btn btn-{{ $verb->userVote(Auth::user()) > 0 ? 'success' : 'default' }}">+</button>
-					</td>
+					<td class="vote-cell"><button data-vote="0" data-verb="{{ $verb->id }}" class="vote btn btn-{{ $verb->userVote(Auth::user()) < 0 ? 'danger' : 'default' }}">-</button></td>
+					<td class="vote-cell"><span class="vote-count btn">{{ $verb->voteCount() }}</span></td>
+					<td class="vote-cell"><button data-vote="1" data-verb="{{ $verb->id }}" class="vote btn btn-{{ $verb->userVote(Auth::user()) > 0 ? 'success' : 'default' }}">+</button></td>
 				</tr>
 			@empty
 				<tr><td colspan="4">There are no active suggestions. Why not add a verb yourself?</td></tr>
-- 
cgit v1.2.3