Added meta->title to pages, and subitem fixes

This commit is contained in:
Deon George 2016-07-28 15:18:01 +10:00
parent c5b2785e82
commit 28fe999d54
2 changed files with 2 additions and 1 deletions

View File

@ -356,6 +356,7 @@ abstract class lnApp_ORM extends Kohana_ORM {
public function subitem_add(Model $item) { public function subitem_add(Model $item) {
array_push($this->_sub_items,$item); array_push($this->_sub_items,$item);
$this->_sub_items_sorted = FALSE;
} }
public function subitem_get($model,array $key) { public function subitem_get($model,array $key) {

View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title><?php echo Site::Appname(); ?></title> <title><?php echo Site::Appname(); ?><?php echo $meta->title ? ' - '.$meta->title : '' ?></title>
<link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/media/img/favicon.ico' ?>" type="image/vnd.microsoft.icon" /> <link rel="shortcut icon" href="<?php echo $meta->shortcut_icon ? $meta->shortcut_icon : '/media/img/favicon.ico' ?>" type="image/vnd.microsoft.icon" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" /> <meta http-equiv="Content-Language" content="<?php echo $meta->language; ?>" />