Commit acb8c66f authored by Dave Lane's avatar Dave Lane

merging oeru-course modifications, including co-branding and other snapshot...

merging oeru-course modifications, including co-branding and other snapshot enhancements, along with theme rationalisation to facilitate WP.org hosting of the OERu Course theme.
parents f1279022 b3d57b59
......@@ -7,13 +7,13 @@ get_header(); ?>
<section class="error-404 not-found">
<header class="page-header">
<h1 class="page-title"><?php _e( 'Sorry, something can\'t be found', 'oeru_theme' ); ?></h1>
<h1 class="page-title"><?php esc_html_e( 'Sorry, something can\'t be found', 'oeru-course' ); ?></h1>
</header><!-- .page-header -->
<div class="page-content">
<p><?php _e( 'It looks like nothing was found at this location.', 'oeru_theme' ); ?></p>
<p><?php esc_html_e( 'It looks like nothing was found at this location.', 'oeru-course' ); ?></p>
<?php get_template_part("parts/search-form/standard"); ?>
<?php get_template_part( 'parts/search-form/standard' ); ?>
</div><!-- .page-content -->
</section><!-- .error-404 -->
......
......@@ -4,7 +4,6 @@ The original work embodied here is licensed under
the **GNU General Public License v2 or later (GNU GPL v2.0).
Please see the COPYING file for the complete license text.**
This repository includes a number of individually licensed components, with
those licenses provided here for convenience.
......@@ -190,4 +189,3 @@ 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.
# wordpress-oeru_theme
# wordpress-oeru_course
An OERu theme from the newSplash design to allow deploying
courses in a WordPress instance.
......
......@@ -8,13 +8,13 @@ get_header(); ?>
<?php if ( have_posts() ) : ?>
<header class="archive-header">
<h1 class="archive-title"><?php printf( __( 'Category Archives: %s', 'twentyfourteen' ), single_cat_title( '', false ) ); ?></h1>
<h1 class="archive-title"><?php printf( esc_html__( 'Category Archives: %s', 'oeru-course' ), single_cat_title( '', false ) ); ?></h1>
<?php
// Show an optional term description.
$term_description = term_description();
if ( ! empty( $term_description ) ) :
printf( '<div class="taxonomy-description">%s</div>', $term_description );
printf( esc_html__('<div class="taxonomy-description">%s</div>', 'oeru-course'), $term_description );
endif;
?>
</header><!-- .archive-header -->
......
......@@ -10,8 +10,13 @@ if ( post_password_required() ) {
<?php if ( have_comments() ) : ?>
<h2 class="comments-title">
<?php
printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'oeru_theme' ),
number_format_i18n( get_comments_number() ), get_the_title() );
$comments_number = get_comments_number();
if ( '1' === $comments_number ) {
printf( _x( 'One thought on &ldquo;%2$s&rdquo;', 'comments title', 'oeru-course' ), get_the_title() );
} else {
printf( esc_html( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', $comments_number, 'comments title', 'oeru-course' ),
number_format_i18n( $comments_number ) ), get_the_title() );
}
?>
</h2>
<ol class="comment-list">
......@@ -29,7 +34,7 @@ if ( post_password_required() ) {
// If comments are closed and there are comments, let's leave a little note, shall we?
if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
?>
<p class="no-comments"><?php _e( 'Comments are closed.', 'oeru_theme' ); ?></p>
<p class="no-comments"><?php _e( 'Comments are closed.', 'oeru-course' ); ?></p>
<?php endif; ?>
<?php comment_form(); ?>
......
<article id="post-<?php the_ID(); ?>" <?php post_class("column-two"); ?>>
<?PHP
<?php
get_template_part("index-columns");
......
<article id="post-<?php the_ID(); ?>" <?php post_class("column-three-main"); ?>>
<?PHP
<?php
get_template_part("index-columns");
......
<article id="post-<?php the_ID(); ?>" <?php post_class("column-three"); ?>>
<?PHP
<?php
get_template_part("index-columns");
......
<article id="post-<?php the_ID(); ?>" <?php post_class("column-four"); ?>>
<?PHP
<?php
get_template_part("index-columns");
......
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<?PHP
<?php
get_template_part("index-columns");
......
......@@ -10,21 +10,21 @@
</div>
</div>
</header>
<div class="entry-and-comments container">
<div class="entry-and-comments container">
<div class="entry-content">
<?php if ( is_home() && current_user_can( 'publish_posts' ) ) : ?>
<p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'twentyfifteen' ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
<p><?php printf( __( 'Ready to publish your first post? <a href="%1$s">Get started here</a>.', 'oeru-course' ), esc_url( admin_url( 'post-new.php' ) ) ); ?></p>
<?php elseif ( is_search() ) : ?>
<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'twentyfifteen' ); ?></p>
<p><?php _e( 'Sorry, but nothing matched your search terms. Please try again with some different keywords.', 'oeru-course' ); ?></p>
<?php get_search_form(); ?>
<?php else : ?>
<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'twentyfifteen' ); ?></p>
<p><?php _e( 'It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps searching can help.', 'oeru-course' ); ?></p>
<?php get_search_form(); ?>
<?php endif; ?>
......
<article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
<?PHP
<?php
if(is_page() || is_single()) :
if(get_theme_mod("third_level_menu")!="off"){
oeru_third_level_menu();
}
endif;
?>
<header class="entry-header container">
<div class="row">
<div class="col-md-12">
<div class="panel">
<div class="panel-body">
<?PHP
<?php
if ( is_single() ) :
the_title( '<h1>', '</h1>' );
else :
the_title( '<h1><a href="' . esc_url( get_permalink() ) . '" rel="bookmark">', '</a></h1>' );
endif;
?>
</div>
</div>
</div>
</div>
</header>
<div class="entry-and-comments container">
<div class="entry-and-comments container">
<div class="entry-content">
<?php
the_content( sprintf(
__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'oeru_theme' ),
__( 'Continue reading %s <span class="meta-nav">&rarr;</span>', 'oeru-course' ),
the_title( '<span class="screen-reader-text">', '</span>', false )
) );
wp_link_pages( array(
'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'oeru_theme' ) . '</span>',
'before' => '<div class="page-links"><span class="page-links-title">' . __( 'Pages:', 'oeru-course' ) . '</span>',
'after' => '</div>',
'link_before' => '<span>',
'link_after' => '</span>',
) ); ?>
) ); ?>
</div>
<div class="oeru_footer">
<?php /* translators: used between list items, there is a space after the comma. */
$tags_list = get_the_tag_list( '', __( ', ', 'oeru-course' ) );
if ( $tags_list ) {
printf(
/* translators: 1: SVG icon. 2: posted in label, only visible to screen readers. 3: list of tags. */
'<span class="tags-links">%1$s<span class="screen-reader-text">%2$s </span>%3$s</span>',
twentynineteen_get_icon_svg( 'tag', 16 ),
__( 'Tags:', 'oeru-course' ),
$tags_list
); // WPCS: XSS OK.
}?>
<?php do_action("oeru_post_footer"); ?>
</div>
<?PHP
<?php
if ( comments_open() || get_comments_number() ) {
?><div id="comment_holder"><?PHP
?><div id="comment_holder"><?php
comments_template();
?></div><?PHP
?></div><?php
} ?>
</div>
<?PHP
<?php
get_sidebar();
......
......@@ -651,10 +651,10 @@ a.external {
}
/* fix bug issue #45 https://github.com/oeru/oeru_course/issues/45 */
footer#colophon {
/*footer#colophon {
padding-bottom: 0px;
padding-top: 0px;
}
}*/
.main-content .oeru_footer .container {
margin-top: 10px;
......@@ -665,3 +665,26 @@ footer#colophon {
#cookie-notice #cn-notice-text {
margin-bottom: 1em;
}
/* updating for multiple logos! dave@oerfoundation.org 20200609 */
.oeru_footer .logos { width: 100%; padding: 4px; }
.oeru_footer .logos .logo { text-align: center; display: flex; flex-direction: column; align-items: center; justify-content: center; }
.oeru_footer .logos .logo img { padding: auto; margin: 0px 6px; }
.oeru_footer .logos .logo .caption { color: #aaa; font-size: 80%; margin-top: 6px; }
.oeru_footer .logos { display: grid; grid-template-columns: 1fr 1fr 1fr; }
@media (max-width: 960px) {
.oeru_footer .logos { dsplay: grid; grid-template-columns: 1fr 1fr; }
}
@media (max-width: 640px) {
.oeru_footer .logos { dsplay: grid; grid-template-columns: 1fr; }
}
.oeru_footer .clear { clear: both; }
.oeru_footer .rule { width: 100%; height: 3px; background-color: #ccc; margin: 10px 0 20px 0; }
.oeru_footer .copyright { width: 100%; margin-bottom: 12px; }
.oeru_footer .notices { float: right; text-align: right; }
.oeru_footer .notices a { display: inline; }
/* fix weird title sidebars */
#content header.entry-header {
background-color: transparent; padding-left: 0; padding-right: 0;
}
.wp-caption {
}
.wp-caption-text {
}
.sticky {
}
.screen-reader-text {
}
.gallery-caption {
}
.bypostauthor {
}
.alignright {
text-align: left;
}
.alignleft {
text-align: left;
}
.aligncenter {
text-align: center;
}
body, div, span, h1, h2, h3, h4, h5, h6, a, label, input, select, button
{
body, div, span, h1, h2, h3, h4, h5, h6, a, label, input, select, button {
font-family: 'Open Sans', sans-serif;
}
.brand {
margin-top: 30px;
margin-bottom: 20px;
display: inline-block;
margin-top: 30px;
margin-bottom: 20px;
display: inline-block;
}
h1
{
h1 {
font-size: 42px;
margin-bottom: 30px;
font-weight: 300 !important;
}
h2
{
h2 {
font-size: 27px;
margin-bottom: 25px;
font-weight: 300 !important;
......@@ -23,48 +20,39 @@ h2
color: #fff;
margin-bottom: 0px;
}
h3
{
h3 {
font-size: 20px;
margin-bottom: 15px;
margin-top: 30px;
font-weight: 300 !important;
}
h4 a
{
h4 a {
color: inherit;
}
h4 a:hover, h4 a:active
{
h4 a:hover, h4 a:active {
color: inherit;
text-decoration: underline;
}
h4
{
h4 {
font-size: 27px;
margin-bottom: 25px;
font-weight: 300 !important;
}
h5
{
h5 {
font-size: 20px;
line-height: 25px;
margin-bottom: 15px;
}
header h2
{
header h2 {
margin-top: 90px;
}
header h2, header p
{
header h2, header p {
color: #FFF;
}
strong
{
strong {
font-weight: 700;
}
#main p
{
#main p {
font-size: 16px;
line-height: 28px;
font-weight: 300;
......@@ -74,18 +62,16 @@ ul {
list-style-type: disc;
}
.panel-heading a:hover, a:focus {
color: #fff;
text-decoration: underline;
color: #fff;
text-decoration: underline;
}
/* Form */
.field
{
.field {
padding: 10px 0;
}
input.text, textarea
{
input.text, textarea {
background-color: #FFFFFF;
border: 1px solid #CCCCCC;
border-radius: 4px 4px 4px 4px;
......@@ -100,20 +86,17 @@ input.text, textarea
max-width: 500px;
width: 100%;
}
input.text
{
input.text {
height: 34px;
}
input[type=submit]
{
input[type=submit] {
margin: 20px 0;
max-width: 300px;
background: #649D23;
color: #FFF;
border: none;
}
.radio, .checkbox {
display: block;
margin-bottom: 10px;
......@@ -123,117 +106,91 @@ input[type=submit]
vertical-align: middle;
}
.mcq a{
color: #005aab;
color: #005aab;
}
.mcq a:hover{
color: #005aab;
color: #005aab;
}
.correct {
color: #6FA92E;
font-weight: 700;
color: #6FA92E;
font-weight: 700;
}
.incorrect {
color: #a94442;
font-weight: 700;
color: #a94442;
font-weight: 700;
}
/* Buttons */
.button
{
.button {
background-color: #6FA92E;
margin-bottom: 10px;
color: #FFF !important;
}
.button a
{
.button a {
font-size: 13px;
color: #FFF;
}
.button, input[type=submit]
{
.button, input[type=submit] {
padding: 7px 20px;
text-transform: uppercase;
border-bottom: 3px solid #5a9319;
display: inline-block;
border-radius: 3px;
}
.button:hover, input[type=submit]:hover
{
.button:hover, input[type=submit]:hover {
opacity: 0.95;
text-decoration: none;
}
.button a:hover,
.button a:focus {
color: #FFF;
color: #FFF;
}
.button:active
{
.button:active {
top: 1px;
}
.warningbutton
{
.warningbutton {
background-color: #ea9841;
margin-bottom: 10px;
}
.warningbutton a
{
.warningbutton a {
font-size: 13px;
color: #FFF;
}
.warningbutton, input[type=submit]
{
.warningbutton, input[type=submit] {
padding: 7px 20px;
text-transform: uppercase;
border-bottom: 3px solid #cc7019;
display: inline-block;
border-radius: 3px;
}
.warningbutton:hover, input[type=submit]:hover
{
.warningbutton:hover, input[type=submit]:hover {
opacity: 0.95;
text-decoration: none;
color: #FFF;
}
.warningbutton:active
{
.warningbutton:active {
top: 1px;
}
@media only screen and (max-width: 992px) {
h2
{
h2 {
font-size: 18px;
}
h1
{
h1 {
font-size: 32px;
}
.brandtext
{
.brandtext {
margin-top: 15px;
}
}
@media (max-width: 768px) {
h3, h4
{
h3, h4 {
font-size: 17px;
}
.pedigogicalicon
{
.pedigogicalicon {
height: 26px;
margin-top: 0px !important;
}
}
</div><!-- #main -->
<?php if(get_theme_mod("scan_page")=="on" || get_option("oeru_theme_scan_page")=="on"):
<?php if(get_theme_mod("scan_page")=="on" || get_option("oeru_course_scan_page")=="on"):
?><div class="modal fade in" id="siteMapmodal" tabindex="-1" role="dialog" aria-labelledby="siteMapLabel" aria-hidden="false">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">X</span><span class="sr-only">Close</span></button>
<h2 class="modal-title" id="myModalLabel"><?PHP echo get_bloginfo ( 'name' ); ?></h2>
<h2 class="modal-title" id="myModalLabel"><?php echo get_bloginfo ( 'name' ); ?></h2>
</div>
<div class="modal-body">
<?PHP
<?php
if(get_theme_mod("scan_page")=="on"):
$oeru_theme = get_option( 'oeru_theme' );
echo $oeru_theme['scan_page_html'];
$oeru_course = get_option( 'oeru-course' );
echo $oeru_course['scan_page_html'];
else:
if(get_option('oeru_theme_scan_page_html')):
if(get_option('oeru_course_scan_page_html')):
echo get_option( 'oeru_theme_scan_page_html');
echo get_option( 'oeru_course_scan_page_html');
endif;
......
<?PHP
<?php
query_posts( array( 'post_type' => 'post', 'posts_per_page' => 4, 'category_name' => "Front Page" ) );
......
<?php
function oeru_theme_defaults() {
function oeru_course_defaults() {
global $wp_rewrite;