From b686b7b4ec4aaa8df15af91499ad553784c882f3 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Fri, 25 Sep 2015 22:58:10 +0300
Subject: [PATCH] =?UTF-8?q?=D0=A1=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=B1=D0=BB=D0=BE=D0=B3=20=D0=B0=D0=B2=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B0=20=D0=BF=D0=BE=D0=B4=20=D1=81=D1=82=D0=B0=D1=82?=
 =?UTF-8?q?=D1=8C=D0=B5=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/views/article.php        |  4 +++-
 ground/views/pointsTemplate.php | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ground/views/article.php b/ground/views/article.php
index d501b0c..7a1d20b 100644
--- a/ground/views/article.php
+++ b/ground/views/article.php
@@ -10,7 +10,9 @@
 			<div style="text-align: justify;">
 				<?= $article->html; ?>
 			</div>
-
+			<p style="margin-top: 25px; text-align: right;">
+				[ <span class="glyphicon glyphicon-user"></span> <a href="/user/<?= $article->author ?>">блог автора <?= $article->authorUser->nick ?></a> - <span class="glyphicon glyphicon-pencil" title="<?= date('d-m-Y H:i', $article->pubDate) ?>"></span>  ]
+			</p>
 		</div>
 	</div>
 	<hr/>
diff --git a/ground/views/pointsTemplate.php b/ground/views/pointsTemplate.php
index 5f82c0a..889000b 100644
--- a/ground/views/pointsTemplate.php
+++ b/ground/views/pointsTemplate.php
@@ -1,3 +1,11 @@
+<?php
+if (App::getParam('user')) {
+	$user = User::model()->getByPK((int) App::getParam('user'));
+	if ($user->id == 0) {
+		App::redirect('/page/points/');
+	}
+}
+?>
 <div id="pageSmoothBackground" style="background-image: url(<?= $randomPoint->getImg('middle') ?>);"></div>
 
 <div class="container" style="background-color: rgba(255,255,255, 0.8);margin-top: -10px;padding-bottom: 30px;">
@@ -5,7 +13,7 @@
 		<div class="col-md-12">
 			<h1 style="text-align: right;">Списки точек по категориям</h1>
 			<div class="coords-container">
-				Вернуться <a href="/">на карту</a>.
+				Перейти: <a href="/">на карту</a> / <a href="/user/<?=$user->id?>">страница <?=$user->nick?></a>.
 			</div>
 			<div style="text-align: justify;">
 				<?php if ($notModeratedPoints): ?>
@@ -33,13 +41,8 @@
 				if ((int) App::getParam('category')) {
 					$header = 'Список точек в категории "' . $categories[(int) App::getParam('category')]->name . '"';
 				}
-				if (App::getParam('user')) {
-					$user = User::model()->getByPK((int) App::getParam('user'));
-					if ($user->id) {
-						$header = 'Список точек пользователя <a href="/user/'.$user->id.'">"' . $user->nick . '"</a>';
-					} else {
-						App::redirect('/page/points/');
-					}
+				if ($user->id) {
+					$header = 'Список точек пользователя <a href="/user/'.$user->id.'">"' . $user->nick . '"</a>';
 				}
 				?>
 				<h3><?= $header ?></h3>