Merge pull request #721 from RRZE-Webteam/dev1-11

fehlendes aria-label ergänzt
RRZE-Webteam · Nov 27, 2019 · d0ead9e · d0ead9e
2 parents 43a6935 + 0aecdea
commit d0ead9e
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 35 deletions.
diff --git a/page-templates/page-portal.php b/page-templates/page-portal.php
@@ -35,10 +35,11 @@
 			?>
 		    </main> 
 		</div>
-		<div class="portalpage-sidebar"><?php
+		<aside class="portalpage-sidebar" aria-label="<?php echo __('Sidebar','fau');?>">
+		    <?php
 		    get_template_part('template-parts/sidebar', 'events'); 	
-		    get_template_part('template-parts/sidebar'); 
-		    ?></div>
+		    get_template_part('template-parts/sidebar');  ?>
+		</aside>
 	    </div>
 
 	    <?php  

diff --git a/page-templates/page-start-sub.php b/page-templates/page-start-sub.php
@@ -91,44 +91,44 @@
 			?>
 			</main>	
 		    </div>
-		    <aside class="startpage-sidebar">
+		    <aside class="startpage-sidebar" aria-label="<?php echo __('Sidebar','fau');?>">
 			    <?php
 			    get_template_part('template-parts/sidebar', 'events'); 					
 			    get_template_part('template-parts/sidebar');
 			    ?>
 		    </aside>
-			</div> <!-- /row -->
-			<?php  
-
-
-			 $menuslug = get_post_meta( $post->ID, 'portalmenu-slug', true );	
-			 if ($menuslug) { ?>	
-			    <hr>
-			    <?php 			
-				$nosub  = get_post_meta( $post->ID, 'fauval_portalmenu_nosub', true );
-				if ($nosub==1) {
-				    $displaysub =0;
-				} else {
-				    $displaysub =1;
-				}
-				$nofallbackthumbs  = get_post_meta( $post->ID, 'fauval_portalmenu_nofallbackthumb', true );
-				$nothumbnails  = get_post_meta( $post->ID, 'fauval_portalmenu_thumbnailson', true ); 
+		</div> 
+		<?php  
 
-				fau_get_contentmenu($menuslug,$displaysub,0,$nothumbnails,$nofallbackthumbs);
-
-			 }
-
-			echo fau_get_ad('werbebanner_unten',true);			
-			$logoliste = get_post_meta( $post->ID, 'fauval_imagelink_catid', true );
-			if ($logoliste) { 
-			    /* New since 1.10.57 */
-			    $logos = fau_imagelink_get(array('size' => "logo-thumb", 'catid' => $logoliste, "autoplay" => true, "dots" => true));
-			    if ((isset($logos) && (!empty($logos)))) {
-				echo "<hr>\n";
-				echo $logos;
-			    }
-
-			} ?>
+
+		 $menuslug = get_post_meta( $post->ID, 'portalmenu-slug', true );	
+		 if ($menuslug) { ?>	
+		    <hr>
+		    <?php 			
+			$nosub  = get_post_meta( $post->ID, 'fauval_portalmenu_nosub', true );
+			if ($nosub==1) {
+			    $displaysub =0;
+			} else {
+			    $displaysub =1;
+			}
+			$nofallbackthumbs  = get_post_meta( $post->ID, 'fauval_portalmenu_nofallbackthumb', true );
+			$nothumbnails  = get_post_meta( $post->ID, 'fauval_portalmenu_thumbnailson', true ); 
+
+			fau_get_contentmenu($menuslug,$displaysub,0,$nothumbnails,$nofallbackthumbs);
+
+		 }
+
+		echo fau_get_ad('werbebanner_unten',true);			
+		$logoliste = get_post_meta( $post->ID, 'fauval_imagelink_catid', true );
+		if ($logoliste) { 
+		    /* New since 1.10.57 */
+		    $logos = fau_imagelink_get(array('size' => "logo-thumb", 'catid' => $logoliste, "autoplay" => true, "dots" => true));
+		    if ((isset($logos) && (!empty($logos)))) {
+			echo "<hr>\n";
+			echo $logos;
+		    }
+
+		} ?>
 	</div>
     </div>  
 <?php get_template_part('template-parts/footer', 'social'); ?>