diff --git a/app.php b/app.php index 96a4a55..0ad1a61 100644 --- a/app.php +++ b/app.php @@ -227,4 +227,9 @@ class App ); } + // IsControlle + public static function ic($controllerName) + { + return strtolower(substr(self::$controller, 0, strlen($controllerName))) == strtolower($controllerName); + } } diff --git a/public/css/style.css b/public/css/style.css index f177bc0..1e37164 100644 --- a/public/css/style.css +++ b/public/css/style.css @@ -145,7 +145,7 @@ img.imageInArticle {border: solid 3px white;} .onlyBigScreen {display: none;} body { - padding: 0!important; + padding: 60px 0 0 0!important; } div.container{ diff --git a/public/img/whiteLogo.png b/public/img/whiteLogo.png new file mode 100644 index 0000000..0ffffec Binary files /dev/null and b/public/img/whiteLogo.png differ diff --git a/views/feed/index.php b/views/feed/index.php index b0c6aab..115678d 100644 --- a/views/feed/index.php +++ b/views/feed/index.php @@ -1,10 +1,5 @@
-
-
- -
-
diff --git a/views/layouts/page.php b/views/layouts/page.php index c89a9a5..38a0abd 100644 --- a/views/layouts/page.php +++ b/views/layouts/page.php @@ -44,10 +44,7 @@ - -
- -
+ diff --git a/views/rightNavigation.php b/views/rightNavigation.php index 835e5c4..1339899 100644 --- a/views/rightNavigation.php +++ b/views/rightNavigation.php @@ -1,66 +1,70 @@ id) { self::addVar('user', App::$user->id); $favorites = Favorite::model()->getAllMy(); } - ?> -
-
-
- -
- -
- +
+ diff --git a/views/user/index.php b/views/user/index.php index a28163b..20785ec 100644 --- a/views/user/index.php +++ b/views/user/index.php @@ -26,7 +26,6 @@ $statuses = array(

Новая запись - Уведомления Записи: