Merge pull request #78 from Deutscher-Tischfussballbund/feature-test-paul-jürgen

Test2

.github/workflows/build_snapshot.yml

@@ -0,0 +1,39 @@
+# This workflow will run release using node and then publish a package to GitHub Packages when a release is created
+# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages
+
+name: Snapshot Release
+
+on:
+  push:
+    tags:
+      - 'v*-snapshot' # run only on version tags like v1.0.0-snapshot
+      # - 'v*'  # Run only on version tags like v1.0.0
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: sportsmanager2-stage
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+
+      - name: Install npm dependencies
+        run: npm ci
+
+      - name: Run build script
+        run: npm run release
+
+      - name: Create GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          prerelease: true
+          name: SNAPSHOT
+          files: package/packages/com_sportsmanager.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,16 +1,22 @@
 # SportsManager
 
-## Deploy status
+## DEV/STAGE environments
 
-### DEV environment
+| LV     | HOSTER   | DOMAIN                                                       | BRANCH             |
-[![buddy pipeline](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/173/badge.svg?token=de39e4e4c47351d592b59a5d1e26a41cf5196861f67d4499bbab990600468001 "buddy pipeline")](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/173) [Preview: sportsmanager.s10.kicktemp.dev](https://sportsmanager.s10.kicktemp.dev)
+| ------ | -------- | ------------------------------------------------------------ | ------------------ |
+| DTFB   | Kicktemp | [stage.dtfb.de](https://stage.dtfb.de)                       | dev                |
+| TFVHH  | Kicktemp | [stage.kickern-hamburg.de](https://stage.kickern-hamburg.de) | dev                |
+| STFVH  | DTFB     | [stage.stfv.de](https://stage.stfv.de/)                      | sportsmanager2-dev |
 
-[![buddy pipeline](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/204/badge.svg?token=de39e4e4c47351d592b59a5d1e26a41cf5196861f67d4499bbab990600468001 "buddy pipeline")](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/204) [Preview: stage.kickern-hamburg.de](https://stage.kickern-hamburg.de)
+## PROD environments
 
-### PROD environment
+| LV     | HOSTER   | DOMAIN                                           | BRANCH              |
-[![buddy pipeline](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/218/badge.svg?token=de39e4e4c47351d592b59a5d1e26a41cf5196861f67d4499bbab990600468001 "buddy pipeline")](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/218) [Preview: dtfb.de](https://dtfb.de)
+| ------ | -------- | ------------------------------------------------ | ------------------- |
-
+| DTFB   | Kicktemp | [dtfb.de](https://dtfb.de)                       | production          |
-[![buddy pipeline](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/219/badge.svg?token=de39e4e4c47351d592b59a5d1e26a41cf5196861f67d4499bbab990600468001 "buddy pipeline")](https://buddy.kicktemp.com/kicktemp/com-sportsmanager/pipelines/pipeline/219) [Preview: kickern-hamburg.de](https://kickern-hamburg.de)
+| TFVHH  | Kicktemp | [kickern-hamburg.de](https://kickern-hamburg.de) | production          |
+| MTFV   | DTFB     | [mtfv.de](https://mtfv.de/)                      | sportsmanager2-prod |
+| TFVSH  | DTFB     | [tfvsh.de](https://tfvsh.de/)                    | sportsmanager2-prod |
+| STFVH  | DTFB     | [stfv.de](https://stfv.de/)                      | sportsmanager2-prod |
 
 
 ## Test setup
@@ -40,3 +46,6 @@ joomla specific database prefixes like #__
 To set it up, insert into the configuration popup which follows after you enable the framework support:  
 Joomla install path: `./data/joomla_data`  
 JConfig: `./data/joomla_data/configuration.php`
+ 
+ 
+Test

src/structure/components/com_sportsmanager/admin.php

@@ -5183,6 +5183,9 @@ function adminKategorien(): void
     $kategorien[2] = array();
     $kategorien[3] = array();
     $kategorien[4] = array();
+	$kategorien[5] = array();
+	$kategorien[6] = array();
+	$kategorien[7] = array();
 
     foreach ($rows as $row)
         $kategorien[$row->typ][$row->nummer] = $row->bezeichnung;
@@ -5216,12 +5219,12 @@ function adminKategorien(): void
     $kategorien[4] = array();
     $kategorien[5] = array();
     $kategorien[6] = array();
-
+	$kategorien[7] = array();
 
     foreach ($rows as $row)
         $kategorien[$row->typ][$row->nummer] = $row->bezeichnung;
 
-	for ($typ = 1; $typ <= 6; $typ++) {
+	for ($typ = 1; $typ <= 7; $typ++) {
         for ($nummer = 1; $nummer <= 50; $nummer++) {
             $bezeichnung = $db->escape($jInput->get('bezeichnung_' . $typ . '_' . $nummer, '', 'RAW'));
             if (empty($bezeichnung)) {
@@ -11255,6 +11258,7 @@ function adminBegegnungenExportForm(): void
 
     // Veranstaltung ermitteln
     $query = "SELECT * FROM #__sportsmanager_veranstaltung WHERE veranstaltung_id = $veranstaltungId";
+
     $db->setQuery($query);
     if (!$db->execute()) {
         die($db->stderr(true));

src/structure/components/com_sportsmanager/src/Controller/DisplayController.php

@@ -1,4 +1,4 @@
-<?php
+<?php
 namespace Dtfb\Component\com_sportsmanager\Site\Controller;
 /*
  * Sports Manager (C) 2006-2020, Sven Nickel

src/structure/components/com_sportsmanager/views/sportsmanager/view_admin.php

@@ -16,145 +16,156 @@ class HTML_sportsmanager_admin
 {
     static function adminUebersicht($veranstaltungen, $spielerstatistiken, $turniere, $ranglisten, $individualwettbewerbe, $statistik, $saisons, $filter_saison_id, $externe_datenbank): void
     {
-        global $params;
+		function checkZeilenumbruch($Spalte_Nr, $max_Spalten)
+		{
+			$Spalte_Nr++;
+			if ($Spalte_Nr >= $max_Spalten){
+				echo "</tr>\n<tr>\n";
+				$Spalte_Nr = 0;
+			}
+			return $Spalte_Nr;
+		}
 		
+        global $params;
         ?>
-        <div class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><a
+        <div class="componentheading<?php echo $params->get('pageclass_sfx'); ?>" style='font-weight: bold;'>
-                href="https://github.com/Deutscher-Tischfussballbund/" target="_blank">Sports
+				<a href="https://github.com/Deutscher-Tischfussballbund/" target="_blank">
-                Manager <?php echo SPORTS_MANAGER_VERSION; ?> </a>
+				Sports Manager <?php echo SPORTS_MANAGER_VERSION; ?> </a>
         </div>
-        <table style="border-spacing: 10px">
+        <table>
-            <?php
+			<tr>
-            if (benutzerZugriff("spieler_aendern")
+				<?php
-                || benutzerVeranstalterModerator()
+				$max_Spalten = 6;
-                || benutzerVereinModerator()
+				$Spalte_Nr = 0;
-                || benutzerZugriff("vereine_aendern")
+				if (benutzerZugriff("spieler_aendern") || benutzerVeranstalterModerator() || benutzerVereinModerator()) {
-                || benutzerZugriff("organisationen_aendern")
+					?>
-                || benutzerZugriff("kategorien_aendern")
+					<td style="padding-right: 15px" nowrap>
-                || benutzerZugriff("moderatoren_aendern")
+						<a href="<?php echo SportsManagerURL('&task=admin_spieler'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_PLAYERS'); ?></a>
-                || benutzerZugriff("einstufungen_aendern")
+					</td>
-                || benutzerZugriff("basiseinstellungen_aendern")) {
+					<?php
-                ?>
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
-                <tr>
+				}
-                    <?php
+				if (benutzerZugriff("vereine_aendern")) {
-                    if (benutzerZugriff("spieler_aendern") || benutzerVeranstalterModerator() || benutzerVereinModerator()) {
+					?>
-                        ?>
+					<td style="padding-right: 15px" nowrap>
-                        <td nowrap><a
+						<a href="<?php echo SportsManagerURL('&task=admin_vereine'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_CLUBS'); ?></a>
-                                href="<?php echo SportsManagerURL('&task=admin_spieler'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_PLAYERS'); ?></a>
+					</td>
-                        </td>
+					<?php
-                        <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
-                    }
+				}
-                    if (benutzerZugriff("vereine_aendern")) {
+				if (benutzerZugriff("organisationen_aendern")) {
-                        ?>
+					?>
-                        <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                                href="<?php echo SportsManagerURL('&task=admin_vereine'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_CLUBS'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_veranstalter'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_ORGANISATIONS'); ?></a>
-                        </td>
+					</td>
-                        <?php
+					<?php
-                    }
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
-                    if (benutzerZugriff("organisationen_aendern")) {
+				}
-                        ?>
+				if (benutzerZugriff("kategorien_aendern")) {
-                        <td nowrap><a
+					?>
-                                href="<?php echo SportsManagerURL('&task=admin_veranstalter'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_ORGANISATIONS'); ?></a>
+					<td style="padding-right: 15px" nowrap>
-                        </td>
+						<a href="<?php echo SportsManagerURL('&task=admin_kategorien'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_CATEGORIES'); ?></a>
-                        <?php
+					</td>
-                    }
+					<?php
-                    if (benutzerZugriff("kategorien_aendern")) {
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
-                        ?>
+				}
-                        <td nowrap><a
+				if (benutzerZugriff("moderatoren_aendern")) {
-                                href="<?php echo SportsManagerURL('&task=admin_kategorien'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_CATEGORIES'); ?></a>
+					?>
-                        </td>
+					<td style="padding-right: 15px" nowrap>
-                        <?php
+						<a href="<?php echo SportsManagerURL('&task=admin_moderatoren'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_MODERATORS'); ?></a>
-                    }
+					</td>
-                    if (benutzerZugriff("moderatoren_aendern")) {
+					<?php
-                        ?>
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
-                        <td nowrap><a
+				}
-                                href="<?php echo SportsManagerURL('&task=admin_moderatoren'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_MODERATORS'); ?></a>
+				if (benutzerZugriff("einstufungen_aendern")) {
-                        </td>
+					?>
-                        <?php
+					<td style="padding-right: 15px" nowrap>
-                    }
+						<a href="<?php echo SportsManagerURL('&task=admin_einstufungen'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_CLASSIFICATIONS'); ?></a>
-                    if (benutzerZugriff("einstufungen_aendern")) {
+					</td>
-                        ?>
+					<?php
-                        <td nowrap><a
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
-                                href="<?php echo SportsManagerURL('&task=admin_einstufungen'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_CLASSIFICATIONS'); ?></a>
+				}
-                        </td>
+				if (benutzerZugriff("basiseinstellungen_aendern")) {
-                        <?php
+					?>
-                    }
+					<td style="padding-right: 15px" nowrap>
-                    if (benutzerZugriff("basiseinstellungen_aendern")) {
+						<a href="<?php echo SportsManagerURL('&task=admin_einstellungen'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_SETTINGS'); ?></a>
-                        ?>
+					</td>
-                        <td nowrap><a
+					<?php
-                                href="<?php echo SportsManagerURL('&task=admin_einstellungen'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_SETTINGS'); ?></a>
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
-                        </td>
+					?>
-                        <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                                href="<?php echo SportsManagerURL('&task=admin_datenbank'); ?>"><?php echo $externe_datenbank ? Text::_('COM_SPORTSMANAGER_DATABASE_EXTERNAL') : Text::_('COM_SPORTSMANAGER_DATABASE_LOCAL'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_datenbank'); ?>"><?php echo $externe_datenbank ? Text::_('COM_SPORTSMANAGER_DATABASE_EXTERNAL') : Text::_('COM_SPORTSMANAGER_DATABASE_LOCAL'); ?></a>
-                        </td>
+					</td>
-                        <?php
+					<?php
-                    }
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
-                    ?>
+				}
-                </tr>
-                <?php
-            }
-            ?>
-            <tr>
-                <?php
                 if (benutzerZugriff("termine_aendern")) {
                     ?>
-                    <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                            href="<?php echo SportsManagerURL('&task=admin_termine'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_APPOINTMENTS'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_termine'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_APPOINTMENTS'); ?></a>
                     </td>
                     <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
                 }
                 if (benutzerZugriff("verteiler_aendern") || benutzerZugriff("verteiler_lesen")) {
                     ?>
-                    <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                            href="<?php echo SportsManagerURL('&task=admin_verteiler'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_MAILING_LISTS'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_verteiler'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_MAILING_LISTS'); ?></a>
                     </td>
                     <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
                 }
                 if (benutzerZugriff("rechnungen_aendern") && $statistik["saisons"] > 0) {
                     ?>
-                    <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                            href="<?php echo SportsManagerURL('&task=admin_rechnungen'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_INVOICES'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_rechnungen'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_INVOICES'); ?></a>
                     </td>
                     <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
                 }
                 if (benutzerZugriff("spielorte_aendern")) {
                     ?>
-                    <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                            href="<?php echo SportsManagerURL('&task=admin_spielorte'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_LOCATIONS'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_spielorte'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_LOCATIONS'); ?></a>
                     </td>
                     <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
                 }
                 if (benutzerZugriff("saisons_aendern")) {
                     ?>
-                    <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                            href="<?php echo SportsManagerURL('&task=admin_saisons'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_SEASONS'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_saisons'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_SEASONS'); ?></a>
                     </td>
                     <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
                 }
                 if (benutzerZugriff("mannschaftsspielplaene_aendern")) {
                     ?>
-                    <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                            href="<?php echo SportsManagerURL('&task=admin_teamspiel_modi'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_TEAM_PLANS'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_teamspiel_modi'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_TEAM_PLANS'); ?></a>
                     </td>
                     <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
                 }
                 if (benutzerZugriff("verschieberegeln_aendern")) {
                     ?>
-                    <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                            href="<?php echo SportsManagerURL('&task=admin_verschieben_modi'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_POSTPONE_RULES'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_verschieben_modi'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_POSTPONE_RULES'); ?></a>
                     </td>
                     <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
                 }
                 if (benutzerZugriff("ranglistenwertungen_aendern")) {
                     ?>
-                    <td nowrap><a
+					<td style="padding-right: 15px" nowrap>
-                            href="<?php echo SportsManagerURL('&task=admin_ranglistensysteme'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_RANKING_RATING'); ?></a>
+						<a href="<?php echo SportsManagerURL('&task=admin_ranglistensysteme'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_RANKING_RATING'); ?></a>
                     </td>
                     <?php
+					$Spalte_Nr = checkZeilenumbruch($Spalte_Nr, $max_Spalten);
                 }
                 ?>
             </tr>
-        </table>
+        </table><br>
         <?php
         if (count($saisons) > 0) {
             ?>
@@ -4898,13 +4909,13 @@ class HTML_sportsmanager_admin
 
         <form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm">
             <div class="uk-overflow-auto">
-                <table class="uk-table" style="width: 100%">
+                <table class="" style="width: 100%">
                     <tr>
                         <td nowrap style="width: 60%; vertical-align: top">
                             <div class="uk-overflow-auto">
-                                <table class="uk-table" style="width: 100%">
+                                <table class="" style="width: 100%">
                                     <?php
-                                    for ($typ = 1; $typ <= 6; $typ++) {
+                                    for ($typ = 1; $typ <= 7; $typ++) {
                                         ?>
                                         <tr>
                                             <td></td>
@@ -4924,6 +4935,8 @@ class HTML_sportsmanager_admin
                                                             echo Text::_('COM_SPORTSMANAGER_PLAYER_STATISTICS');
                                                         else if ($typ == 6)
                                                             echo Text::_('COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS');
+                                                        else if ($typ == 7)
+                                                            echo Text::_('COM_SPORTSMANAGER_ASSOCIATION_BODIES');
                                                         ?>
                                                     </H2>
                                                 </div>
@@ -6922,11 +6935,11 @@ class HTML_sportsmanager_admin
         <form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm"
               enctype="multipart/form-data">
             <div class="uk-overflow-auto">
-                <table class="uk-table" style="width: 100%">
+                <table class="" style="width: 100%">
                     <tr>
                         <td nowrap style="width: 60%; vertical-align: top">
                             <div class="uk-overflow-auto">
-                                <table class="uk-table" style="width: 100%">
+                                <table class="" style="width: 100%">
                                     <tr>
                                         <td nowrap style="width: 20%; text-align: right">
                                             <label
@@ -6961,7 +6974,7 @@ class HTML_sportsmanager_admin
                                                 :</label>
                                         </td>
                                         <td nowrap>
-                                            <select class="uk-select uk-form-width-medium" name="kategorie"
+                                            <select class="uk-select uk-form-width-medium"  style='width: 350px;' name="kategorie"
                                                     id="category" size="1">
                                                 <?php
                                                 for ($i = 1; $i <= 50; $i++) {
@@ -7132,7 +7145,7 @@ class HTML_sportsmanager_admin
                                                 :</label>
                                         </td>
                                         <td nowrap>
-                                            <select class="uk-select uk-form-width-medium" name="tabellenwertung"
+                                            <select class="uk-select uk-form-width-large" style='width: 600px;' name="tabellenwertung"
                                                     id="table_evaluation" size="1">
                                                 <?php
                                                 $typ = array(
@@ -7249,7 +7262,7 @@ class HTML_sportsmanager_admin
                                                     }
                                                     ?>
                                                 </tr>
-                                            </table>
+                                            </table><br/>
                                         </td>
                                     </tr>
                                     <tr>
@@ -7264,13 +7277,13 @@ class HTML_sportsmanager_admin
                                                 ?>
                                                 <input type="radio" name="bildbeibehalten_logo" id="keep_logo" value="1"
                                                        checked><?php echo Text::_('COM_SPORTSMANAGER_NEWS_IMAGE'); ?>
-                                                <br/><br/><?php echo $bild; ?>
+                                                <br/><?php echo $bild; ?>
-                                                <br/><br/><label><input type="radio" name="bildbeibehalten_logo"
+                                                <br/><label><input type="radio" name="bildbeibehalten_logo"
                                                                         value="0"><?php echo Text::_('COM_SPORTSMANAGER_NEW_IMAGE'); ?>
                                                 </label>
-                                                <br/><br/><input type="file" name="bild_logo" size="30"
+                                                <br/><input type="file" name="bild_logo" size="30"
                                                                  onchange="document.adminForm.bildbeibehalten_logo[1].checked = true;"/>
-                                                <br/><br/><label>URL: <input class="inputbox" type="text"
+                                                <br/><label>URL: <input class="inputbox" type="text"
                                                                              name="logo_url" size="50"
                                                                              maxlength="150"
                                                                              value="<?php if (!empty($row)) echo htmlentities_utf8($row->logo_url); ?>"/></label>
@@ -7279,13 +7292,13 @@ class HTML_sportsmanager_admin
                                                 ?>
                                                 <label
                                                     for="logo_url"><?php echo Text::_('COM_SPORTSMANAGER_NEW_IMAGE'); ?></label>
-                                                <br/><br/><input type="file" name="bild_logo" size="30"/>
+                                                <br/><input type="file" name="bild_logo" size="30"/>
-                                                <br/><br/><label>URL: <input class="inputbox" type="text"
+                                                <br/><label>URL: <input class="inputbox" type="text"
                                                                              name="logo_url" id="logo_url" size="50"
                                                                              maxlength="150"/></label>
                                                 <?php
                                             }
-                                            ?>
+                                            ?><br/><br/>
                                         </td>
                                     </tr>
                                     <tr>
@@ -7301,13 +7314,13 @@ class HTML_sportsmanager_admin
                                                 <input type="radio" name="bildbeibehalten_ticker_logo"
                                                        id="keep_ticker_logo" value="1"
                                                        checked><?php echo Text::_('COM_SPORTSMANAGER_NEWS_IMAGE'); ?>
-                                                <br/><br/><?php echo $bild; ?>
+                                                <br/><?php echo $bild; ?>
-                                                <br/><br/><label><input type="radio" name="bildbeibehalten_ticker_logo"
+                                                <br/><label><input type="radio" name="bildbeibehalten_ticker_logo"
                                                                         value="0"><?php echo Text::_('COM_SPORTSMANAGER_NEW_IMAGE'); ?>
                                                 </label>
-                                                <br/><br/><input type="file" name="bild_ticker_logo" size="30"
+                                                <br/><input type="file" name="bild_ticker_logo" size="30"
                                                                  onchange="document.adminForm.bildbeibehalten_ticker_logo[1].checked = true;"/>
-                                                <br/><br/><label>URL: <input class="inputbox" type="text"
+                                                <br/><label>URL: <input class="inputbox" type="text"
                                                                              name="ticker_logo_url"
                                                                              size="50" maxlength="150"
                                                                              value="<?php if (!empty($row)) echo htmlentities_utf8($row->ticker_logo_url); ?>"/></label>
@@ -7316,8 +7329,8 @@ class HTML_sportsmanager_admin
                                                 ?>
                                                 <label
                                                     for="ticker_logo_url"><?php echo Text::_('COM_SPORTSMANAGER_NEW_IMAGE'); ?></label>
-                                                <br/><br/><input type="file" name="bild_ticker_logo" size="30"/>
+                                                <br/><input type="file" name="bild_ticker_logo" size="30"/>
-                                                <br/><br/>URL: <input class="inputbox" type="text"
+                                                <br/>URL: <input class="inputbox" type="text"
                                                                       name="ticker_logo_url" id="ticker_logo_url"
                                                                       size="50" maxlength="150"/>
                                                 <?php
@@ -9538,7 +9551,7 @@ class HTML_sportsmanager_admin
 		$jahr = $veranstaltung->erster_tag != null ? substr($veranstaltung->erster_tag, 0, 4) : 0;
 		?>
         <div class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"
-			style='background-color:#000066;width:760px;font-weight:600;text-align:center;'>
+			style='background-color:#000066;color: #cccccc;width:760px;font-weight:600;text-align:center;'>
 		<?php echo Text::_('COM_SPORTSMANAGER_COMPETITION'); ?>
             <?php echo htmlentities_utf8($veranstaltung->bezeichnung); ?>
             : <?php echo Text::_('COM_SPORTSMANAGER_GENERATE_ENCOUNTERS_NEXT_ROUND'); ?></div>
@@ -9550,7 +9563,7 @@ class HTML_sportsmanager_admin
                         <td nowrap style="width: 60%; vertical-align: top">
                             <div class="uk-overflow-auto">
                                 <table>
-                                    <tr><td colspan=2 style="text-align: center; background-color: #660033"><b>Grundeinstellungen</b></td></tr>
+                                    <tr><td colspan=2 style="text-align: center; background-color: #660033;color: #cccccc;"><b>Grundeinstellungen</b></td></tr>
 						<tr>
 						<td>Runden</td>
 						<td colspan style="text-align: left">
@@ -9607,14 +9620,14 @@ class HTML_sportsmanager_admin
 									$bgcolor = "#000099";
 								}
 								if ($spieltag == 1){
-									echo "<tr><td colspan=2 style='text-align: center; background-color: #000099'><b>Hinrunde</b></td></tr>";
+									echo "<tr><td colspan=2 style='text-align: center; background-color: #000099; color: #cccccc;'><b>Hinrunde</b></td></tr>";
 								}
 								if ($spieltag == $spieltage + 1){
-									echo "<tr><td colspan=2 style='text-align: center; background-color: #000033'><b>R&uuml;ckrunde</b> (Bei <i><u>Nur Hinrunde</u></i> sind hier keine Eingaben erforderlich)</td></tr>";
+									echo "<tr><td colspan=2 style='text-align: center; background-color: #000033; color: #cccccc;'><b>R&uuml;ckrunde</b> (Bei <i><u>Nur Hinrunde</u></i> sind hier keine Eingaben erforderlich)</td></tr>";
 								}
 								?>
                                         <tr>
-                                            <td nowrap style="width: 130px; text-align: center; background-color: <?php echo $bgcolor; ?>">
+                                            <td nowrap style="width: 130px; text-align: center; background-color: <?php echo $bgcolor; ?>; color: #cccccc;">
                                                 <label
                                                     for="calendar_week_<?php echo $spieltag; ?>"><?php echo $spieltag; ?>
                                                     . <?php echo Text::_('COM_SPORTSMANAGER_GAMEDAY'); ?>:</label>
@@ -9659,7 +9672,7 @@ class HTML_sportsmanager_admin
                                         <?php
                                     }
                                     echo "<tr><td colspan=2 style='text-align: center'>&nbsp;</td></tr>";
-                                    echo "<tr><td colspan=2 style='text-align: center; background-color: #660033'
+                                    echo "<tr><td colspan=2 style='text-align: center; background-color: #660033; color: #cccccc;'
                                                   title='Setzliste bzw. Erste Paarung&#10;Automatisch: Spiele sind die die erste Begegnungen in der Saison&#10;Setzliste: Mannschaften werden in eine Spielmatrix gesetzt&#10;Manschaften aud 1/2 bzw. 3/4 bzw. 5/6 usw. haben nie gleichzeitg Heimrecht!'><b>Setzliste bzw. Erste Paarung</b></td></tr>";
                                     for ($teamnr = 1; $teamnr <= $anzahlteams; $teamnr += 2) {
                                         ?>
@@ -10013,52 +10026,49 @@ class HTML_sportsmanager_admin
     {
 		global $params;
 		?>
-        <div class="componentheading<?php echo $params->get('pageclass_sfx'); ?>"><?php echo Text::_('COM_SPORTSMANAGER_EXPORT'); ?></div>
-
         <form action="<?php echo SportsManagerURL(); ?>" method="post" name="adminForm" id="adminForm">
-            <div class="uk-overflow-auto"><table class="" style="width: 100%">
+            <div class="uk-overflow-auto">
-                <tr>
+				<table class="" style="width: 500px">
-                    <td nowrap style="width: 60%; vertical-align: top">
+					<tr>
-                        <div class="uk-overflow-auto"><table class="" style="width: 100%">
+						<th align=center colspan='2'><?php echo Text::_('COM_SPORTSMANAGER_EXPORT'); ?></th>
-							<tr>
+					</tr>
-								<td nowrap style="width: 20%; text-align: right">
+					<tr>
-									<label for="veranstaltungId">Veranstaltung</label>
+						<td nowrap style="width: 120px; text-align: right">
-								</td>
+							<label for="veranstaltungId">Veranstaltung</label>
-								<td nowrap>
+						</td>
-									<select class="uk-select uk-form-width-medium" name="veranstaltungid" size="1">
+						<td nowrap>
-										<option value='<?PHP echo $veranstaltung->veranstaltung_id; ?>'><?PHP echo $veranstaltung->bezeichnung; ?></option>
+							<select class="uk-select uk-form-width-large" style='width: 320px;' name="veranstaltungid" size="1">
-										<?PHP foreach ($saison AS $key => $value) { ?>
+								<option value='<?PHP echo $veranstaltung->veranstaltung_id; ?>'><?PHP echo $veranstaltung->bezeichnung; ?></option>
-											<option value='<?PHP echo $value->veranstaltung_id; ?>'><?PHP echo $value->bezeichnung; ?></option>
+								<?PHP foreach ($saison AS $key => $value) { ?>
-										<?PHP } ?>
+									<option value='<?PHP echo $value->veranstaltung_id; ?>'><?PHP echo $value->bezeichnung; ?></option>
-									</select>
+								<?PHP } ?>
-								</td>
+							</select>
-							</tr>
+						</td>
-							<tr>
+					</tr>
-								<td nowrap style="width: 20%; text-align: right">
+					<tr>
-                                    <label for="export">Exportieren</label>
+						<td nowrap style="text-align: right">
-								</td>
+							<label for="export">Exportieren</label>
-								<td nowrap>
+						</td>
-									<select class="uk-select uk-form-width-medium" name="export" id="export" size="1">
+						<td nowrap>
-										<option value='spieler'>Spieler</option>
+							<select class="uk-select uk-form-width-large" style='width: 320px;' name="export" id="export" size="1">
-										<option value='spielplan'>Spielplan</option>
+								<option value='spieler'>Spieler</option>
-										<option value='spielberichte'>Spielberichte</option>
+								<option value='spielplan'>Spielplan</option>
-									</select>
+								<option value='spielberichte'>Spielberichte</option>
-								</td>
+							</select>
-							</tr>
+						</td>
-							<tr>
+					</tr>
-								<td nowrap style="width: 20%; text-align: right">
+					<tr>
-									<label for="exportformat">Exportformat</label>
+						<td nowrap style="text-align: right">
-								</td>
+							<label for="exportformat">Exportformat</label>
-								<td nowrap>
+						</td>
-									<select class="uk-select uk-form-width-medium" name="exportformat" id="exportformat" size="1">
+						<td nowrap>
-										<option value='csvdatei'>CSV-Datei</option>
+							<select class="uk-select uk-form-width-large" style='width: 320px;' name="exportformat" id="exportformat" size="1">
-									</select>
+								<option value='csvdatei'>CSV-Datei</option>
-								</td>
+							</select>
-							</tr>
+						</td>
-                        </table></div>
+					</tr>
-                    </td>
+				</table>
-                </tr>
+			</div>
-            </table></div>
 
             <input type="submit" name="save" value="<?php echo Text::_('COM_SPORTSMANAGER_EXPORT'); ?>"
                    class="button"/>

src/structure/language/de-DE/de-DE.com_sportsmanager.ini

@@ -1,4 +1,4 @@
-; Sports Manager (C) 2006-2020, Sven Nickel (Test)
+; Sports Manager (C) 2006-2020, Sven Nickel (Test)
 COM_SPORTSMANAGER="Sports Manager"
 COM_SPORTSMANAGER_PLAYERS="Spieler"
 COM_SPORTSMANAGER_CLUBS="Vereine"
@@ -70,6 +70,7 @@ COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Willst du die Rangliste wirklich entfe
 COM_SPORTSMANAGER_ADD_INDIVIDUAL_COMPETITION="Individualwettbewerb hinzufügen"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITION="Individualwettbewerb"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS="Individualwettbewerbe"
+COM_SPORTSMANAGER_ASSOCIATION_BODIES="Verbandsorgane"
 COM_SPORTSMANAGER_GAME="Spiel"
 COM_SPORTSMANAGER_GAMES="Spiele"
 COM_SPORTSMANAGER_GAMES_SHORTCUT="S"

src/structure/language/en-GB/en-GB.com_sportsmanager.ini

@@ -1,4 +1,4 @@
-; Sports Manager (C) 2006-2020, Sven Nickel
+; Sports Manager (C) 2006-2020, Sven Nickel
 COM_SPORTSMANAGER="Sports Manager"
 COM_SPORTSMANAGER_PLAYERS="Players"
 COM_SPORTSMANAGER_CLUBS="Clubs"
@@ -70,6 +70,7 @@ COM_SPORTSMANAGER_CONFIRM_REMOVE_RANKING="Do you really want to remove the ranki
 COM_SPORTSMANAGER_ADD_INDIVIDUAL_COMPETITION="Add individual competition"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITION="Individual competition"
 COM_SPORTSMANAGER_INDIVIDUAL_COMPETITIONS="Individual competitions"
+COM_SPORTSMANAGER_ASSOCIATION_BODIES="Association bodies"
 COM_SPORTSMANAGER_GAME="Game"
 COM_SPORTSMANAGER_GAMES="Games"
 COM_SPORTSMANAGER_GAMES_SHORTCUT="G"

src/structure/script.php

@@ -1110,7 +1110,7 @@ return new class () implements InstallerScriptInterface
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }
 
-		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '102';";
+		$query = "INSERT IGNORE #__sportsmanager_einstellungen SET name = 'datenbank_version', wert = '103';";
 		$db->setQuery( $query );
 		if (!$db->execute()) { die($db->stderr(true)); }