diff --git a/ground/classes/Controller.php b/ground/classes/Controller.php
index d52313b..d5cf301 100644
--- a/ground/classes/Controller.php
+++ b/ground/classes/Controller.php
@@ -3,7 +3,7 @@
abstract class Controller
{
- static $layout = 'layout.php';
+ static $layout = 'layouts/default.php';
static private $styles = array();
static private $scripts = array();
static private $og = array();
diff --git a/ground/controllers/ArticleController.php b/ground/controllers/ArticleController.php
index 8ee2c91..c6f240b 100644
--- a/ground/controllers/ArticleController.php
+++ b/ground/controllers/ArticleController.php
@@ -4,7 +4,7 @@ class ArticleController extends Controller
{
static function actionIndex()
{
- self::$layout = 'layoutPage.php';
+ self::$layout = 'layouts/page.php';
$articleId = (int) App::getParam('id');
if ($articleId) {
@@ -72,7 +72,7 @@ class ArticleController extends Controller
}
$articleId = (int) App::getParam('id');
- self::$layout = 'layoutClear.php';
+ self::$layout = 'layouts/clear.php';
self::addScript('/js/jquery-2.1.0.min.js');
self::addScript('/js/jquery-ui-1.10.4.custom.min.js');
self::addScript('/js/bootstrap.min.js');
diff --git a/ground/controllers/ArticlesController.php b/ground/controllers/ArticlesController.php
index 7855f45..06547d3 100644
--- a/ground/controllers/ArticlesController.php
+++ b/ground/controllers/ArticlesController.php
@@ -9,7 +9,7 @@ class ArticlesController extends Controller
static function actionIndex()
{
- self::$layout = 'layoutPage.php';
+ self::$layout = 'layouts/page.php';
self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addScript('/js/jquery-2.1.0.min.js');
diff --git a/ground/controllers/IndexController.php b/ground/controllers/IndexController.php
index 6303b9d..8bc516e 100644
--- a/ground/controllers/IndexController.php
+++ b/ground/controllers/IndexController.php
@@ -178,7 +178,7 @@ class IndexController extends Controller
static function actionRoute()
{
- self::$layout = 'layoutPrint.php';
+ self::$layout = 'layouts/print.php';
self::addStyle('/css/print.css?ver=' . App::getConfig('version'));
if (!isset($_GET['route']) || !$_GET['route']) {
diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php
index d3fbe27..d60beea 100644
--- a/ground/controllers/PageController.php
+++ b/ground/controllers/PageController.php
@@ -5,7 +5,7 @@ class PageController extends Controller
static function actionPoints()
{
- self::$layout = 'layoutPage.php';
+ self::$layout = 'layouts/page.php';
self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addScript('/js/jquery-2.1.0.min.js');
@@ -137,7 +137,7 @@ class PageController extends Controller
static function action404($message)
{
- self::$layout = 'layoutPage.php';
+ self::$layout = 'layouts/page.php';
self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addStyle('/css/bootstrap.min.css');
diff --git a/ground/controllers/PointController.php b/ground/controllers/PointController.php
index 51eae01..44aaee3 100644
--- a/ground/controllers/PointController.php
+++ b/ground/controllers/PointController.php
@@ -4,7 +4,7 @@ class PointController extends Controller
{
static function actionIndex()
{
- self::$layout = 'layoutPage.php';
+ self::$layout = 'layouts/page.php';
$pointId = (int) App::getParam('id');
if ($pointId) {
diff --git a/ground/controllers/UserController.php b/ground/controllers/UserController.php
index 1d25b37..b237691 100644
--- a/ground/controllers/UserController.php
+++ b/ground/controllers/UserController.php
@@ -19,7 +19,7 @@ class UserController extends Controller
App::error404();
}
- self::$layout = 'layoutPage.php';
+ self::$layout = 'layouts/page.php';
self::addScript('/js/jquery-2.1.0.min.js');
self::addScript('/js/jquery-ui-1.10.4.custom.min.js');
self::addScript('/js/bootstrap.min.js');
diff --git a/ground/views/layoutClear.php b/ground/views/layouts/clear.php
similarity index 91%
rename from ground/views/layoutClear.php
rename to ground/views/layouts/clear.php
index 358c3db..16fe886 100644
--- a/ground/views/layoutClear.php
+++ b/ground/views/layouts/clear.php
@@ -1,4 +1,8 @@
-
+