This commit is contained in:
Torsten 2017-10-25 10:42:05 +02:00
parent ed0c445bfa
commit 30f6157606
15 changed files with 248 additions and 169 deletions

View file

@ -17,7 +17,7 @@
</label>
@endif
&nbsp;
<a style="font-color: blue; font-size: 22px;" href="/tipps#{{\App\Round::getFirstTippableRound()->id}}">Tipps</a> &nbsp;
<a style="font-color: blue; font-size: 22px;" href="/tipps#{{\App\Round::getFirstTippableRoundId()}}">Tipps</a> &nbsp;
&nbsp;
<a style="font-color: blue; font-size: 22px;" href="/users/ranking/roundid_-1#playerid_{{Auth::user()->id}}" >Rangliste</a> &nbsp;
@ -25,10 +25,9 @@
<a href="#" id="btn_league" onclick="toggleSelect('dropdown_league'); return false;" style="font-weight:normal; font-color: blue; font-size: 22px;">Spieler-Liga</a>
<div id="dropdown_league" class="dropdown-content">
<a style="font-weight:normal; font-color: blue; font-size: 22px;" href="/league_show_rounds/league_rank=4/round_id=30">Spielplan</a> &nbsp;
<a style="font-weight:normal; font-color: blue; font-size: 22px;" href="/league/show/rank=4/max_round_id=-1">Tabellen</a> &nbsp;
<a style="font-weight:normal; font-color: blue; font-size: 22px;" href="/league/show/rank=4/max_round_id=-1#user_{{Auth::user()->id}}">Tabellen</a> &nbsp;
</div>
</label>
&nbsp;
<label class="dropdown" id="dropdown3">
<a href="#" id="btn_info" onclick="toggleSelect('dropdown_info'); return false;" style="font-weight:normal; font-color: blue; font-size: 22px;">Info</a>

View file

@ -11,16 +11,20 @@
<table class="table-bordered col-lg-12">
<tr class="table-bordered">
<td class="table-bordered" style="width:50px;">Punkte</td>
<td class="table-bordered" style="width:50px;">Pos</td>
<td class="table-bordered" style="width:150px;">Spieler</td>
<td class="table-bordered" style="width:50px;">Punkte</td>
<td class="table-bordered" style="width:150px;">Tordifferenz</td>
<td class="table-bordered" style="width:150px;">Torverhältnis</td>
</tr>
<!-- Start Matchgruppen-Loop-->
@foreach($playerTuples as $player)
@foreach($playerTuples as $pos => $player)
<tr class="table-bordered">
<td>&nbsp; {{$pos+1}}&nbsp;</td>
<td>&nbsp;<a name="user_{{$player[0]}}" class="{{ $player[0]==Auth::user()->id ? 'blink_text' : '' }}" href="/league/showSingleUserMatches/user_id={{$player[0]}}"> {{$userNames[$player[0]]}} </a>&nbsp;</td>
<td>&nbsp; {{$player[1]}} &nbsp;</td>
<td>&nbsp;<a href="/league/showSingleUserMatches/user_id={{$player[0]}}"> {{$userNames[$player[0]]}} </a>&nbsp;</td>
<td>&nbsp; {{$player[2]-$player[3]}} &nbsp;</td>
<td>&nbsp; {{$player[2]}}:{{$player[3]}} &nbsp;</td>
</tr>
@endforeach

View file

@ -60,7 +60,7 @@
//alert($global_selected_round_id);
var round_count=document.getElementById("input_round_count").value;
var link = '/league_settings/create_league/start_round_id='+global_start_round_id+"/round_count="+round_count+"/league_mode="+global_league_mode;
var link = '/league_settings/create_league/start_round_id='+global_start_round_id+"/round_count="+round_count;
//alert(link);
window.location=link;
}

View file

@ -6,6 +6,7 @@
<span class="col-md-2"></span>
<span class="text-center col-md-8">
@if(Auth::check())
@if($hourDiffToLock<49)
@if (strlen($message_text_tipps)>0)
<div><p class="blink_text" style="font-size:21px;">{{ $message_text_tipps }}</p></div>
@ -17,17 +18,18 @@
<div><p class="blink_text" style="font-size:21px;">{{ $nextRoundName }} sperrt sich: {{ $nextRoundLockTime }} ( noch {{ $hourDiffToLock }} )</p></div>
@endif
@endif
@endif
<h1 class="jumbotron-heading">Hoschis Tippspiel</h1>
<p class="lead text-muted">Eine Tippgemeinschaft unter Freunden.</p>
<div><p></p><p></p><p></p></div>
@if (!Auth::check())
<div>
<div>
<a href="/login" class="btn btn-primary">Anmelden</a>
</div>
<p>&nbsp;</p>
<div>
<p>&nbsp;</p>
<div>
<a href="/register" class="btn btn-primary">Registrieren</a>
</div>
@ -35,14 +37,16 @@
</span>
</section>
@if (Auth::check())
@foreach($display_rounds as $round)
<div class="container-fluid col-md-12">
<span class="col-md-2"></span>
<span class="text-center col-md-8">
<h2>&nbsp;{{ $round['name'] }}</h2>
<div style="font-size: 18px;">&nbsp;{!! $round['report'] !!}</div>
</span>
</div>
@endforeach
@if ($display_rounds)
@foreach($display_rounds as $round)
<div class="container-fluid col-md-12">
<span class="col-md-2"></span>
<span class="text-center col-md-8">
<h2>&nbsp;{{ $round['name'] }}</h2>
<div style="font-size: 18px;">&nbsp;{!! $round['report'] !!}</div>
</span>
</div>
@endforeach
@endif
@endif
@endsection

View file

@ -5,11 +5,12 @@
<div class="container">
<label>{{ $activeSeason->name }}</label>
@if (sizeof($rounds)<$round_count)
<!--
if (sizeof($rounds)<$round_count)
<div><a href="/rounds/create" class="btn btn-primary" >Runde hinzufügen</a></div>
<p>&nbsp;</p>
@endif
endif
-->
</div>
<div class="container">
@ -40,10 +41,8 @@
<div class="container-fluid" style="width:800px;">
<p>&nbsp;</p>
<p>Berichterstattung</p>
<form method="POST" action="/rounds/store_report" class="text-center">
{{ csrf_field() }}

View file

@ -17,15 +17,11 @@
@endforeach
</ul>
</div>
@endif
@if ($currentSeason)
<div>
<form method="POST" action="/seasons/store_quota">
{{ csrf_field() }}
<h3>Anzahl Runden</h3>