Skip to content

Commit

Permalink
Bumps version to 1.3.1.
Browse files Browse the repository at this point in the history
  • Loading branch information
Connor Bär committed Sep 15, 2016
1 parent 2021cb8 commit 51283f2
Show file tree
Hide file tree
Showing 15 changed files with 110 additions and 112 deletions.
12 changes: 10 additions & 2 deletions components/contact-button.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,18 @@

<div class="contact-outer">
<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 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"/></svg></button>
<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 esc_html( $contact ); ?></p>
<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>
</div>
Expand Down
4 changes: 3 additions & 1 deletion components/element-video.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
?>

<section class="section-video">
<?php the_field( 'video_url' ); ?>
<div class="section-wrapper">
<?php the_field( 'video_url' ); ?>
</div>
</section>

<article id="post-<?php the_ID(); ?>" <?php post_class( 'category-post' ); ?>>
Expand Down
25 changes: 0 additions & 25 deletions components/navigation-header.php
View file

This file was deleted.

22 changes: 0 additions & 22 deletions components/navigation-social.php
View file

This file was deleted.

18 changes: 18 additions & 0 deletions components/site-logo.php
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion editor-style.css
View file

Large diffs are not rendered by default.

51 changes: 43 additions & 8 deletions header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,57 @@
?>" />
</head>

<body <?php body_class(); ?>>
<div id="page" class="site">
<body id="js-body" <?php body_class(); ?>>
<div id="site">
<a class="skip-link screen-reader-text" href="#content"><?php esc_html_e( 'Skip to content', 'uwc-website' ); ?></a>

<header id="js-navigation" class="site-navigation -loaded" role="banner">
<div class="navigation-ctnr">
<div class="navigation-logo">
<?php uwc_website_custom_logo(); ?>
<div class="navigation-upper">

<div class="navigation-center">
<?php get_template_part( 'components/site', 'logo' ); ?>
</div>

<?php get_template_part( 'components/navigation', 'social' ); ?>
<?php if ( has_nav_menu( 'social' ) ) {
wp_nav_menu( array(
'theme_location' => 'social',
'container_class' => 'navigation-left',
'menu_id' => 'menu-social',
'depth' => 1,
'link_before' => '<span class="screen-reader-text">',
'link_after' => '</span>',
'fallback_cb' => 'false',
) );
} ?>

<?php get_template_part( 'components/navigation', 'header' ); ?>
<div class="navigation-right">
<button id="js-search" class="navigation-search"><span class="screen-reader-text"><?php esc_attr_e( 'Search', 'uwc-website' ) ?></span><svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path class="search-open" d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path class="search-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>
<button id="js-menu" class="navigation-button"><?php esc_html_e( 'Menu', 'uwc-website' ); ?></button>
</div>

</div>

<div class="navigation-lower" role="navigation">

<?php if ( has_nav_menu( 'primary' ) ) {
wp_nav_menu( array(
'theme_location' => 'primary',
'depth' => '2',
'container' => 'nav',
'container_class' => 'nav-collapse closed',
'menu_id' => 'menu-primary',
'fallback_cb' => 'false',
) );
} ?>

</div>

</header>

<div class="site-search">
<div class="search-field">
<?php get_search_form(); ?>
</div>
</div>

<div id="content" class="site-content">
17 changes: 0 additions & 17 deletions inc/extras.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,6 @@
* @package UWC_Website
*/

/**
* Adds the search icon to the navigation menu on desktop.
* From https://wordpress.stackexchange.com/questions/15455/how-to-hard-code-custom-menu-items
*
* @param array $items List elements in the menu.
* @param array $args Menu arguments for theme location.
*/
function uwc_website_nav_menu_items( $items, $args ) {
if ( 'menu-header' == $args -> menu_class ) {
$addmenu = '<li id="menu-item-search" class="menu-item"><a id="js-searchOpen" href="#"><span class="screen-reader-text">' . __( 'Search', 'uwc-website' ) . '</span></a></li>';
return $items . $addmenu;
} else {
return $items;
}
}
add_filter( 'wp_nav_menu_items','uwc_website_nav_menu_items', 10, 2 );

/**
* Limits the length of excerpts to 32 words.
* See https://codex.wordpress.org/Plugin_API/Filter_Reference/excerpt_length
Expand Down
4 changes: 2 additions & 2 deletions js/scripts.js
View file

Large diffs are not rendered by default.

Binary file modified languages/de_DE.mo
View file
Binary file not shown.
28 changes: 14 additions & 14 deletions languages/de_DE.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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-14 14:48+0200\n"
"PO-Revision-Date: 2016-09-16 00:28+0200\n"
"Last-Translator: Connor Bär <[email protected]>\n"
"Language-Team: Made by Connor. <[email protected]>\n"
"Language: de_DE\n"
Expand Down Expand Up @@ -47,7 +47,7 @@ msgstr ""
msgid "Contact us"
msgstr "Kontaktieren Sie uns"

#: src/components/contact-button.php:27
#: src/components/contact-button.php:35
msgid "Ask a question"
msgstr "Eine Nachricht senden"

Expand Down Expand Up @@ -86,18 +86,14 @@ msgid "Pages:"
msgstr "Seiten: "

#: src/components/element-link.php:19, src/components/element-standard.php:19,
#: src/components/element-video.php:23
#: src/components/element-video.php:25
msgid "Featured"
msgstr "Featured"

#: src/components/element-standard.php:37, src/components/element-video.php:41
#: src/components/element-standard.php:37, src/components/element-video.php:43
msgid "Weiter lesen"
msgstr "Weiter lesen"

#: src/components/navigation-header.php:12
msgid "Top Menu"
msgstr "Hauptnavigation"

#: src/footer.php:34
msgid "All rights reserved."
msgstr "Alle Rechte vorbehalten."
Expand Down Expand Up @@ -135,6 +131,14 @@ msgstr "on"
msgid "Skip to content"
msgstr "Zum Inhalt springen"

#: src/header.php:61
msgid "Search"
msgstr "Suchen"

#: src/header.php:62
msgid "Menu"
msgstr "Menü"

#: src/image.php:22
msgid "Previous Image"
msgstr "Voriges Bild"
Expand Down Expand Up @@ -187,10 +191,6 @@ msgstr ""
"Kommentare werden NICHT gelöscht und können somit jederzeit wieder "
"eingeblendet werden."

#: src/inc/extras.php:19
msgid "Search"
msgstr "Suche"

#: src/inc/template-tags.php:90
msgid "Previous page"
msgstr "Vorherige Seite"
Expand All @@ -213,12 +213,12 @@ msgstr "von %s."
msgid "Search results for &#x201c;%s&#x201d;:"
msgstr "Suchergebnisse für &#x201c;%s&#x201d;:"

#: src/searchform.php:10
#: src/searchform.php:9
msgctxt "label"
msgid "Search for:"
msgstr "Suche nach:"

#: src/searchform.php:11
#: src/searchform.php:10
msgctxt "placeholder"
msgid "Search..."
msgstr "Suche..."
Expand Down
26 changes: 13 additions & 13 deletions languages/uwc-website.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ msgstr ""
msgid "Contact us"
msgstr ""

#: src/components/contact-button.php:27
#: src/components/contact-button.php:35
msgid "Ask a question"
msgstr ""

Expand Down Expand Up @@ -60,18 +60,14 @@ msgstr ""
msgid "Pages:"
msgstr ""

#: src/components/element-link.php:19, src/components/element-standard.php:19, src/components/element-video.php:23
#: src/components/element-link.php:19, src/components/element-standard.php:19, src/components/element-video.php:25
msgid "Featured"
msgstr ""

#: src/components/element-standard.php:37, src/components/element-video.php:41
#: src/components/element-standard.php:37, src/components/element-video.php:43
msgid "Weiter lesen"
msgstr ""

#: src/components/navigation-header.php:12
msgid "Top Menu"
msgstr ""

#: src/footer.php:34
msgid "All rights reserved."
msgstr ""
Expand Down Expand Up @@ -109,6 +105,14 @@ msgstr ""
msgid "Skip to content"
msgstr ""

#: src/header.php:61
msgid "Search"
msgstr ""

#: src/header.php:62
msgid "Menu"
msgstr ""

#: src/image.php:22
msgid "Previous Image"
msgstr ""
Expand Down Expand Up @@ -147,10 +151,6 @@ msgstr ""
msgid "Check the box to hide comments on the frontend. Comments are NOT deleted and can thus be unhidden at any time."
msgstr ""

#: src/inc/extras.php:19
msgid "Search"
msgstr ""

#: src/inc/template-tags.php:90
msgid "Previous page"
msgstr ""
Expand All @@ -173,12 +173,12 @@ msgstr ""
msgid "Search results for &#x201c;%s&#x201d;:"
msgstr ""

#: src/searchform.php:10
#: src/searchform.php:9
msgctxt "label"
msgid "Search for:"
msgstr ""

#: src/searchform.php:11
#: src/searchform.php:10
msgctxt "placeholder"
msgid "Search..."
msgstr ""
2 changes: 1 addition & 1 deletion readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Requires at least: WordPress 4.5

Tested up to: WordPress 4.6.1

Version: 1.3.0
Version: 1.3.1

License: [MIT](#copyright)

Expand Down
7 changes: 3 additions & 4 deletions searchform.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
*/

?><form role="search" method="get" class="search-form" action="<?php echo esc_url( home_url( '/' ) ); ?>">
<label>
<span class="screen-reader-text"><?php echo esc_attr_x( 'Search for:', 'label', 'uwc-website' ); ?></span>
<input type="search" class="search-field" placeholder="<?php echo esc_attr_x( 'Search...', 'placeholder', 'uwc-website' ); ?>" value="<?php echo get_search_query(); ?>" name="s" />
</label>
<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" />
<span class="form-underline"></span>
</form>
4 changes: 2 additions & 2 deletions style.css
View file

Large diffs are not rendered by default.

0 comments on commit 51283f2

Please sign in to comment.