kiduc
/
bibiuc.com
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 59 Wiki Activity
Browse Source

Merge remote-tracking branch 'upstream/master'

pull/401/head
Stefan Björk 5 years ago
parent
7193ba0fd9 b1611d8c38
commit
aba9982263
47 changed files with 153 additions and 278 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -18
      README.md
  2. +1
    -1
      cache/installedVersion.json
  3. +0
    -147
      config/config.ini
  4. +3
    -1
      config/config.ini.example
  5. +0
    -9
      config/users/kanti.ini
  6. +24
    -5
      humans.txt
  7. +1
    -1
      system/admin/admin.php
  8. +1
    -1
      system/admin/views/backup.html.php
  9. +1
    -1
      system/admin/views/delete-category.html.php
  10. +1
    -1
      system/admin/views/delete-page.html.php
  11. +1
    -1
      system/admin/views/delete-post.html.php
  12. +1
    -1
      system/admin/views/edit-content.html.php
  13. +1
    -1
      system/admin/views/edit-page.html.php
  14. +1
    -1
      system/admin/views/popular-posts.html.php
  15. +1
    -1
      system/admin/views/posts-list.html.php
  16. +1
    -1
      system/admin/views/user-draft.html.php
  17. +1
    -1
      system/admin/views/user-posts.html.php
  18. +28
    -28
      system/htmly.php
  19. +1
    -1
      system/includes/dispatch.php
  20. +5
    -10
      system/includes/functions.php
  21. +11
    -9
      themes/blog/layout.html.php
  22. +2
    -3
      themes/blog/main.html.php
  23. +2
    -3
      themes/blog/post.html.php
  24. +1
    -1
      themes/blog/profile.html.php
  25. +4
    -4
      themes/clean/css/style.css
  26. +10
    -1
      themes/clean/layout.html.php
  27. +1
    -1
      themes/clean/main.html.php
  28. +1
    -3
      themes/clean/post.html.php
  29. +1
    -1
      themes/clean/profile.html.php
  30. +10
    -1
      themes/default/layout.html.php
  31. +1
    -1
      themes/default/main.html.php
  32. +1
    -2
      themes/default/post.html.php
  33. +1
    -1
      themes/default/profile.html.php
  34. +7
    -1
      themes/logs/layout.html.php
  35. +1
    -1
      themes/logs/main.html.php
  36. +1
    -3
      themes/logs/post.html.php
  37. +1
    -1
      themes/logs/profile.html.php
  38. +7
    -1
      themes/twentyfifteen/css/style.css
  39. +1
    -1
      themes/twentyfifteen/layout.html.php
  40. +1
    -1
      themes/twentyfifteen/main.html.php
  41. +1
    -1
      themes/twentyfifteen/post.html.php
  42. +1
    -1
      themes/twentyfifteen/profile.html.php
  43. +6
    -0
      themes/twentysixteen/css/style.css
  44. +1
    -2
      themes/twentysixteen/layout.html.php
  45. +1
    -1
      themes/twentysixteen/main.html.php
  46. +1
    -1
      themes/twentysixteen/post.html.php
  47. +1
    -1
      themes/twentysixteen/profile.html.php

+ 3
- 18
README.md View File

@ -2,7 +2,7 @@
HTMLy is an open source Databaseless Blogging Platform or Flat-File Blog prioritizes simplicity and speed written in PHP. HTMLy can be referred to as Flat-File CMS either since it will also manage your content.
You do not need to use a VPS to run HTMLy, shared hosting or even [free hosting](https://github.com/danpros/htmly#openshift) should work as long as the host supports at least PHP 5.3.
You do not need to use a VPS to run HTMLy, shared hosting or even free hosting should work as long as the host supports at least PHP 5.3.
Demo
----
@ -42,6 +42,7 @@ Features
- File Caching
- Auto Update
- Post Draft
- i18n
Requirements
------------
@ -129,15 +130,6 @@ server {
}
````
OpenShift
---------
Need a free server to test HTMLy? try [OpenShift](https://www.openshift.com) using the [HTMLy OpenShift QuickStart](https://hub.openshift.com/quickstarts/219-htmly) for easy deployment.
**Quick install:**
[![Click to install OpenShift](http://launch-shifter.rhcloud.com/launch/light/Click to install.svg)](https://hub.openshift.com/quickstarts/deploy/219-htmly)
Making a secure password
----------------------
Passwords can be stored in `username.ini` (where "username" is the user's username) in either plaintext, encryption algorithms supported by php `hash` or bcrypt (recommended). To generate a bcrypt encrypted password:
@ -287,14 +279,7 @@ Contribute
Contributors
----------
- [danpros](https://github.com/danpros) - [Weblog](http://www.danpros.com)
- [Kanti](https://github.com/Kanti) - [Weblog](https://kanti.de)
- [fahmi182](https://github.com/fahmi182) - [Weblog](http://ifahmi.com)
- [fanningert](https://github.com/fanningert) - [Weblog](http://thomas.fanninger.at)
- [BlackCodec](https://github.com/BlackCodec)
- [mlncn](https://github.com/mlncn)
- [Tea23](https://github.com/Tea23)
- [greenphp](https://github.com/greenphp)
- [HTMLy Contributors](https://github.com/danpros/htmly/graphs/contributors)
Copyright / License
-------------------


+ 1
- 1
cache/installedVersion.json View File

@ -1,4 +1,4 @@
{
"id": 782014,
"tag_name": "v2.7.4"
"tag_name": "v2.7.5"
}

+ 0
- 147
config/config.ini View File

@ -1,147 +0,0 @@
; The URL of your blog. Include the http or https if you are using Facebook or Disqus comment.
site.url = ""
; Your timezone
timezone = "Asia/Jakarta"
; Your language ("en" for English, "de" for German, "pl" for Polish)
language = "en"
; Blog info
blog.title = "HTMLy"
blog.tagline = "Just another HTMLy blog"
blog.description = "Proudly powered by HTMLy, a databaseless blogging platform."
blog.copyright = "(c) Your name."
; Set permalink type. "default" using /year/month/title. "post" using /post/title
permalink.type = "default"
; Make the frontpage static. Options "false" and "true"
static.frontpage = "false"
; Show the /blog url as the blog homepage. Options "false" and "true"
blog.enable = "false"
; Social account
social.twitter = "https://twitter.com"
social.facebook = "https://www.facebook.com"
social.google = "https://plus.google.com"
social.tumblr = "http://www.tumblr.com"
; Custom menu link.
; See example below:
; "Google->http://www.google.com|Wikipedia->http://www.wikipedia.org".
blog.menu = ""
; Breadcrumb home text. Useful when installed on subfolder.
breadcrumb.home = "Home"
; Comment system. Choose "facebook", "disqus", or "disable".
comment.system = "disable"
; Facebook comments
fb.appid = ""
fb.num = "5"
fb.color = "light"
; Disqus comments
disqus.shortname = ""
; Google Web Master Tool ID verification
google.wmt.id = ""
; Google+ publisher
google.publisher = ""
; Google analytics
google.analytics.id = ""
; Google reCaptcha
; https://www.google.com/recaptcha/admin. Options "false" and "true"
google.reCaptcha = "false"
google.reCaptcha.public = ""
google.reCaptcha.private = ""
; Pagination, RSS, and JSON
posts.perpage = "10"
category.perpage = "10"
tag.perpage = "10"
archive.perpage = "10"
search.perpage = "10"
profile.perpage = "10"
type.perpage = "10"
json.count = "10"
; Category info
category.info = "true"
; Related posts
related.count = "3"
; Recent posts
recent.count = "5"
; Popular posts
popular.count = "5"
; Author info on blog post. Set "true" or "false".
author.info = "true"
; Teaser type: set "trimmed" or "full".
teaser.type = "full"
; Read more link text for "full" teaser type
read.more = "Read more"
; Teaser character count
teaser.char = "200"
; Description character count
description.char = "150"
; RSS feed count
rss.count = "10"
; RSS feed description length. If left empty we will use full page.
rss.char = "200"
; Enable image thumbnail on teaser, the options is "true" and "false". If set to "true", you can specify the default thumbnail also.
img.thumbnail = "false"
default.thumbnail = ""
; Enable views Counter, the options is "true" and "false". If set to "true", you can see the Counts in Admin page and popular posts.
views.counter = "false"
; Sitemap priorities between "0.0" and "1.0". Set "false" to disable a sitemap for the given type. (See /sitemap.xml)
sitemap.priority.base = "1.0"
sitemap.priority.post = "0.5"
sitemap.priority.static = "0.5"
sitemap.priority.category = "0.5"
sitemap.priority.tag = "0.5"
sitemap.priority.archiveDay = "0.5"
sitemap.priority.archiveMonth = "0.5"
sitemap.priority.archiveYear = "0.5"
sitemap.priority.author = "0.5"
sitemap.priority.type = "0.5"
; Also install pre-release
prerelease = "false"
; Cache expiration in hour. Eg. "6", "12". Default 6 hours.
cache.expiration = "6"
; Switch on and off the file cache for development purposes. Options "false" and "true"
cache.off = "false"
; Switch on and off the page generation time. Options "false" and "true"
generation.time = "false"
; Switch on and off the cache timestamp. Options "false" and "true"
cache.timestamp = "false"
; Set the theme here
views.root = "themes/twentysixteen"
; Framework config. No need to edit.
views.layout = "layout"

+ 3
- 1
config/config.ini.example View File

@ -4,6 +4,9 @@ site.url = ""
; Your timezone
timezone = "Asia/Jakarta"
; Time format. See: https://www.php.net/manual/en/function.date.php
time.format = "d F Y"
; Your language (currently only "en" for English or "de" for German)
language = "en"
@ -25,7 +28,6 @@ blog.enable = "false"
; Social account
social.twitter = "https://twitter.com"
social.facebook = "https://www.facebook.com"
social.google = "https://plus.google.com"
social.tumblr = "http://www.tumblr.com"
; Custom menu link.


+ 0
- 9
config/users/kanti.ini View File

@ -1,9 +0,0 @@
;Password
password = yourpassword
encryption = clear
; encryption: not set, leave blank or set to clear or none to use plain text password for the user,
; else set to encryption algoritm supported by hash function of php to use the selected
; encryption
;Role
role = admin

+ 24
- 5
humans.txt View File

@ -2,28 +2,23 @@
Owner: danpros
Github: https://github.com/danpros
Weblog: http://www.danpros.com
Location: Indonesia
Contributor: Kanti
Github: https://github.com/Kanti
Weblog: https://kanti.de
Location: Stuttgart - Germany
Contributor: fahmi182
Github: https://github.com/fahmi182
Weblog: http://ifahmi.com
Location: Jakarta
Contributor: fanningert
Github: https://github.com/fanningert
Location: Vienna
Contributor: BlackCodec
Github: https://github.com/BlackCodec
Contributor: mlncn
Github: https://github.com/mlncn
Location: Natick, Massachusetts, USA
Contributor: Tea23
Github: https://github.com/Tea23
@ -31,6 +26,30 @@ Github: https://github.com/Tea23
Contributor: greenphp
Github: https://github.com/greenphp
Contributor: brh55
Github: https://github.com/brh55
Contributor: ecc
Github: https://github.com/ecc
Contributor: bluebirch
Github: https://github.com/bluebirch
Contributor: EBethus
Github: https://github.com/EBethus
Contributor: nikkolai14
Github: https://github.com/nikkolai14
Contributor: RalfZim
Github: https://github.com/RalfZim
Contributor: NightPurrer
Github: https://github.com/NightPurrer
Contributor: EtherialNL
Github: https://github.com/EtherialNL
/* THANKS */
Name: Martin Angelov (http://tutorialzine.com)
Name: Xiaoying Riley (http://themes.3rdwavemedia.com)


+ 1
- 1
system/admin/admin.php View File

@ -695,7 +695,7 @@ function get_user_posts()
$i++;
echo '<tr class="' . $class . '">';
echo '<td><a target="_blank" href="' . $p->url . '">' . $p->title . '</a></td>';
echo '<td>' . date('d F Y', $p->date) . '</td>';
echo '<td>' . format_date($p->date) . '</td>';
if (config("views.counter") == "true")
echo '<td>' . $p->views . '</td>';
echo '<td>' . $p->tag . '</td>';


+ 1
- 1
system/admin/views/backup.html.php View File

@ -1,7 +1,7 @@
<?php
if (login()) {
if (isset($_GET['file'])) {
$file = $_GET['file'];
$file = _h($_GET['file']);
if (!empty($file)) {
unlink($file);


+ 1
- 1
system/admin/views/delete-category.html.php View File

@ -1,6 +1,6 @@
<?php
if (isset($_GET['destination'])) {
$destination = $_GET['destination'];
$destination = _h($_GET['destination']);
}
$url = $p->file;


+ 1
- 1
system/admin/views/delete-page.html.php View File

@ -1,6 +1,6 @@
<?php
if (isset($_GET['destination'])) {
$destination = $_GET['destination'];
$destination = _h($_GET['destination']);
}
$url = $p->file;


+ 1
- 1
system/admin/views/delete-post.html.php View File

@ -1,6 +1,6 @@
<?php
if (isset($_GET['destination'])) {
$destination = $_GET['destination'];
$destination = _h($_GET['destination']);
}
$url = $p->file;
$oldurl = explode('_', $url);


+ 1
- 1
system/admin/views/edit-content.html.php View File

@ -30,7 +30,7 @@ if (empty($oldtag)) {
$oldmd = str_replace('.md', '', $oldurl[2]);
if (isset($_GET['destination'])) {
$destination = $_GET['destination'];
$destination = _h($_GET['destination']);
} else {
$destination = 'admin';
}


+ 1
- 1
system/admin/views/edit-page.html.php View File

@ -41,7 +41,7 @@ if ($type == 'is_frontpage') {
$oldcontent = remove_html_comments($content);
if (isset($_GET['destination'])) {
$destination = $_GET['destination'];
$destination = _h($_GET['destination']);
} else {
$destination = 'admin';
}


+ 1
- 1
system/admin/views/popular-posts.html.php View File

@ -24,7 +24,7 @@
?>
<tr class="<?php echo $class ?>">
<td><a target="_blank" href="<?php echo $p->url ?>"><?php echo $p->title ?></a></td>
<td><?php echo date('d F Y', $p->date) ?></td>
<td><?php echo format_date($p->date) ?></td>
<?php if (config("views.counter") == "true"): ?>
<td><?php echo $p->views ?></td><?php endif; ?>
<td><a target="_blank" href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></td>


+ 1
- 1
system/admin/views/posts-list.html.php View File

@ -24,7 +24,7 @@
?>
<tr class="<?php echo $class ?>">
<td><a target="_blank" href="<?php echo $p->url ?>"><?php echo $p->title ?></a></td>
<td><?php echo date('d F Y', $p->date) ?></td>
<td><?php echo format_date($p->date) ?></td>
<?php if (config("views.counter") == "true"): ?>
<td><?php echo $p->views ?></td><?php endif; ?>
<td><a target="_blank" href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></td>


+ 1
- 1
system/admin/views/user-draft.html.php View File

@ -22,7 +22,7 @@
?>
<tr class="<?php echo $class ?>">
<td><?php echo $p->title ?></td>
<td><?php echo date('d F Y', $p->date) ?></td>
<td><?php echo format_date($p->date) ?></td>
<td><?php echo strip_tags($p->tag) ?></td>
<td><a href="<?php echo $p->url ?>/edit?destination=admin/draft"><?php echo i18n('Edit');?></a> <a href="<?php echo $p->url ?>/delete?destination=admin/draft"><?php echo i18n('Delete');?></a></td>
</tr>


+ 1
- 1
system/admin/views/user-posts.html.php View File

@ -25,7 +25,7 @@
?>
<tr class="<?php echo $class ?>">
<td><a target="_blank" href="<?php echo $p->url ?>"><?php echo $p->title ?></a></td>
<td><?php echo date('d F Y', $p->date) ?></td>
<td><?php echo format_date($p->date) ?></td>
<?php if (config("views.counter") == "true"): ?>
<td><?php echo $p->views ?></td>
<?php endif; ?>


+ 28
- 28
system/htmly.php View File

@ -17,7 +17,7 @@ if (config('timezone')) {
get('/index', function () {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -186,7 +186,7 @@ post('/login', function () {
get('/author/:name', function ($name) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -394,10 +394,10 @@ get('/front/edit', function () {
}
});
// Show the "Add post" page
// Show the "Add content" page
get('/add/content', function () {
$req = $_GET['type'];
$req = _h($_GET['type']);
$type = 'is_' . $req;
@ -412,7 +412,7 @@ get('/add/content', function () {
'type' => $type,
'is_admin' => true,
'bodyclass' => 'add-content',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add post'
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add content'
));
} else {
$login = site_url() . 'login';
@ -794,7 +794,7 @@ get('/add/category', function () {
'type' => 'is_category',
'is_admin' => true,
'bodyclass' => 'add-category',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add page'
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add category'
));
} else {
$login = site_url() . 'login';
@ -841,7 +841,7 @@ post('/add/category', function () {
'type' => 'is_category',
'is_admin' => true,
'bodyclass' => 'add-category',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add page'
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add category'
));
}
});
@ -1401,7 +1401,7 @@ get('/admin/categories', function () {
get('/category/:category', function ($category) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -1597,7 +1597,7 @@ post('/category/:category/delete', function () {
get('/type/:type', function ($type) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -1666,7 +1666,7 @@ get('/type/:type', function ($type) {
get('/tag/:tag', function ($tag) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -1731,7 +1731,7 @@ get('/tag/:tag', function ($tag) {
get('/archive/:req', function ($req) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -1806,7 +1806,7 @@ get('/archive/:req', function ($req) {
get('/search/:keyword', function ($keyword) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -1904,7 +1904,7 @@ get('/feed/opml', function () {
get('/post/:name', function ($name) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -1973,7 +1973,7 @@ get('/post/:name', function ($name) {
}
if (config('blog.enable') === 'true') {
$blog = ' <span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . 'blog">Blog</a></span> &#187; ';
$blog = '<li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a itemprop="item" href="' . site_url() . 'blog"><span itemprop="name">Blog</span></a><meta itemprop="position" content="2" /></li> &#187; ';
} else {
$blog = '';
}
@ -2010,7 +2010,7 @@ get('/post/:name', function ($name) {
'p' => $current,
'author' => $author,
'bodyclass' => 'in-post category-' . $current->ct . ' type-' . $current->type,
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; '. $blog . '<span typeof="v:Breadcrumb">' . $current->categoryb . '</span>' . ' &#187; ' . $current->title,
'breadcrumb' => '<style>.breadcrumb-list {margin:0; padding:0;} .breadcrumb-list li {display: inline-block; list-style: none;}</style><ol class="breadcrumb-list" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a itemprop="item" href="' . site_url() . '"><span itemprop="name">' . config('breadcrumb.home') . '</span></a><meta itemprop="position" content="1" /></li> &#187; '. $blog . '<li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">' . $current->categoryb . '<meta itemprop="position" content="3" /></li>' . ' &#187; ' . $current->title . '</ol>',
'prev' => has_prev($prev),
'next' => has_next($next),
'type' => $var,
@ -2062,7 +2062,7 @@ get('/post/:name/edit', function ($name) {
'type' => $type,
'is_admin' => true,
'bodyclass' => 'edit-post',
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
'breadcrumb' => '<span><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
));
} else {
render('denied', array(
@ -2072,7 +2072,7 @@ get('/post/:name/edit', function ($name) {
'p' => $current,
'bodyclass' => 'denied',
'is_admin' => true,
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
'breadcrumb' => '<span><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
));
}
} else {
@ -2254,7 +2254,7 @@ get('/post/:name/delete', function ($name) {
'p' => $current,
'is_admin' => true,
'bodyclass' => 'delete-post',
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
'breadcrumb' => '<span><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
));
} else {
render('denied', array(
@ -2264,7 +2264,7 @@ get('/post/:name/delete', function ($name) {
'p' => $current,
'is_admin' => true,
'bodyclass' => 'delete-post',
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
'breadcrumb' => '<span><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
));
}
} else {
@ -2288,7 +2288,7 @@ post('/post/:name/delete', function () {
get('/:static', function ($static) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -2683,7 +2683,7 @@ post('/:static/delete', function () {
get('/:static/:sub', function ($static, $sub) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -2890,7 +2890,7 @@ post('/:static/:sub/delete', function () {
get('/:year/:month/:name', function ($year, $month, $name) {
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -2957,7 +2957,7 @@ get('/:year/:month/:name', function ($year, $month, $name) {
}
if (config('blog.enable') === 'true') {
$blog = ' <span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . 'blog">Blog</a></span> &#187; ';
$blog = '<li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a itemprop="item" href="' . site_url() . 'blog"><span itemprop="name">Blog</span></a><meta itemprop="position" content="2" /></li> &#187; ';
} else {
$blog = '';
}
@ -2994,7 +2994,7 @@ get('/:year/:month/:name', function ($year, $month, $name) {
'p' => $current,
'author' => $author,
'bodyclass' => 'in-post category-' . $current->ct . ' type-' . $current->type,
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; '. $blog . '<span typeof="v:Breadcrumb">' . $current->categoryb . '</span>' . ' &#187; ' . $current->title,
'breadcrumb' => '<style>.breadcrumb-list {margin:0; padding:0;} .breadcrumb-list li {display: inline-block; list-style: none;}</style><ol class="breadcrumb-list" itemscope itemtype="http://schema.org/BreadcrumbList"><li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem"><a itemprop="item" href="' . site_url() . '"><span itemprop="name">' . config('breadcrumb.home') . '</span></a><meta itemprop="position" content="1" /></li> &#187; '. $blog . '<li class="breadcrumb-item" itemprop="itemListElement" itemscope itemtype="http://schema.org/ListItem">' . $current->categoryb . '<meta itemprop="position" content="3" /></li>' . ' &#187; ' . $current->title . '</ol>',
'prev' => has_prev($prev),
'next' => has_next($next),
'type' => $var,
@ -3046,7 +3046,7 @@ get('/:year/:month/:name/edit', function ($year, $month, $name) {
'type' => $type,
'bodyclass' => 'edit-post',
'is_admin' => true,
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
'breadcrumb' => '<span><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
));
} else {
render('denied', array(
@ -3056,7 +3056,7 @@ get('/:year/:month/:name/edit', function ($year, $month, $name) {
'p' => $current,
'bodyclass' => 'denied',
'is_admin' => true,
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
'breadcrumb' => '<span><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
));
}
} else {
@ -3238,7 +3238,7 @@ get('/:year/:month/:name/delete', function ($year, $month, $name) {
'p' => $current,
'bodyclass' => 'delete-post',
'is_admin' => true,
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
'breadcrumb' => '<span><a rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
));
} else {
render('denied', array(
@ -3248,7 +3248,7 @@ get('/:year/:month/:name/delete', function ($year, $month, $name) {
'p' => $current,
'bodyclass' => 'delete-post',
'is_admin' => true,
'breadcrumb' => '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
'breadcrumb' => '<span><a href="' . site_url() . '">' . config('breadcrumb.home') . '</a></span> &#187; ' . $current->tagb . ' &#187; ' . $current->title
));
}
} else {


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

@ -366,7 +366,7 @@ function render($view, $locals = null, $layout = null)
ob_start();
require $layout;
}
if (!$login) {
if (!$login && $view != '404') {
if (!file_exists($cachefile)) {
if (config('cache.timestamp') == 'true') {
echo "\n" . '<!-- Cached page generated on '.date('Y-m-d H:i:s').' -->';


+ 5
- 10
system/includes/functions.php View File

@ -268,13 +268,13 @@ function get_posts($posts, $page = 1, $perpage = 0)
if($str[count($str) - 3] == 'uncategorized') {
$category = default_category();
$post->category = '<a href="' . $category->url . '">' . $category->title . '</a>';
$post->categoryb = '<a property="v:title" rel="v:url" href="' . $category->url . '">' . $category->title . '</a>';
$post->categoryb = '<a itemprop="item" href="' . $category->url . '"><span itemprop="name">' . $category->title . '</span></a>';
} else {
foreach ($catC as $k => $v) {
if ($v['0'] === $str[count($str) - 3]) {
$post->category = '<a href="' . site_url() . 'category/' . $v['0'] . '">' . $v['1'] . '</a>';
$post->categoryb = '<a property="v:title" rel="v:url" href="' . site_url() . 'category/' . $v['0'] . '">' . $v['1'] . '</a>';
$post->categoryb = '<a itemprop="item" href="' . site_url() . 'category/' . $v['0'] . '"><span itemprop="name">' . $v['1'] . '</span></a>';
}
}
@ -343,7 +343,7 @@ function get_posts($posts, $page = 1, $perpage = 0)
foreach ($tag as $a) {
$url[] = '<a rel="tag" href="' . $a[1] . '">' . $a[0] . '</a>';
$bc[] = '<span typeof="v:Breadcrumb"><a property="v:title" rel="v:url" href="' . $a[1] . '">' . $a[0] . '</a></span>';
$bc[] = '<span><a href="' . $a[1] . '">' . $a[0] . '</a></span>';
}
$post->tag = implode(' ', $url);
@ -1816,7 +1816,6 @@ function social($imgDir = null)
{
$twitter = config('social.twitter');
$facebook = config('social.facebook');
$google = config('social.google');
$tumblr = config('social.tumblr');
$rss = site_url() . 'feed/rss';
@ -1832,10 +1831,6 @@ function social($imgDir = null)
echo '<a href="' . $facebook . '" target="_blank"><img src="' . site_url() . 'themes/' . $imgDir . 'facebook.png" width="32" height="32" alt="Facebook"/></a>';
}
if (!empty($google)) {
echo '<a href="' . $google . '" target="_blank"><img src="' . site_url() . 'themes/' . $imgDir . 'googleplus.png" width="32" height="32" alt="Google+"/></a>';
}
if (!empty($tumblr)) {
echo '<a href="' . $tumblr . '" target="_blank"><img src="' . site_url() . 'themes/' . $imgDir . 'tumblr.png" width="32" height="32" alt="Tumblr"/></a>';
}
@ -2164,7 +2159,7 @@ EOF;
EOF;
}
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -3212,7 +3207,7 @@ function get_language()
$langID = config('language');
$langFile = 'lang/'. $langID . '.ini';
$local = strtolower($langID);
$local = $langID;
// Settings for the language
if (!isset($langID) || config('language') === 'en') {


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

@ -26,7 +26,7 @@
</head>
<?php
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -51,7 +51,6 @@
<p class="desc"><?php echo blog_tagline();?></p>
<ul class="social list-inline">
<li><a href="<?php echo config('social.twitter');?>"><i class="fa fa-twitter"></i></a></li>
<li><a href="<?php echo config('social.google');?>"><i class="fa fa-google-plus"></i></a></li>
<li><a href="<?php echo config('social.facebook');?>"><i class="fa fa-facebook"></i></a></li>
<li><a href="<?php echo config('social.tumblr');?>"><i class="fa fa-tumblr"></i></a></li>
<li><a href="<?php echo site_url();?>feed/rss"><i class="fa fa-rss"></i></a></li>
@ -172,14 +171,17 @@
</div><!--//content-->
</div><!--//section-inner-->
</aside><!--//section-->
<aside class="tags aside section">
<aside class="category-list aside section">
<div class="section-inner">
<h2 class="heading">Tags</h2>
<div class="tag-cloud">
<?php $tags = tag_cloud(true);?>
<?php foreach ($tags as $tag => $count):?>
<a class="more-link" href="<?php echo site_url();?>tag/<?php echo $tag;?>"><?php echo tag_i18n($tag);?></a>
<?php endforeach;?>
<h2 class="heading"><?php echo i18n("Popular_tags");?></h2>
<div class="content">
<?php $i = 1; $tags = tag_cloud(true); arsort($tags); ?>
<ul>
<?php foreach ($tags as $tag => $count):?>
<li><a href="<?php echo site_url();?>tag/<?php echo $tag;?>"><?php echo tag_i18n($tag);?> (<?php echo $count;?>)</a></li>
<?php if ($i++ >= 5) break;?>
<?php endforeach;?>
</ul>
</div><!--//content-->
</div><!--//section-inner-->
</aside><!--//section-->


+ 2
- 3
themes/blog/main.html.php View File

@ -58,7 +58,7 @@
<h2 class="title" itemprop="headline"><a href="<?php echo $p->url;?>"><?php echo $p->title;?></a></h2>
<?php } ?>
<p class="meta">
<span class="date" itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
<span class="date" itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
<span itemprop="articleSection"><?php echo $p->category;?></span> by
<span itemprop="author"><a href="<?php echo $p->authorUrl;?>"><?php echo $p->author;?></a></span>
<?php if (disqus_count()) { ?>
@ -77,8 +77,7 @@
<?php endif;?>
<span class="share pull-right">
<a target="_blank" class="first" href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title ?>"><i class="fa fa-facebook"></i></a>
<a target="_blank" href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>"><i class="fa fa-twitter"></i></a>
<a target="_blank" class="last" href="https://plus.google.com/share?url=<?php echo $p->url ?>"><i class="fa fa-google-plus"></i></a>
<a target="_blank" href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>"><i class="fa fa-twitter"></i></a>
</span>
<div style="clear:both;"></div>
</div>


+ 2
- 3
themes/blog/post.html.php View File

@ -33,7 +33,7 @@
<h1 class="title" itemprop="headline"><?php echo $p->title;?></h1>
<?php } ?>
<p class="meta">
<span class="date" itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
<span class="date" itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
<span itemprop="articleSection"><?php echo $p->category;?></span> by
<span itemprop="author"><a href="<?php echo $p->authorUrl;?>"><?php echo $p->author;?></a></span>
</p>
@ -50,8 +50,7 @@
<?php } ?>
<span class="share pull-right">
<a target=" " class="first" href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title ?>"><i class="fa fa-facebook"></i></a>
<a target=" " href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>"><i class="fa fa-twitter"></i></a>
<a target=" " class="last" href="https://plus.google.com/share?url=<?php echo $p->url ?>"><i class="fa fa-google-plus"></i></a>
<a target=" " href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>"><i class="fa fa-twitter"></i></a>
</span>
<div style="clear:both;"></div>
</div>


+ 1
- 1
themes/blog/profile.html.php View File

@ -24,7 +24,7 @@
$i++; ?>
<li class="<?php echo $class; ?>">
<span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
<span><?php echo date('d F Y', $p->date) ?></span> - Posted in <span><?php echo $p->category ?></span>
<span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->category ?></span>
</li>
<?php endforeach; ?>
</ul>


+ 4
- 4
themes/clean/css/style.css View File

@ -211,16 +211,16 @@ h6 {
text-decoration: none;
}
.infront .post, .intag .post, .inarchive .post, .insearch .post, .inprofile .post {
.in-front .post, .in-tag .post, .in-archive .post, .in-search .post, .in-profile .post {
border-bottom: 1px solid #dfdfdf;
padding: 30px 0 10px 0;
}
.infront .post.first {
.in-front .post.first {
padding-top: 50px;
}
.intag .post.first, .inarchive .post.first, .insearch .post.first, .inprofile .post.first {
.in-tag .post.first, .in-archive .post.first, .in-search .post.first, .in-profile .post.first {
padding-top: 0px;
}
@ -831,7 +831,7 @@ aside .copyright p {
padding-top: 0px;
}
.infront .post, .intag .post, .inarchive .post, .insearch .post {
.in-front .post, .in-tag .post, .in-archive .post, .in-search .post {
padding: 30px 0 20px 0;
}


+ 10
- 1
themes/clean/layout.html.php View File

@ -35,7 +35,16 @@
<div class="recent"><h3><?php echo i18n('Recent_posts');?></h3><?php echo recent_posts() ?></div>
<div class="archive"><h3><?php echo i18n('Archives');?></h3><?php echo archive_list() ?></div>
<div class="category-list"><h3><?php echo i18n('Category');?></h3><?php echo category_list() ?></div>
<div class="tagcloud"><h3>Tags</h3><?php echo tag_cloud() ?></div>
<div class="tagcloud">
<h3>Tags</h3>
<?php $i = 1; $tags = tag_cloud(true); arsort($tags); ?>
<ul>
<?php foreach ($tags as $tag => $count):?>
<li><a href="<?php echo site_url();?>tag/<?php echo $tag;?>"><?php echo tag_i18n($tag);?> (<?php echo $count;?>)</a></li>
<?php if ($i++ >= 5) break;?>
<?php endforeach;?>
</ul>
</div>
<div class="copyright"><?php echo copyright() ?></div>
</aside>
<section id="content">


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

@ -29,7 +29,7 @@
<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
<?php } ?>
<div class="date">
<span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
<span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
<span itemprop="articleSection"><?php echo $p->category ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
<?php if (disqus_count()) { ?> -


+ 1
- 3
themes/clean/post.html.php View File

@ -11,7 +11,7 @@
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<?php } ?>
<div class="date">
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
- Posted in
<span itemprop="articleSection"><?php echo $p->category ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
@ -54,8 +54,6 @@
href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>">Twitter</a>
<a class="facebook" target="_blank"
href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title ?>">Facebook</a>
<a class="googleplus" target="_blank"
href="https://plus.google.com/share?url=<?php echo $p->url ?>">Google+</a>
</div>
</div>
<div class="related">


+ 1
- 1
themes/clean/profile.html.php View File

@ -22,7 +22,7 @@
$i++; ?>
<li class="<?php echo $class; ?>">
<span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
<span><?php echo date('d F Y', $p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
<span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
</li>
<?php endforeach; ?>
</ul>


+ 10
- 1
themes/default/layout.html.php View File

@ -62,7 +62,16 @@
<div class="inner"><h3>Archive</h3><?php echo archive_list() ?></div>
</div>
<div class="tagcloud column">
<div class="inner"><h3>Tags</h3><?php echo tag_cloud() ?></div>
<div class="inner">
<h3>Tags</h3>
<?php $i = 1; $tags = tag_cloud(true); arsort($tags); ?>
<ul>
<?php foreach ($tags as $tag => $count):?>
<li><a href="<?php echo site_url();?>tag/<?php echo $tag;?>"><?php echo tag_i18n($tag);?> (<?php echo $count;?>)</a></li>
<?php if ($i++ >= 5) break;?>
<?php endforeach;?>
</ul>
</div>
</div>
<div class="social column">
<div class="inner"><h3>Follow</h3><?php echo social() ?></div>


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

@ -29,7 +29,7 @@
<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
<?php } ?>
<div class="date">
<span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
<span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
<span itemprop="articleSection"><?php echo $p->category ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
<?php if (disqus_count()) { ?> -


+ 1
- 2
themes/default/post.html.php View File

@ -11,7 +11,7 @@
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<?php } ?>
<div class="date">
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
- Posted in
<span itemprop="articleSection"><?php echo $p->category ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
@ -52,7 +52,6 @@
<h4>Share this post</h4>
<a class="twitter" target="_blank" href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>">Twitter</a>
<a class="facebook" target="_blank" href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title ?>">Facebook</a>
<a class="googleplus" target="_blank" href="https://plus.google.com/share?url=<?php echo $p->url ?>">Google+</a>
</div>
</div>
<div class="related">


+ 1
- 1
themes/default/profile.html.php View File

@ -22,7 +22,7 @@
$i++; ?>
<li class="<?php echo $class; ?>">
<span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
<span><?php echo date('d F Y', $p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
<span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
</li>
<?php endforeach; ?>
</ul>


+ 7
- 1
themes/logs/layout.html.php View File

@ -80,7 +80,13 @@
</div>
<div class="tagcloud">
<h3>Tags</h3>
<?php echo tag_cloud() ?>
<?php $i = 1; $tags = tag_cloud(true); arsort($tags); ?>
<ul>
<?php foreach ($tags as $tag => $count):?>
<li><a href="<?php echo site_url();?>tag/<?php echo $tag;?>"><?php echo tag_i18n($tag);?> (<?php echo $count;?>)</a></li>
<?php if ($i++ >= 5) break;?>
<?php endforeach;?>
</ul>
</div>
</aside>
</div>


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

@ -29,7 +29,7 @@
<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
<?php } ?>
<div class="date">
<span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
<span itemprop="datePublished"><?php echo format_date($p->date) ?></span> - Posted in
<span itemprop="articleSection"><?php echo $p->category ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span>
<?php if (disqus_count()) { ?> -


+ 1
- 3
themes/logs/post.html.php View File

@ -11,7 +11,7 @@
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<?php } ?>
<div class="date">
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo date('d F Y', $p->date) ?></a></span>
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>" title="Show all posts made on this month"><?php echo format_date($p->date) ?></a></span>
- Posted in
<span itemprop="articleSection"><?php echo $p->category ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorUrl ?>"><?php echo $p->author ?></a></span> -
@ -54,8 +54,6 @@
href="https://twitter.com/share?url=<?php echo $p->url ?>&text=<?php echo $p->title ?>">Twitter</a>
<a class="facebook" target="_blank"
href="https://www.facebook.com/sharer.php?u=<?php echo $p->url ?>&t=<?php echo $p->title ?>">Facebook</a>
<a class="googleplus" target="_blank"
href="https://plus.google.com/share?url=<?php echo $p->url ?>">Google+</a>
</div>
</div>
<div class="related">


+ 1
- 1
themes/logs/profile.html.php View File

@ -22,7 +22,7 @@
$i++; ?>
<li class="<?php echo $class; ?>">
<span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
<span><?php echo date('d F Y', $p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
<span><?php echo format_date($p->date) ?></span> - Posted in <span><?php echo $p->tag ?></span>
</li>
<?php endforeach; ?>
</ul>


+ 7
- 1
themes/twentyfifteen/css/style.css View File

@ -880,7 +880,7 @@ a:focus {
content: "\f516";
}
.social-navigation a[href$="/feed/"]:before {
.social-navigation a[href$="/feed/rss"]:before {
content: "\f413";
}
@ -2092,6 +2092,12 @@ a.post-thumbnail:focus {
margin-bottom: 0;
}
.entry-content figcaption,
.entry-summary figcaption {
font-style: italic;
text-align: center;
padding-bottom: .5em;
}
/**
* 12.2 Post Formats


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

@ -19,7 +19,7 @@
</head>
<?php
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}


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

@ -50,7 +50,7 @@
</div>
<footer class="entry-footer">
<span class="posted-on">
<a href="<?php echo $p->url;?>" rel="permalink"><time class="entry-date published updated"><?php echo date('F d, Y', $p->date) ?></time></a>
<a href="<?php echo $p->url;?>" rel="permalink"><time class="entry-date published updated"><?php echo format_date($p->date) ?></time></a>
</span>
<span class="byline">
<span class="author vcard">


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

@ -48,7 +48,7 @@
</div>
<footer class="entry-footer">
<span class="posted-on">
<a href="<?php echo $p->url;?>" rel="permalink"><time class="entry-date published updated"><?php echo date('F d, Y', $p->date) ?></time></a>
<a href="<?php echo $p->url;?>" rel="permalink"><time class="entry-date published updated"><?php echo format_date($p->date) ?></time></a>
</span>
<span class="byline">
<span class="author vcard">


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

@ -19,7 +19,7 @@
$i++; ?>
<li class="<?php echo $class; ?>">
<span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
<span><?php echo date('d F Y', $p->date) ?></span> - <?php echo i18n('Posted_in');?> <span><?php echo $p->tag ?></span>
<span><?php echo format_date($p->date) ?></span> - <?php echo i18n('Posted_in');?> <span><?php echo $p->tag ?></span>
</li>
<?php endforeach; ?>
</ul>


+ 6
- 0
themes/twentysixteen/css/style.css View File

@ -2102,6 +2102,12 @@ body.search-no-results .page-header {
margin-bottom: 3.5em;
}
.entry-content figcaption,
.entry-summary figcaption {
font-style: italic;
text-align: center;
padding-bottom: .5em;
}
/**
* 11.3 - Post Formats


+ 1
- 2
themes/twentysixteen/layout.html.php View File

@ -21,7 +21,7 @@
</head>
<?php
if (isset($_GET['search'])) {
$search = $_GET['search'];
$search = _h($_GET['search']);
$url = site_url() . 'search/' . remove_accent($search);
header("Location: $url");
}
@ -135,7 +135,6 @@
<ul class="social-links-menu" id="menu-social-links">
<li><a href="<?php echo config('social.twitter');?>"><span class="screen-reader-text">Twitter</span></a></li>
<li><a href="<?php echo config('social.facebook');?>"><span class="screen-reader-text">Facebook</span></a></li>
<li><a href="<?php echo config('social.google');?>"><span class="screen-reader-text">Google+</span></a></li>
<li><a href="<?php echo config('social.github');?>"><span class="screen-reader-text">GitHub</span></a></li>
</ul>
</div>


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

@ -50,7 +50,7 @@
<footer class="entry-footer">
<span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->author;?>" 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->author;?></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 date('d F Y', $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="tags-links"><span class="screen-reader-text">Tags </span><?php echo $p->tag;?></span>
<?php if (disqus_count()) { ?>


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

@ -54,7 +54,7 @@
<footer class="entry-footer">
<span class="byline"><span class="author vcard"><a href="<?php echo $p->authorUrl;?>"><img alt="<?php echo $p->author;?>" title="<?php echo $p->author;?>" 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->author;?></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 date('d F Y', $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>
<span class="cat-links"><span class="screen-reader-text"><?php echo i18n('Category');?> </span><?php echo $p->category;?></span>


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

@ -19,7 +19,7 @@
$i++; ?>
<li class="<?php echo $class; ?>">
<span><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></span> on
<span><?php echo date('d F Y', $p->date) ?></span> - Posted in <span class="tags-links"><?php echo $p->tag ?></span>
<span><?php echo format_date($p->date) ?></span> - Posted in <span class="tags-links"><?php echo $p->tag ?></span>
</li>
<?php endforeach; ?>
</ul>


Write Preview
Loading…
Cancel
Save