1.1.0

1.1.0 Bugfix - Standaard toevoegen van de plugin: WP Mail SMTP by WPForms. - background-position: top toevoegen aan dit om de foto op de homepage bovenaan vast te zetten - Homepage template > Wat ouders zeggen, weg als er geen quotes zijn ingevoerd. - Sliderbeelden in vervolg template - Teampagina the_content(); toegevoegd.
catapultcc · Apr 28, 2020 · fc92b1a · fc92b1a
1 parent 5a4f730
commit fc92b1a
Show file tree

Hide file tree

Showing 7 changed files with 104 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,10 @@
+1.1.0 Bugfix
+- Standaard toevoegen van de plugin: WP Mail SMTP by WPForms.
+- background-position: top toevoegen aan dit om de foto op de homepage bovenaan vast te zetten
+- Homepage template > Wat ouders zeggen, weg als er geen quotes zijn ingevoerd.
+- Sliderbeelden in vervolg template
+- Teampagina the_content(); toegevoegd.
+
 1.0.9 Bugfix
 - Iconen in header aangepast qua stijl
 - home-intro opnieuw opgebouwd ivm Youtube en foto rechts 

diff --git a/assets/css/opmaak.css b/assets/css/opmaak.css
diff --git a/functions.php b/functions.php
@@ -13,7 +13,7 @@ function theme_styles() {
     wp_enqueue_style( 'owlslider-style', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.carousel.min.css');
     wp_enqueue_style( 'owlslider-style-default', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/assets/owl.theme.default.min.css');
     wp_enqueue_style( 'fancybox-css', 'https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.6/jquery.fancybox.min.css');
-    wp_enqueue_style( 'opmaak-style', get_template_directory_uri() . '/assets/css/opmaak.css?v=1.2.0');
+    wp_enqueue_style( 'opmaak-style', get_template_directory_uri() . '/assets/css/opmaak.css?v=1.2.1');
 
     /* SCRIPTS */
     wp_enqueue_script( 'boots-4-script', 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js', '', '3.0.0' , true );
@@ -22,7 +22,7 @@ function theme_styles() {
     wp_enqueue_script( 'jquery-ui', 'https://code.jquery.com/ui/1.12.1/jquery-ui.js', '', '1.12.1' , true);
     wp_enqueue_script( 'owlslider-script', 'https://cdnjs.cloudflare.com/ajax/libs/OwlCarousel2/2.3.4/owl.carousel.min.js', '', '2.3.4' , true );
     wp_enqueue_script( 'fancybox-script', 'https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.5.6/jquery.fancybox.min.js', '', '3.5.6' , true );
-    wp_enqueue_script( 'eigen-script', get_template_directory_uri() . '/assets/js/scripts.js', '', '3.0.0' , true );
+    wp_enqueue_script( 'eigen-script', get_template_directory_uri() . '/assets/js/scripts.js', '', '3.0.1' , true );
 
 }
 add_action( 'wp_enqueue_scripts', 'theme_styles' );
@@ -218,11 +218,11 @@ function catapult_register_required_plugins() {
             'external_url'       => 'https://nl.wordpress.org/plugins/classic-editor/',
         ),
 					array(
-            'name'               => 'ManageWP - Worker',
+            'name'               => 'WP Mail SMTP by WPForms',
             'slug'               => 'worker', 
-            'source'             => 'https://downloads.wordpress.org/plugin/worker.zip',
+            'source'             => 'https://downloads.wordpress.org/plugin/wp-mail-smtp.1.8.1.zip',
             'required'           => false,
-            'external_url'       => 'https://nl.wordpress.org/plugins/worker/',
+            'external_url'       => 'https://downloads.wordpress.org/plugin/wp-mail-smtp',
         ),
 					array(
             'name'               => 'TinyMCE Advanced',
@@ -251,6 +251,13 @@ function catapult_register_required_plugins() {
             'source'             => 'https://downloads.wordpress.org/plugin/relevanssi.4.3.1.1.zip',
             'required'           => true,
             'external_url'       => 'https://nl.wordpress.org/plugins/relevanssi/',
+        ),
+    				array(
+            'name'               => 'WP Mail SMTP by WPForms',
+            'slug'               => 'wp-mail-smtp', 
+            'source'             => 'https://downloads.wordpress.org/plugin/wp-mail-smtp.2.0.0.zip',
+            'required'           => true,
+            'external_url'       => 'https://nl.wordpress.org/plugins/wp-mail-smtp/',
         ),
     );
 

diff --git a/page-homepage.php b/page-homepage.php
@@ -112,10 +112,12 @@
 <section id="wat-zeggen" class="pt-2 pb-3 vlak-lichtgrijs">
 	<div class="container">
 		<div class="row pt-5 pb-5">
+			<?php if( have_rows('slider') ): ?>
 			<div class="col-12 center">
 				<h3>Wat zeggen</h3>
 				<h2>onze ouders en leerlingen</h2>
 			</div>
+            <?php endif; ?>
 		</div>
 	</div>
 	<?php
@@ -134,7 +136,7 @@
                     $tel = 0;
 					if( have_rows('slider') ):
 						while ( have_rows('slider') ) : the_row(); $tel++;
-                            if($tel < 5) :
+                            if($tel < 6) :
                                 if ( get_sub_field('slide_foto')) :
                                     $hoofdAfbeelding = get_sub_field('slide_foto');
                                     $size = 'medium';

diff --git a/page-team.php b/page-team.php
@@ -39,25 +39,25 @@
 							<div class="pr-2 pl-2 mb-5">
 								<div class="row">
 									<div class="col-12 afbeelding-team pb-3">
-                    <a data-fancybox="team2" data-src="#team-<?php echo $team_teller; ?>" href="javascript:;" class="team-klik2" >
-                        <img src="<?php echo $afbeelding_urlTeam; ?>" class="hoef team-img mt-3" alt="<?php echo $afbeelding_altTeam; ?>" width="100%"></a>
+                                        <a data-fancybox="team2" data-src="#team-<?php echo $team_teller; ?>" href="javascript:;" class="team-klik2" >
+                                        <img src="<?php echo $afbeelding_urlTeam; ?>" class="hoef team-img mt-3" alt="<?php echo $afbeelding_altTeam; ?>" width="100%"></a>
 									</div>
 									<div class="col-7 col-sm-6 col-xl-7">
-										<h3 class="rem12 mt-2"><?php echo get_field('teamlid_voornaam'); ?></h3>
+										<h3 class="rem12 mt-2"><?php echo ucfirst(get_field('teamlid_voornaam')); ?></h3>
 									</div>
 									<div class="col-5 col-sm-6 col-xl-5 right">
-										<a data-fancybox="team" data-src="#team-<?php echo $team_teller; ?>" href="javascript:;" class="team-klik button button-secondair over">Over</a>
+										<a data-fancybox="team" data-src="#team-<?php echo $team_teller; ?>" href="javascript:void(0);" class="team-klik button button-secondair over">Over</a>
 									</div>
-                  <div class="col-12 rem10"><?php echo get_field('teamlid_functie'); ?></div>
+                                  <div class="col-12 rem10"><?php echo ucfirst(get_field('teamlid_functie')); ?></div>
 								</div>
 
 								<div class="fancybox-team" style="display: none;" id="team-<?php echo $team_teller; ?>">
 									<img src="<?php echo $afbeelding_urlTeam; ?>" class="mt-3" alt="<?php echo $afbeelding_altTeam; ?>" width="200">
 								  	<div class="row team-info px-1 px-md-4 pb-5">
 										<div class="col-12">
-                        <button data-fancybox-close="" class="fancybox-close-small sluit" title="Close"><i class="fas fa-times"></i></button>
+                                            <button data-fancybox-close="" class="fancybox-close-small sluit" title="Close"><i class="fas fa-times"></i></button>
 											<h5><?php the_title(); ?></h5>
-								  			<p><?php echo get_the_content(); ?></p>
+								  			<p><?php the_content(); ?></p>
 										</div>
 									</div>
 								</div>
@@ -69,6 +69,14 @@
 				endif;
 			wp_reset_postdata(); ?>
 		</div>
+		<div class="row">
+			<div class="col-12">
+				<?php $the_content = apply_filters('the_content', get_the_content());
+				if ( !empty($the_content) ) {
+					echo $the_content;
+				} ?>
+			</div>
+		</div>
 	</div>
 </section>
 

diff --git a/page-vervolg-plus.php b/page-vervolg-plus.php
@@ -244,7 +244,7 @@
 
 						<div class="item p-0">
 
-							<img class="" src="<?php echo $afbeelding_url; ?>" alt="Stel je vraag aan" width="100%">
+							<img class="" src="<?php echo $afbeelding_url; ?>" alt="<?php echo get_bloginfo();?> - <?php the_title();?>" width="100%">
 
 						</div>
 

diff --git a/style.css b/style.css
@@ -2,8 +2,8 @@
 Theme Name: Catent Basisschool
 Theme URI: https://www.catapult.nl
 Description: Driven by Catapult - Stichting Catent
-Author: Jurre Hengstman & Hans Nep
-Version: 1.0.9
+Author: Jurre Hengstman, Thom Schraa & Hans Nep
+Version: 1.1.0
 GitHub Theme URI: https://github.com/catapultcc/catent-basisschool
 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -244,7 +244,7 @@ @@
     						<div class="item p-0">
-    							<img class="" src="<?php echo $afbeelding_url; ?>" alt="Stel je vraag aan" width="100%">
+    							<img class="" src="<?php echo $afbeelding_url; ?>" alt="<?php echo get_bloginfo();?> - <?php the_title();?>" width="100%">
     						</div>
@@ Expand Down @@