Browse Source

Templating Improvements

Move the title, description, and canonical from the head_contents for
better templating. Eg. for Twitter Card or OG.
pull/189/head
Danang Probo Sayekti 10 years ago
parent
commit
7de2b1b744
24 changed files with 291 additions and 272 deletions
  1. +4
    -1
      system/admin/views/layout.html.php
  2. +147
    -49
      system/htmly.php
  3. +6
    -15
      system/includes/functions.php
  4. +0
    -2
      themes/clean/404-search.html.php
  5. +0
    -2
      themes/clean/404.html.php
  6. +10
    -10
      themes/clean/layout.html.php
  7. +10
    -15
      themes/clean/main.html.php
  8. +8
    -16
      themes/clean/post.html.php
  9. +11
    -14
      themes/clean/profile.html.php
  10. +3
    -5
      themes/clean/static.html.php
  11. +1
    -3
      themes/default/404-search.html.php
  12. +1
    -3
      themes/default/404.html.php
  13. +12
    -14
      themes/default/layout.html.php
  14. +10
    -15
      themes/default/main.html.php
  15. +11
    -22
      themes/default/post.html.php
  16. +11
    -14
      themes/default/profile.html.php
  17. +3
    -5
      themes/default/static.html.php
  18. +1
    -5
      themes/logs/404-search.html.php
  19. +1
    -5
      themes/logs/404.html.php
  20. +13
    -14
      themes/logs/layout.html.php
  21. +10
    -15
      themes/logs/main.html.php
  22. +7
    -13
      themes/logs/post.html.php
  23. +11
    -14
      themes/logs/profile.html.php
  24. +0
    -1
      themes/logs/static.html.php

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

@ -1,7 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<?php echo $head_contents ?>
<?php echo head_contents() ?>
<title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" />
<link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
<link href='//fonts.googleapis.com/css?family=Open+Sans:400,700' rel='stylesheet' type='text/css'>
<?php if (publisher()): ?>


+ 147
- 49
system/htmly.php View File

@ -38,7 +38,9 @@ get('/index', function () {
// a non-existing page
render('no-posts', array(
'head_contents' => head_contents(blog_title() . $tagline, blog_description(), site_url()),
'title' => blog_title() . $tagline,
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'noposts',
));
@ -46,7 +48,9 @@ get('/index', function () {
}
render('main', array(
'head_contents' => head_contents(blog_title() . $tagline, blog_description(), site_url()),
'title' => blog_title() . $tagline,
'description' => blog_description(),
'canonical' => site_url(),
'page' => $page,
'posts' => $posts,
'bodyclass' => 'infront',
@ -73,7 +77,9 @@ post('/login', function () {
config('views.root', 'system/admin/views');
render('login', array(
'head_contents' => head_contents('Login - ' . blog_title(), 'Login page on ' . blog_title(), site_url()),
'title' => 'Login - ' . blog_title(),
'description' => 'Login page on ' . blog_title(),
'canonical' => site_url(),
'error' => '<ul>' . $log . '</ul>',
'bodyclass' => 'editprofile',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Login'
@ -97,7 +103,9 @@ post('/login', function () {
config('views.root', 'system/admin/views');
render('login', array(
'head_contents' => head_contents('Login - ' . blog_title(), 'Login page on ' . blog_title(), site_url()),
'title' => 'Login - ' . blog_title(),
'description' => 'Login page on ' . blog_title(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'username' => $user,
'password' => $pass,
@ -129,7 +137,9 @@ get("/:static/:sub/edit", function ($static, $sub) {
$page = $page[0];
render('edit-page', array(
'head_contents' => head_contents('Edit page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'editpage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . $post->url . '">' . $post->title . '</a> &#187; ',
'p' => $page,
@ -178,7 +188,9 @@ post("/:static/:sub/edit", function ($static, $sub) {
config('views.root', 'system/admin/views');
render('edit-page', array(
'head_contents' => head_contents('Edit page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'oldfile' => $oldfile,
'postTitle' => $title,
@ -212,7 +224,9 @@ get("/:static/:sub/delete", function ($static, $sub) {
$page = $page[0];
render('delete-page', array(
'head_contents' => head_contents('Delete page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Delete page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'deletepage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . $post->url . '">' . $post->title . '</a>' . $page->title,
'p' => $page,
@ -279,7 +293,9 @@ get('/:year/:month/:name', function ($year, $month, $name) {
}
render('post', array(
'head_contents' => head_contents($current->title . ' - ' . blog_title(), $current->description, $current->url),
'title' => $current->title . ' - ' . blog_title(),
'description' => $current->description,
'canonical' => $current->url,
'p' => $current,
'authorinfo' => authorinfo($bio->title, $bio->body),
'bodyclass' => 'inpost',
@ -309,14 +325,18 @@ get('/:year/:month/:name/edit', function ($year, $month, $name) {
if ($user === $current->author || $role === 'admin') {
render('edit-post', array(
'head_contents' => head_contents('Edit post - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit post - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'p' => $current,
'bodyclass' => 'editpost',
'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
));
} else {
render('denied', array(
'head_contents' => head_contents('Edit post - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit post - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'p' => $current,
'bodyclass' => 'denied',
'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
@ -371,7 +391,9 @@ post('/:year/:month/:name/edit', function () {
config('views.root', 'system/admin/views');
render('edit-post', array(
'head_contents' => head_contents('Edit post - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit post - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'oldfile' => $oldfile,
'postTitle' => $title,
@ -405,14 +427,18 @@ get('/:year/:month/:name/delete', function ($year, $month, $name) {
if ($user === $current->author || $role === 'admin') {
render('delete-post', array(
'head_contents' => head_contents('Delete post - ' . blog_title(), blog_description(), site_url()),
'title' => 'Delete post - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'p' => $current,
'bodyclass' => 'deletepost',
'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
));
} else {
render('denied', array(
'head_contents' => head_contents('Delete post - ' . blog_title(), blog_description(), site_url()),
'title' => 'Delete post - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'p' => $current,
'bodyclass' => 'deletepost',
'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
@ -460,7 +486,9 @@ get('/author/:profile', function ($profile) {
if (empty($posts) || $page < 1) {
render('profile', array(
'head_contents' => head_contents('Profile for: ' . $bio->title . ' - ' . blog_title(), 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.', site_url() . 'author/' . $profile),
'title' => 'Profile for: ' . $bio->title . ' - ' . blog_title(),
'description' => 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.',
'canonical' => site_url() . 'author/' . $profile,
'page' => $page,
'posts' => null,
'bio' => $bio->body,
@ -473,7 +501,9 @@ get('/author/:profile', function ($profile) {
}
render('profile', array(
'head_contents' => head_contents('Profile for: ' . $bio->title . ' - ' . blog_title(), 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.', site_url() . 'author/' . $profile),
'title' => 'Profile for: ' . $bio->title . ' - ' . blog_title(),
'description' => 'Profile page and all posts by ' . $bio->title . ' on ' . blog_title() . '.',
'canonical' => site_url() . 'author/' . $profile,
'page' => $page,
'posts' => $posts,
'bio' => $bio->body,
@ -491,7 +521,9 @@ get('/edit/profile', function () {
config('views.root', 'system/admin/views');
render('edit-profile', array(
'head_contents' => head_contents('Edit profile - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit profile - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'editprofile',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Edit profile',
));
@ -525,7 +557,9 @@ post('/edit/profile', function () {
config('views.root', 'system/admin/views');
render('edit-profile', array(
'head_contents' => head_contents('Edit profile - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit profile - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'postTitle' => $title,
'postContent' => $content,
@ -557,7 +591,9 @@ get('/admin/posts', function () {
// a non-existing page
render('no-posts', array(
'head_contents' => head_contents('All blog posts - ' . blog_title(), blog_description(), site_url()),
'title' => 'All blog posts - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'noposts',
));
@ -573,7 +609,9 @@ get('/admin/posts', function () {
}
render('posts-list', array(
'head_contents' => head_contents('All blog posts - ' . blog_title(), blog_description(), site_url()),
'title' => 'All blog posts - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'heading' => 'All blog posts',
'page' => $page,
'posts' => $posts,
@ -583,7 +621,9 @@ get('/admin/posts', function () {
));
} else {
render('denied', array(
'head_contents' => head_contents('All blog posts - ' . blog_title(), blog_description(), site_url()),
'title' => 'All blog posts - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'denied',
'breadcrumb' => '',
));
@ -621,7 +661,9 @@ get('/admin/mine', function () {
if (empty($posts) || $page < 1) {
render('user-posts', array(
'head_contents' => head_contents('My blog posts - ' . blog_title(), blog_description(), site_url()),
'title' => 'My blog posts - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'page' => $page,
'heading' => 'My posts',
'posts' => null,
@ -635,7 +677,9 @@ get('/admin/mine', function () {
}
render('user-posts', array(
'head_contents' => head_contents('My blog posts - ' . blog_title(), blog_description(), site_url()),
'title' => 'My blog posts - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'heading' => 'My posts',
'page' => $page,
'posts' => $posts,
@ -679,7 +723,9 @@ get('/:static', function ($static) {
if (login()) {
config('views.root', 'system/admin/views');
render('main', array(
'head_contents' => head_contents('Admin - ' . blog_title(), blog_description(), site_url()),
'title' => 'Admin - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'adminfront',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Admin'
));
@ -691,7 +737,9 @@ get('/:static', function ($static) {
} elseif ($static === 'login') {
config('views.root', 'system/admin/views');
render('login', array(
'head_contents' => head_contents('Login - ' . blog_title(), 'Login page from ' . blog_title() . '.', site_url() . '/login'),
'title' => 'Login - ' . blog_title(),
'description' => 'Login page from ' . blog_title() . '.',
'canonical' => site_url() . '/login',
'bodyclass' => 'inlogin',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Login'
));
@ -700,7 +748,9 @@ get('/:static', function ($static) {
if (login()) {
config('views.root', 'system/admin/views');
render('logout', array(
'head_contents' => head_contents('Logout - ' . blog_title(), blog_description(), site_url()),
'title' => 'Logout - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'inlogout',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Logout'
));
@ -733,7 +783,9 @@ get('/:static', function ($static) {
}
render('static', array(
'head_contents' => head_contents($post->title . ' - ' . blog_title(), $post->description, $post->url),
'title' => $post->title . ' - ' . blog_title(),
'description' => $post->description,
'canonical' => $post->url,
'bodyclass' => 'inpage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . $post->title,
'p' => $post,
@ -757,7 +809,9 @@ get('/:static/edit', function ($static) {
$post = $post[0];
render('edit-page', array(
'head_contents' => head_contents('Edit page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'editpage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . $post->title,
'p' => $post,
@ -805,7 +859,9 @@ post('/:static/edit', function () {
config('views.root', 'system/admin/views');
render('edit-page', array(
'head_contents' => head_contents('Edit page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Edit page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'oldfile' => $oldfile,
'postTitle' => $title,
@ -832,7 +888,9 @@ get('/:static/delete', function ($static) {
$post = $post[0];
render('delete-page', array(
'head_contents' => head_contents('Delete page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Delete page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'deletepage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; ' . $post->title,
'p' => $post,
@ -863,7 +921,9 @@ get('/add/post', function () {
config('views.root', 'system/admin/views');
render('add-post', array(
'head_contents' => head_contents('Add post - ' . blog_title(), blog_description(), site_url()),
'title' => 'Add post - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'addpost',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add post'
));
@ -909,7 +969,9 @@ post('/add/post', function () {
}
config('views.root', 'system/admin/views');
render('add-post', array(
'head_contents' => head_contents('Add post - ' . blog_title(), blog_description(), site_url()),
'title' => 'Add post- ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'postTitle' => $title,
'postFi' => $fi,
@ -931,7 +993,9 @@ get('/add/page', function () {
config('views.root', 'system/admin/views');
render('add-page', array(
'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Add page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'addpage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add page'
));
@ -949,7 +1013,9 @@ get('/add/page', function () {
config('views.root', 'system/admin/views');
render('add-page', array(
'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Add page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'addpage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Add page'
));
@ -988,7 +1054,9 @@ post('/add/page', function () {
}
config('views.root', 'system/admin/views');
render('add-page', array(
'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Add page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'postTitle' => $title,
'postUrl' => $url,
@ -1004,7 +1072,9 @@ get('/admin/import', function () {
if (login()) {
config('views.root', 'system/admin/views');
render('import', array(
'head_contents' => head_contents('Import feed - ' . blog_title(), blog_description(), site_url()),
'title' => 'Import feed - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'importfeed',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Import feed'
));
@ -1032,7 +1102,9 @@ post('/admin/import', function () {
config('views.root', 'system/admin/views');
render('import', array(
'head_contents' => head_contents('Import feed - ' . blog_title(), blog_description(), site_url()),
'title' => 'Import feed - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $log . '</ul>',
'bodyclass' => 'editprofile',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Import feed'
@ -1050,7 +1122,9 @@ post('/admin/import', function () {
config('views.root', 'system/admin/views');
render('import', array(
'head_contents' => head_contents('Import feed - ' . blog_title(), blog_description(), site_url()),
'title' => 'Import feed - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'url' => $url,
'bodyclass' => 'editprofile',
@ -1064,7 +1138,9 @@ get('/admin/config', function () {
if (login()) {
config('views.root', 'system/admin/views');
render('config', array(
'head_contents' => head_contents('Config - ' . blog_title(), blog_description(), site_url()),
'title' => 'Config - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'config',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Config'
));
@ -1112,7 +1188,9 @@ get('/admin/backup', function () {
if (login()) {
config('views.root', 'system/admin/views');
render('backup', array(
'head_contents' => head_contents('Backup content - ' . blog_title(), blog_description(), site_url()),
'title' => 'Backup content - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'backup',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Backup'
));
@ -1128,7 +1206,9 @@ get('/admin/backup-start', function () {
if (login()) {
config('views.root', 'system/admin/views');
render('backup-start', array(
'head_contents' => head_contents('Backup content started - ' . blog_title(), blog_description(), site_url()),
'title' => 'Backup content started - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'startbackup',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Backup started'
));
@ -1144,7 +1224,9 @@ get('/admin/clear-cache', function () {
if (login()) {
config('views.root', 'system/admin/views');
render('clear-cache', array(
'head_contents' => head_contents('Clearing cache started - ' . blog_title(), blog_description(), site_url()),
'title' => 'Clearing cache started - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'clearcache',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Clearing cache started'
));
@ -1177,7 +1259,9 @@ get('/tag/:tag', function ($tag) {
}
render('main', array(
'head_contents' => head_contents('Posts tagged: ' . $tag . ' - ' . blog_title(), 'All posts tagged: ' . $tag . ' on ' . blog_title() . '.', site_url() . 'tag/' . $tag),
'title' => 'Posts tagged: ' . $tag . ' - ' . blog_title(),
'description' => 'All posts tagged: ' . $tag . ' on ' . blog_title() . '.',
'canonical' => site_url() . 'tag/' . $tag,
'page' => $page,
'posts' => $posts,
'bodyclass' => 'intag',
@ -1223,7 +1307,9 @@ get('/archive/:req', function ($req) {
}
render('main', array(
'head_contents' => head_contents('Archive for: ' . $timestamp . ' - ' . blog_title(), 'Archive page for: ' . $timestamp . ' on ' . blog_title() . '.', site_url() . 'archive/' . $req),
'title' => 'Archive for: ' . $timestamp . ' - ' . blog_title(),
'description' => 'Archive page for: ' . $timestamp . ' on ' . blog_title() . '.',
'canonical' => site_url() . 'archive/' . $req,
'page' => $page,
'posts' => $posts,
'bodyclass' => 'inarchive',
@ -1254,7 +1340,9 @@ get('/search/:keyword', function ($keyword) {
}
render('main', array(
'head_contents' => head_contents('Search results for: ' . $keyword . ' - ' . blog_title(), 'Search results for: ' . $keyword . ' on ' . blog_title() . '.', site_url() . 'search/' . $keyword),
'title' => 'Search results for: ' . $keyword . ' - ' . blog_title(),
'description' => 'Search results for: ' . $keyword . ' on ' . blog_title() . '.',
'canonical' => site_url() . 'search/' . $keyword,
'page' => $page,
'posts' => $posts,
'bodyclass' => 'insearch',
@ -1298,7 +1386,9 @@ get('/admin/update', function () {
if (login()) {
config('views.root', 'system/admin/views');
render('update', array(
'head_contents' => head_contents('Check for Update - ' . blog_title(), blog_description(), site_url()),
'title' => 'Check for Update - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'updatepage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Update HTMLy'
));
@ -1320,7 +1410,9 @@ get('/admin/update/now/:csrf', function ($CSRF) {
$updater->update();
config('views.root', 'system/admin/views');
render('updated-to', array(
'head_contents' => head_contents('Updated - ' . blog_title(), blog_description(), site_url()),
'title' => 'Updated - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'info' => $updater->getCurrentInfo(),
'bodyclass' => 'updatepage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; Update HTMLy'
@ -1346,7 +1438,9 @@ get('/:static/add', function ($static) {
$post = $post[0];
render('add-page', array(
'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Add page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'bodyclass' => 'addpage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . $post->url . '">' . $post->title . '</a> Add page'
));
@ -1383,7 +1477,9 @@ post('/:static/add', function ($static) {
}
config('views.root', 'system/admin/views');
render('add-page', array(
'head_contents' => head_contents('Add page - ' . blog_title(), blog_description(), site_url()),
'title' => 'Add page - ' . blog_title(),
'description' => blog_description(),
'canonical' => site_url(),
'error' => '<ul>' . $message['error'] . '</ul>',
'postTitle' => $title,
'postUrl' => $url,
@ -1415,7 +1511,9 @@ get('/:static/:sub', function ($static, $sub) {
}
render('static', array(
'head_contents' => head_contents($post->title . ' - ' . blog_title(), $post->description, $post->url),
'title' => $post->title . ' - ' . blog_title(),
'description' => $post->description,
'canonical' => $post->url,
'bodyclass' => 'inpage',
'breadcrumb' => '<a href="' . site_url() . '">' . config('breadcrumb.home') . '</a> &#187; <a href="' . $father_post[0]->url . '">' . $father_post[0]->title . '</a> &#187; ' . $post->title,
'p' => $post,


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

@ -578,13 +578,13 @@ function get_related($tag)
if ($total >= 1) {
$i = 1;
echo '<div class="related"><h4>Related posts</h4><ul>';
echo '<ul>';
foreach ($tmp as $post) {
echo '<li><a href="' . $post->url . '">' . $post->title . '</a></li>';
if ($i++ >= $perpage)
break;
}
echo '</ul></div>';
echo '</ul>';
}
}
@ -679,7 +679,6 @@ function archive_list()
$script = <<<EOF
if (this.parentNode.className.indexOf('expanded') > -1){this.parentNode.className = 'collapsed';this.innerHTML = '&#9658;';} else {this.parentNode.className = 'expanded';this.innerHTML = '&#9660;';}
EOF;
echo '<h3>Archive</h3>';
$i = 0;
$len = count($by_year);
foreach ($by_year as $year => $months) {
@ -737,7 +736,6 @@ function tag_cloud()
$tag_collection = array_count_values($tags);
ksort($tag_collection);
echo '<h3>Tags</h3>';
echo '<ul class="taglist">';
foreach ($tag_collection as $tag => $count) {
echo '<li class="item"><a href="' . site_url() . 'tag/' . $tag . '">' . $tag . '</a> <span class="count">(' . $count . ')</span></li>';
@ -963,10 +961,6 @@ function recent_comments()
$comment = config('comment.system');
$disqus = config('disqus.shortname');
$script = <<<EOF
<script type="text/javascript">
var heading ='<h3>Comments</h3>';
document.write(heading);
</script>
<script type="text/javascript" src="//{$disqus}.disqus.com/recent_comments_widget.js?num_items=5&hide_avatars=0&avatar_size=48&excerpt_length=200&hide_mods=0"></script>
<style>li.dsq-widget-item {border-bottom: 1px solid #ebebeb;margin:0;margin-bottom:10px;padding:0;padding-bottom:10px;}a.dsq-widget-user {font-weight:normal;}img.dsq-widget-avatar {margin-right:10px; }.dsq-widget-comment {display:block;padding-top:5px;}.dsq-widget-comment p {display:block;margin:0;}p.dsq-widget-meta {padding-top:5px;margin:0;}#dsq-combo-widget.grey #dsq-combo-content .dsq-combo-box {background: transparent;}#dsq-combo-widget.grey #dsq-combo-tabs li {background: none repeat scroll 0 0 #DDDDDD;}</style>
EOF;
@ -1600,22 +1594,19 @@ function authorinfo($title = null, $body = null)
}
}
function head_contents($title, $description, $canonical)
function head_contents()
{
$styleImage = config('lightbox');
$jq = config('jquery');
$output = '';
$wmt_id = config('google.wmt.id');
$title = '<title>' . $title . '</title>';
$favicon = '<link rel="icon" type="image/x-icon" href="' . site_url() . 'favicon.ico" />';
$charset = '<meta charset="utf-8" />';
$generator = '<meta name="generator" content="htmly" />';
$xua = '<meta http-equiv="X-UA-Compatible" content="IE=edge" />';
$viewport = '<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />';
$description = '<meta name="description" content="' . $description . '"/>';
$sitemap = '<link rel="sitemap" href="' . site_url() . 'sitemap.xml" />';
$canonical = '<link rel="canonical" href="' . $canonical . '" />';
$feed = '<link rel="alternate" type="application/rss+xml" title="' . blog_title() . ' Feed" href="' . site_url() . 'feed/rss" />';
$lightboxcss = '<link href="' . site_url() . 'system/plugins/lightbox/css/lightbox.css" rel="stylesheet" />';
$jquery = '<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>';
@ -1627,12 +1618,12 @@ function head_contents($title, $description, $canonical)
}
if ($styleImage == 'on') {
$output .= $charset . "\n" . $xua . "\n" . $title . "\n" . $description . "\n" . $viewport . "\n" . $generator . "\n" . $webmasterTools . "\n" . $favicon . "\n" . $canonical . "\n" . $sitemap . "\n" . $feed . "\n" . $lightboxcss . "\n" . $jquery . "\n" . $lightbox . "\n" . $corejs . "\n";
$output .= $charset . "\n" . $xua . "\n" . $viewport . "\n" . $generator . "\n" . $favicon . $sitemap . "\n" . $feed . "\n" . $lightboxcss . "\n" . $jquery . "\n" . $lightbox . "\n" . $corejs . "\n" . $webmasterTools;
} else {
if ($jq == 'enable') {
$output .= $charset . "\n" . $xua . "\n" . $title . "\n" . $description . "\n" . $viewport . "\n" . $generator . "\n" . $webmasterTools . "\n" . $favicon . "\n" . $canonical . "\n" . $sitemap . "\n" . $feed . "\n" . $jquery . "\n";
$output .= $charset . "\n" . $xua . "\n" . $viewport . "\n" . $generator . "\n" . $favicon . "\n" . $sitemap . "\n" . $feed . "\n" . $jquery . "\n" . $webmasterTools;
} else {
$output .= $charset . "\n" . $xua . "\n" . $title . "\n" . $description . "\n" . $viewport . "\n" . $generator . "\n" . $webmasterTools . "\n" . $favicon . "\n" . $canonical . "\n" . $sitemap . "\n" . $feed . "\n";
$output .= $charset . "\n" . $xua . "\n" . $viewport . "\n" . $generator . "\n" . $favicon . "\n" . $sitemap . "\n" . $feed . "\n" . $webmasterTools;
}
}


+ 0
- 2
themes/clean/404-search.html.php View File

@ -7,13 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
<title>Search results not found! - <?php echo blog_title() ?></title>
<link href="<?php echo site_url() ?>themes/clean/css/style.css" rel="stylesheet"/>
<!-- Include the Open Sans font -->
<link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/>
</head>
<body>
<div class="center message">
<h1>Search results not found!</h1>
<div class="search">
<?php echo search() ?>
</div>


+ 0
- 2
themes/clean/404.html.php View File

@ -7,13 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
<title>404 Not Found - <?php echo blog_title() ?></title>
<link href="<?php echo site_url() ?>themes/clean/css/style.css" rel="stylesheet"/>
<!-- Include the Open Sans font -->
<link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/>
</head>
<body>
<div class="center message">
<h1>This page doesn't exist!</h1>
<p>Would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
</div>
</body>

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

@ -1,11 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<?php echo $head_contents ?>
<?php echo head_contents() ?>
<title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" />
<link href="<?php echo site_url() ?>themes/clean/css/style.css" rel="stylesheet"/>
<link href="//fonts.googleapis.com/css?family=Open+Sans+Condensed:700&subset=latin,cyrillic-ext" rel="stylesheet"/>
<?php if (publisher()): ?>
<link href="<?php echo publisher() ?>" rel="publisher" /><?php endif; ?>
<link href="<?php echo publisher() ?>" rel="publisher" />
<?php endif; ?>
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@ -15,12 +19,8 @@
<meta content="<?php echo blog_title() ?>" itemprop="name"/>
<meta content="<?php echo blog_description() ?>" itemprop="description"/>
</div>
<?php if (facebook()) {
echo facebook();
} ?>
<?php if (login()) {
toolbar();
} ?>
<?php if (facebook()) { echo facebook(); } ?>
<?php if (login()) { toolbar(); } ?>
<aside>
<?php if (is_index()) { ?>
<h1 class="blog-title"><a rel="home" href="<?php echo site_url() ?>"><?php echo blog_title() ?></a></h1>
@ -33,8 +33,8 @@
<div class="social"><?php echo social() ?></div>
<div class="menu"><?php echo menu() ?></div>
<div class="recent"><h3>Recent Posts</h3><?php echo recent() ?></div>
<div class="archive"><?php echo archive_list() ?></div>
<div class="tagcloud"><?php echo tag_cloud() ?></div>
<div class="archive"><h3>Archive</h3><?php echo archive_list() ?></div>
<div class="tagcloud"><h3>Tags</h3><?php echo tag_cloud() ?></div>
<div class="copyright"><?php echo copyright() ?></div>
</aside>
<section id="content">


+ 10
- 15
themes/clean/main.html.php View File

@ -1,32 +1,27 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div><?php endif; ?>
<?php $i = 0;
$len = count($posts); ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<?php $i = 0; $len = count($posts); ?>
<?php foreach ($posts as $p): ?>
<?php
if ($i == 0) {
<?php if ($i == 0) {
$class = 'post first';
} elseif ($i == $len - 1) {
$class = 'post last';
} else {
$class = 'post';
}
$i++;
?>
<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope"
itemtype="http://schema.org/BlogPosting">
$i++; ?>
<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
<div class="date">
<span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
<span itemprop="articleSection"><?php echo $p->tag ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
<?php
if (disqus_count()) { ?> - <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
<?php if (disqus_count()) { ?> -
<span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
<?php } elseif (facebook()) { ?> -
<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count
href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
<?php } ?>
</div>
<?php if (!empty($p->image)) { ?>
@ -58,4 +53,4 @@ $len = count($posts); ?>
<?php endif; ?>
<?php if (disqus_count()): ?>
<?php echo disqus_count() ?>
<?php endif; ?>
<?php endif; ?>

+ 8
- 16
themes/clean/post.html.php View File

@ -1,17 +1,13 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div><?php endif; ?>
<?php if (login()) {
echo tab($p);
} ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<?php if (login()) { echo tab($p); } ?>
<div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<a name="more"></a>
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<div class="date">
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>"
title="Show all posts made on this day"><?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 day"><?php echo date('d F Y', $p->date) ?></a></span>
- Posted in
<span itemprop="articleSection"><?php echo $p->tag ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span> -
@ -47,8 +43,7 @@
<?php echo get_related($p->tag) ?>
<div id="comments" class="comments border">
<?php if (facebook()): ?>
<div class="fb-comments" data-href="<?php echo $p->url ?>" data-numposts="<?php echo config('fb.num') ?>"
data-colorscheme="<?php echo config('fb.color') ?>"></div>
<div class="fb-comments" data-href="<?php echo $p->url ?>" data-numposts="<?php echo config('fb.num') ?>" data-colorscheme="<?php echo config('fb.color') ?>"></div>
<?php endif; ?>
<?php if (disqus()): ?>
<div id="disqus_thread"></div>
@ -56,16 +51,13 @@
</div>
<div class="postnav">
<?php if (!empty($next)): ?>
<span><a href="<?php echo($next['url']); ?>" class="pagination-arrow newer"
rel="next"><?php echo($next['title']); ?></a></span>
<span><a href="<?php echo($next['url']); ?>" class="pagination-arrow newer" rel="next"><?php echo($next['title']); ?></a></span>
<?php endif; ?>
<?php if (!empty($prev)): ?>
<span><a href="<?php echo($prev['url']); ?>" class="pagination-arrow older"
rel="prev"><?php echo($prev['title']); ?></a></span>
<span><a href="<?php echo($prev['url']); ?>" class="pagination-arrow older" rel="prev"><?php echo($prev['title']); ?></a></span>
<?php endif; ?>
</div>
<?php if (disqus()): ?>
<?php echo disqus($p->title, $p->url) ?>
<?php endif; ?>
</div>
</div>

+ 11
- 14
themes/clean/profile.html.php View File

@ -1,28 +1,25 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div><?php endif; ?>
<div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
<div class="profile" itemtype="http://schema.org/Person" itemscope="itemscope" itemprop="Person">
<h1 class="title-post" itemprop="name"><?php echo $name ?></h1>
<div class="bio" itemprop="description"><?php echo $bio ?></div>
</div>
<div class="breadcrumb"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
<div class="profile" itemtype="http://schema.org/Person" itemscope="itemscope" itemprop="Person">
<h1 class="title-post" itemprop="name"><?php echo $name ?></h1>
<div class="bio" itemprop="description"><?php echo $bio ?></div>
</div>
<h2 class="post-index">Posts by this author</h2>
</div>
<h2 class="post-index">Posts by this author</h2>
<?php if (!empty($posts)) { ?>
<ul class="post-list">
<?php $i = 0;
$len = count($posts); ?>
<?php $i = 0; $len = count($posts); ?>
<?php foreach ($posts as $p): ?>
<?php
if ($i == 0) {
<?php if ($i == 0) {
$class = 'item first';
} elseif ($i == $len - 1) {
$class = 'item last';
} else {
$class = 'item';
}
$i++;
?>
$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>


+ 3
- 5
themes/clean/static.html.php View File

@ -1,12 +1,10 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div><?php endif; ?>
<?php if (login()) {
echo tab($p);
} ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<?php if (login()) { echo tab($p); } ?>
<div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<div class="post-body" itemprop="articleBody">
<?php echo $p->body; ?>
</div>


+ 1
- 3
themes/default/404-search.html.php View File

@ -7,13 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
<title>Search results not found! - <?php echo blog_title() ?></title>
<link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
<!-- Include the Open Sans font -->
<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">
</head>
<body>
<div class="center message">
<h1>Search results not found!</h1>
<div class="search-404">
<?php echo search() ?>
</div>


+ 1
- 3
themes/default/404.html.php View File

@ -7,13 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
<title>404 Not Found - <?php echo blog_title() ?></title>
<link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
<!-- Include the Open Sans font -->
<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">
</head>
<body>
<div class="center message">
<h1>This page doesn't exist!</h1>
<p>Would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
</div>
</body>

+ 12
- 14
themes/default/layout.html.php View File

@ -1,11 +1,15 @@
<!DOCTYPE html>
<html>
<head>
<?php echo $head_contents ?>
<?php echo head_contents() ?>
<title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" />
<link href="<?php echo site_url() ?>themes/default/css/style.css" rel="stylesheet"/>
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
<?php if (publisher()): ?>
<link href="<?php echo publisher() ?>" rel="publisher" /><?php endif; ?>
<link href="<?php echo publisher() ?>" rel="publisher" />
<?php endif; ?>
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@ -15,12 +19,8 @@
<meta content="<?php echo blog_title() ?>" itemprop="name"/>
<meta content="<?php echo blog_description() ?>" itemprop="description"/>
</div>
<?php if (facebook()) {
echo facebook();
} ?>
<?php if (login()) {
toolbar();
} ?>
<?php if (facebook()) { echo facebook(); } ?>
<?php if (login()) { toolbar(); } ?>
<div id="outer-wrapper">
<div id="menu-wrapper">
<div class="container">
@ -35,11 +35,9 @@
<header id="header">
<section id="branding">
<?php if (is_index()) { ?>
<h1 class="blog-title"><a rel="home"
href="<?php echo site_url() ?>"><?php echo blog_title() ?></a></h1>
<h1 class="blog-title"><a rel="home" href="<?php echo site_url() ?>"><?php echo blog_title() ?></a></h1>
<?php } else { ?>
<h2 class="blog-title"><a rel="home"
href="<?php echo site_url() ?>"><?php echo blog_title() ?></a></h2>
<h2 class="blog-title"><a rel="home" href="<?php echo site_url() ?>"><?php echo blog_title() ?></a></h2>
<?php } ?>
<div class="blog-tagline"><p><?php echo blog_tagline() ?></p></div>
</section>
@ -61,10 +59,10 @@
<div class="inner"><h3>Recent Posts</h3><?php echo recent() ?></div>
</div>
<div class="archive column">
<div class="inner"><?php echo archive_list() ?></div>
<div class="inner"><h3>Archive</h3><?php echo archive_list() ?></div>
</div>
<div class="tagcloud column">
<div class="inner"><?php echo tag_cloud() ?></div>
<div class="inner"><h3>Tags</h3><?php echo tag_cloud() ?></div>
</div>
<div class="social column">
<div class="inner"><h3>Follow</h3><?php echo social() ?></div>


+ 10
- 15
themes/default/main.html.php View File

@ -1,32 +1,27 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div><?php endif; ?>
<?php $i = 0;
$len = count($posts); ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<?php $i = 0; $len = count($posts); ?>
<?php foreach ($posts as $p): ?>
<?php
if ($i == 0) {
<?php if ($i == 0) {
$class = 'post first';
} elseif ($i == $len - 1) {
$class = 'post last';
} else {
$class = 'post';
}
$i++;
?>
<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope"
itemtype="http://schema.org/BlogPosting">
$i++; ?>
<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
<div class="date">
<span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
<span itemprop="articleSection"><?php echo $p->tag ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
<?php
if (disqus_count()) { ?> - <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
<?php if (disqus_count()) { ?> -
<span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
<?php } elseif (facebook()) { ?> -
<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count
href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
<?php } ?>
</div>
<?php if (!empty($p->image)) { ?>
@ -58,4 +53,4 @@ $len = count($posts); ?>
<?php endif; ?>
<?php if (disqus_count()): ?>
<?php echo disqus_count() ?>
<?php endif; ?>
<?php endif; ?>

+ 11
- 22
themes/default/post.html.php View File

@ -1,17 +1,13 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div><?php endif; ?>
<?php if (login()) {
echo tab($p);
} ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<?php if (login()) { echo tab($p); } ?>
<div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<a name="more"></a>
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<div class="date">
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>"
title="Show all posts made on this day"><?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 day"><?php echo date('d F Y', $p->date) ?></a></span>
- Posted in
<span itemprop="articleSection"><?php echo $p->tag ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span> -
@ -36,19 +32,15 @@
<?php echo $authorinfo ?>
<div class="share">
<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>
<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>
<?php echo get_related($p->tag) ?>
<div id="comments" class="comments border">
<?php if (facebook()): ?>
<div class="fb-comments" data-href="<?php echo $p->url ?>" data-numposts="<?php echo config('fb.num') ?>"
data-colorscheme="<?php echo config('fb.color') ?>"></div>
<div class="fb-comments" data-href="<?php echo $p->url ?>" data-numposts="<?php echo config('fb.num') ?>" data-colorscheme="<?php echo config('fb.color') ?>"></div>
<?php endif; ?>
<?php if (disqus()): ?>
<div id="disqus_thread"></div>
@ -56,16 +48,13 @@
</div>
<div class="postnav">
<?php if (!empty($next)): ?>
<span><a href="<?php echo($next['url']); ?>" class="pagination-arrow newer"
rel="next"><?php echo($next['title']); ?></a></span>
<span><a href="<?php echo($next['url']); ?>" class="pagination-arrow newer" rel="next"><?php echo($next['title']); ?></a></span>
<?php endif; ?>
<?php if (!empty($prev)): ?>
<span><a href="<?php echo($prev['url']); ?>" class="pagination-arrow older"
rel="prev"><?php echo($prev['title']); ?></a></span>
<span><a href="<?php echo($prev['url']); ?>" class="pagination-arrow older" rel="prev"><?php echo($prev['title']); ?></a></span>
<?php endif; ?>
</div>
<?php if (disqus()): ?>
<?php echo disqus($p->title, $p->url) ?>
<?php endif; ?>
</div>
</div>

+ 11
- 14
themes/default/profile.html.php View File

@ -1,28 +1,25 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div><?php endif; ?>
<div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
<div class="profile" itemtype="http://schema.org/Person" itemscope="itemscope" itemprop="Person">
<h1 class="title-post" itemprop="name"><?php echo $name ?></h1>
<div class="bio" itemprop="description"><?php echo $bio ?></div>
</div>
<div class="breadcrumb"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
<div class="profile" itemtype="http://schema.org/Person" itemscope="itemscope" itemprop="Person">
<h1 class="title-post" itemprop="name"><?php echo $name ?></h1>
<div class="bio" itemprop="description"><?php echo $bio ?></div>
</div>
<h2 class="post-index">Posts by this author</h2>
</div>
<h2 class="post-index">Posts by this author</h2>
<?php if (!empty($posts)) { ?>
<ul class="post-list">
<?php $i = 0;
$len = count($posts); ?>
<?php $i = 0; $len = count($posts); ?>
<?php foreach ($posts as $p): ?>
<?php
if ($i == 0) {
<?php if ($i == 0) {
$class = 'item first';
} elseif ($i == $len - 1) {
$class = 'item last';
} else {
$class = 'item';
}
$i++;
?>
$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>


+ 3
- 5
themes/default/static.html.php View File

@ -1,12 +1,10 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div><?php endif; ?>
<?php if (login()) {
echo tab($p);
} ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<?php if (login()) { echo tab($p); } ?>
<div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<div class="post-body" itemprop="articleBody">
<?php echo $p->body; ?>
</div>


+ 1
- 5
themes/logs/404-search.html.php View File

@ -7,15 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
<title>Search results not found! - <?php echo blog_title() ?></title>
<link href="<?php echo site_url() ?>themes/logs/css/style.css" rel="stylesheet"/>
<!-- Include the Open Sans font -->
<link
href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic'
rel='stylesheet' type='text/css'>
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
</head>
<body>
<div class="center message">
<h1>Search results not found!</h1>
<div class="search-404">
<?php echo search() ?>
</div>


+ 1
- 5
themes/logs/404.html.php View File

@ -7,15 +7,11 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" user-scalable="no"/>
<title>404 Not Found - <?php echo blog_title() ?></title>
<link href="<?php echo site_url() ?>themes/logs/css/style.css" rel="stylesheet"/>
<!-- Include the Open Sans font -->
<link
href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic'
rel='stylesheet' type='text/css'>
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
</head>
<body>
<div class="center message">
<h1>This page doesn't exist!</h1>
<p>Would you like to try our <a href="<?php echo site_url() ?>">homepage</a> instead?</p>
</div>
</body>

+ 13
- 14
themes/logs/layout.html.php View File

@ -1,11 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<?php echo $head_contents ?>
<?php echo head_contents() ?>
<title><?php echo $title;?></title>
<meta name="description" content="<?php echo $description; ?>"/>
<link rel="canonical" href="<?php echo $canonical; ?>" />
<link href="<?php echo site_url() ?>themes/logs/css/style.css" rel="stylesheet"/>
<link href="//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600&subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic" rel="stylesheet" type="text/css">
<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700" rel="stylesheet" type="text/css">
<?php if (publisher()): ?>
<link href="<?php echo publisher() ?>" rel="publisher" /><?php endif; ?>
<link href="<?php echo publisher() ?>" rel="publisher" /><?php endif; ?>
<!--[if lt IE 9]>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
@ -15,22 +18,16 @@
<meta content="<?php echo blog_title() ?>" itemprop="name"/>
<meta content="<?php echo blog_description() ?>" itemprop="description"/>
</div>
<?php if (facebook()) {
echo facebook();
} ?>
<?php if (login()) {
toolbar();
} ?>
<?php if (facebook()) { echo facebook(); } ?>
<?php if (login()) { toolbar(); } ?>
<div id="cover">
<div id="header-wrapper">
<header id="header" class="responsive">
<div id="branding">
<?php if (is_index()) { ?>
<h1 class="blog-title"><a rel="home" href="<?php echo site_url() ?>"><?php echo blog_title() ?></a>
</h1>
<h1 class="blog-title"><a rel="home" href="<?php echo site_url() ?>"><?php echo blog_title() ?></a></h1>
<?php } else { ?>
<h2 class="blog-title"><a rel="home" href="<?php echo site_url() ?>"><?php echo blog_title() ?></a>
</h2>
<h2 class="blog-title"><a rel="home" href="<?php echo site_url() ?>"><?php echo blog_title() ?></a></h2>
<?php } ?>
<div class="blog-tagline"><p><?php echo blog_tagline() ?></p></div>
</div>
@ -50,7 +47,6 @@
<aside id="sidebar">
<div class="about">
<h3>About</h3>
<p><?php echo blog_description() ?></p>
</div>
<div class="social">
@ -62,14 +58,17 @@
<?php echo recent() ?>
</div>
<div class="archive">
<h3>Archive</h3>
<?php echo archive_list() ?>
</div>
<?php if (disqus()): ?>
<div class="comments">
<h3>Comments</h3>
<?php echo recent_comments() ?>
</div>
<?php endif; ?>
<div class="tagcloud">
<h3>Tags</h3>
<?php echo tag_cloud() ?>
</div>
</aside>


+ 10
- 15
themes/logs/main.html.php View File

@ -1,32 +1,27 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div><?php endif; ?>
<?php $i = 0;
$len = count($posts); ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<?php $i = 0; $len = count($posts); ?>
<?php foreach ($posts as $p): ?>
<?php
if ($i == 0) {
<?php if ($i == 0) {
$class = 'post first';
} elseif ($i == $len - 1) {
$class = 'post last';
} else {
$class = 'post';
}
$i++;
?>
<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope"
itemtype="http://schema.org/BlogPosting">
$i++; ?>
<div class="<?php echo $class ?>" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<h2 class="title-index" itemprop="name"><a href="<?php echo $p->url ?>"><?php echo $p->title ?></a></h2>
<div class="date">
<span itemprop="datePublished"><?php echo date('d F Y', $p->date) ?></span> - Posted in
<span itemprop="articleSection"><?php echo $p->tag ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span>
<?php
if (disqus_count()) { ?> - <span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
<?php } elseif (facebook()) { ?> -
<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count
href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
<?php if (disqus_count()) { ?> -
<span><a href="<?php echo $p->url ?>#disqus_thread">Comments</a></span>
<?php } elseif (facebook()) { ?> -
<a href="<?php echo $p->url ?>#comments"><span><fb:comments-count href=<?php echo $p->url ?>></fb:comments-count> Comments</span></a>
<?php } ?>
</div>
<?php if (!empty($p->image)) { ?>


+ 7
- 13
themes/logs/post.html.php View File

@ -1,17 +1,15 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div><?php endif; ?>
<div class="breadcrumb" xmlns:v="http://rdf.data-vocabulary.org/#"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<?php if (login()) {
echo tab($p);
} ?>
<div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<a name="more"></a>
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<div class="date">
<span itemprop="datePublished"><a href="<?php echo $p->archive ?>"
title="Show all posts made on this day"><?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 day"><?php echo date('d F Y', $p->date) ?></a></span>
- Posted in
<span itemprop="articleSection"><?php echo $p->tag ?></span> by
<span itemprop="author"><a href="<?php echo $p->authorurl ?>"><?php echo $p->author ?></a></span> -
@ -47,8 +45,7 @@
<?php echo get_related($p->tag) ?>
<div id="comments" class="comments border">
<?php if (facebook()): ?>
<div class="fb-comments" data-href="<?php echo $p->url ?>" data-numposts="<?php echo config('fb.num') ?>"
data-colorscheme="<?php echo config('fb.color') ?>"></div>
<div class="fb-comments" data-href="<?php echo $p->url ?>" data-numposts="<?php echo config('fb.num') ?>" data-colorscheme="<?php echo config('fb.color') ?>"></div>
<?php endif; ?>
<?php if (disqus()): ?>
<div id="disqus_thread"></div>
@ -56,16 +53,13 @@
</div>
<div class="postnav">
<?php if (!empty($next)): ?>
<span class="newer">&laquo; <a href="<?php echo($next['url']); ?>"
rel="next"><?php echo($next['title']); ?></a></span>
<span class="newer">&laquo; <a href="<?php echo($next['url']); ?>" rel="next"><?php echo($next['title']); ?></a></span>
<?php endif; ?>
<?php if (!empty($prev)): ?>
<span class="older"><a href="<?php echo($prev['url']); ?>"
rel="prev"><?php echo($prev['title']); ?></a> &raquo;</span>
<span class="older"><a href="<?php echo($prev['url']); ?>" rel="prev"><?php echo($prev['title']); ?></a> &raquo;</span>
<?php endif; ?>
</div>
<?php if (disqus()): ?>
<?php echo disqus($p->title, $p->url) ?>
<?php endif; ?>
</div>
</div>

+ 11
- 14
themes/logs/profile.html.php View File

@ -1,28 +1,25 @@
<?php if (!empty($breadcrumb)): ?>
<div class="breadcrumb"><?php echo $breadcrumb ?></div><?php endif; ?>
<div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
<div class="profile" itemtype="http://schema.org/Person" itemscope="itemscope" itemprop="Person">
<h1 class="title-post" itemprop="name"><?php echo $name ?></h1>
<div class="bio" itemprop="description"><?php echo $bio ?></div>
</div>
<div class="breadcrumb"><?php echo $breadcrumb ?></div>
<?php endif; ?>
<div class="profile-wrapper" itemprop="accountablePerson" itemscope="itemscope">
<div class="profile" itemtype="http://schema.org/Person" itemscope="itemscope" itemprop="Person">
<h1 class="title-post" itemprop="name"><?php echo $name ?></h1>
<div class="bio" itemprop="description"><?php echo $bio ?></div>
</div>
<h2 class="post-index">Posts by this author</h2>
</div>
<h2 class="post-index">Posts by this author</h2>
<?php if (!empty($posts)) { ?>
<ul class="post-list">
<?php $i = 0;
$len = count($posts); ?>
<?php $i = 0; $len = count($posts); ?>
<?php foreach ($posts as $p): ?>
<?php
if ($i == 0) {
<?php if ($i == 0) {
$class = 'item first';
} elseif ($i == $len - 1) {
$class = 'item last';
} else {
$class = 'item';
}
$i++;
?>
$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>


+ 0
- 1
themes/logs/static.html.php View File

@ -6,7 +6,6 @@
<div class="post" itemprop="blogPost" itemscope="itemscope" itemtype="http://schema.org/BlogPosting">
<div class="main">
<h1 class="title-post" itemprop="name"><?php echo $p->title ?></h1>
<div class="post-body" itemprop="articleBody">
<?php echo $p->body; ?>
</div>


Loading…
Cancel
Save