Neue PLatzhalterbilder #1291

RRZE-Webteam · Oct 23, 2023 · d7a0e44 · d7a0e44
1 parent 437b2b7
commit d7a0e44
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 23 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Wordpress-Theme für zentrale Einrichtungen der Friedrich-Alexander-Universität
 
 
 
-Version: 2.3.37
+Version: 2.3.38
 
 
 

diff --git a/functions/constants.php b/functions/constants.php
@@ -10,7 +10,7 @@
 // Name des Options-Array
 
 $defaultoptions = [
-	'optiontable-version'           => 98,
+	'optiontable-version'           => 102,
 	// zaehlt jedesmal hoch, wenn neue Optionen eingefuegt werden 
 	// oder Default Optionen geaendert werden. Vorhandene Defaultoptions 
 	// in der Options-Table werden nur dann geändert, wenn der Wert erhöht 
@@ -24,28 +24,31 @@
 	// Oder hier von Hand :)
 	'js-version'                    => '2.12',
 	// Theme-Versionslinie, wird überschrieben durch Style.css Version
-
 	'website_type'                  => 1,
 	// website_type: 
 	//  0 = Fakultaetsportal; 
 	//  1 = Lehrstuehle, Departments 
 	//  2 = Zentrale Einrichtungen, 
 	//  3 = Kooperationen 
 	// -1 = fau.de Portal (4 Spalter in Bühne, kein Link zur FAU. 
-
 	'website_usefaculty'            => '',
 	// phil, med, nat, rw, tf
 	// Setzt fest die Fakultät bei Wahl des Website-Types    
 
 	'default_home_orga'             => 'fau',
 	// Muss in $default_fau_orga_data auf erster Ebene vorhanden sein.	
 	'default-social-media-color'	=> '#04316a',
-	'default-sourcecode-notice'		=> true,
+	'default-sourcecode-notice'		=> false,
 	'default-sourcecode-notice-text'	=> __("Wenn Sie dies lesen, sind wir vielleicht was für Sie! \n	    Die FAU sucht immer vielversprechende Talente in allen universitären Bereichen, die bereit sind, sich mit Leidenschaft, Kreativität und Engagement für die FAU einzusetzen: \n	    https://jobs.fau.de", 'fau'),
 	'optionpage-tab-default'		=> 'website',
 	'content-width'                 => 620,
 	'content-width-fullpage'		=> 940,
-	'src-fallback-slider-image'		=> get_fau_template_uri() . '/img/slider-fallback.jpg',
+	'src-fallback-slider-image'		=> get_fau_template_uri() . '/img/FallbackSlider.png',
+    'default_startseite-bannerbild-image_src'	=> get_fau_template_uri() . '/img/FallbackBanner.png',
+    'startseite_banner_usedefault'	=> false,
+    'src-fallback-post-image'		=> get_fau_template_uri() . '/img/FallbackPost.png',
+    'fallback_svgfaulogo'           => false,
+        // falls ken Artikelbild gesetzt wird, wird anstelle des definierten Fallback, das FAU Logo SVG verwendet
 	'slider-catid'                  => 0,
 	'src-scriptjs'                  => get_fau_template_uri() . '/js/fau-theme.min.js',
 	'src-sliderjs'                  => get_fau_template_uri() . '/js/fau-theme-slick.min.js',
@@ -85,11 +88,10 @@
 	'start_topevents_active'		=> true,
 	'topevent_hideimage'			=> false,
 	'topevents_templates'			=> array(1),
-	'fallback_topevent_image'		=> 0,
 	'default_topevent_excerpt_length'		=> 100,
 
-	'default_startseite-bannerbild-image_src'	=> get_fau_template_uri() . '/img/bannerbild-tafel-1260x182.jpg',
-	'startseite_banner_usedefault'		=> false,
+
+
 
 
 	/* Image Sizes */

diff --git a/functions/template-functions.php b/functions/template-functions.php
@@ -690,6 +690,8 @@ function fau_display_news_teaser($id = 0, $withdate = false, $hstart = 2, $hidem
             $post_thumbnail_id = get_post_thumbnail_id($post->ID);
             $pretitle          = get_theme_mod('advanced_blogroll_thumblink_alt_pretitle');
             $posttitle         = get_theme_mod('advanced_blogroll_thumblink_alt_posttitle');
+            $fallback_svgfaulogo = get_theme_mod('fallback_svgfaulogo');
+
             $alttext           = $pretitle . get_the_title($post->ID) . $posttitle;
             $alttext           = esc_html($alttext);
 
@@ -707,14 +709,12 @@ function fau_display_news_teaser($id = 0, $withdate = false, $hstart = 2, $hidem
             $output .= '<div class="thumbnailregion';
 
             if (metadata_exists('post', $post->ID, 'vidpod_url') && shortcode_exists('fauvideo')) {
+                 // check if the post is using Video/Podcast
                 $output .= ' vidpod-thumb">';
                 $vidpod_url = get_post_meta($post->ID, 'vidpod_url', true);
                 $output .= do_shortcode('[fauvideo url="' . $vidpod_url . '"]');
             } else {
-
-                // check if the post is using Video/Podcast
-
-                if ($usefallbackthumb) {
+                if (($usefallbackthumb) && ($fallback_svgfaulogo)) {
                     $output .= ' fallback';
                 }
                 $output .= '">';
@@ -1872,8 +1872,7 @@ function fau_get_image_htmlcode($id = 0, $size = 'rwd-480-3-2', $alttext = '', $
 /*-----------------------------------------------------------------------------------*/
 /* get info of defined sizes
 /*-----------------------------------------------------------------------------------*/
-function fau_get_image_sizes($size = 'rwd-480-3-2')
-{
+function fau_get_image_sizes($size = 'rwd-480-3-2') {
     global $defaultoptions;
 
     // Find (old) aliases and map them
@@ -1899,15 +1898,16 @@ function fau_get_image_sizes($size = 'rwd-480-3-2')
 /*-----------------------------------------------------------------------------------*/
 /* get fallback image by size
 /*-----------------------------------------------------------------------------------*/
-function fau_get_image_fallback_htmlcode($size = 'rwd-480-3-2', $alttext = '', $classes = '', $atts = array())
-{
+function fau_get_image_fallback_htmlcode($size = 'rwd-480-3-2', $alttext = '', $classes = '', $atts = array()) {
     $imgsrc  = $imgsrcset = $imgsrcsizes = '';
     $alttext = esc_html($alttext);
 
     $sizedata = fau_get_image_sizes($size);
     $width = $sizedata['width'];
     $height = $sizedata['height'];
 
+    $fallback_svgfaulogo = get_theme_mod('fallback_svgfaulogo');
+
     switch ($size) {
         case 'topevent_thumb':
             $fallback = get_theme_mod('fallback_topevent_image');
@@ -1975,11 +1975,25 @@ function fau_get_image_fallback_htmlcode($size = 'rwd-480-3-2', $alttext = '', $
         $item_output .= ' loading="lazy">';
 
         return $item_output;
-    } else {
+    } elseif ($fallback_svgfaulogo) {
         $item_output = fau_use_svg("fau-logo-2021", $width, $height, $classes, false);
 
+        return $item_output;
+    } else {
+        global $defaultoptions;
+        $item_output = '';
+        $item_output .= '<img src="' . fau_esc_url($defaultoptions['src-fallback-post-image']) . '" width="' . $width . '" height="' . $height . '" alt="' . $alttext . '"';
+
+        $classes .= ' fallback';
+        $item_output .= ' class="' . $classes . '"';
+        if ($attributes) {
+            $item_output .= $attributes;
+        }
+        $item_output .= ' loading="lazy">';
+
         return $item_output;
     }
+
 
     return;
 }

diff --git a/img/FallbackBanner.png b/img/FallbackBanner.png
diff --git a/img/FallbackPost.png b/img/FallbackPost.png
diff --git a/img/FallbackSlider.png b/img/FallbackSlider.png
diff --git a/img/bannerbild-tafel-1260x182.jpg b/img/bannerbild-tafel-1260x182.jpg
diff --git a/img/slider-fallback.jpg b/img/slider-fallback.jpg
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "FAU-Einrichtungen",
     "textdomain": "fau",
-    "version": "2.3.37",
+    "version": "2.3.38",
     "keywords": [
         "WordPress",
         "Theme",

diff --git a/print.css b/print.css
diff --git a/style.css b/style.css
diff --git a/template-parts/hero-banner.php b/template-parts/hero-banner.php
@@ -8,6 +8,7 @@
  * @since FAU 1.7
  */
 
+global $defaultoptions;
 $banner = get_theme_mod("startseite_banner_image");
 $copyright = '';
 
@@ -30,8 +31,6 @@
     $url = get_theme_mod("default_startseite-bannerbild-image_src");
     $width = $defaultoptions['default_image_sizes']['herobanner']['width']; 
     $height = $defaultoptions['default_image_sizes']['herobanner']['height'];
-    $crop = $defaultoptions['default_image_sizes']['herobanner']['crop'];
-
     $image = '<img src="'.fau_esc_url($url).'" width="'.$width.'" height="'.$height.'" alt="" loading="lazy">';	
 } else {
     $image = '';