From 0c96d6da2e685bca9b4dbd244d46f65c8c6722df Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Fri, 25 Sep 2015 18:44:15 +0300
Subject: [PATCH] =?UTF-8?q?ADD=20=D1=81=D1=81=D1=8B=D0=BB=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D1=82=D0=BE=D1=87=D0=BA=D0=B8=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/controllers/PageController.php | 2 ++
 ground/views/pointsTemplate.php       | 8 ++++++++
 ground/views/user/index.php           | 2 +-
 public/css/user.css                   | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php
index 3dd993e..186436a 100644
--- a/ground/controllers/PageController.php
+++ b/ground/controllers/PageController.php
@@ -41,6 +41,8 @@ class PageController extends Controller
 		$param['order'] = 'id DESC';
 		if (App::getParam('category')) {
 			$param['where'] = 'categoryId = ' . (int) App::getParam('category') . ' AND `moderate` = 1';
+		} else if (App::getParam('user')) {
+			$param['where'] = '`author` = ' . (int) App::getParam('user') . ' AND `moderate` = 1';
 		} else {
 			$param['where'] = '`moderate` = 1';
 			if (!(App::$user && App::$user->isAdmin)) {
diff --git a/ground/views/pointsTemplate.php b/ground/views/pointsTemplate.php
index 438f143..5f82c0a 100644
--- a/ground/views/pointsTemplate.php
+++ b/ground/views/pointsTemplate.php
@@ -33,6 +33,14 @@
 				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/');
+					}
+				}
 				?>
 				<h3><?= $header ?></h3>
 
diff --git a/ground/views/user/index.php b/ground/views/user/index.php
index a27e14c..8d05748 100644
--- a/ground/views/user/index.php
+++ b/ground/views/user/index.php
@@ -9,7 +9,7 @@
 	<div class="socialNetworks">
 		В социальных сетях: <a href="<?= $user->profile ?>" target="_blank"><img src="/img/social/<?= $user->network ?>.png" /></a>
 		<br/><br/>
-		Создано точек: <b><?= $user->getPointsCount() ?></b>
+		Создано точек: <b><a href="/page/points/user/<?= $user->id ?>" class="toPoints"><?= $user->getPointsCount() ?></a></b>
 	</div>
 </div>
 <div class="container lightBody">
diff --git a/public/css/user.css b/public/css/user.css
index 6beae73..49bc9e5 100644
--- a/public/css/user.css
+++ b/public/css/user.css
@@ -3,6 +3,7 @@
 .darkHeader .userPic {font-size: 70px; font-family: Ubuntu, inherit;}
 .darkHeader .userPic img {height: 70px; border-radius: 5px;}
 .darkHeader .socialNetworks {margin-top: 10px;}
+.darkHeader .socialNetworks a.toPoints{color: #fff;}
 .darkHeader .socialNetworks img {height: 30px; margin: 0 5px;}
 
 .lightBody {background-color: rgba(255,255,255, 0.8);margin-top: 0px;padding-bottom: 30px;}