diff options
Diffstat (limited to 'resources')
-rw-r--r-- | resources/views/add_root.blade.php | 29 | ||||
-rw-r--r-- | resources/views/auth/login.blade.php | 68 | ||||
-rw-r--r-- | resources/views/auth/passwords/email.blade.php | 47 | ||||
-rw-r--r-- | resources/views/auth/passwords/reset.blade.php | 70 | ||||
-rw-r--r-- | resources/views/auth/register.blade.php | 82 | ||||
-rw-r--r-- | resources/views/contribute.blade.php | 53 | ||||
-rw-r--r-- | resources/views/layouts/master.blade.php | 40 | ||||
-rw-r--r-- | resources/views/mails/user/create.blade.php | 13 | ||||
-rw-r--r-- | resources/views/shared/already_logged_in.blade.php | 1 | ||||
-rw-r--r-- | resources/views/shared/messages.blade.php | 5 | ||||
-rw-r--r-- | resources/views/stats.blade.php | 134 | ||||
-rw-r--r-- | resources/views/suggest.blade.php | 89 | ||||
-rw-r--r-- | resources/views/suggestions.blade.php | 43 | ||||
-rw-r--r-- | resources/views/trainer.blade.php | 70 | ||||
-rw-r--r-- | resources/views/user/create.blade.php | 32 | ||||
-rw-r--r-- | resources/views/user/top.blade.php | 39 |
16 files changed, 29 insertions, 786 deletions
diff --git a/resources/views/add_root.blade.php b/resources/views/add_root.blade.php deleted file mode 100644 index 107eb16..0000000 --- a/resources/views/add_root.blade.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php -use HebrewParseTrainer\RootKind; -?> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Add a new root</h3> - </div> - <div class="panel-body"> - <form id="add-root"> - <input type="hidden" name="_token" value="{{ csrf_token() }}"> - <div class="alerts"></div> - <div class="form-group"> - <label for="add-root-root">Root</label> - <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> - <select id="add-root-kind" class="form-control" name="root_kind_id"> - @foreach(RootKind::all() as $kind) - <option value="{{ $kind->id }}">{{{ $kind->name }}}</option> - @endforeach - </select> - </div> - <div class="form-group"> - <button type="submit" class="btn btn-primary">Add</button> - </div> - </form> - </div> -</div> diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php deleted file mode 100644 index 2070f2b..0000000 --- a/resources/views/auth/login.blade.php +++ /dev/null @@ -1,68 +0,0 @@ -@extends('layouts.master') - -@section('master-content') -<div class="container"> - <div class="row"> - <div class="col-md-8 col-md-offset-2"> - <div class="panel panel-default"> - <div class="panel-heading">Login</div> - <div class="panel-body"> - <form class="form-horizontal" role="form" method="POST" action="{{ url('/login') }}"> - {{ csrf_field() }} - - <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}"> - <label for="email" class="col-md-4 control-label">E-Mail Address</label> - - <div class="col-md-6"> - <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required autofocus> - - @if ($errors->has('email')) - <span class="help-block"> - <strong>{{ $errors->first('email') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}"> - <label for="password" class="col-md-4 control-label">Password</label> - - <div class="col-md-6"> - <input id="password" type="password" class="form-control" name="password" required> - - @if ($errors->has('password')) - <span class="help-block"> - <strong>{{ $errors->first('password') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group"> - <div class="col-md-6 col-md-offset-4"> - <div class="checkbox"> - <label> - <input type="checkbox" name="remember"> Remember Me - </label> - </div> - </div> - </div> - - <div class="form-group"> - <div class="col-md-8 col-md-offset-4"> - <button type="submit" class="btn btn-primary"> - Login - </button> - - <a class="btn btn-link" href="{{ url('/password/reset') }}"> - Forgot Your Password? - </a> - </div> - </div> - </form> - </div> - </div> - </div> - </div> -</div> -@endsection diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php deleted file mode 100644 index 62e0120..0000000 --- a/resources/views/auth/passwords/email.blade.php +++ /dev/null @@ -1,47 +0,0 @@ -@extends('layouts.master') - -<!-- Main Content --> -@section('master-content') -<div class="container"> - <div class="row"> - <div class="col-md-8 col-md-offset-2"> - <div class="panel panel-default"> - <div class="panel-heading">Reset Password</div> - <div class="panel-body"> - @if (session('status')) - <div class="alert alert-success"> - {{ session('status') }} - </div> - @endif - - <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}"> - {{ csrf_field() }} - - <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}"> - <label for="email" class="col-md-4 control-label">E-Mail Address</label> - - <div class="col-md-6"> - <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required> - - @if ($errors->has('email')) - <span class="help-block"> - <strong>{{ $errors->first('email') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group"> - <div class="col-md-6 col-md-offset-4"> - <button type="submit" class="btn btn-primary"> - Send Password Reset Link - </button> - </div> - </div> - </form> - </div> - </div> - </div> - </div> -</div> -@endsection diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php deleted file mode 100644 index deb4d56..0000000 --- a/resources/views/auth/passwords/reset.blade.php +++ /dev/null @@ -1,70 +0,0 @@ -@extends('layouts.master') - -@section('master-content') -<div class="container"> - <div class="row"> - <div class="col-md-8 col-md-offset-2"> - <div class="panel panel-default"> - <div class="panel-heading">Reset Password</div> - - <div class="panel-body"> - <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/reset') }}"> - {{ csrf_field() }} - - <input type="hidden" name="token" value="{{ $token }}"> - - <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}"> - <label for="email" class="col-md-4 control-label">E-Mail Address</label> - - <div class="col-md-6"> - <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus> - - @if ($errors->has('email')) - <span class="help-block"> - <strong>{{ $errors->first('email') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}"> - <label for="password" class="col-md-4 control-label">Password</label> - - <div class="col-md-6"> - <input id="password" type="password" class="form-control" name="password" required> - - @if ($errors->has('password')) - <span class="help-block"> - <strong>{{ $errors->first('password') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}"> - <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label> - <div class="col-md-6"> - <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required> - - @if ($errors->has('password_confirmation')) - <span class="help-block"> - <strong>{{ $errors->first('password_confirmation') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group"> - <div class="col-md-6 col-md-offset-4"> - <button type="submit" class="btn btn-primary"> - Reset Password - </button> - </div> - </div> - </form> - </div> - </div> - </div> - </div> -</div> -@endsection diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php deleted file mode 100644 index c4f9009..0000000 --- a/resources/views/auth/register.blade.php +++ /dev/null @@ -1,82 +0,0 @@ -@extends('layouts.master') - -@section('master-content') -<div class="container"> - <div class="row"> - <div class="col-md-8 col-md-offset-2"> - <div class="panel panel-default"> - <div class="panel-heading">Register</div> - <div class="panel-body"> - <form class="form-horizontal" role="form" method="POST" action="{{ url('/register') }}"> - {{ csrf_field() }} - - <div class="form-group{{ $errors->has('name') ? ' has-error' : '' }}"> - <label for="name" class="col-md-4 control-label">Name</label> - - <div class="col-md-6"> - <input id="name" type="text" class="form-control" name="name" value="{{ old('name') }}" required autofocus> - - @if ($errors->has('name')) - <span class="help-block"> - <strong>{{ $errors->first('name') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}"> - <label for="email" class="col-md-4 control-label">E-Mail Address</label> - - <div class="col-md-6"> - <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required> - - @if ($errors->has('email')) - <span class="help-block"> - <strong>{{ $errors->first('email') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}"> - <label for="password" class="col-md-4 control-label">Password</label> - - <div class="col-md-6"> - <input id="password" type="password" class="form-control" name="password" required> - - @if ($errors->has('password')) - <span class="help-block"> - <strong>{{ $errors->first('password') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}"> - <label for="password-confirm" class="col-md-4 control-label">Confirm Password</label> - - <div class="col-md-6"> - <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required> - - @if ($errors->has('password_confirmation')) - <span class="help-block"> - <strong>{{ $errors->first('password_confirmation') }}</strong> - </span> - @endif - </div> - </div> - - <div class="form-group"> - <div class="col-md-6 col-md-offset-4"> - <button type="submit" class="btn btn-primary"> - Register - </button> - </div> - </div> - </form> - </div> - </div> - </div> - </div> -</div> -@endsection diff --git a/resources/views/contribute.blade.php b/resources/views/contribute.blade.php deleted file mode 100644 index 86473de..0000000 --- a/resources/views/contribute.blade.php +++ /dev/null @@ -1,53 +0,0 @@ -<?php -use HebrewParseTrainer\Verb; -?> -@extends('layouts.master') - -@section('master-content') -<p class="lead"> - Thank you for wanting to help out! To expand our database, we are looking for volunteers to enter more verbs. -</p> - -@if(!Auth::check()) - <a class="btn btn-lg btn-primary" href="{{ url('/login') }}">Login</a> - <a class="btn btn-lg btn-success" href="{{ url('/register') }}">Sign up</a> -@endif - -<h3>Here's how it works:</h3> - -<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>{{ 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> - -<p> - If you have any questions, please write me at <a href="mailto:info@camilstaps.nl">info@camilstaps.nl</a>. -</p> - -@if(Auth::check()) - <hr/> - <div class="row"> - <div class="col-md-6"> - @include('suggestions') - </div> - <div class="col-lg-4 col-md-6"> - @include('suggest') - </div> - <div class="col-lg-2 col-md-6"> - @include('add_root') - </div> - </div> - - <hr/> - - <div class="row"> - <div class="col-md-6 col-lg-4"> - @include('user.top') - </div> - </div> -@endif - -@endsection diff --git a/resources/views/layouts/master.blade.php b/resources/views/layouts/master.blade.php index 6a472e3..faf8aa2 100644 --- a/resources/views/layouts/master.blade.php +++ b/resources/views/layouts/master.blade.php @@ -1,7 +1,7 @@ <!DOCTYPE html> <!-- -HebrewParseTrainer - practice Hebrew verbs -Copyright (C) 2015 Camil Staps <info@camilstaps.nl> +Luo Parse Trainer - practice Ancient Greek verb forms +Copyright (C) 2015-present Camil Staps <info@camilstaps.nl> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,20 +16,6 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. --> -<?php -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Request; - -$activePage = isset($activePage) ? $activePage : ''; -$menu = [ - 'Train' => ['/', ''], -]; - -if (Auth::check()) { - $menu['Contribute'] = ['contribute', 'contribute']; - $menu['Statistics'] = ['stats', 'stats']; -} -?> <html lang="en"> <head> <meta charset="utf-8"/> @@ -38,7 +24,7 @@ if (Auth::check()) { <title>ParseTrainer</title> <link rel="stylesheet" href="{{ asset('vendor/twbs/bootstrap/dist/css/bootstrap.min.css') }}"/> - <link rel="stylesheet" href="{{ asset('public/css/hebrewparsetrainer.css') }}"/> + <link rel="stylesheet" href="{{ asset('public/css/luoparsetrainer.css') }}"/> <script type="text/javascript"> var app_url = '{{ env('APP_URL') }}'; @@ -48,16 +34,6 @@ if (Auth::check()) { <body role="application"> <div class="container" role="main"> <div class="header clearfix"> - <nav> - <ul class="nav nav-pills pull-right"> - @foreach($menu as $name => $link) - <li role="presentation" class="{{ Request::is($link[0]) ? 'active' : '' }}"><a href="{{ url($link[1]) }}">{{ $name }}</a></li> - @endforeach - @if(Auth::check()) - <li role="presentation"><a href="{{ url('/logout') }}" onclick="event.preventDefault();document.getElementById('logout-form').submit();">Logout</a></li> - @endif - </ul> - </nav> <h2 class="text-muted"><a href="{{ url('/') }}">ParseTrainer</a></h2> </div> @@ -66,14 +42,6 @@ if (Auth::check()) { <script src="{{ asset('vendor/components/jquery/jquery.min.js') }}"></script> <script src="{{ asset('vendor/twbs/bootstrap/dist/js/bootstrap.min.js') }}"></script> - <script src="{{ asset('public/js/alerts.js') }}"></script> - <script src="{{ asset('public/js/hebrewparsetrainer.js') }}"></script> - @if(Auth::check()) - <script src="{{ asset('public/js/moderators.js') }}"></script> - - <form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display:none;"> - {{ csrf_field() }} - </form> - @endif + <script src="{{ asset('public/js/luoparsetrainer.js') }}"></script> </body> </html> diff --git a/resources/views/mails/user/create.blade.php b/resources/views/mails/user/create.blade.php deleted file mode 100644 index 4094dfd..0000000 --- a/resources/views/mails/user/create.blade.php +++ /dev/null @@ -1,13 +0,0 @@ -Dear {{ $user->name }}, - -Thank you for creating an account at the Hebrew Parse Trainer. - -You can now login at {{ URL::to('/contribute?login=yes') }}, using your email address and password. - -If you need any help, you can reach us at {{ env('MAIL_FROM_ADDRESS') }}. - -Thank you for your help! - -Best, - -{{ env('MAIL_FROM_NAME') }} diff --git a/resources/views/shared/already_logged_in.blade.php b/resources/views/shared/already_logged_in.blade.php deleted file mode 100644 index 37725fa..0000000 --- a/resources/views/shared/already_logged_in.blade.php +++ /dev/null @@ -1 +0,0 @@ -You are already logged in. diff --git a/resources/views/shared/messages.blade.php b/resources/views/shared/messages.blade.php deleted file mode 100644 index 67feae5..0000000 --- a/resources/views/shared/messages.blade.php +++ /dev/null @@ -1,5 +0,0 @@ -@if(isset($messages)) -@foreach($messages as $message) - <div class="alert alert-{{{ $message[0] }}}" role="alert">{{{ $message[1] }}}</div> -@endforeach -@endif diff --git a/resources/views/stats.blade.php b/resources/views/stats.blade.php deleted file mode 100644 index eb4205f..0000000 --- a/resources/views/stats.blade.php +++ /dev/null @@ -1,134 +0,0 @@ -<?php -use \HebrewParseTrainer\RandomLog; - -$db_stats = RandomLog - ::select( - DB::raw('COUNT(*) as count'), - DB::raw('DATE(created_at) as created_at')) - ->groupBy(DB::raw('DATE(created_at)')) - ->orderBy('created_at') - ->get(); - -$stats['requests'] = []; -$last_date = null; -foreach ($db_stats as $stat) { - $date = strtotime($stat->created_at); - while ($last_date != null && $last_date + 86400 < $date) { - $last_date += 86400; - $stats['requests'][] = "[Date.UTC" . date("(Y,n-1,j)", $last_date) . ",0]"; - } - $stats['requests'][] = "[Date.UTC" . date("(Y,n-1,j)", $date) . "," . $stat->count . "]"; - $last_date = $date; -} -$stats['requests'] = "[" . implode(",", $stats['requests']) . "]"; - -$db_stats = RandomLog - ::select( - DB::raw('COUNT(DISTINCT `ip`) as count'), - DB::raw('DATE(created_at) as created_at')) - ->groupBy(DB::raw('DATE(created_at)')) - ->orderBy('created_at') - ->get(); - -$stats['unique-ips'] = []; -$last_date = null; -foreach ($db_stats as $stat) { - $date = strtotime($stat->created_at); - while ($last_date != null && $last_date + 86400 < $date) { - $last_date += 86400; - $stats['unique-ips'][] = "[Date.UTC" . date("(Y,n-1,j)", $last_date) . ",0]"; - } - $stats['unique-ips'][] = "[Date.UTC" . date("(Y,n-1,j)", $date) . "," . $stat->count . "]"; - $last_date = $date; -} -$stats['unique-ips'] = "[" . implode(",", $stats['unique-ips']) . "]"; -?> - -@extends('layouts.master') - -@section('master-content') -<div class="row"> - <div class="col-lg-12"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Random verb requests</h3> - </div> - <div class="panel-body"> - <div id="random-requests" style="height:400px;"></div> - </div> - </div> - </div> -</div> - -<script src="{{ url("/vendor/components/jquery/jquery.min.js") }}"></script> -<script src="{{ url("/vendor/twbs/bootstrap/dist/js/bootstrap.min.js") }}"></script> -<script src="//code.highcharts.com/stock/highstock.js"></script> -<script src="{{ url("/public/js/hebrewparsetrainer.js") }}"></script> - -<script type="text/javascript"> - $('#random-requests').highcharts('StockChart', { - chart: { - type: 'column', - zoomType: 'x' - }, - credits: { enabled: false }, - xAxis: { ordinal: false }, - yAxis: [ - { - min: 0, - title: { text: 'Requests' }, - opposite: false - }, { - min: 0, - title: { text: 'Unique visitors' }, - opposite: true - } - ], - rangeSelector: { - buttons: [ - {type: 'week', count: 1, text: '1w'}, - {type: 'month', count: 1, text: '1m'}, - {type: 'month', count: 3, text: '3m'}, - {type: 'year', count: 1, text: '1y'}, - {type: 'all', text: 'All'} - ], - selected: 3 - }, - plotOptions: { - column: { - dataGrouping: { - groupPixelWidth: 80, - units: [ - ['day', [1]], - ['week', [1]], - ['month', [1]], - ['month', [3]], - ['year', [1]] - ] - }, - pointPadding: 0.02, - groupPadding: 0.02 - }, - series: { - dataGrouping: { - approximation: 'sum' - } - } - }, - tooltip: { pointFormat: '<b>{point.y}</b> requests<br>' }, - series: [ - { - name: 'Requests', - data: {{ $stats['requests'] }} - }, - { - type: 'spline', - yAxis: 1, - name: 'Unique visitors', - data: {{ $stats['unique-ips'] }}, - tooltip: { pointFormat: '<b>{point.y}</b> unique visitors' }, - } - ] - }); -</script> -@endsection diff --git a/resources/views/suggest.blade.php b/resources/views/suggest.blade.php deleted file mode 100644 index 1e5c424..0000000 --- a/resources/views/suggest.blade.php +++ /dev/null @@ -1,89 +0,0 @@ -<?php -use HebrewParseTrainer\Root; -use HebrewParseTrainer\Stem; -use HebrewParseTrainer\Tense; -use HebrewParseTrainer\Verb; -?> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Suggest a new verb</h3> - </div> - <div class="panel-body"> - <form class="form-horizontal" id="suggest"> - <input type="hidden" name="_token" value="{{ csrf_token() }}"> - <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 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 hebrew input-lg" name="root"> - @foreach(Root::orderBy('root')->get() as $root) - <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::orderBy('id')->get() as $stem) - <option value="{{ $stem->name }}">{{{ $stem->name }}}</option> - @endforeach - </select> - </div> - </div> - <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" name="tense"> - @foreach(Tense::all() as $tense) - <option value="{{ $tense->name }}">{{{ $tense->abbreviation }}}: {{{ $tense->name }}}</option> - @endforeach - </select> - </div> - </div> - <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" name="person"> - <option value="">(none)</option> - <option value="1">1</option> - <option value="2">2</option> - <option value="3">3</option> - </select> - </div> - </div> - <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" name="gender"> - <option value="">(none)</option> - <option value="m">masculine</option> - <option value="f">feminine</option> - </select> - </div> - </div> - <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" name="number"> - <option value="">(none)</option> - <option value="s">singular</option> - <option value="p">plural</option> - </select> - </div> - </div> - <div class="form-group"> - <div class="col-sm-offset-2 col-sm-10"> - <button type="submit" class="btn btn-primary">Suggest</button> - </div> - </div> - </form> - </div> -</div> diff --git a/resources/views/suggestions.blade.php b/resources/views/suggestions.blade.php deleted file mode 100644 index 68ad049..0000000 --- a/resources/views/suggestions.blade.php +++ /dev/null @@ -1,43 +0,0 @@ -<?php -use HebrewParseTrainer\Verb; - -$suggestions = Verb::where('active', 0) - ->orderBy('root') - ->orderBy('stem', 'desc') - ->orderBy('tense', 'desc') - ->orderBy('number') - ->orderBy('person', 'desc') - ->orderBy('gender') - ->get(); -?> -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Current suggestions</h3> - </div> - <div class="panel-body"> - <table class="table table-hover table-condensed suggestions"> - <thead> - <tr> - <th>Verb</th> - <th>Root</th> - <th>Parsing</th> - <th colspan="3">Votes</th> - </tr> - </thead> - <tbody> - @forelse($suggestions as $verb) - <tr> - <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> - <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> - @endforelse - </tbody> - </table> - </div> -</div> diff --git a/resources/views/trainer.blade.php b/resources/views/trainer.blade.php index ea0c141..c73dcd3 100644 --- a/resources/views/trainer.blade.php +++ b/resources/views/trainer.blade.php @@ -1,26 +1,17 @@ <?php use HebrewParseTrainer\Root; -use HebrewParseTrainer\Stem; +use HebrewParseTrainer\Mode; use HebrewParseTrainer\Tense; ?> @extends('layouts.with_sidebar') @section('sidebar') -<form id="hebrewparsetrainer-settings"> +<form id="luoparsetrainer-settings"> <input type="hidden" id="csrf" value="{{ csrf_token() }}"/> <div class="form-group"> - <h3>Stems</h3> - @foreach (Stem::all() as $stem) - <div class="checkbox"> - <label><input class="reload-verb" type="checkbox" name="stem" value="{{{ $stem->name }}}" checked="checked"/> {{{ $stem->name }}}</label> - </div> - @endforeach - </div> - - <div class="form-group"> - <h3>Tenses</h3> + <h3>Tempora</h3> @foreach (Tense::all() as $tense) <div class="checkbox"> <label><input class="reload-verb" type="checkbox" name="tense" value="{{{ $tense->name }}}" checked="checked"/> {{{ $tense->name }}}</label> @@ -29,14 +20,12 @@ use HebrewParseTrainer\Tense; </div> <div class="form-group"> - <h3>Roots</h3> - <select name="root" class="reload-verb form-control hebrew ltr" multiple="multiple"> - @foreach (Root::orderBy('root_kind_id')->orderBy('root')->get() as $root) - @if ($root->verbs()->where('active', 1)->count() > 0) - <option value="{{{ $root->root }}}" selected="selected">{{{ $root->root }}} ({{{ $root->kind->name }}})</option> - @endif + <h3>Modi</h3> + @foreach (Mode::all() as $mode) + <div class="checkbox"> + <label><input class="reload-verb" type="checkbox" name="mode" value="{{{ $mode->name }}}" checked="checked"/> {{{ $mode->name }}}</label> + </div> @endforeach - </select> </div> <div class="form-group"> @@ -52,39 +41,30 @@ use HebrewParseTrainer\Tense; <div id="trainer"> <div id="trainer-input-container"> <p class="bg-danger" id="trainer-404">There are no verbs matching the criteria in our database.</p> - <p class="lead"><span class="hebrew hebrew-large" id="trainer-verb"></span><span id="trainer-answer"></span></p> + <p class="lead"><span class="greek greek-large" id="trainer-verb"></span><span id="trainer-answer"></span></p> </div> <div id="trainer-input-fancy"></div> <div class="text-muted"> <div id="trainer-input-help"> - <p>Parse the verb and enter the answer as described below. Press return. If your answer was correct and there are multiple possible parsings, an extra input field will appear. After the first incorrect answer or after entering all possible answers, you can continue to the next verb by pressing return once more.</p> <p> - <strong>Stems</strong>: either use the full name or a significant beginning (i.e. <code>Q</code> for Qal but <code>Pi</code> for Piel rather than <code>P</code>).<br/> - <strong>Tenses</strong>: use the abbreviations <code>pf</code>, <code>ipf</code>, <code>coh</code>, <code>imp</code>, <code>jus</code>, <code>infcs</code>, <code>infabs</code>, <code>pta</code> and <code>ptp</code>.<br/> - <strong>Person</strong>: <code>1</code>, <code>2</code>, <code>3</code> or none (infinitives and participles).<br/> - <strong>Gender</strong>: <code>m</code>, <code>f</code> or none (infinitives).<br/> - <strong>Number</strong>: <code>s</code>, <code>p</code> or none (infinitives). + Parseer de werkwoordsvorm en vul het antwoord in, gevolgd door <code>Enter</code>. + Als het antwoord correct is en er meerdere mogelijke antwoorden zijn, verschijnt er een extra invoerveld. + Na het eerste incorrecte antwoord, of als alle mogelijkheden zijn gegeven, kun je door naar de volgende vorm met <code>Enter</code>. </p> - <p><strong>Examples</strong>: <code>Q pf 3ms</code>, <code>ni pta fp</code>, <code>pi infabs</code>.</p> - <p>You can also use the buttons to enter your answer. This is an experimental feature.</p> - </div> - <button type="button" class="btn btn-default btn-xs" id="show-hide-help">Show help</button> - </div> -</div> - -<hr/> - -<div class="row"> - <div class="col-md-12"> - <div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">About</h3> - </div> - <div class="panel-body"> - <p>© 2015–{!! date('y') !!} <a href="https://camilstaps.nl">Camil Staps</a>. Licensed under <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">GPL 3.0</a>. Source is on <a href="https://github.com/HebrewTools/ParseTrainer">GitHub</a>.</p> - <p>Please report any mistakes to <a href="mailto:info@camilstaps.nl">info@camilstaps.nl</a>.</p> - </div> + <p> + <strong>Tempora</strong> (tijden): gebruik de afkortingen pr(aesens), imp(er)f(ectum), aor(istus), fut(urum), p(er)f(ectum) en p(lus)q(uam)p(er)f(ectum).<br/> + <strong>Modi</strong> (wijzen): ind(icativus), conj(unctivus), opt(ativus), imp!(erativus), p(ar)t(i)c(ipium), inf(initivus).<br/> + <strong>Genera</strong>: A(ctivum), M(edium), P(assivum), M(edio-)P(assivum).<br/> + <strong>Persoon</strong> (indien van toepassing): 1, 2 of 3.<br/> + <strong>Geslacht</strong> (indien van toepassing): M(asculinum), F(eminimum), N(eutrum).<br/> + <strong>Naamval</strong> (indien van toepassing): nom(inativus), gen(itivus), dat(ivus), acc(usativus).<br/> + <strong>Getal</strong> (indien van toepassing): e(nkel)v(oud) of m(eer)v(oud). + </p> + <p><strong>Voorbeelden</strong>: <code>pr ind A 1 ev</code>, <code>fut inf M</code>, <code>pqpf ptc P M nom ev</code>.</p> + <p>Je kunt ook de knoppen gebruiken om een vorm te parseren.</p> + <p>© 2015–{!! date('y') !!} <a href="https://camilstaps.nl">Camil Staps</a>. Gelicenseerd onder <a href="http://www.gnu.org/licenses/gpl-3.0.en.html">GPL 3.0</a>. De broncode staat op <a href="https://git.camilstaps.nl/luo-parsetrainer.git">git.camilstaps.nl/luo-parsetrainer.git</a>.</p> </div> + <button type="button" class="btn btn-default btn-xs" id="show-hide-help">Meer informatie</button> </div> </div> diff --git a/resources/views/user/create.blade.php b/resources/views/user/create.blade.php deleted file mode 100644 index b823451..0000000 --- a/resources/views/user/create.blade.php +++ /dev/null @@ -1,32 +0,0 @@ -@extends('layouts.master') - -@section('master-content') - -@if(Auth::check()) - @include('shared.already_logged_in') -@else - @include('shared.messages') - - <form method="post"> - <div class="form-group"> - <label for="create-user-email">Email address (private)</label> - <input type="email" class="form-control" id="create-user-email" placeholder="Email" name="email" value="{{{ $form['email'] }}}" aria-describedby="create-user-email-help"/> - <span id="create-user-email-help" class="help-block">You will not receive any automated email from us, but we like to have some way of contacting you available. Your email address will not be shared with third parties, and will not be visible to users of the website.</span> - </div> - <div class="form-group"> - <label for="create-user-name">Username</label> - <input type="text" class="form-control" id="create-user-name" placeholder="Username" name="name" value="{{{ $form['name'] }}}" aria-describedby="create-user-name-help"/> - <span id="create-user-name-help" class="help-block">Your name as shown on the site.</span> - </div> - <div class="form-group"> - <label for="create-user-pw1">Password</label> - <input type="password" class="form-control" id="create-user-pw1" placeholder="Password" name="password"/> - </div> - <div class="form-group"> - <input type="password" class="form-control" id="create-user-pw2" placeholder="Password (confirmation)" name="password_confirmation"/> - </div> - <button type="submit" class="btn btn-primary">Create account</button> - </form> -@endif - -@endsection diff --git a/resources/views/user/top.blade.php b/resources/views/user/top.blade.php deleted file mode 100644 index eeeafde..0000000 --- a/resources/views/user/top.blade.php +++ /dev/null @@ -1,39 +0,0 @@ -<?php -use HebrewParseTrainer\User; - -$users = User::where('isadmin', false) - ->orderBy('points', 'desc') - ->take(3) - ->get(); -?> -@if(count($users) > 0) -<div class="panel panel-default"> - <div class="panel-heading"> - <h3 class="panel-title">Top contributors</h3> - </div> - <div class="panel-body"> - <table class="table table-hover"> - <thead> - <tr> - <th></th> - <th>Name</th> - <th>Points</th> - </tr> - </thead> - <tbody> - @foreach($users as $user) - <tr> - <td><a href="http://gravatar.com"><img src="https://gravatar.com/avatar/{{ md5(strtolower(trim($user->email))) }}?s=40"/></a></td> - <td>{{{ $user->name }}}</td> - <td>{{{ $user->points }}}</td> - </tr> - @endforeach - </tbody> - </table> - - @if(Auth::check()) - <p>You have {{ Auth::user()->points }} points.</p> - @endif - </div> -</div> -@endif |