mirror of
https://github.com/Deutscher-Tischfussballbund/com_sportsmanager.git
synced 2026-06-10 14:37:52 +00:00
Merge pull request #109 from Deutscher-Tischfussballbund/sportsmanager2-issue108
Mannschaftsbilder in Teamsport zu klein gefixt (issue #108)
This commit is contained in:
@@ -1085,46 +1085,29 @@ static function begegnungenAnzeigen($veranstaltung, $modus, $rows, $zeitfenster,
|
|||||||
?>
|
?>
|
||||||
|
|
||||||
<div class="uk-overflow-auto">
|
<div class="uk-overflow-auto">
|
||||||
<table class="uk-table contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
|
<table style='width: 100%; border-collapse: collapse;' class="contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
|
||||||
<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
|
<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
|
||||||
<?php if ($zeitpunkt_anzeigen) { ?>
|
<?php if ($zeitpunkt_anzeigen) { ?>
|
||||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_SCHEDULE_DATE'); ?></strong>
|
<th nowrap style='text-align: left; width:20%;'><strong><?php echo Text::_('COM_SPORTSMANAGER_SCHEDULE_DATE'); ?></strong>
|
||||||
</th><?php } ?>
|
</th><?php } ?>
|
||||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_TEAM_HOME'); ?></strong></th>
|
<th nowrap style='text-align: left; width:25%;'><strong><?php echo Text::_('COM_SPORTSMANAGER_TEAM_HOME'); ?></strong></th>
|
||||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_TEAM_VISITOR'); ?></strong></th>
|
<th nowrap style='text-align: left; width:25%;'><strong><?php echo Text::_('COM_SPORTSMANAGER_TEAM_VISITOR'); ?></strong></th>
|
||||||
<?php
|
|
||||||
/*
|
|
||||||
if ($veranstaltung == NULL) {
|
|
||||||
?>
|
|
||||||
<th nowrap><strong>Wettbewerb</strong></th>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
?>
|
|
||||||
<?php
|
<?php
|
||||||
if ($veranstaltung != null && $modus->punktetyp == 0) {
|
if ($veranstaltung != null && $modus->punktetyp == 0) {
|
||||||
?>
|
?>
|
||||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_GOALS'); ?></strong></th>
|
<th nowrap style='text-align: center; width:12%;'><strong><?php echo Text::_('COM_SPORTSMANAGER_GOALS'); ?></strong></th>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<th nowrap><strong><?php echo Text::_('COM_SPORTSMANAGER_RESULT'); ?></strong></th>
|
<th nowrap style='text-align: center; width:12%;'><strong><?php echo Text::_('COM_SPORTSMANAGER_RESULT'); ?></strong></th>
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
/*
|
|
||||||
if ($zeitfenster != 0) {
|
|
||||||
?> <tr><td nowrap height="4"></td></tr><tr class="sectiontableheader<?php echo $params->get( 'pageclass_sfx' ); ?>" style="text-align: center"><th nowrap><font size=-2><i>+/- <?php echo $zeitfenster; ?> Tage</i></font></th></tr> <?php
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
|
|
||||||
$k = 0;
|
$k = 0;
|
||||||
$monat = "...";
|
$monat = "...";
|
||||||
$spieltag = 0;
|
$spieltag = 0;
|
||||||
$spielort_name = "";
|
$spielort_name = "";
|
||||||
foreach ($rows as $row) {
|
foreach ($rows as $row) {
|
||||||
$ergebnis_vorhanden = $row->heim_punkte != null || $row->gast_punkte != null;
|
$ergebnis_vorhanden = $row->heim_punkte != null || $row->gast_punkte != null;
|
||||||
// if ($monat == NULL)
|
|
||||||
// $monat = substr($row->zeitpunkt, 0, 7);
|
|
||||||
if ($zeitfenster == 0 && $veranstaltung != null) {
|
if ($zeitfenster == 0 && $veranstaltung != null) {
|
||||||
if ($veranstaltung->unterteilung == 0 || $veranstaltung->unterteilung == 1) {
|
if ($veranstaltung->unterteilung == 0 || $veranstaltung->unterteilung == 1) {
|
||||||
if ($spieltag != $row->spieltag || $spielort_name != $row->spielort_name) {
|
if ($spieltag != $row->spieltag || $spielort_name != $row->spielort_name) {
|
||||||
@@ -1132,17 +1115,17 @@ static function begegnungenAnzeigen($veranstaltung, $modus, $rows, $zeitfenster,
|
|||||||
$spielort_name = $row->spielort_name;
|
$spielort_name = $row->spielort_name;
|
||||||
?>
|
?>
|
||||||
<tr>
|
<tr>
|
||||||
<td nowrap height="4"></td>
|
<td nowrap height="10"></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>"
|
<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>"
|
||||||
style="text-align: center">
|
style="text-align: center">
|
||||||
<th nowrap><span style="font-size: 70%; "><i>
|
<th nowrap style='text-align: left; font-size: 70%; font-style: italic;'>
|
||||||
<?php
|
<?php
|
||||||
echo htmlentities_utf8(Rundenbezeichnung($spieltag, $veranstaltung->unterteilung == 0));
|
echo htmlentities_utf8(Rundenbezeichnung($spieltag, $veranstaltung->unterteilung == 0));
|
||||||
if (!empty($spielort_name))
|
if (!empty($spielort_name))
|
||||||
echo "<br />" . htmlentities_utf8($spielort_name);
|
echo "<br />" . htmlentities_utf8($spielort_name);
|
||||||
?>
|
?>
|
||||||
</i></span></th>
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
@@ -1179,8 +1162,7 @@ static function begegnungenAnzeigen($veranstaltung, $modus, $rows, $zeitfenster,
|
|||||||
echo "<a href=\"" . SportsManagerURL('&task=begegnung_verlegen_form&veranstaltungid=' . $row->veranstaltung_id . '&id=' . $row->begegnung_id . ($aus_uebersicht ? "&aus_uebersicht=1" : "")) . "\">" . ($row->verlegung_eingetragen != null ? ("bisher " . FormatiertesDatum($row->zeitpunkt)) : FormatiertesDatum($row->zeitpunkt)) . "</small></a>";
|
echo "<a href=\"" . SportsManagerURL('&task=begegnung_verlegen_form&veranstaltungid=' . $row->veranstaltung_id . '&id=' . $row->begegnung_id . ($aus_uebersicht ? "&aus_uebersicht=1" : "")) . "\">" . ($row->verlegung_eingetragen != null ? ("bisher " . FormatiertesDatum($row->zeitpunkt)) : FormatiertesDatum($row->zeitpunkt)) . "</small></a>";
|
||||||
else
|
else
|
||||||
echo $row->verlegung_eingetragen != null ? ("bisher " . FormatiertesDatum($row->zeitpunkt)) : FormatiertesDatum($row->zeitpunkt);
|
echo $row->verlegung_eingetragen != null ? ("bisher " . FormatiertesDatum($row->zeitpunkt)) : FormatiertesDatum($row->zeitpunkt);
|
||||||
?>
|
|
||||||
<?php
|
|
||||||
if ($veranstaltung == null) {
|
if ($veranstaltung == null) {
|
||||||
?>
|
?>
|
||||||
<br/>
|
<br/>
|
||||||
@@ -1234,13 +1216,6 @@ static function begegnungenAnzeigen($veranstaltung, $modus, $rows, $zeitfenster,
|
|||||||
?>
|
?>
|
||||||
</td>
|
</td>
|
||||||
<?php
|
<?php
|
||||||
/*
|
|
||||||
if ($veranstaltung == NULL) {
|
|
||||||
?>
|
|
||||||
<td nowrap><?php echo htmlentities_utf8($row->bezeichnung); ?></td>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
if ($veranstaltung != null && $modus->punktetyp == 0) {
|
if ($veranstaltung != null && $modus->punktetyp == 0) {
|
||||||
?>
|
?>
|
||||||
<td nowrap style="text-align: center">
|
<td nowrap style="text-align: center">
|
||||||
@@ -1565,7 +1540,7 @@ global $params;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param $veranstaltung
|
* @param $veranstaltung
|
||||||
* @param $modus
|
* @param $modus
|
||||||
* @param $teams
|
* @param $teams
|
||||||
@@ -1575,14 +1550,14 @@ global $params;
|
|||||||
* @param int $praesentation
|
* @param int $praesentation
|
||||||
* @since 1.0.0
|
* @since 1.0.0
|
||||||
*/
|
*/
|
||||||
static function tabelleAnzeigen($veranstaltung, $modus, $teams, $spieltag, $spieltage, $alleine_angezeigt, int $praesentation = 0): void
|
static function tabelleAnzeigen($veranstaltung, $modus, $teams, $spieltag, $spieltage, $alleine_angezeigt, int $praesentation = 0): void
|
||||||
{
|
{
|
||||||
global $params;
|
global $params;
|
||||||
|
|
||||||
if (count($teams) > 0) {
|
if (count($teams) > 0) {
|
||||||
if ($alleine_angezeigt && $veranstaltung->tabellenwertung >= -1 && $veranstaltung->tabellenwertung <= 11 && count($spieltage) > 1) {
|
if ($alleine_angezeigt && $veranstaltung->tabellenwertung >= -1 && $veranstaltung->tabellenwertung <= 11 && count($spieltage) > 1) {
|
||||||
?>
|
?>
|
||||||
<form action="<?php echo SportsManagerURL(); ?>" method="post" name="matchDayForm" id="matchDayForm">
|
<form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm">
|
||||||
<div class="uk-overflow-auto">
|
<div class="uk-overflow-auto">
|
||||||
<table class="uk-table contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
|
<table class="uk-table contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
|
||||||
<tr>
|
<tr>
|
||||||
@@ -1590,7 +1565,7 @@ global $params;
|
|||||||
<select
|
<select
|
||||||
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_MATCHDAY_SELECT'); ?>"
|
aria-label="<?php echo Text::_('COM_SPORTSMANAGER_ARIA_LABEL_MATCHDAY_SELECT'); ?>"
|
||||||
class="uk-select uk-form-width-medium" name="spieltag" size="1"
|
class="uk-select uk-form-width-medium" name="spieltag" size="1"
|
||||||
onChange="document.matchDayForm.submit();">
|
onChange="document.adminForm.submit();">
|
||||||
<?php
|
<?php
|
||||||
foreach ($spieltage as $s) {
|
foreach ($spieltage as $s) {
|
||||||
echo "<option value=\"" . $s->spieltag . "\"" . ($s->spieltag == $spieltag ? " selected" : "") . ">" . htmlentities_utf8(Rundenbezeichnung($s->spieltag, $veranstaltung->unterteilung == 0)) . "</option>";
|
echo "<option value=\"" . $s->spieltag . "\"" . ($s->spieltag == $spieltag ? " selected" : "") . ">" . htmlentities_utf8(Rundenbezeichnung($s->spieltag, $veranstaltung->unterteilung == 0)) . "</option>";
|
||||||
@@ -1633,26 +1608,32 @@ global $params;
|
|||||||
<!-- Gruppentabelle mit Ergebnissen -->
|
<!-- Gruppentabelle mit Ergebnissen -->
|
||||||
<!-- dtfl-table-small css from yootheme-->
|
<!-- dtfl-table-small css from yootheme-->
|
||||||
<div class="uk-overflow-auto">
|
<div class="uk-overflow-auto">
|
||||||
<table
|
<table style='width: 100%; border-collapse: collapse;'
|
||||||
class="uk-table uk-table-hover uk-table-divider uk-table-middle dtfl-table-medium contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
|
class="uk-table-hover uk-table-divider uk-table-middle dtfl-table-medium contentpaneopen<?php echo $params->get('pageclass_sfx'); ?>">
|
||||||
<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
|
<tr class="sectiontableheader<?php echo $params->get('pageclass_sfx'); ?>">
|
||||||
<th><strong><?php echo Text::_('COM_SPORTSMANAGER_PLACE'); ?></strong></th>
|
<th><strong><?php echo Text::_('COM_SPORTSMANAGER_PLACE'); ?></strong></th>
|
||||||
<th style="text-align: left">
|
<th style="text-align: left; width: 280px;">
|
||||||
<strong><?php echo Text::_('COM_SPORTSMANAGER_TEAM'); ?></strong></th>
|
<strong><?php echo Text::_('COM_SPORTSMANAGER_TEAM'); ?></strong></th>
|
||||||
<?php
|
<?php
|
||||||
|
if ($bilder_anzeigen) {
|
||||||
|
?>
|
||||||
|
<th style="text-align: center; width: 70px;">
|
||||||
|
<strong></strong></th>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
if ($praesentation == 0) {
|
if ($praesentation == 0) {
|
||||||
?>
|
?>
|
||||||
<th nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_MATCHES'); ?>">
|
<th style="text-align: center; width: 30px;" nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_MATCHES'); ?>">
|
||||||
<strong><?php echo Text::_('COM_SPORTSMANAGER_MATCHES_SHORTCUT'); ?></strong>
|
<strong><?php echo Text::_('COM_SPORTSMANAGER_MATCHES_SHORTCUT'); ?></strong>
|
||||||
</th>
|
</th>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<th nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_VICTORIES'); ?>">
|
<th style="text-align: center; width: 30px;" nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_VICTORIES'); ?>">
|
||||||
<strong><?php echo Text::_('COM_SPORTSMANAGER_VICTORIES_SHORTCUT'); ?></strong></th>
|
<strong><?php echo Text::_('COM_SPORTSMANAGER_VICTORIES_SHORTCUT'); ?></strong></th>
|
||||||
<th nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_DRAWS'); ?>">
|
<th style="text-align: center; width: 30px;" nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_DRAWS'); ?>">
|
||||||
<strong><?php echo Text::_('COM_SPORTSMANAGER_DRAWS_SHORTCUT'); ?></strong></th>
|
<strong><?php echo Text::_('COM_SPORTSMANAGER_DRAWS_SHORTCUT'); ?></strong></th>
|
||||||
<th nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_DEFEATS'); ?>">
|
<th style="text-align: center; width: 30px;" nowrap title="<?php echo Text::_('COM_SPORTSMANAGER_DEFEATS'); ?>">
|
||||||
<strong><?php echo Text::_('COM_SPORTSMANAGER_DEFEATS_SHORTCUT'); ?></strong></th>
|
<strong><?php echo Text::_('COM_SPORTSMANAGER_DEFEATS_SHORTCUT'); ?></strong></th>
|
||||||
<?php
|
<?php
|
||||||
if ($zusatzpunkte_anzeigen) {
|
if ($zusatzpunkte_anzeigen) {
|
||||||
@@ -1751,10 +1732,6 @@ global $params;
|
|||||||
$buchholz2_wert = $team->buchholz2;
|
$buchholz2_wert = $team->buchholz2;
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
<td nowrap>
|
|
||||||
|
|
||||||
<table style="width: 100%; border: none; border-spacing: 0; padding: 0">
|
|
||||||
<tr>
|
|
||||||
<td>
|
<td>
|
||||||
<?php
|
<?php
|
||||||
echo "<a href=\"" . SportsManagerURL('&task=team_details&id=' . $team->team_id) . "\">" . htmlentities_utf8(NichtLeererString($team->teamname)) . "</a>";
|
echo "<a href=\"" . SportsManagerURL('&task=team_details&id=' . $team->team_id) . "\">" . htmlentities_utf8(NichtLeererString($team->teamname)) . "</a>";
|
||||||
@@ -1763,7 +1740,7 @@ global $params;
|
|||||||
<?php
|
<?php
|
||||||
if ($bilder_anzeigen) {
|
if ($bilder_anzeigen) {
|
||||||
?>
|
?>
|
||||||
<td style="width: 50px" height="50" style="text-align: right">
|
<td style="text-align: center;">
|
||||||
<?php
|
<?php
|
||||||
$bild = bildHTML("mannschaften", $team->team_id, 50, 50, 0, 0, 'border="0"');
|
$bild = bildHTML("mannschaften", $team->team_id, 50, 50, 0, 0, 'border="0"');
|
||||||
if ($bild != null) {
|
if ($bild != null) {
|
||||||
@@ -1777,12 +1754,6 @@ global $params;
|
|||||||
</td>
|
</td>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
?>
|
|
||||||
</tr>
|
|
||||||
</table>
|
|
||||||
|
|
||||||
</td>
|
|
||||||
<?php
|
|
||||||
if ($praesentation == 0) {
|
if ($praesentation == 0) {
|
||||||
?>
|
?>
|
||||||
<td nowrap
|
<td nowrap
|
||||||
@@ -1885,7 +1856,7 @@ global $params;
|
|||||||
?>
|
?>
|
||||||
<span class="article_seperator<?php echo $params->get('pageclass_sfx'); ?>"> </span>
|
<span class="article_seperator<?php echo $params->get('pageclass_sfx'); ?>"> </span>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
|
||||||
static function tabelleEigeneAnzeigen($veranstaltung, $teams, $alleine_angezeigt, $praesentation = 0): void
|
static function tabelleEigeneAnzeigen($veranstaltung, $teams, $alleine_angezeigt, $praesentation = 0): void
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user