Browse Source

Merge pull request #426 from bluebirch/theme_updates

Theme updates
pull/431/head
Dan 5 years ago
committed by GitHub
parent
commit
b6a59ea768
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
  1. +1
    -1
      system/includes/functions.php
  2. +6
    -6
      themes/twentyfifteen/layout.html.php

+ 1
- 1
system/includes/functions.php View File

@ -1539,7 +1539,7 @@ function has_pagination($total, $perpage, $page = 1)
$total = count(get_post_unsorted());
}
$totalPage = ceil($total / $perpage);
$number = 'Page '. $page . ' of ' . $totalPage;
$number = i18n('Page') . ' ' . $page . ' ' . i18n('of') . ' ' . $totalPage;
$pager = get_pagination($page, $total, $perpage, 2);
return array(
'prev' => $page > 1,


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

@ -48,7 +48,7 @@
</div>
</nav>
<aside class="widget widget_meta">
<h2 class="widget-title">About</h2>
<h2 class="widget-title"><?php echo i18n("About");?></h2>
<p><?php echo blog_description() ?></p>
</aside>
<nav id="social-navigation" class="social-navigation" role="navigation">
@ -76,23 +76,23 @@
<form><input type="search" name="search" class="form-control" placeholder="Type to search"></form>
</aside>
<aside class="widget widget_meta">
<h2 class="widget-title">Recent Posts</h2>
<h2 class="widget-title"><?php echo i18n("Recent_posts");?></h2>
<?php echo recent_posts() ?>
</aside>
<?php if (config('views.counter') === 'true') :?>
<aside class="widget widget_meta">
<h2 class="widget-title">Popular Posts</h2>
<h2 class="widget-title"><?php echo i18n("Popular_posts");?></h2>
<?php echo popular_posts() ?>
</aside>
<?php endif;?>
<?php if (disqus()): ?>
<aside class="widget widget_meta">
<h2 class="widget-title">Recent Comments</h2>
<h2 class="widget-title"><?php echo i18n("Recent_comments");?></h2>
<script src="//<?php echo config('disqus.shortname');?>.disqus.com/recent_comments_widget.js?num_items=5&amp;hide_avatars=0&amp;avatar_size=48&amp;excerpt_length=200&amp;hide_mods=0" type="text/javascript"></script><style>li.dsq-widget-item {padding-top:15px;} img.dsq-widget-avatar {margin-right:5px;}</style>
</aside>
<?php endif;?>
<aside class="widget widget_meta">
<h2 class="widget-title">Archive</h2>
<h2 class="widget-title"><?php echo i18n("Archive");?></h2>
<?php echo archive_list() ?>
</aside>
<aside class="widget widget_meta">
@ -100,7 +100,7 @@
<?php echo category_list() ?>
</aside>
<aside class="widget widget_meta">
<h2 class="widget-title">Popular Tags</h2>
<h2 class="widget-title"><?php echo i18n("Popular_tags");?></h2>
<?php $i = 1; $tags = tag_cloud(true); arsort($tags); ?>
<ul>
<?php foreach ($tags as $tag => $count):?>


Loading…
Cancel
Save