Browse Source

Update themes

pull/659/head
danpros 2 years ago
parent
commit
fd72fd5e4c
10 changed files with 45 additions and 41 deletions
  1. +6
    -0
      system/includes/functions.php
  2. +7
    -9
      themes/blog/layout.html.php
  3. +2
    -2
      themes/clean/layout.html.php
  4. +2
    -2
      themes/logs/layout.html.php
  5. +2
    -2
      themes/readable/layout.html.php
  6. +11
    -11
      themes/twentyfifteen/layout.html.php
  7. +1
    -1
      themes/twentyfifteen/post.html.php
  8. +11
    -11
      themes/twentysixteen/layout.html.php
  9. +1
    -1
      themes/twentysixteen/main.html.php
  10. +2
    -2
      themes/twentysixteen/post.html.php

+ 6
- 0
system/includes/functions.php View File

@ -2922,6 +2922,12 @@ function blog_copyright()
return config('blog.copyright'); return config('blog.copyright');
} }
// Return blog language
function blog_language()
{
return str_replace('_', '-', config('language'));
}
// Return author info. Deprecated // Return author info. Deprecated
function authorinfo($name = null, $about = null) function authorinfo($name = null, $about = null)
{ {


+ 7
- 9
themes/blog/layout.html.php View File

@ -1,8 +1,6 @@
<?php if (!defined('HTMLY')) die('HTMLy'); ?> <?php if (!defined('HTMLY')) die('HTMLy'); ?>
<!DOCTYPE html> <!DOCTYPE html>
<!--[if IE 8]> <html lang="<?php echo str_replace('_', '-', config('language'));?>" class="ie8"> <![endif]-->
<!--[if IE 9]> <html lang="<?php echo str_replace('_', '-', config('language'));?>" class="ie9"> <![endif]-->
<!--[if !IE]><!--> <html lang="<?php echo str_replace('_', '-', config('language'));?>"> <!--<![endif]-->
<html lang="<?php echo blog_language();?>">
<head> <head>
<?php echo head_contents();?> <?php echo head_contents();?>
<title><?php echo $title;?></title> <title><?php echo $title;?></title>
@ -12,11 +10,11 @@
<link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Crimson+Text:400,400italic" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Crimson+Text:400,400italic" rel="stylesheet" type="text/css">
<!-- Global CSS --> <!-- Global CSS -->
<link rel="stylesheet" href="<?php echo site_url();?>themes/blog/css/bootstrap.min.css">
<link rel="stylesheet" href="<?php echo theme_path();?>css/bootstrap.min.css">
<!-- Plugins CSS --> <!-- Plugins CSS -->
<link rel="stylesheet" href="<?php echo site_url();?>themes/blog/css/font-awesome.min.css">
<link rel="stylesheet" href="<?php echo theme_path();?>css/font-awesome.min.css">
<!-- Theme CSS --> <!-- Theme CSS -->
<link id="theme-style" rel="stylesheet" href="<?php echo site_url();?>themes/blog/css/styles.css">
<link id="theme-style" rel="stylesheet" href="<?php echo theme_path();?>css/styles.css">
<!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script> <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
@ -40,7 +38,7 @@
<!-- ******HEADER****** --> <!-- ******HEADER****** -->
<header class="header"> <header class="header">
<div class="container"> <div class="container">
<div class="logo pull-left"><img class="logo-image" src="<?php echo site_url();?>themes/blog/images/logo.png"/></div>
<div class="logo pull-left"><img class="logo-image" src="<?php echo theme_path();?>images/logo.png"/></div>
<div class="branding pull-left"> <div class="branding pull-left">
<?php if (is_index()) {?> <?php if (is_index()) {?>
<h1 class="name"><a href="<?php echo site_url();?>"><?php echo blog_title();?></a></h1> <h1 class="name"><a href="<?php echo site_url();?>"><?php echo blog_title();?></a></h1>
@ -189,8 +187,8 @@
</div><!--//container--> </div><!--//container-->
</footer><!--//footer--> </footer><!--//footer-->
<!-- Javascript --> <!-- Javascript -->
<script type="text/javascript" src="<?php echo site_url();?>themes/blog/js/jquery-latest.min.js"></script>
<script type="text/javascript" src="<?php echo site_url();?>themes/blog/js/bootstrap.min.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/jquery-latest.min.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/bootstrap.min.js"></script>
<?php if (analytics()): ?><?php echo analytics() ?><?php endif; ?> <?php if (analytics()): ?><?php echo analytics() ?><?php endif; ?>
</body> </body>
</html> </html>

+ 2
- 2
themes/clean/layout.html.php View File

@ -1,12 +1,12 @@
<?php if (!defined('HTMLY')) die('HTMLy'); ?> <?php if (!defined('HTMLY')) die('HTMLy'); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?php echo str_replace('_', '-', config('language'));?>">
<html lang="<?php echo blog_language();?>">
<head> <head>
<?php echo head_contents() ?> <?php echo head_contents() ?>
<title><?php echo $title;?></title> <title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/> <meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" /> <link rel="canonical" href="<?php echo $canonical; ?>" />
<link href="<?php echo site_url() ?>themes/clean/css/style.css" rel="stylesheet"/>
<link href="<?php echo theme_path() ?>css/style.css" rel="stylesheet"/>
<link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/> <link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/>
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>


+ 2
- 2
themes/logs/layout.html.php View File

@ -1,12 +1,12 @@
<?php if (!defined('HTMLY')) die('HTMLy'); ?> <?php if (!defined('HTMLY')) die('HTMLy'); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?php echo str_replace('_', '-', config('language'));?>">
<html lang="<?php echo blog_language();?>">
<head> <head>
<?php echo head_contents() ?> <?php echo head_contents() ?>
<title><?php echo $title;?></title> <title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/> <meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" /> <link rel="canonical" href="<?php echo $canonical; ?>" />
<link href="<?php echo site_url() ?>themes/logs/css/style.css" rel="stylesheet"/>
<link href="<?php echo theme_path() ?>css/style.css" rel="stylesheet"/>
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>


+ 2
- 2
themes/readable/layout.html.php View File

@ -1,12 +1,12 @@
<?php if (!defined('HTMLY')) die('HTMLy'); ?> <?php if (!defined('HTMLY')) die('HTMLy'); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?php echo str_replace('_', '-', config('language'));?>">
<html lang="<?php echo blog_language();?>">
<head> <head>
<?php echo head_contents() ?> <?php echo head_contents() ?>
<title><?php echo $title;?></title> <title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/> <meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" /> <link rel="canonical" href="<?php echo $canonical; ?>" />
<link href="<?php echo site_url() ?>themes/readable/css/style.css" rel="stylesheet"/>
<link href="<?php echo theme_path() ?>css/style.css" rel="stylesheet"/>
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css"> <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script> <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>


+ 11
- 11
themes/twentyfifteen/layout.html.php View File

@ -1,19 +1,19 @@
<?php if (!defined('HTMLY')) die('HTMLy'); ?> <?php if (!defined('HTMLY')) die('HTMLy'); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?php echo str_replace('_', '-', config('language'));?>">
<html lang="<?php echo blog_language();?>">
<head> <head>
<?php echo head_contents();?> <?php echo head_contents();?>
<title><?php echo $title;?></title> <title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/> <meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" /> <link rel="canonical" href="<?php echo $canonical; ?>" />
<link rel="stylesheet" id="twentyfifteen-fonts-css" href="<?php echo site_url();?>themes/twentyfifteen/css/font.css" type="text/css" media="all">
<link rel="stylesheet" id="genericons-css" href="<?php echo site_url();?>themes/twentyfifteen/genericons/genericons.css" type="text/css" media="all">
<link rel="stylesheet" id="twentyfifteen-style-css" href="<?php echo site_url();?>themes/twentyfifteen/css/style_v2.css" type="text/css" media="all">
<link rel="stylesheet" id="twentyfifteen-fonts-css" href="<?php echo theme_path();?>css/font.css" type="text/css" media="all">
<link rel="stylesheet" id="genericons-css" href="<?php echo theme_path();?>genericons/genericons.css" type="text/css" media="all">
<link rel="stylesheet" id="twentyfifteen-style-css" href="<?php echo theme_path();?>css/style_v2.css" type="text/css" media="all">
<!--[if lt IE 9]> <!--[if lt IE 9]>
<link rel='stylesheet' id='twentyfifteen-ie-css' href='<?php echo site_url();?>themes/twentyfifteen/css/ie.css' type='text/css' media='all' />
<link rel='stylesheet' id='twentyfifteen-ie-css' href='<?php echo theme_path();?>css/ie.css' type='text/css' media='all' />
<![endif]--> <![endif]-->
<!--[if lt IE 8]> <!--[if lt IE 8]>
<link rel='stylesheet' id='twentyfifteen-ie7-css' href='<?php echo site_url();?>themes/twentyfifteen/css/ie7.css' type='text/css' media='all' />
<link rel='stylesheet' id='twentyfifteen-ie7-css' href='<?php echo theme_path();?>css/ie7.css' type='text/css' media='all' />
<![endif]--> <![endif]-->
</head> </head>
<?php <?php
@ -126,11 +126,11 @@
var screenReaderText = {"expand":"<span class=\"screen-reader-text\">expand child menu<\/span>","collapse":"<span class=\"screen-reader-text\">collapse child menu<\/span>"}; var screenReaderText = {"expand":"<span class=\"screen-reader-text\">expand child menu<\/span>","collapse":"<span class=\"screen-reader-text\">collapse child menu<\/span>"};
/* ]]> */ /* ]]> */
</script> </script>
<!--[if lte IE 8]><script type='text/javascript' src='<?php echo site_url();?>themes/twentyfifteen/js/html5.js'></script><![endif]-->
<script type="text/javascript" src="<?php echo site_url();?>themes/twentyfifteen/js/jquery.js"></script>
<script type="text/javascript" src="<?php echo site_url();?>themes/twentyfifteen/js/jquery-migrate.js"></script>
<script type="text/javascript" src="<?php echo site_url();?>themes/twentyfifteen/js/functions.js"></script>
<script type="text/javascript" src="<?php echo site_url();?>themes/twentyfifteen/js/skip-link-focus-fix.js"></script>
<!--[if lte IE 8]><script type='text/javascript' src='<?php echo theme_path();?>js/html5.js'></script><![endif]-->
<script type="text/javascript" src="<?php echo theme_path();?>js/jquery.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/jquery-migrate.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/functions.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/skip-link-focus-fix.js"></script>
<?php if (analytics()): ?><?php echo analytics() ?><?php endif; ?> <?php if (analytics()): ?><?php echo analytics() ?><?php endif; ?>
</body> </body>
</html> </html>


+ 1
- 1
themes/twentyfifteen/post.html.php View File

@ -40,7 +40,7 @@
<div class="author-info"> <div class="author-info">
<h2 class="author-heading"><?php echo i18n('Published').' '.i18n('by');?></h2> <h2 class="author-heading"><?php echo i18n('Published').' '.i18n('by');?></h2>
<div class="author-avatar"> <div class="author-avatar">
<img width="56" height="56" class="avatar avatar-56" src="<?php echo site_url();?>themes/twentyfifteen/images/avatar.png" alt="<?php echo $author->name; ?>">
<img width="56" height="56" class="avatar avatar-56" src="<?php echo theme_path();?>images/avatar.png" alt="<?php echo $author->name; ?>">
</div><!-- .author-avatar --> </div><!-- .author-avatar -->
<div class="author-description"> <div class="author-description">
<h3 class="author-title"><?php echo $author->name; ?></h3> <h3 class="author-title"><?php echo $author->name; ?></h3>


+ 11
- 11
themes/twentysixteen/layout.html.php View File

@ -1,22 +1,22 @@
<?php if (!defined('HTMLY')) die('HTMLy'); ?> <?php if (!defined('HTMLY')) die('HTMLy'); ?>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<?php echo str_replace('_', '-', config('language'));?>">
<html lang="<?php echo blog_language();?>">
<head> <head>
<?php echo head_contents();?> <?php echo head_contents();?>
<title><?php echo $title;?></title> <title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/> <meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" /> <link rel="canonical" href="<?php echo $canonical; ?>" />
<link rel="stylesheet" id="twentysixteen-fonts-css" href="https://fonts.googleapis.com/css?family=Merriweather%3A400%2C700%2C900%2C400italic%2C700italic%2C900italic%7CMontserrat%3A400%2C700%7CInconsolata%3A400&#038;subset=latin%2Clatin-ext" type="text/css" media="all" /> <link rel="stylesheet" id="twentysixteen-fonts-css" href="https://fonts.googleapis.com/css?family=Merriweather%3A400%2C700%2C900%2C400italic%2C700italic%2C900italic%7CMontserrat%3A400%2C700%7CInconsolata%3A400&#038;subset=latin%2Clatin-ext" type="text/css" media="all" />
<link rel="stylesheet" id="genericons-css" href="<?php echo site_url();?>themes/twentysixteen/genericons/genericons.css" type="text/css" media="all" />
<link rel="stylesheet" id="twentysixteen-style-css" href="<?php echo site_url();?>themes/twentysixteen/css/style.css" type="text/css" media="all" />
<link rel="stylesheet" id="genericons-css" href="<?php echo theme_path();?>genericons/genericons.css" type="text/css" media="all" />
<link rel="stylesheet" id="twentysixteen-style-css" href="<?php echo theme_path();?>css/style.css" type="text/css" media="all" />
<!--[if lt IE 10]> <!--[if lt IE 10]>
<link rel="stylesheet" id="twentysixteen-ie-css" href="<?php echo site_url();?>themes/twentysixteen/css/ie.css" type="text/css" media="all" />
<link rel="stylesheet" id="twentysixteen-ie-css" href="<?php echo theme_path();?>css/ie.css" type="text/css" media="all" />
<![endif]--> <![endif]-->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<link rel="stylesheet" id="twentysixteen-ie8-css" href="<?php echo site_url();?>themes/twentysixteen/css/ie8.css" type="text/css" media="all" />
<link rel="stylesheet" id="twentysixteen-ie8-css" href="<?php echo theme_path();?>css/ie8.css" type="text/css" media="all" />
<![endif]--> <![endif]-->
<!--[if lt IE 8]> <!--[if lt IE 8]>
<link rel="stylesheet" id="twentysixteen-ie7-css" href="<?php echo site_url();?>themes/twentysixteen/css/ie7.css" type="text/css" media="all" />
<link rel="stylesheet" id="twentysixteen-ie7-css" href="<?php echo theme_path();?>css/ie7.css" type="text/css" media="all" />
<![endif]--> <![endif]-->
</head> </head>
<?php <?php
@ -145,17 +145,17 @@
</div><!-- .site --> </div><!-- .site -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script type="text/javascript" src="<?php echo site_url();?>themes/twentysixteen/js/html5.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/html5.js"></script>
<![endif]--> <![endif]-->
<script type="text/javascript" src="<?php echo site_url();?>themes/twentysixteen/js/jquery.js"></script>
<script type="text/javascript" src="<?php echo site_url();?>themes/twentysixteen/js/jquery-migrate.js"></script>
<script type="text/javascript" src="<?php echo site_url();?>themes/twentysixteen/js/skip-link-focus-fix.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/jquery.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/jquery-migrate.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/skip-link-focus-fix.js"></script>
<script type="text/javascript"> <script type="text/javascript">
/* <![CDATA[ */ /* <![CDATA[ */
var screenReaderText = {"expand":"expand child menu","collapse":"collapse child menu"}; var screenReaderText = {"expand":"expand child menu","collapse":"collapse child menu"};
/* ]]> */ /* ]]> */
</script> </script>
<script type="text/javascript" src="<?php echo site_url();?>themes/twentysixteen/js/functions.js"></script>
<script type="text/javascript" src="<?php echo theme_path();?>js/functions.js"></script>
<?php if (analytics()): ?><?php echo analytics() ?><?php endif; ?> <?php if (analytics()): ?><?php echo analytics() ?><?php endif; ?>
</body> </body>
</html> </html>

+ 1
- 1
themes/twentysixteen/main.html.php View File

@ -50,7 +50,7 @@
</div><!-- .entry-content --> </div><!-- .entry-content -->
<footer class="entry-footer"> <footer class="entry-footer">
<span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->authorName;?>" src="<?php echo site_url();?>themes/twentysixteen/img/avatar.png" class="avatar avatar-49 grav-hashed grav-hijack" height="49" width="49"></a><span class="screen-reader-text">Author </span> <a class="url fn n" href="<?php echo $p->authorUrl;?>"><?php echo $p->authorName;?></a></span></span>
<span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->authorName;?>" src="<?php echo theme_path();?>img/avatar.png" class="avatar avatar-49 grav-hashed grav-hijack" height="49" width="49"></a><span class="screen-reader-text">Author </span> <a class="url fn n" href="<?php echo $p->authorUrl;?>"><?php echo $p->authorName;?></a></span></span>
<span class="posted-on"><span class="screen-reader-text"><?php echo i18n('Posted_on');?> </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php echo format_date($p->date) ?></time></a></span> <span class="posted-on"><span class="screen-reader-text"><?php echo i18n('Posted_on');?> </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php echo format_date($p->date) ?></time></a></span>
<span class="cat-links"><span class="screen-reader-text"><?php echo i18n('Category');?> </span><?php echo $p->category;?></span> <span class="cat-links"><span class="screen-reader-text"><?php echo i18n('Category');?> </span><?php echo $p->category;?></span>
<span class="tags-links"><span class="screen-reader-text">Tags </span><?php echo $p->tag;?></span> <span class="tags-links"><span class="screen-reader-text">Tags </span><?php echo $p->tag;?></span>


+ 2
- 2
themes/twentysixteen/post.html.php View File

@ -40,7 +40,7 @@
<div class="author-info"> <div class="author-info">
<div class="author-avatar"> <div class="author-avatar">
<a href="<?php echo $p->authorUrl;?>"><img alt="<?php $author->name;?>" src="<?php echo site_url();?>themes/twentysixteen/img/avatar.png" class="avatar avatar-42" height="42" width="42" /></a>
<a href="<?php echo $p->authorUrl;?>"><img alt="<?php $author->name;?>" src="<?php echo theme_path();?>img/avatar.png" class="avatar avatar-42" height="42" width="42" /></a>
</div><!-- .author-avatar --> </div><!-- .author-avatar -->
<div class="author-description"> <div class="author-description">
@ -53,7 +53,7 @@
</div><!-- .entry-content --> </div><!-- .entry-content -->
<footer class="entry-footer"> <footer class="entry-footer">
<span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->authorName;?>" title="<?php echo $p->authorName;?>" src="<?php echo site_url();?>themes/twentysixteen/img/avatar.png" class="avatar avatar-49 grav-hashed grav-hijack" height="49" width="49"/></a><span class="screen-reader-text">Author </span> <a class="url fn n" href="<?php echo $p->authorUrl;?>"><?php echo $p->authorName;?></a></span></span>
<span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->authorName;?>" title="<?php echo $p->authorName;?>" src="<?php echo theme_path();?>img/avatar.png" class="avatar avatar-49 grav-hashed grav-hijack" height="49" width="49"/></a><span class="screen-reader-text">Author </span> <a class="url fn n" href="<?php echo $p->authorUrl;?>"><?php echo $p->authorName;?></a></span></span>
<span class="posted-on"><span class="screen-reader-text">Posted on </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php echo format_date($p->date) ?></time></a></span> <span class="posted-on"><span class="screen-reader-text">Posted on </span><a href="<?php echo $p->url;?>" rel="bookmark"><time class="entry-date published"><?php echo format_date($p->date) ?></time></a></span>


Loading…
Cancel
Save