Create fixing release

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

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>

releases/slt-1.0.1.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.1</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-1.0.1.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>

releases/slt-1.0.2.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.2</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-1.0.2.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>

releases/slt-1.0.3.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.3</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-1.0.3.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>

releases/slt-1.0.4.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.4</version>
+		<downloads>
+			<downloadurl type="full" format="tar.gz">$DL_PREFIX/slt-1.0.4.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/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-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-\* | sort -V | 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 @@
-10
+4

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/abstract/_responsive.scss

@@ -11,3 +11,9 @@
         @content;
     }
 }
+
+@mixin for-narrow-screen {
+    @media screen and (max-width: 800px) {
+        @content;
+    }
+}

slt/css/components/_contact-list.scss

@@ -0,0 +1,13 @@
+table.com-content-category__table {
+    thead {
+        display: none;
+    }
+
+    tr {
+        > th,
+        > td {
+            border: none;
+            box-shadow: none;
+        }
+    }
+}

slt/css/components/_current-page-menu.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/components/_index.scss

@@ -1,3 +1,8 @@
 @use "slideshow";
 @use "article";
-@use "current-page-manu";
+@use "current-page-menu";
+@use "result-table";
+@use "presseberichte";
+@use "verbandstag";
+@use "vereine";
+@use "contact-list";

slt/css/components/_presseberichte.scss

@@ -0,0 +1,17 @@
+@use "../abstract" as abstract;
+
+table.pressespiegel {
+    @include abstract.for-narrow-screen {
+        tr {
+            &:first-child {
+                display: none;
+            }
+
+            > td {
+                &:last-child::before {
+                    content: "Rubrik: ";
+                }
+            }
+        }
+    }
+}

slt/css/components/_result-table.scss

@@ -0,0 +1,15 @@
+@use "../abstract" as abstract;
+
+table.result {
+    max-width: 800px;
+    margin: 0 auto;
+}
+
+div.result-links a {
+    display: block;
+
+    @include abstract.for-narrow-screen {
+        padding: 7px 0;
+        margin: 15px 0;
+    }
+}

slt/css/components/_verbandstag.scss

@@ -0,0 +1,11 @@
+@use "../abstract" as abstract;
+
+table.verbandstag {
+    @include abstract.for-narrow-screen {
+        tr {
+            &:first-child {
+                display: none;
+            }
+        }
+    }
+}

slt/css/components/_vereine.scss

@@ -0,0 +1,39 @@
+@use "../abstract" as abstract;
+
+.slt-vereine {
+    @include abstract.for-narrow-screen {
+        display: block;
+        line-height: 150%;
+
+        > tbody,
+        tr,
+        td {
+            display: block;
+            width: 100%;
+        }
+
+        tr {
+            padding: 7px 0;
+
+            &:first-child {
+                display: none;
+            }
+
+            > td:first-child {
+                display: none;
+            }
+
+            > td:nth-child(2) {
+                font-weight: bold;
+            }
+
+            > td:nth-child(4)::before {
+                content: "Ansprechpartner: ";
+            }
+        }
+
+        p {
+            margin: 0;
+        }
+    }
+}

slt/css/core/_default-classes.scss

@@ -24,7 +24,7 @@ li.row-fluid {
 .row-striped .row-fluid:nth-child(n),
 .list-striped li:nth-child(n),
 .table-striped tbody > tr:nth-child(n) > td {
-    background-color: inherit;
+    background-color: initial;
 }
 
 .well {

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/_blog.scss

@@ -0,0 +1,35 @@
+@use "../abstract" as abstract;
+
+.columns-2,
+.columns-3,
+.columns-4,
+.columns-5,
+.columns-6 {
+    @include abstract.for-desktop {
+        display: grid;
+
+        > div {
+            margin: 5px 5px 15px;
+        }
+    }
+}
+
+.columns-2 {
+    grid-template-columns: 1fr 1fr;
+}
+
+.columns-3 {
+    grid-template-columns: 1fr 1fr 1fr;
+}
+
+.columns-4 {
+    grid-template-columns: 1fr 1fr 1fr 1fr;
+}
+
+.columns-5 {
+    grid-template-columns: 1fr 1fr 1fr 1fr 1fr;
+}
+
+.columns-6 {
+    grid-template-columns: 1fr 1fr 1fr 1fr 1fr 1fr;
+}

slt/css/layout/_index.scss

@@ -7,3 +7,5 @@
 @use "pageheader";
 @use "side-images";
 @use "main-content";
+@use "blog";
+@use "mobile-table";

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/_mobile-table.scss

@@ -0,0 +1,38 @@
+@use "../abstract" as abstract;
+
+table:not(.no-responsive-table) {
+    width: 100%;
+    
+    @include abstract.for-narrow-screen {
+        display: block;
+
+        > tbody {
+            display: block;
+        }
+
+        tr {
+            display: block;
+            padding: 7px 0;
+            border-style: none;
+            border-bottom-style: solid;
+            border-width: 1px;
+
+            &:nth-child(2) {
+                border-top-style: solid;
+            }
+
+            > td {
+                display: block;
+                text-align: left !important;
+            }
+        }
+    }
+}
+
+table:not(.alternating) {
+    @include abstract.for-narrow-screen {
+        tr:nth-child(2n+1) {
+            background-color: #bbb;
+        }
+    }
+}

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/html/com_contact/category/default_items.php

@@ -1,131 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  com_contact
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-JHtml::_('behavior.core');
-
-$listOrder = $this->escape($this->state->get('list.ordering'));
-$listDirn  = $this->escape($this->state->get('list.direction'));
-?>
-<?php if (empty($this->items)) : ?>
-	<p> <?php echo JText::_('COM_CONTACT_NO_CONTACTS'); ?>	 </p>
-<?php else : ?>
-
-	<form action="<?php echo htmlspecialchars(JUri::getInstance()->toString()); ?>" method="post" name="adminForm" id="adminForm">
-	<?php if ($this->params->get('filter_field') || $this->params->get('show_pagination_limit')) : ?>
-	<fieldset class="filters btn-toolbar">
-		<?php if ($this->params->get('filter_field')) : ?>
-			<div class="btn-group">
-				<label class="filter-search-lbl element-invisible" for="filter-search"><span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span><?php echo JText::_('COM_CONTACT_FILTER_LABEL') . '&#160;'; ?></label>
-				<input type="text" name="filter-search" id="filter-search" value="<?php echo $this->escape($this->state->get('list.filter')); ?>" class="inputbox" onchange="document.adminForm.submit();" title="<?php echo JText::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>" placeholder="<?php echo JText::_('COM_CONTACT_FILTER_SEARCH_DESC'); ?>" />
-			</div>
-		<?php endif; ?>
-
-		<?php if ($this->params->get('show_pagination_limit')) : ?>
-			<div class="btn-group pull-right">
-				<label for="limit" class="element-invisible">
-					<?php echo JText::_('JGLOBAL_DISPLAY_NUM'); ?>
-				</label>
-				<?php echo $this->pagination->getLimitBox(); ?>
-			</div>
-		<?php endif; ?>
-	</fieldset>
-	<?php endif; ?>
-
-		<ul class="category row-striped">
-			<?php foreach ($this->items as $i => $item) : ?>
-
-				<?php if (in_array($item->access, $this->user->getAuthorisedViewLevels())) : ?>
-					<?php if ($this->items[$i]->published == 0) : ?>
-						<li class="row-fluid system-unpublished cat-list-row<?php echo $i % 2; ?>">
-					<?php else : ?>
-						<li class="row-fluid cat-list-row<?php echo $i % 2; ?>" >
-					<?php endif; ?>
-
-					<?php if ($this->params->get('show_image_heading')) : ?>
-						<?php $contact_width = 7; ?>
-						<div class="span2 col-md-2">
-							<?php if ($this->items[$i]->image) : ?>
-								<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>">
-									<?php echo JHtml::_('image', $this->items[$i]->image, JText::_('COM_CONTACT_IMAGE_DETAILS'), array('class' => 'contact-thumbnail img-thumbnail')); ?></a>
-							<?php endif; ?>
-						</div>
-					<?php else : ?>
-						<?php $contact_width = 9; ?>
-					<?php endif; ?>
-
-					<div class="list-title span<?php echo $contact_width; ?> col-md-<?php echo $contact_width; ?>">
-						<a href="<?php echo JRoute::_(ContactHelperRoute::getContactRoute($item->slug, $item->catid)); ?>">
-							<?php echo $item->name; ?></a>
-						<?php if ($this->items[$i]->published == 0) : ?>
-							<span class="label label-warning"><?php echo JText::_('JUNPUBLISHED'); ?></span>
-						<?php endif; ?>
-						<?php echo $item->event->afterDisplayTitle; ?>
-
-						<?php echo $item->event->beforeDisplayContent; ?>
-
-						<?php if ($this->params->get('show_position_headings')) : ?>
-								<br /><?php echo $item->con_position; ?><br />
-						<?php endif; ?>
-						<?php if ($this->params->get('show_email_headings')) : ?>
-								<?php echo $item->email_to; ?><br />
-						<?php endif; ?>
-						<?php $location = array(); ?>
-						<?php if ($this->params->get('show_suburb_headings') && !empty($item->suburb)) : ?>
-							<?php $location[] = $item->suburb; ?>
-						<?php endif; ?>
-						<?php if ($this->params->get('show_state_headings') && !empty($item->state)) : ?>
-							<?php $location[] = $item->state; ?>
-						<?php endif; ?>
-						<?php if ($this->params->get('show_country_headings') && !empty($item->country)) : ?>
-							<?php $location[] = $item->country; ?>
-						<?php endif; ?>
-						<?php 
-							echo implode(', ', $location);
-							if(! empty($location))
-								echo "<br />"; 
-						?>
-
-						<?php if ($this->params->get('show_telephone_headings') && !empty($item->telephone)) : ?>
-							<?php echo JText::sprintf('COM_CONTACT_TELEPHONE_NUMBER', $item->telephone); ?><br />
-						<?php endif; ?>
-
-						<?php if ($this->params->get('show_mobile_headings') && !empty ($item->mobile)) : ?>
-								<?php echo JText::sprintf('COM_CONTACT_MOBILE_NUMBER', $item->mobile); ?><br />
-						<?php endif; ?>
-
-						<?php if ($this->params->get('show_fax_headings') && !empty($item->fax) ) : ?>
-							<?php echo JText::sprintf('COM_CONTACT_FAX_NUMBER', $item->fax); ?><br />
-						<?php endif; ?>
-					</div>
-
-					<?php echo $item->event->afterDisplayContent; ?>
-				</li>
-				<?php endif; ?>
-			<?php endforeach; ?>
-		</ul>
-
-		<?php if ($this->params->get('show_pagination', 2)) : ?>
-		<div class="pagination">
-			<?php if ($this->params->def('show_pagination_results', 1)) : ?>
-			<p class="counter">
-				<?php echo $this->pagination->getPagesCounter(); ?>
-			</p>
-			<?php endif; ?>
-			<?php echo $this->pagination->getPagesLinks(); ?>
-		</div>
-		<?php endif; ?>
-		<div>
-			<input type="hidden" name="filter_order" value="<?php echo $listOrder; ?>" />
-			<input type="hidden" name="filter_order_Dir" value="<?php echo $listDirn; ?>" />
-		</div>
-</form>
-<?php endif; ?>
-

slt/html/com_contact/contact/default_address.php

@@ -1,125 +0,0 @@
-<?php
-/**
- * @package     Joomla.Site
- * @subpackage  com_contact
- *
- * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- */
-
-defined('_JEXEC') or die;
-
-/**
- * Marker_class: Class based on the selection of text, none, or icons
- * jicon-text, jicon-none, jicon-icon
- */
-?>
-<dl class="contact-address dl-horizontal" itemprop="address" itemscope itemtype="https://schema.org/PostalAddress">
-	<?php if (($this->params->get('address_check') > 0) &&
-		($this->contact->address || $this->contact->suburb  || $this->contact->state || $this->contact->country || $this->contact->postcode)) : ?>
-		<dt>
-			<span class="<?php echo $this->params->get('marker_class'); ?>">
-				<?php echo $this->params->get('marker_address'); ?>
-			</span>
-		</dt>
-
-		<?php if ($this->contact->address && $this->params->get('show_street_address')) : ?>
-			<dd>
-				<span class="contact-street" itemprop="streetAddress">
-					<?php echo nl2br($this->contact->address); ?>
-					<br />
-				</span>
-			</dd>
-		<?php endif; ?>
-
-		<?php if ($this->contact->suburb && $this->params->get('show_suburb')) : ?>
-			<dd>
-			  <span class="contact-postcode" itemprop="postalCode">
-				<?php echo $this->contact->postcode; ?>
-			  </span>
-              <span class="contact-suburb" itemprop="addressLocality">
-					<?php echo $this->contact->suburb; ?>
-					<br />
-				</span>
-			</dd>
-		<?php endif; ?>
-		<?php if ($this->contact->state && $this->params->get('show_state')) : ?>
-			<dd>
-				<span class="contact-state" itemprop="addressRegion">
-					<?php echo $this->contact->state; ?>
-					<br />
-				</span>
-			</dd>
-		<?php endif; ?>
-		<?php if ($this->contact->country && $this->params->get('show_country')) : ?>
-		<dd>
-			<span class="contact-country" itemprop="addressCountry">
-				<?php echo $this->contact->country; ?>
-				<br />
-			</span>
-		</dd>
-		<?php endif; ?>
-	<?php endif; ?>
-
-<?php if ($this->contact->email_to && $this->params->get('show_email')) : ?>
-	<dt>
-		<span class="<?php echo $this->params->get('marker_class'); ?>" itemprop="email">
-			<?php echo nl2br($this->params->get('marker_email')); ?>
-		</span>
-	</dt>
-	<dd>
-		<span class="contact-emailto">
-			<?php echo $this->contact->email_to; ?>
-		</span>
-	</dd>
-<?php endif; ?>
-
-<?php if ($this->contact->telephone && $this->params->get('show_telephone')) : ?>
-	<dt>
-		<span class="<?php echo $this->params->get('marker_class'); ?>">
-			<?php echo $this->params->get('marker_telephone'); ?>
-		</span>
-	</dt>
-	<dd>
-		<span class="contact-telephone" itemprop="telephone">
-			<?php echo $this->contact->telephone; ?>
-		</span>
-	</dd>
-<?php endif; ?>
-<?php if ($this->contact->fax && $this->params->get('show_fax')) : ?>
-	<dt>
-		<span class="<?php echo $this->params->get('marker_class'); ?>">
-			<?php echo $this->params->get('marker_fax'); ?>
-		</span>
-	</dt>
-	<dd>
-		<span class="contact-fax" itemprop="faxNumber">
-		<?php echo $this->contact->fax; ?>
-		</span>
-	</dd>
-<?php endif; ?>
-<?php if ($this->contact->mobile && $this->params->get('show_mobile')) : ?>
-	<dt>
-		<span class="<?php echo $this->params->get('marker_class'); ?>">
-			<?php echo $this->params->get('marker_mobile'); ?>
-		</span>
-	</dt>
-	<dd>
-		<span class="contact-mobile" itemprop="telephone">
-			<?php echo $this->contact->mobile; ?>
-		</span>
-	</dd>
-<?php endif; ?>
-<?php if ($this->contact->webpage && $this->params->get('show_webpage')) : ?>
-	<dt>
-		<span class="<?php echo $this->params->get('marker_class'); ?>">
-		</span>
-	</dt>
-	<dd>
-		<span class="contact-webpage">
-			<a href="<?php echo $this->contact->webpage; ?>" target="_blank" rel="noopener noreferrer" itemprop="url">
-			<?php echo JStringPunycode::urlToUTF8($this->contact->webpage); ?></a>
-		</span>
-	</dd>
-<?php endif; ?>
-</dl>

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
@@ -47,7 +40,6 @@ JHtml::_('script', 'user.js', array('version' => 'auto', 'relative' => true));
 
 <jdoc:include type="head" />
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
 </head>
 <body>