From 69270540ae3f6b40d5ec416ce847180b0b031594 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Sat, 5 Dec 2015 16:29:08 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B8=D1=86=D0=B0=D1=85=20=D0=BD=D0=B0=D0=B2=D0=B8=D0=B3=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D1=8F=20=D1=83=D0=B1=D1=80=D0=B0=D0=BD=D0=B0=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B2=D0=B5=D1=80=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.php | 5 ++ public/css/style.css | 2 +- public/img/whiteLogo.png | Bin 0 -> 6749 bytes views/feed/index.php | 5 -- views/layouts/page.php | 5 +- views/rightNavigation.php | 108 ++++++++++++++++++++------------------ views/user/index.php | 1 - 7 files changed, 63 insertions(+), 63 deletions(-) create mode 100644 public/img/whiteLogo.png 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 0000000000000000000000000000000000000000..0ffffec1a4d4d3f345c54497df3591b9e23f5dea GIT binary patch literal 6749 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 literal 0 HcmV?d00001 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 64620d8..f4ed2bc 100644 --- a/views/user/index.php +++ b/views/user/index.php @@ -26,7 +26,6 @@ $statuses = array(

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