From 183478a12b7eb24b6433f4e6d5f3205198a095d9 Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Tue, 6 Sep 2016 21:22:35 +0200
Subject: Several minor interface improvements

---
 public/css/hebrewparsetrainer.css     |  5 +++++
 resources/views/add_root.blade.php    |  2 +-
 resources/views/contribute.blade.php  |  5 ++++-
 resources/views/suggest.blade.php     |  6 +++---
 resources/views/suggestions.blade.php | 14 +++++++++++---
 resources/views/trainer.blade.php     |  4 ++--
 6 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/public/css/hebrewparsetrainer.css b/public/css/hebrewparsetrainer.css
index 8ca939f..03c661c 100644
--- a/public/css/hebrewparsetrainer.css
+++ b/public/css/hebrewparsetrainer.css
@@ -64,9 +64,14 @@ body {
 }
 
 .hebrew {
+	direction: rtl;
 	font-family: 'Ezra SIL', David;
 }
 
+.ltr {
+	direction: ltr;
+}
+
 .hebrew-large {
 	font-size: 40px;
 }
diff --git a/resources/views/add_root.blade.php b/resources/views/add_root.blade.php
index 8da9726..86c67cf 100644
--- a/resources/views/add_root.blade.php
+++ b/resources/views/add_root.blade.php
@@ -10,7 +10,7 @@ use HebrewParseTrainer\RootKind;
 			<div class="alerts"></div>
 			<div class="form-group">
 				<label for="add-root-root">Root</label>
-				<input type="text" class="form-control" id="add-root-root" name="root" placeholder="קטל"/>
+				<input type="text" class="form-control hebrew input-lg" id="add-root-root" name="root" placeholder="קטל"/>
 			</div>
 			<div class="form-group">
 				<label for="add-root-kind">Kind</label>
diff --git a/resources/views/contribute.blade.php b/resources/views/contribute.blade.php
index dd2d8bb..2e0eff3 100644
--- a/resources/views/contribute.blade.php
+++ b/resources/views/contribute.blade.php
@@ -1,3 +1,6 @@
+<?php
+use HebrewParseTrainer\Verb;
+?>
 @extends('layouts.master')
 
 @section('master-content')
@@ -15,7 +18,7 @@
 <ul>
 	<li>Any user can <em>suggest new verbs</em>.</li>
 	<li>These have to be <em>peer-reviewed</em> by other contributors.</li>
-	<li>It has to get <em>five</em> votes to be accepted.</li>
+	<li>It has to get <em>{{ Verb::ACCEPTED_VOTE_COUNT }}</em> votes to be accepted.</li>
 	<li>Contributors <em>earn points</em> for all accepted verbs they suggested.</li>
 	<li>The <em>vote weight</em> is dependent on the number of points a user has.</li>
 </ul>
diff --git a/resources/views/suggest.blade.php b/resources/views/suggest.blade.php
index b297060..0677cda 100644
--- a/resources/views/suggest.blade.php
+++ b/resources/views/suggest.blade.php
@@ -14,14 +14,14 @@ use HebrewParseTrainer\Verb;
 			<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" name="verb" placeholder="קָטַל"/>
+					<input type="text" class="form-control hebrew input-lg" 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" name="root">
-						@foreach(Root::all() as $root)
+					<select id="suggest-root" class="form-control hebrew input-lg" name="root">
+						@foreach(Root::orderBy('root')->get() as $root)
 							<option value="{{ $root->root }}">{{{ $root->root }}}</option>
 						@endforeach
 					</select>
diff --git a/resources/views/suggestions.blade.php b/resources/views/suggestions.blade.php
index 2e95eff..963b2fb 100644
--- a/resources/views/suggestions.blade.php
+++ b/resources/views/suggestions.blade.php
@@ -1,5 +1,13 @@
 <?php
 use HebrewParseTrainer\Verb;
+
+$suggestions = Verb::where('active', 0)
+	->orderBy('root')
+	->orderBy('tense', 'desc')
+	->orderBy('number')
+	->orderBy('person', 'desc')
+	->orderBy('gender')
+	->get();
 ?>
 <div class="panel panel-default">
 	<div class="panel-heading">
@@ -16,10 +24,10 @@ use HebrewParseTrainer\Verb;
 				</tr>
 			</thead>
 			<tbody>
-			@forelse(Verb::where('active', 0)->orderBy('verb')->get() as $verb)
+			@forelse($suggestions as $verb)
 				<tr>
-					<td class="large">{{ $verb->verb }}</td>
-					<td class="large">{{ $verb->root }}</td>
+					<td class="large hebrew text-center">{{ $verb->verb }}</td>
+					<td class="large hebrew text-center">{{ $verb->root }}</td>
 					<td>{{ $verb->stem }} {{ $verb->tense }} {{ $verb->person }}{{ $verb->gender }}{{ $verb->number }}</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>
diff --git a/resources/views/trainer.blade.php b/resources/views/trainer.blade.php
index c4452f6..02d9964 100644
--- a/resources/views/trainer.blade.php
+++ b/resources/views/trainer.blade.php
@@ -28,10 +28,10 @@ use HebrewParseTrainer\Tense;
 
 	<div class="form-group">
 		<h3>Roots</h3>
-		<select name="root" class="reload-verb form-control" multiple="multiple">
+		<select name="root" class="reload-verb form-control hebrew ltr" multiple="multiple">
 		@foreach (Root::orderBy('root_kind_id')->get() as $root)
 			@if ($root->verbs()->where('active', 1)->count() > 0)
-					<option class="hebrew" value="{{{ $root->root }}}" selected="selected">{{{ $root->root }}} ({{{ $root->kind->name }}})</option>
+					<option value="{{{ $root->root }}}" selected="selected">{{{ $root->root }}} ({{{ $root->kind->name }}})</option>
 			@endif
 		@endforeach
 		</select>
-- 
cgit v1.2.3