1
0
mirror of https://github.com/flextype/flextype.git synced 2025-08-11 07:34:22 +02:00

Code cleanup and refactoring #5

This commit is contained in:
Awilum
2018-03-16 20:58:14 +03:00
parent 9c7988b808
commit 4c6dab7584
4 changed files with 20 additions and 13 deletions

View File

@@ -1,3 +1,10 @@
<?php $this->rawilum['themes']->getTemplate('partials/head'); ?>
<?php echo $page['content']; ?>
<?php $this->rawilum['themes']->getTemplate('partials/footer'); ?>
<?php Rawilum\Templates::display('partials/head'); ?>
<?php echo Rawilum\readingTime($page['content']); ?>
<?php echo Rawilum\readingTime($page['content'], [
'minute' => 'Minute!',
'minutes' => 'Minutes!',
'second' => 'Second',
'seconds' => 'Seconds']);
?>
<?php //cho Rawilum\redirect(); ?>
<?php Rawilum\Templates::display('partials/footer'); ?>

View File

@@ -6,21 +6,21 @@
<meta name="description" content="">
<meta name="author" content="">
<?php $this->rawilum['events']->dispatch('theme_meta'); ?>
<?php Rawilum\Events::dispatch('theme_meta'); ?>
<link rel="shortcut icon" href="<?php echo Url::getBase(); ?>/favicon.ico">
<title><?php echo $this->rawilum['config']->get('site.title'); ?> | <?php echo $page['title']; ?></title>
<title><?php echo Rawilum\Config::get('site.title'); ?> | <?php echo $page['title']; ?></title>
<link href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:400,600,700' rel='stylesheet' type='text/css'>
<!-- Bootstrap core CSS -->
<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo $this->rawilum['config']->get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Rawilum\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<!-- Custom styles for this template -->
<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo $this->rawilum['config']->get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
<?php $this->rawilum['events']->dispatch('theme_header'); ?>
<link href="<?php echo Url::getBase(); ?>/site/themes/<?php echo Rawilum\Config::get('site.theme'); ?>/assets/css/theme.css" rel="stylesheet">
<?php Rawilum\Events::dispatch('theme_header'); ?>
</head>
<body>
<?php $this->rawilum['themes']->getTemplate('partials/navigation'); ?>
<?php Rawilum\Templates::display('partials/navigation'); ?>
<main role="main" class="container content">

View File

@@ -1,6 +1,6 @@
<nav class="navbar navbar-expand-lg navbar-light bg-white border-bottom box-shadow">
<div class="container">
<a class="navbar-brand" href="<?php echo Url::getBase(); ?>"><?php echo $this->rawilum['config']->get('site.title'); ?></a>
<a class="navbar-brand" href="<?php echo Url::getBase(); ?>"><?php echo Rawilum\Config::get('site.title'); ?></a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>

View File

@@ -1,3 +1,3 @@
<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo $this->rawilum['config']->get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo $this->rawilum['config']->get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
<?php $this->rawilum['events']->dispatch('theme_footer'); ?>
<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo Rawilum\Config::get('site.theme'); ?>/node_modules/jquery/dist/jquery.slim.min.js"></script>
<script src="<?php echo Url::getBase(); ?>/site/themes/<?php echo Rawilum\Config::get('site.theme'); ?>/node_modules/bootstrap/dist/js/bootstrap.min.js"></script>
<?php Rawilum\Events::dispatch('theme_footer'); ?>