Merge pull request #3 from bramwaas/develop

2.2.0 Develop

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding//scss/_template_dropdown.scss=UTF-8

README.md

@@ -3,10 +3,37 @@
 - up to version 1.3.5 compatible with Joomla 3
 - from version 1.4 compatible with Joomla 3.8 +
 - from version 2.1.0 Bootstrap 3,4,5 and more specific Joomla 4 code. like use of webassets in Joomla 4.
+- from version 2.2 Bootstrap 4 and 5 Joomla 4+ (although J 3.8+ may still work)
+
+## Documentation    
+
+Classes for featured articles, category blog, and tagged items and news feeds.<br>
+(columns only in desktop view, so wider than desktop view breakpoint can be set in template-style)<br>
+Bootstrap make-row for header of the list and make-col-ready and row-cols for items in the list.<br>
+.columns-n:<br>
+CSS class Page view page class. Works on display of the component.<br>
+Blog view(Leading) article class in n columns or n in # Columns for intro articles. Works on the part of the blog.<br>
+.photo-album .blog-items img, .blog-items.photo-album img, .com-tags__items .list-group img,<br>
+[class*="rssfoto"] .com-newsfeeds-newsfeed__items img<br>
+CSS class for all photos in the component with shadow as if pasted into an album<br>
+<br>
+.photo-in-album<br>
+CSS class for a random individual photo with shadow as if pasted into an album<br>
+<br>
+.rssphoto<br>
+CSS class Page view page class. Works on display of the newsfeed component.<br>
+Adjustments to newsfeed with photos from Fickr.<br>
+<br>
 ## Copyright and License
 
 This project is licensed under the [GNU GPL], version 3 or later.
-2018&thinsp;&ndash;&thinsp;2021 &copy; [Bram Waasdorp](http://www.waasdorpsoekhan.nl).
+2018&thinsp;&ndash;&thinsp;2024 &copy; [Bram Waasdorp](http://www.waasdorpsoekhan.nl).
 
 ## Changelog
-* 2.1.2 removed hard returns from documentation field because j4.4 + doesn't accept that.
+* 2.2.0.dev improvements rssfoto newsfeeds for J4,J5, remove suport BS3, use latest versions BS4 and BS5, remove some redundant code.
+    original scss files of BS4 and BS5 in folders scss bs4 and bs5.
+    New scss compiler scssphp/scssphp 1.13.0 and server scssphp/server 1.1.0 as continuation of leafo/scssphp   
+    Remove options for extra/override breakpoints.   
+    Implement class .columns-n in component at page level and desktoplay-out for tagged-items, category-blog, newsfeed, and featured-articles.
+    For category-blog and featured-articles also in blog-layout ((leading) article class and #columns). 
+* 2.1.2 removed hard returns from documentation field because j4.4 + doesn't accept that.

html/mod_menu/default.php

@@ -18,6 +18,7 @@
  * 30-12-2021 overbodige container-fluid bij eerder verwijderde navbar-inner verwijderd vanwege onnodige padding. 
  * 31-1-2022 referentie naar 'default_'.$item->type verbeterd, zodat deze ook bij gebruik in ander template werkt 
  *  entries voor seperator en heading gekopieerd van mod_menu
+ * 17-10-22 2.2.0 wsaDesktopExpand replaces breakpoint of wsaNavbarExpand
  */
 
 \defined('_JEXEC') or die;
@@ -42,7 +43,7 @@
 if ($twbs_version == 3) {
 	$menuType = str_replace(array("light", "dark", "bg-"), array("default", "inverse", ""), $menuType);	
 }
-$wsaNavbarExpand = htmlspecialchars($app->getTemplate(true)->params->get('wsaNavbarExpand', 'navbar-expand-md'));
+$wsaDesktopExpand = htmlspecialchars($app->getTemplate(true)->params->get('wsaDesktopExpand', 'xl'));
 $wsaNavtext = ($app->getTemplate(true)->params->get('wsaNavtext'));
 
 $moduleTag     = $params->get('module_tag', 'div');
@@ -84,7 +85,7 @@ function wsa_load($position, $style = 'none')
 
 <!-- Begin Navbar-->
 <?php // div in plaats van nav gebruikt oa IE8 nav nog niet kent ?>
-		    	<<?php echo $moduleTag; ?> class="navbar <?php echo  $wsaNavbarExpand .  ' ' . $menuType; ?> " role="navigation">
+		    	<<?php echo $moduleTag; ?> class="navbar navbar-expand-<?php  echo $wsaDesktopExpand .  ' ' . $menuType; ?> " role="navigation">
 					<!-- Brand and toggle get grouped for better mobile display -->
 					<!-- navbar-header -->
 					<?php if ($brandImage > " ") : ?>
@@ -101,25 +102,11 @@ function wsa_load($position, $style = 'none')
 					<a class="navbar-brand brand" href="#"><?php echo $sitename ?></a>
 					<?php endif; ?>
 					<?php echo '<!-- $twbs_version=' . $twbs_version . ". -->\n"; ?>
-					<?php if ($twbs_version == '3') : ?>
-					<div class="navbar-header">
-					  <button type="button"  class="navbar-toggle" data-toggle="collapse" data-target="#navbar-<?php echo $moduleIdPos; ?>"  aria-controls="navbar-<?php echo $moduleIdPos; ?>" aria-expanded="false">
-						<span class="sr-only">Toggle navigation</span>
- 						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-						<span class="icon-bar"></span>
-					  </button> 
-					<?php else: // $twbs_version == '4' or '5' ?>
 				    <button class="navbar-toggler" type="button" data-toggle="collapse" data-bs-toggle="collapse"  data-target="#navbar-<?php echo $moduleIdPos; ?>" data-bs-target="#navbar-<?php echo $moduleIdPos; ?>" aria-controls="#navbar-<?php echo $moduleIdPos; ?>" aria-expanded="false" aria-label="Toggle navigation">
 					  <span class="navbar-toggler-icon"></span>
 				    </button>
 					<!-- navbar-header -->
-					<?php endif; ?>
-					<?php if ($twbs_version == '3') : ?>
-					</div> <!-- navbar-header -->
-					<?php endif; ?>
 				   <div id="navbar-<?php echo $moduleIdPos; ?>" class="collapse navbar-collapse">
-
 <!-- oude module -->
 
 <ul <?php echo $id; ?> class="mod-menu nav navbar-nav mr-auto menu<?php echo $class_sfx;?>">