rayelliott
/
understrap
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into testing

This commit is contained in:
Holger Könemann 2015-09-09 10:50:01 +02:00
parent e1626991fb 2a6a60dace
commit 76b57bbfa2
4 changed files with 71 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inc/custom-comments.php
View File

@ -9,11 +9,11 @@
$aria_req = ( $req ? " aria-required='true'" : '' ); $aria_req = ( $req ? " aria-required='true'" : '' );
$html5 = current_theme_supports( 'html5', 'comment-form' ) ? 1 : 0; $html5 = current_theme_supports( 'html5', 'comment-form' ) ? 1 : 0;
$fields = array( $fields = array(
'author' => '<div class="form-group comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' . 'author' => '<div class="form-group comment-form-author">' . '<label for="author">' . __( 'Name', 'understrap' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
'<input class="form-control" id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></div>', '<input class="form-control" id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></div>',
'email' => '<div class="form-group comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' . 'email' => '<div class="form-group comment-form-email"><label for="email">' . __( 'Email', 'understrap' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
'<input class="form-control" id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></div>', '<input class="form-control" id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></div>',
'url' => '<div class="form-group comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' . 'url' => '<div class="form-group comment-form-url"><label for="url">' . __( 'Website', 'understrap' ) . '</label> ' .
'<input class="form-control" id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></div>', '<input class="form-control" id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></div>',
); );
return $fields; return $fields;
@ -22,7 +22,7 @@
add_filter( 'comment_form_defaults', 'bootstrap3_comment_form' ); add_filter( 'comment_form_defaults', 'bootstrap3_comment_form' );
function bootstrap3_comment_form( $args ) { function bootstrap3_comment_form( $args ) {
$args['comment_field'] = '<div class="form-group comment-form-comment"> $args['comment_field'] = '<div class="form-group comment-form-comment">
<label for="comment">' . _x( 'Comment', 'noun' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> <label for="comment">' . _x( 'Comment', 'noun', 'understrap' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label>
<textarea class="form-control" id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea> <textarea class="form-control" id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea>
</div>'; </div>';
return $args; return $args;

38
languages/understrap.pot
View File

@ -1,16 +1,43 @@
# Copyright (C) 2014 Automattic # Copyright (C) 2014 Automattic
# This file is distributed under the GNU General Public License v2 or later. # This file is distributed under the GNU General Public License v2 or later.
#, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: _s 1.0-wpcom\n" "Project-Id-Version: understrap\n"
"Report-Msgid-Bugs-To: http://wordpress.org/support/theme/_s\n" "Report-Msgid-Bugs-To: http://wordpress.org/support/theme/_s\n"
"POT-Creation-Date: 2014-12-03 09:43:15+00:00\n" "POT-Creation-Date: 2015-09-01 21:23+0200\n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"PO-Revision-Date: 2014-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: 2014-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: \n"
"X-Generator: Poedit 1.8.4\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-KeywordsList: __;_x;_nx;_e\n"
"X-Poedit-Basepath: ..\n"
"X-Poedit-SearchPath-0: footer.php\n"
"X-Poedit-SearchPath-1: header.php\n"
"X-Poedit-SearchPath-2: index.php\n"
"X-Poedit-SearchPath-3: statichero.php\n"
"X-Poedit-SearchPath-4: 404.php\n"
"X-Poedit-SearchPath-5: archive.php\n"
"X-Poedit-SearchPath-6: search.php\n"
"X-Poedit-SearchPath-7: sticky.php\n"
"X-Poedit-SearchPath-8: single.php\n"
"X-Poedit-SearchPath-9: sidebar.php\n"
"X-Poedit-SearchPath-10: comment-form.php\n"
"X-Poedit-SearchPath-11: comments.php\n"
"X-Poedit-SearchPath-12: content-none.php\n"
"X-Poedit-SearchPath-13: content-page.php\n"
"X-Poedit-SearchPath-14: content-search.php\n"
"X-Poedit-SearchPath-15: content-single.php\n"
"X-Poedit-SearchPath-16: content.php\n"
"X-Poedit-SearchPath-17: hero.php\n"
"X-Poedit-SearchPath-18: page.php\n"
"X-Poedit-SearchPath-19: functions.php\n"
"X-Poedit-SearchPath-20: page-templates\n"
"X-Poedit-SearchPath-21: inc\n"
#: 404.php:15 #: 404.php:15
msgid "Oops! That page can&rsquo;t be found." msgid "Oops! That page can&rsquo;t be found."
@ -25,7 +52,6 @@ msgid "Most Used Categories"
msgstr "" msgstr ""
#. translators: %1$s: smiley #. translators: %1$s: smiley
#: 404.php:44 #: 404.php:44
msgid "Try looking in the monthly archives. %1$s" msgid "Try looking in the monthly archives. %1$s"
msgstr "" msgstr ""
@ -78,7 +104,6 @@ msgid "Edit"
msgstr "" msgstr ""
#. translators: %s: Name of current post #. translators: %s: Name of current post
#: content.php:22 #: content.php:22
msgid "Continue reading %s <span class=\"meta-nav\">&rarr;</span>" msgid "Continue reading %s <span class=\"meta-nav\">&rarr;</span>"
msgstr "" msgstr ""
@ -148,7 +173,6 @@ msgid "by %s"
msgstr "" msgstr ""
#. translators: used between list items, there is a space after the comma #. translators: used between list items, there is a space after the comma
#: inc/template-tags.php:104 inc/template-tags.php:110 #: inc/template-tags.php:104 inc/template-tags.php:110
msgid ", " msgid ", "
msgstr "" msgstr ""
@ -262,7 +286,6 @@ msgid "Archives: %s"
msgstr "" msgstr ""
#. translators: 1: Taxonomy singular name, 2: Current taxonomy term #. translators: 1: Taxonomy singular name, 2: Current taxonomy term
#: inc/template-tags.php:173 #: inc/template-tags.php:173
msgid "%1$s: %2$s" msgid "%1$s: %2$s"
msgstr "" msgstr ""
@ -274,6 +297,7 @@ msgstr ""
#: search.php:16 #: search.php:16
msgid "Search Results for: %s" msgid "Search Results for: %s"
msgstr "" msgstr ""
#. Theme Name of the plugin/theme #. Theme Name of the plugin/theme
msgid "_s" msgid "_s"
msgstr "" msgstr ""

2
style.css
View File

@ -5,7 +5,7 @@ Author: Holger Koenemann
Author URI: http://www.holgerkoenemann.de Author URI: http://www.holgerkoenemann.de
Description: Combination of Automattic´s _s theme and Bootstrap SASS. Made as a solid starting point for your next theme project and WordPress website. Including Font Awesome support, build-in widget slider and much more you need for basic websites. Description: Combination of Automattic´s _s theme and Bootstrap SASS. Made as a solid starting point for your next theme project and WordPress website. Including Font Awesome support, build-in widget slider and much more you need for basic websites.
A developer version (with Grunt/node and SASS sources) is available on github: https://github.com/holger1411/understrap A developer version (with Grunt/node and SASS sources) is available on github: https://github.com/holger1411/understrap
Version: 0.3.0 Version: 0.3.3
License: GNU General Public License v2 or later License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: understrap Text Domain: understrap

35
woocommerce.php Normal file
View File

@ -0,0 +1,35 @@
<?php
/**
* The template for displaying all pages.
*
* This is the template that displays all pages by default.
* Please note that this is the WordPress construct of pages
* and that other 'pages' on your WordPress site will use a
* different template.
*
* @package understrap
*/
get_header(); ?>
<div class="wrapper" id="page-wrapper">
<div class="container">
<div id="primary" class="<?php if ( is_active_sidebar( 'sidebar-1' ) ) : ?>col-md-8<?php else : ?>col-md-12<?php endif; ?> content-area">
<main id="main" class="site-main" role="main">
<!-- The WooCommerce loop -->
<?php woocommerce_content(); ?>
</main><!-- #main -->
</div><!-- #primary -->
<?php get_sidebar(); ?>
</div><!-- Container end -->
</div><!-- Wrapper end -->
<?php get_footer(); ?>