Merge pull request #73 from RRZE-Webteam/dev

Release 2.1
RRZE-Webteam · Jul 11, 2022 · 9c5845a · 9c5845a
2 parents 5f59d0a + 98278bc
commit 9c5845a
Show file tree

Hide file tree

Showing 122 changed files with 3,860 additions and 3,349 deletions.
diff --git a/attachment.php b/attachment.php
@@ -14,8 +14,8 @@
 
 	<?php get_template_part('template-parts/hero', 'small'); ?>
 	<div id="content">
-		<div class="container">
-			<div class="row">
+		<div class="content-container">
+		    <div class="content-row">
 
 			    <main>
 				<h1 class="screen-reader-text"><?php the_title(); ?></h1>

diff --git a/css/fau-theme-admin.css b/css/fau-theme-admin.css
diff --git a/css/fau-theme-editor-style.css b/css/fau-theme-editor-style.css
diff --git a/css/fau-theme-gutenberg.css b/css/fau-theme-gutenberg.css
diff --git a/footer.php b/footer.php
@@ -9,55 +9,45 @@
  * @subpackage FAU
  * @since FAU 1.0
  */
+
+	$website_type = get_theme_mod('website_type');			
+	if (($website_type ==3 ) &&  ( is_active_sidebar( 'footer-block1' ) )) {  
+		$logoclass = "other";
+	} else {
+		$logoclass = "fau";
+	} 
+	$display_address = get_theme_mod("advanced_footer_display_address");
+	$contact_address_name = get_theme_mod("contact_address_name");
+	$contact_address_name2 = get_theme_mod("contact_address_name2");
+	$contact_address_street = get_theme_mod("contact_address_street");
+	$contact_address_plz = get_theme_mod("contact_address_plz");
+	$contact_address_ort = get_theme_mod("contact_address_ort");
+	$contact_address_country = get_theme_mod("contact_address_country");
+	$schemaname = $contact_address_name." ".$contact_address_name2;
 ?>
 
 
 	<footer id="footer">
-	    <div class="container">
-		<div class="footer-row">
-		    <?php 
-		    $website_type = get_theme_mod('website_type');			
-		    if (($website_type ==3 ) &&  ( is_active_sidebar( 'footer-block1' ) )) {  
-			$logoclass = "other";
-		    } else {
-			$logoclass = "fau";
-		    }
-		    ?>
-		     <div class="footer-logo <?php echo $logoclass; ?>">
-			<?php if (($website_type ==3 ) &&  ( is_active_sidebar( 'footer-block1' ) )) {  
-			    dynamic_sidebar( 'footer-block1' );
-			} else { 
-                            fau_use_svg("fau-logo-2021",144,55,'fau-logo-footer'); 
-                        } ?>
-		    </div>
-		    <div class="footer-address">
-			<?php 
-			if (($website_type ==3 ) &&  ( is_active_sidebar( 'footer-block2' ) )) {  
-			     dynamic_sidebar( 'footer-block2' );
-			} else {
-			    $display_address = get_theme_mod("advanced_footer_display_address");
-			    if ($display_address) { ?>
-			<address itemscope itemtype="http://schema.org/PostalAddress">
-			    <?php
-			    $contact_address_name = get_theme_mod("contact_address_name");
-			    $contact_address_name2 = get_theme_mod("contact_address_name2");
-			    $contact_address_street = get_theme_mod("contact_address_street");
-			    $contact_address_plz = get_theme_mod("contact_address_plz");
-			    $contact_address_ort = get_theme_mod("contact_address_ort");
-			    $contact_address_country = get_theme_mod("contact_address_country");
-			    $schemaname = $contact_address_name." ".$contact_address_name2; ?>
-			    <meta itemprop="name" content="<?php echo esc_html($schemaname);?>">
-			    <span><?php echo $contact_address_name; 
-			    if (!fau_empty($contact_address_name2)) { echo "<br>".$contact_address_name2; } ?></span><br>
-			    <span itemprop="streetAddress"><?php echo $contact_address_street; ?></span><br>
-			    <span itemprop="postalCode"><?php echo $contact_address_plz; ?></span> <span itemprop="addressLocality"><?php echo $contact_address_ort; ?></span><br>
-			    <?php if (isset($contact_address_country)) { ?>
-			       <span itemprop="addressCountry"><?php echo $contact_address_country; ?></span>
-			    <?php } ?>   
-		       </address>
-			<?php } 
-			} ?>   
-		    </div>
+		<div class="container">
+			<div class="footer-row">
+				<div class="footer-logo <?php echo $logoclass; ?>">
+					<?php if (($website_type == 3 ) &&  ( is_active_sidebar( 'footer-block1' ) )) {  
+						dynamic_sidebar( 'footer-block1' );
+					} else { 
+						fau_use_svg("fau-logo-2021",144,55,'fau-logo-footer'); 
+                    } ?>
+				</div>
+				<div class="footer-address">
+			<?php if (($website_type ==3 ) &&  ( is_active_sidebar( 'footer-block2' ) )) {  
+				dynamic_sidebar( 'footer-block2' ); 		
+			} elseif ($display_address) { ?>		<address itemscope itemtype="http://schema.org/PostalAddress">
+						<meta itemprop="name" content="<?php echo esc_html($schemaname);?>">
+						<span><?php echo $contact_address_name; if (!fau_empty($contact_address_name2)) { echo "<br>".$contact_address_name2; } ?></span><br>
+						<span itemprop="streetAddress"><?php echo $contact_address_street; ?></span><br>
+						<span itemprop="postalCode"><?php echo $contact_address_plz; ?></span> <span itemprop="addressLocality"><?php echo $contact_address_ort; ?></span><br>
+						<?php if (isset($contact_address_country)) { ?><span itemprop="addressCountry"><?php echo $contact_address_country; ?></span><?php } ?>   
+					</address>
+			<?php }  ?>   	</div>
 		    <div class="footer-meta">
 			<nav aria-label="<?php echo __('Kontakt, Impressum und Zusatzinformationen','fau'); ?>">
 			    <?php 
@@ -90,6 +80,6 @@
 		<span class="screen-reader-text"><?php echo __('Nach oben','fau'); ?></span></a>
 	</footer>
     </div> 
-	<?php wp_footer(); ?>
-</body>
+		<?php print_indented("wp_footer",2); ?>
+	</body>
 </html>