Bumps version to 1.4.0.

components/content-link.php

@@ -34,7 +34,7 @@
 	</div>
 
 	<?php if ( $tags = get_the_tags() ) {
-		echo '<p class="category-tags">';
+		echo '<p class="post-tags">';
 		foreach ( $tags as $tag ) {
 			$sep = ( end( $tags ) === $tag ) ? '' : ', ';
 			echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );

components/content-standard.php

@@ -51,7 +51,7 @@
 	</div>
 
 	<?php if ( $tags = get_the_tags() ) {
-		echo '<p class="category-tags">';
+		echo '<p class="post-tags">';
 		foreach ( $tags as $tag ) {
 			$sep = ( end( $tags ) === $tag ) ? '' : ', ';
 			echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );

components/content-video.php

@@ -49,7 +49,7 @@
 	</div>
 
 	<?php if ( $tags = get_the_tags() ) {
-		echo '<p class="category-tags">';
+		echo '<p class="post-tags">';
 		foreach ( $tags as $tag ) {
 			$sep = ( end( $tags ) === $tag ) ? '' : ', ';
 			echo '<a href="' . esc_url( get_term_link( $tag, $tag->taxonomy ) ) . '">#' . esc_html( $tag->name ) . '</a>' . esc_html( $sep );

components/contact-button.php → components/site-contact.php

@@ -11,7 +11,9 @@
 if ( wp_get_post_parent_id( $id ) ) {
 	$id = wp_get_post_parent_id( $id );
 }
+
 $name = get_field( 'name', $id );
+$role = get_field( 'role', $id );
 $contact = get_field( 'contact_information', $id );
 $email = get_field( 'email', $id );
 
@@ -22,17 +24,31 @@
 		<div class="contact-inner">
 			<button id="js-contact" class="contact-button"><span class="screen-reader-text"><?php esc_attr_e( 'Contact us', 'uwc-website' ) ?></span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path class="contact-open" d="M21 6h-2v9H6v2c0 .55.45 1 1 1h11l4 4V7c0-.55-.45-1-1-1zm-4 6V3c0-.55-.45-1-1-1H3c-.55 0-1 .45-1 1v14l4-4h10c.55 0 1-.45 1-1z"/><path class="contact-close" d="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12z"/></svg></button>
 			<div class="contact-box">
-				<h2 class="contact-headline"><?php echo esc_html( $name ); ?></h2>
-				<p class="contact-text"><?php echo wp_kses( $contact, array(
-				    'a' => array(
-				        'href' => array(),
-				        'title' => array(),
-				    ),
-				    'br' => array(),
-				    'em' => array(),
-				    'strong' => array(),
-				) ); ?></p>
-				<a href="mailto:<?php echo esc_html( $email ) ?>" class="contact-link"><?php echo esc_attr_e( 'Ask a question', 'uwc-website' ) ?></a>
+				<div class="contact-header">
+				<?php if ( get_field( 'profile_picture', $id ) ) :
+						$image = get_field( 'profile_picture', $id );
+						$size = 'thumbnail';
+						$url = $image['sizes'][ $size ];
+						?>
+					<div class="contact-image" style="background-image: url(<?php echo esc_url( $url ); ?>)"></div>
+				<?php endif; ?>
+					<div class="contact-headline">
+						<h2 class="contact-name"><?php echo esc_html( $name ); ?></h2>
+						<p class="contact-role"><?php echo esc_html( $role ); ?></p>
+					</div>
+				</div>
+				<div class="contact-body">
+					<p class="contact-info"><?php echo wp_kses( $contact, array(
+					    'a' => array(
+					        'href' => array(),
+					        'title' => array(),
+					    ),
+					    'br' => array(),
+					    'em' => array(),
+					    'strong' => array(),
+					) ); ?></p>
+					<a href="mailto:<?php echo esc_html( $email ) ?>" class="contact-link"><?php echo esc_attr_e( 'Ask a question', 'uwc-website' ) ?></a>
+				</div>
 			</div>
 		</div>
 	</div>

languages/de_DE.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: UWC Website\n"
 "Report-Msgid-Bugs-To: https://github.com/uwc/uwc-website/issues\n"
 "POT-Creation-Date: \n"
-"PO-Revision-Date: 2016-09-16 16:12+0200\n"
+"PO-Revision-Date: 2016-09-17 16:46+0200\n"
 "Last-Translator: Connor Bär <[email protected]>\n"
 "Language-Team: Made by Connor. <[email protected]>\n"
 "Language: de_DE\n"
@@ -39,7 +39,7 @@ msgstr "Kontaktieren Sie uns"
 
 #: src/components/contact-button.php:35
 msgid "Ask a question"
-msgstr "Eine Nachricht senden"
+msgstr "Nachricht senden"
 
 #: src/components/content-link.php:33, src/components/element-link.php:37
 msgid "Continue reading"

languages/uwc-website.pot

@@ -24,14 +24,6 @@ msgstr ""
 msgid "Sorry, the page you’re looking for doesn’t exist. Check the URL for errors or try searching for it below."
 msgstr ""
 
-#: src/components/contact-button.php:23
-msgid "Contact us"
-msgstr ""
-
-#: src/components/contact-button.php:35
-msgid "Ask a question"
-msgstr ""
-
 #: src/components/content-link.php:33, src/components/element-link.php:37
 msgid "Continue reading"
 msgstr ""
@@ -68,6 +60,14 @@ msgstr ""
 msgid "Weiter lesen"
 msgstr ""
 
+#: src/components/site-contact.php:25
+msgid "Contact us"
+msgstr ""
+
+#: src/components/site-contact.php:50
+msgid "Ask a question"
+msgstr ""
+
 #: src/footer.php:34
 msgid "All rights reserved."
 msgstr ""

page.php

@@ -43,7 +43,7 @@
 					endif;
 				}
 
-				get_template_part( 'components/contact', 'button' );
+				get_template_part( 'components/site', 'contact' );
 
 			endwhile; // End of the loop.
 			?>

readme.txt

@@ -0,0 +1,58 @@
+[![Build Status](https://travis-ci.org/uwc/uwc-website.svg?branch=development)](https://travis-ci.org/uwc/uwc-website)
+
+
+# A WordPress template for UWC websites. 
+
+> Please [request permission](mailto:[email protected]) before use.
+
+Contributors: [Connor Bär](http://connorbaer.io)
+
+Requires at least: WordPress 4.5
+
+Tested up to: WordPress 4.6.1
+
+Version: 1.4.0
+
+License: [MIT](#copyright)
+
+Tags: custom-menu, editor-style, featured-image-header, featured-images, post-formats, sticky-post, theme-options, education, translation-ready
+
+## Description
+
+### This theme is still under development and NOT intended for use yet.
+
+If you are interested in contributing to the development, [drop me a line](mailto:[email protected]).
+
+
+## Installation
+
+> This theme can only be installed on self-hosted WordPress installations and not on sites that are hosted on wordpress.com.
+
+1. UWC Website is not listed publicly on Wordpress.org. Therefore you have to install the [GitHub Updater](https://github.com/afragen/github-updater) plugin to install the theme and receive future updates. Follow the instructions in the [readme file](https://github.com/afragen/github-updater#upload) to install the plugin, then come back here.
+2. In WordPress, navigate to 'Settings' > 'GitHub Updater', then select 'Install Theme' from the tabs at the top. 
+3. Paste the url `https://github.com/uwc/uwc-website` into the field 'Theme URI'. You can leave the other fields as they are and click on the 'Install Theme' button.
+4. Click on the 'Activate' button to use your new theme right away.
+5. Go to https:// for a guide on how to customize this theme.
+6. Navigate to Appearance > Customize in your admin panel and customize to taste.
+
+
+## Copyright
+
+The MIT License (MIT)
+Copyright (c) 2016 Connor Bär
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
+UWC Website theme bundles the following third-party resources:
+
+HTML5 Shiv v3.7.0, Copyright 2014 Alexander Farkas
+Licenses: MIT/GPL2
+Source: https://github.com/aFarkas/html5shiv
+
+...and others to be added.

searchform.php

@@ -7,6 +7,6 @@
 
 ?><form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
 	<label class="screen-reader-text"><?php echo esc_attr_x( 'Search for:', 'label', 'uwc-website' ); ?></label>
-	<input type="search" class="form-input" placeholder="<?php echo esc_attr_x( 'Search...', 'placeholder', 'uwc-website' ); ?>" value="<?php echo get_search_query(); ?>" name="s" />
+	<input type="search" class="form-input" placeholder="<?php echo esc_attr_x( 'Search...', 'placeholder', 'uwc-website' ); ?>" value="<?php echo get_search_query(); ?>" name="s"/>
 	<span class="form-underline"></span>
 </form>