Merge pull request 'Migrate the template to Joomla 4' (#1) from dev/j4-compatibility into master

Reviewed-on: #1

Makefile

@@ -2,7 +2,7 @@
 # UPDATE_PATH=/srv/slt-update
 PACKAGES = slt.tar.gz
 
-export DL_PREFIX=https://slt.wolf-stuttgart.net/update/template
+export DL_PREFIX=https://slt.wolf-stuttgart.net/update/template/files
 
 RSYNC_OPTIONS=-rltDz --delete --delete-delay --delete-excluded --exclude '.gitignore'
 RSYNC_USER=christian
@@ -19,7 +19,7 @@ npm:
 	cd slt; npm run sass
 
 .PHONY: slt.tar.gz
-slt.tar.gz: npm
+slt.tar.gz: npm slt/templateDetails.xml
 	# cd slt ; tar czf ../$@ *
 	tar czf $@ -C slt \
 		css/dynamic-styles.css.php css/index.html css/style.css css/.htaccess \
@@ -34,6 +34,10 @@ slt.tar.gz: npm
 		template_thumbnail.png \
 		templateDetails.xml
 
+.PHONY: slt/templateDetails.xml
+slt/templateDetails.xml:
+	./scripts/create-details-xml.sh
+
 .PHONY: release
 release: slt.tar.gz
 	./scripts/create-release.sh

releases/slt-0.0.1.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.1</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.1.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-0.0.10.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.10</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.10.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-0.0.3.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.3</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.3.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-0.0.4.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.4</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.4.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-0.0.5.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.5</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.5.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-0.0.6.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.6</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.6.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-0.0.7.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.7</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.7.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-0.0.8.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.8</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.8.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-0.0.9.xml

@@ -0,0 +1,16 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>0.0.9</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-0.0.9.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="3.[012345678]|3.10"/>
+	</update>

releases/slt-1.0.0.xml

@@ -0,0 +1,20 @@
+	<update>
+		<name>SLT Template</name>
+		<description>Template for the SLT for the Joomla! CMS</description>
+		<element>slt</element>
+		<type>template</type>
+		<client>site</client>
+		<version>1.0.0</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-1.0.0.tar.gz</downloadurl>
+		</downloads>
+		<tags>
+			<tag>stable</tag>
+			<!--<tag>rc</tag>-->
+			<!--<tag>beta</tag>-->
+			<!--<tag>alpha</tag>-->
+			<!--<tag>dev</tag>-->
+		</tags>
+		<maintainer>Christian Wolf</maintainer>
+		<targetplatform name="joomla" version="4[.].*"/>
+	</update>

res/templateDetails.tmpl.xml

@@ -1,59 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd"> 
-<!-- MUSS Seit Joomla 1.6 ist der Installer universell. Also wichtig, version="2.5" type="template" client="site" angeben -->
 <extension
     version="3.0"
     method="upgrade"
     type="template"
     client="site"> 
-  <!-- SOLLTE, Der Annzeige-Name in Joomla -->
   <name>SLT</name>
-  <title>SLT</title>
+  <title>Template des Saarländischen Landesverbands für Tanzsport e.V.</title>
-  <!--SOLLTE Erstellungsdatum -->
+  <creationDate>${DATE}</creationDate>
-  <creationDate>25.03.2019</creationDate>
+  <version>${VERSION}</version>
-  <!-- SOLLTE, Wer ist der Urheber -->
   <author>Christian Wolf</author>
-  <!-- SOLLTE, für ausgelieferte Templates immer eine Kontakt-E-Mail-Adressse -->
   <authorEmail>homepage@slt.wolf-stuttgart.net</authorEmail>
-  <!-- SOLLTE, klar, die Webseite gehört dazu -->
+  <authorUrl>https://git.christian-wolf.click/slt/template</authorUrl>
-  <!--<authorUrl>http://www.joomla-templates.de</authorUrl>-->
-  <!-- SOLLTE, die eigene Versionsnummer des Templates -->
-  <version>0.0.8</version>
   <!-- SOLLTE, Die Template-Beschreibung wird hier als Joomla language mit einem Platzhalter versehen. In diesem Template-Ordner befindet sich die Sprachdatei in der TPL_TEST_TEMPLATE_XML_DESCRIPTION hinterlegt ist -->
   <!--<description>TPL_TEST_TEMPLATE_XML_DESCRIPTION</description>-->
-  <!-- MUSS, der Files-Tag bezeichnet den Block mit den Dateien und Ordnern die mit installiert werden -->
   <files> 
-    <!-- Der Folder-Tag weist Joomla an, den Ordner bspw. html samt dem Inhalt im Template-Ordner zu Speichern -->
-    <!--<folder>html</folder>-->
     <folder>css</folder>
     <folder>images</folder>
     <folder>language</folder>
     <folder>js</folder>
     <folder>html</folder>
-    <!-- MUSS, die Hauptdatei für die Ausgabe des Templates -->
     <filename>index.php</filename>
-    <!-- MUSS, jeder Ordner in Joomla ist mit einer Dummy-Html ausgestattet, so werden Server Fehlermeldungen verhindert, falls sich doch ein Webseitenbesucher in ein Verzeichnis verirrt -->
     <filename>index.html</filename>
-    <!-- SOLLTE, das Browser-Tab icon macht sich immer gut -->
+    <filename>favicon.ico</filename>
-    <!--<filename>favicon.ico</filename>-->
-    <!-- MUSS, diese Datei muss natürlich mit installiert werden -->
     <filename>templateDetails.xml</filename>
-    <!--SOLLTE, im Joomla Backend in der Template-Verwaltung wird dieses Bild vom Layout angezeigt. Am besten einen Screenshot der Webseiten Vorlage einfügen oder wenn die Seite fertig ist ein Browser-Screeensho -->
     <filename>template_preview.png</filename>
     <filename>template_thumbnail.png</filename>
     <!-- SOLLTE, in dieser Datei kann eine individuelle Fehlerseite erstellt werden (404) -->
     <!--<filename>error.php</filename>-->
   </files>
-  <!-- MUSS, das sind letztendlich die Positionen an die die Module geschickt werden-->
   <positions>
-    <!--<position>meine-topposition</position>
-    <position>linke-position</position>
-    <position>brotkrumen</position>
-    <position>zu-guter-letzt</position>
-    <position>so-soll-die-positon-heissen</position>
-    <position>neuigkeiten</position>-->
-    <!-- <position>ich-kann-später-noch-weitere-positionen-einfügen</position> -->
-    
     <position>topmenu</position>
     <position>slideshow</position>
     <position>mobile_menu</position>
@@ -62,8 +38,6 @@
     <position>impressum</position>
     <position>footer</position>
     <position>current_page_menu</position>
-    <!--<position></position>-->
-    
   </positions>
   <!--Sollte, Sollten unterschiedliche Sprachen genutzt werden, ist hier der richtige Platz um diese zu installieren-->
   <!--<languages folder="language">

res/update.template

@@ -3,14 +3,18 @@
 		<description>Template for the SLT for the Joomla! CMS</description>
 		<element>slt</element>
 		<type>template</type>
-		<client>0</client>
+		<client>site</client>
-		<version>__VERSION__</version>
+		<version>$VERSION</version>
 		<downloads>
-			<downloadurl type="full" format="__FORMAT__">__DOWNLOAD_URL__</downloadurl>
+			<downloadurl type="full" format="$FORMAT">$DOWNLOAD_URL</downloadurl>
 		</downloads>
 		<tags>
 			<tag>stable</tag>
+			<!--<tag>rc</tag>-->
+			<!--<tag>beta</tag>-->
+			<!--<tag>alpha</tag>-->
+			<!--<tag>dev</tag>-->
 		</tags>
 		<maintainer>Christian Wolf</maintainer>
-		<targetplatform name="joomla" version=".*"/>
+		<targetplatform name="joomla" version="4[.].*"/>
 	</update>

scripts/create-details-xml.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+MAJOR=`cat serial/major`
+MINOR=`cat serial/minor`
+RELEASE=`cat serial/release`
+
+export DATE=`date '+%Y-%m-%d'`
+export VERSION="$MAJOR.$MINOR.$RELEASE"
+
+cat res/templateDetails.tmpl.xml | envsubst > slt/templateDetails.xml

scripts/create-release.sh

@@ -5,7 +5,10 @@ MINOR=`cat serial/minor`
 RELEASE=`cat serial/release`
 TOTRELEASE="$MAJOR.$MINOR.$RELEASE"
 
-outname="releases/slt-$TOTRELEASE.tar.gz"
+filebase="slt-$TOTRELEASE"
+filename="$filebase.tar.gz"
+outname="releases/$filename"
+xmlname="releases/$filebase.xml"
 
 mkdir -p releases
 
@@ -17,3 +20,9 @@ if [ -f "$outname" ]; then
 fi
 
 cp slt.tar.gz "$outname"
+
+export VERSION="$TOTRELEASE"
+export FORMAT='tar.gz'
+export DOWNLOAD_URL="\$DL_PREFIX/$filename"
+
+cat res/update.template | envsubst > "$xmlname"

scripts/create-update-xml.sh

@@ -1,22 +1,11 @@
 #!/bin/bash
 
-# DL_PREFIX="https://slt.wolf-stuttgart.net/update/template"
-
 cat res/prefix.template > slt-update.xml
 
-find releases -name slt-\* | while read f
+find releases -name slt-\*.xml | sort -V | while read f
 do
-	
+	# Replace DL_PREFIX in the XML parts and combine them
-	VSTR=`echo "$f" | sed -E 's@releases/slt-@@; s@^([0-9]+\.[0-9]+\.[0-9]+).*$@\1@'`
+	cat "$f" | envsubst >> slt-update.xml
-	
-	FILE=`echo "$f" | sed 's@releases/@@'`
-	FORMAT=`echo "$f" | sed -E 's@^.*[0-9]+\.[0-9]+\.[0-9]+\.@@'`
-	
-	sed '
-		s@__VERSION__@'"$VSTR"'@g;
-		s@__DOWNLOAD_URL__@'"$DL_PREFIX/files/$FILE"'@g;
-		s@__FORMAT__@'"$FORMAT"'@g
-		' res/update.template >> slt-update.xml
 	
 done
 

serial/major

@@ -1 +1 @@
-0
+1

serial/release

@@ -1 +1 @@
-9
+0

slt/.gitignore

@@ -1,2 +1,3 @@
 /node_modules/
 /.stylelintcache
+/templateDetails.xml

slt/.stylelintrc.json

@@ -5,6 +5,7 @@
         "stylelint-scss"
     ],
     "rules": {
-        "indentation": 4
+        "indentation": 4,
+        "selector-class-pattern": "^([a-z][a-z0-9]*)((-|__)[a-z0-9]+)*$"
     }
   }

slt/css/components/_current-page-manu.scss

@@ -1,4 +1,4 @@
-#left-menu .current-page-menu ul.menu {
+#left-menu .current-page-menu ul.mod-menu {
     background-color: transparent;
     padding-top: 0;
     padding-bottom: 0;

slt/css/dynamic-styles.css.php

@@ -5,10 +5,11 @@ define('JPATH_BASE', '../../../');
 require_once ( JPATH_BASE .'/includes/defines.php' );
 require_once ( JPATH_BASE .'/includes/framework.php' );
 
-/* Create the Application */
+$container = \Joomla\CMS\Factory::getContainer();
-$mainframe = JFactory::getApplication('site');
+$container->alias(\Joomla\Session\SessionInterface::class, 'session.web.site');
-$mainframe->initialise();
+$mainframe = $container->get(\Joomla\CMS\Application\SiteApplication::class);
-$params = JFactory::getApplication()->getTemplate(true)->params;
+$template = $mainframe->getTemplate(true);
+$params = $template->params;
 
 header("content-type: text/css");
 
@@ -24,8 +25,6 @@ header("Cache-Control: must-revalidate, max-age=$offset, public");
 
 $leftImageValue  = (empty($params['imgleft']) ? "none" : "url(\"" . JPATH_BASE. "/" . $params['imgleft'] . "\")") ; 
 $rightImageValue = (empty($params['imgright']) ? "none" : "url(\"" . JPATH_BASE . "/" . $params['imgright'] . "\")") 
-// $leftImageValue  = (empty($params['imgleft']) ? "none" : "url(\"" . $this->baseurl . "/" . $params['imgleft'] . "\")") ; 
-// $rightImageValue = (empty($params['imgright']) ? "none" : "url(\"" . $this->baseurl . "/" . $params['imgright'] . "\")") 
 
 ?>
 
@@ -67,7 +66,7 @@ a, a:hover, a:active, a:visited
     color: <?php echo $params['licolor3']; ?>;
 }
 
-ul.menu {
+ul.mod-menu {
 	background-color: <?php echo $params['bgcolor1']; ?>;
 	color: <?php echo $params['fgcolor1']; ?>;
 }
@@ -77,8 +76,8 @@ ul.menu {
 	color: <?php echo $params['fgcolor1']; ?>;
 }
 
-ul.menu li.current > a,
+ul.mod-menu li.current > a,
-ul.menu li.current:hover > a
+ul.mod-menu li.current:hover > a
 {
 	background-color: <?php echo $params['bgcolor2']; ?>;
 	color: <?php echo $params['licolor2']; ?>;
@@ -86,27 +85,27 @@ ul.menu li.current:hover > a
 
 ul.nav > li > a:hover,
 ul.nav > li > a:focus,
-ul.nav-child > li > a:hover,
+ul.mod-menu__sub > li > a:hover,
-ul.nav-child > li > a:focus
+ul.mod-menu__sub > li > a:focus
 {
 	background-color: <?php echo $params['bgcolor3']; ?>;
 	color: <?php echo $params['licolor3']; ?>;
 }
 
 #topmenu,
-#topmenu > ul.menu {
+#topmenu > ul.mod-menu {
   background-color: <?php echo $params['topbgcolor1']; ?>;
   color: <?php echo $params['topfgcolor1']; ?>;
 }
 
-#topmenu .nav-child > li.current
+#topmenu .mod-menu__sub > li.current
 
 {
   background-color: <?php echo $params['topbgcolor2']; ?>;
   color: <?php echo $params['topfgcolor2']; ?>;
 }
 
-#topmenu .nav-child {
+#topmenu .mod-menu__sub {
   background-color: <?php echo $params['topbgcolor3']; ?>;
   color: <?php echo $params['topfgcolor3']; ?>;
 }
@@ -114,8 +113,8 @@ ul.nav-child > li > a:focus
 #topmenu .nav > li:hover,
 #topmenu .nav > li:focus,
 #topmenu .nav > li.active,
-#topmenu .nav-child > li:hover,
+#topmenu .mod-menu__sub > li:hover,
-#topmenu .nav-child > li:focus
+#topmenu .mod-menu__sub > li:focus
 {
   background-color: <?php echo $params['topbgcolor2']; ?>;
   color: <?php echo $params['topfgcolor2']; ?>;

slt/css/layout/_leftmenu.scss

@@ -8,7 +8,7 @@
         display: block;
         margin: 15px 0 15px 5px;
 
-        > ul.menu {
+        > ul.mod-menu {
             padding: 10px;
 
             li > a {
@@ -17,15 +17,27 @@
         }
     }
 
+    .nav {
+        display: block;
+
+        li > a {
+            display: block;
+        }
+    }
+
     .nav > li,
-    .nav-child > li {
+    .mod-menu__sub > li {
         padding: 5px 0;
         border-top-style: solid;
         border-width: 1px;
-    }
 
-    .nav > li:first-child,
+        &:first-child {
-    .nav-child > li:first-child {
             border-top-style: none;
         }
+    }
+
+    // .nav > li:first-child,
+    // .mod-menu__sub > li:first-child {
+    // border-top-style: none;
+    // }
 }

slt/css/layout/_menu.scss

@@ -8,7 +8,7 @@
     }
 }
 
-.nav-child {
+.mod-menu__sub {
     font-size: small;
 
     > li > a {
@@ -19,13 +19,13 @@
 }
 
 .nav,
-.nav-child {
+.mod-menu__sub {
     padding: 0;
 
     > li {
         display: block;
 
-        > .nav-child {
+        > .mod-menu__sub {
             padding-left: 10px;
             margin-left: 10px;
 
@@ -37,7 +37,7 @@
 }
 
 ul.nav > li > a:hover,
-ul.nav-child > li > a:hover {
+ul.mod-menu__sub > li > a:hover {
     /* background-color: inherit; */
 
     /* FIXME */

slt/css/layout/_mobile-menu.scss

@@ -34,6 +34,8 @@
         padding: 0;
         border: none;
         margin-left: 0;
+        display: flex;
+        flex-direction: column;
     }
 
     li {
@@ -41,7 +43,7 @@
         margin-right: 5px;
     }
 
-    .nav-child > li {
+    .mod-menu__sub > li {
         margin: 0;
     }
 
@@ -54,7 +56,7 @@
         border: none;
     }
 
-    > ul.menu {
+    > ul.mod-menu {
         background-color: initial;
         color: initial;
         margin-bottom: initial;

slt/css/layout/_topmenu.scss

@@ -6,10 +6,8 @@
     text-align: center;
 
     @include abstract.for-desktop {
-        position: fixed;
         display: flex;
         width: 100vw;
-        z-index: 5000;
         font-weight: bold;
         text-align: center;
 
@@ -28,9 +26,10 @@
     }
 
     .nav > li,
-    .nav-child > li {
+    .mod-menu__sub > li {
         padding: 0;
         border-style: none;
+        height: 100%;
     }
 
     .nav {
@@ -38,13 +37,11 @@
         display: flex;
         flex-flow: row nowrap;
         justify-content: space-between;
-        position: relative;
         align-items: center;
 
         @include abstract.for-desktop {
             padding: 0 10px;
             margin: 0;
-            height: 40px;
             width: 980px;
         }
 
@@ -57,8 +54,9 @@
             }
 
             > a {
-                position: relative;
                 font-size: large;
+                display: block;
+                height: 100%;
 
                 @include abstract.for-desktop {
                     font-size: large;
@@ -72,12 +70,11 @@
                 background-color: inherit;
             }
 
-            > .nav-child {
+            > .mod-menu__sub {
                 position: absolute;
                 display: none;
 
                 @include abstract.for-desktop {
-                    z-index: 3000;
                     margin: 0 20px 10px 0;
                     border: none;
                     padding: 0;
@@ -93,10 +90,6 @@
 
                         @include abstract.for-desktop {
                             padding: 10px 5px 10px 4px;
-
-                            // border-left-color: transparent;
-                            // border-left-style: solid;
-                            // border-left-width: 6px;
                             border-left: 6px solid transparent;
                         }
                     }
@@ -107,7 +100,7 @@
                 }
             }
 
-            &:hover > .nav-child {
+            &:hover > .mod-menu__sub {
                 display: block;
 
                 @include abstract.for-desktop {
@@ -126,49 +119,53 @@
             color: inherit;
         }
 
-        .nav-child > li:hover > a:hover,
+        .mod-menu__sub > li:hover > a:hover,
-        .nav-child > li:focus > a:hover,
+        .mod-menu__sub > li:focus > a:hover,
-        .nav-child > li:hover > a:focus {
+        .mod-menu__sub > li:hover > a:focus {
             text-decoration: none;
         }
     }
 
     // Special colors for topics
-    > ul.nav .nav-child a.lehre {
+    > ul.nav .mod-menu__sub a.lehre {
         border-left-color: abstract.$color-lehre;
     }
 
-    > ul.nav .nav-child a.breitensport {
+    > ul.nav .mod-menu__sub a.breitensport {
         border-left-color: abstract.$color-breitensport;
     }
 
-    > ul.nav .nav-child a.jugend {
+    > ul.nav .mod-menu__sub a.jugend {
         border-left-color: abstract.$color-jugend;
     }
 
-    > ul.nav .nav-child a.jmd {
+    > ul.nav .mod-menu__sub a.jmd {
         border-left-color: abstract.$color-jmd;
     }
 
-    > ul.nav .nav-child a.fachverbaende {
+    > ul.nav .mod-menu__sub a.fachverbaende {
         border-left-color: abstract.$color-fachverbaende;
     }
 
-    > ul.nav .nav-child a.sport {
+    > ul.nav .mod-menu__sub a.sport {
         border-left-color: abstract.$color-sport;
     }
 }
 
 #topmenu-div {
     @include abstract.for-desktop {
+        position: sticky;
+        top: 0;
         width: 100vw;
         height: 40px;
+        z-index: 1;
     }
 }
 
 a.facebook {
     img {
         display: none;
+        height: 25px;
 
         @include abstract.for-desktop {
             display: inline;

slt/index.php

@@ -4,7 +4,7 @@ defined('_JEXEC') or die;
 
 use Joomla\CMS\Uri\Uri;
 
-JHTML::_('behavior.framework', true);
+//JHTML::_('behavior.framework', true);
 $app = JFactory::getApplication();
 $doc = JFactory::getDocument();
 
@@ -15,18 +15,11 @@ JHtml::_('bootstrap.loadCss', true, $this->direction);
 // Add jQuery framework
 JHtml::_('jquery.framework');
 
-// Add template js
-//JHtml::_('script', 'template.js', array('version' => 'auto', 'relative' => true));
-
-// Add html5 shiv
-//JHtml::_('script', 'jui/html5.js', array('version' => 'auto', 'relative' => true, 'conditional' => 'lt IE 9'));
-
 // Add Stylesheets
 JHtml::_('stylesheet', 'templates/system/css/system.css', array('version' => 'auto', 'relative' => false));
-// JHtml::_('stylesheet', 'media/jui/css/icomoon.css', array('version' => 'auto', 'relative' => false));
 JHtml::_('stylesheet', 'style.css', array('version' => 'auto', 'relative' => true));
 
-$doc->addStyleSheet($this->baseurl.'/media/jui/css/icomoon.css');
+$doc->addStyleSheet($this->baseurl.'/media/system/css/joomla-fontawesome.css');
 $doc->addStyleSheet($this->baseurl.'/templates/slt/css/dynamic-styles.css.php?Itemid=' . $app->input->getInt('Itemid'));
 
 // Add Javascript for mobile menu
@@ -46,8 +39,7 @@ JHtml::_('script', 'user.js', array('version' => 'auto', 'relative' => true));
 <head>
 
 <jdoc:include type="head" />
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
-
 </head>
 <body>