Merge pull request #34 from quicko-software/staging

Bugfixing, update for bootstrap_package 14
quicko-software · Dec 31, 2023 · 01dabdd · 01dabdd
2 parents c149325 + f90f7d6
commit 01dabdd
Show file tree

Hide file tree

Showing 40 changed files with 1,074 additions and 1,145 deletions.
diff --git a/Classes/Controller/BaseSettingsController.php b/Classes/Controller/BaseSettingsController.php
@@ -23,6 +23,12 @@ protected function updateDefaultSettingsIfRequired() {
         }        
         if(empty($this->settings["detailLocationPage"])) {
             $this->settings["detailLocationPage"] = $config->get('clubmanager', 'defaultDetailLocationPage');
-        }      
+        }
+        if(empty($this->settings["uidCategoryMember"])) {
+            $this->settings["uidCategoryMember"] = $config->get('clubmanager', 'uidCategoryMember');
+        }
+        if(empty($this->settings["uidCategoryLocation"])) {
+            $this->settings["uidCategoryLocation"] = $config->get('clubmanager', 'uidCategoryLocation');
+        }
     }
 }
diff --git a/Classes/Domain/Model/Country.php b/Classes/Domain/Model/Country.php
@@ -19,18 +19,4 @@
 
 class Country extends SysCountry
 {
-    /**
-     * Returns the shortNameLL.
-     *
-     * @return \string $shortNameLL
-     */
-    public function getShortNameLL()
-    {
-        $L = $GLOBALS['TSFE']->sys_language_uid;
-        if ($L < 1) {
-            return $this->getShortNameLocal();
-        } else {
-            return $this->getShortNameEn();
-        }
-    }
 }
diff --git a/Classes/Domain/Model/ExtFileRef.php b/Classes/Domain/Model/ExtFileRef.php
@@ -31,18 +31,6 @@ public function setOriginalResource(\TYPO3\CMS\Core\Resource\ResourceInterface $
     $this->originalFileIdentifier = (int)$originalResource->getOriginalFile()->getUid();    
   }
 
-  /**
-   * @return \TYPO3\CMS\Core\Resource\FileReference
-   */
-  public function getOriginalResource() {
-    if ($this->originalResource === NULL) {
-        $this->originalResource = \TYPO3\CMS\Core\Resource\ResourceFactory::getInstance()->getFileReferenceObject(
-            $this->getUid()
-        );
-    }
-    return $this->originalResource;
-  }
-
   /**
    * This is the magic function - give it a sys file. 
    * 
@@ -51,7 +39,6 @@ public function getOriginalResource() {
    */
   public function setFile(\TYPO3\CMS\Core\Resource\File $falFile) {
     $this->originalFileIdentifier = $falFile->getUid();
-    // $this->uidLocal = $this->originalFileIdentifier;
   }
 
   public function getOriginalFileIdentifier() {

diff --git a/Classes/Domain/Repository/CategoryRepository.php b/Classes/Domain/Repository/CategoryRepository.php
@@ -79,13 +79,12 @@ public function getFlatChildrenList(?array $parentUids): array
     $result = [];
     if ($children->count() > 0) {
       foreach ($children as $child) {
-        $childElem = $child->getUid();
         $subChildren = $this->getFlatChildrenList([$child->getUid()]);
 
         if ($subChildren) {
           $result = array_merge($result, $subChildren);
         }
-        $result[] = $childElem;
+        $result[] = $child;
       }
     }
     return $result;

diff --git a/Configuration/TCA/tx_clubmanager_domain_model_location.php b/Configuration/TCA/tx_clubmanager_domain_model_location.php
@@ -116,9 +116,9 @@
                 'type'       => 'select',
                 'renderType' => 'selectSingle',
                 'items'      => [
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.other', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_OTHER],
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.male', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_MALE],
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.female', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_FEMALE],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.0', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_OTHER],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.1', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_MALE],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.2', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_FEMALE],
                 ],
                 'size'       => 1,
                 'maxitems'   => 1,

diff --git a/Configuration/TCA/tx_clubmanager_domain_model_member.php b/Configuration/TCA/tx_clubmanager_domain_model_member.php
@@ -194,9 +194,9 @@
                 'type'       => 'select',
                 'renderType' => 'selectSingle',
                 'items'      => [
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.other', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_OTHER],
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.male', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_MALE],
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.female', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_FEMALE],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.0', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_OTHER],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.1', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_MALE],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.2', \Quicko\Clubmanager\Domain\Model\Member::SALUTATION_FEMALE],
                 ],
                 'size'       => 1,
                 'maxitems'   => 1,
@@ -361,11 +361,11 @@
                 'renderType' => 'selectSingle',
                 'size'       => 1,
                 'items' => [
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.unset', \Quicko\Clubmanager\Domain\Model\Member::STATE_UNSET],
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.applied', \Quicko\Clubmanager\Domain\Model\Member::STATE_APPLIED],
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.active', \Quicko\Clubmanager\Domain\Model\Member::STATE_ACTIVE],
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.suspended', \Quicko\Clubmanager\Domain\Model\Member::STATE_SUSPENDED],
-                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.cancelled', \Quicko\Clubmanager\Domain\Model\Member::STATE_CANCELLED],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.0', \Quicko\Clubmanager\Domain\Model\Member::STATE_UNSET],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.1', \Quicko\Clubmanager\Domain\Model\Member::STATE_APPLIED],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.2', \Quicko\Clubmanager\Domain\Model\Member::STATE_ACTIVE],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.3', \Quicko\Clubmanager\Domain\Model\Member::STATE_SUSPENDED],
+                    ['LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.state.4', \Quicko\Clubmanager\Domain\Model\Member::STATE_CANCELLED],
                 ],
             ],
         ],

diff --git a/Configuration/TSConfig/Page/TCEFORM.tsconfig b/Configuration/TSConfig/Page/TCEFORM.tsconfig
@@ -12,7 +12,7 @@ TCEFORM {
                 // default = LLL:EXT:clubmanager/Resources/Private/Language/Backend.xlf:salutation.default
             }
             addItems {
-                3 = LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.divers
+                3 = LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.3
             }
         }
         // customfield1 {
@@ -27,7 +27,7 @@ TCEFORM {
                 // default = LLL:EXT:clubmanager/Resources/Private/Language/Backend.xlf:salutation.default
             }
             addItems {
-                3 = LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.divers
+                3 = LLL:EXT:clubmanager/Resources/Private/Language/locallang_db.xlf:tx_clubmanager_domain_model_member.salutation.3
             }
         }
     }

diff --git a/Configuration/TypoScript/Bootstrap_package/constants.typoscript b/Configuration/TypoScript/Bootstrap_package/constants.typoscript
@@ -54,7 +54,7 @@ page {
 			text = <a href="https://quicko.software" rel="noopener" target="_blank">QUiCKO - Der Clubmanager</a> - entwickelt von <a href="https://www.wirkwerk.com" rel="noopener" target="_blank">WirkWerk</a> & <a href="https://www.codemacher.de" rel="noopener" target="_blank">Codemacher UG</a>.
 		}
 
-		//Cookieman is used so BOOTSTRAP PACKAGE cookieconsent is not needed
+		// Cookieman is used so BOOTSTRAP PACKAGE cookieconsent is not needed
 		cookieconsent.enable = 0
 	}
 
@@ -87,8 +87,16 @@ plugin.bootstrap_package {
 		cssSourceMapping = 0
 		// BOOTSTRAP SCSS CONSTANTS
 		scss {
-			primary = #0288D1
-			secondary = #FFEB3B
+			// Basic-Status
+			default = #222222
+			// Links, Buttons
+			primary = #1D90C7
+			// Bronze-Status
+			secondary = #a08d51
+			// Silber-Status
+			tertiary = #C0C0C0
+			// Gold-Status
+			quaternary = #FFD700
 			breadcrumb-bg = #FFFFFF
 			cookieconsent-bg = #F2F2F2
 			footer-sections = (content:(background: #0288D1, color: #ffffff, link-color: #FFEB3B), meta:(background: #ffffff, color: $body-color, link-color: #0288D1))

diff --git a/Configuration/TypoScript/Felogin/setup.typoscript b/Configuration/TypoScript/Felogin/setup.typoscript
@@ -10,9 +10,9 @@ lib.login {
     10 = TEXT
     10 {
         wrap = <div class="ms-md-5 my-3 text-end"> | </div>
-        value = <span class="btn btn-primary d-block">{$styles.content.loginform.label.login}</span>
+        value = {$styles.content.loginform.label.login}
         typolink {
-            ATagParams = class="text-white"
+            ATagParams = class="btn btn-primary d-block text-white"
             enable = 1
             parameter = {$styles.content.loginform.loginFormPid}
         }
@@ -51,9 +51,9 @@ lib.login {
             10 = TEXT
             10 {
                 wrap = <div class="col"> | </div>
-                value = <span class="btn btn-success d-block">{$styles.content.loginform.label.profile}</span>
+                value = {$styles.content.loginform.label.profile}
                 typolink {
-                    ATagParams = class="text-white"
+                    ATagParams = class="btn btn-success d-block text-white"
                     enable = 1
                     parameter = {$styles.content.loginform.memberProfilePage}
                 }
@@ -63,9 +63,9 @@ lib.login {
             20 = TEXT
             20 {
                 wrap = <div class="col"> | </div>
-                value = <span class="btn btn-danger d-block">{$styles.content.loginform.label.logout}</span>
+                value = {$styles.content.loginform.label.logout}
                 typolink {
-                    ATagParams = class="text-white"
+                    ATagParams = class="btn btn-danger d-block text-white"
                     enable = 1
                     parameter = {$styles.content.loginform.redirectPageLogout}
                     additionalParams = &logintype=logout

diff --git a/...urces/Private/Extensions/Bootstrap_package/Partials/Page/DropIn/Navigation/MainAfter.html b/...urces/Private/Extensions/Bootstrap_package/Partials/Page/DropIn/Navigation/MainAfter.html
@@ -0,0 +1,5 @@
+<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
+<f:comment></f:comment>
+
+<f:cObject typoscriptObjectPath="lib.login"/>
+</html>
diff --git a/Resources/Private/Extensions/Bootstrap_package/Partials/Page/Navigation/Main.html b/Resources/Private/Extensions/Bootstrap_package/Partials/Page/Navigation/Main.html
diff --git a/Resources/Private/Extensions/Felogin/Templates/Login/Login.html b/Resources/Private/Extensions/Felogin/Templates/Login/Login.html
@@ -26,7 +26,7 @@
 
 <f:section name="content">
     <div class="ms-md-5 my-3 text-end">
-        <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#loginModal">
+        <button type="button" class="btn btn-primary text-white" data-bs-toggle="modal" data-bs-target="#loginModal">
             <f:translate key="login"/>
         </button>
     </div>
@@ -101,7 +101,7 @@ <h3>
                             </f:link.action>
                         </div>
 
-                        <f:form.submit value="{f:translate(key: 'login')}" name="submit" class="btn btn-primary"/>
+                        <f:form.submit value="{f:translate(key: 'login')}" name="submit" class="btn btn-primary text-white"/>
 
                         <div class="felogin-hidden">
                             <f:form.hidden name="logintype" value="login"/>