From 7601d27a978af8481e64fdb75d1bfa32ead6ed95 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sat, 5 Dec 2015 16:40:50 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D1=91=D0=BC=20?=
 =?UTF-8?q?=D0=BE=D1=82=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=BA=D1=83=20=D0=B1?=
 =?UTF-8?q?=D0=BB=D0=BE=D0=BA=D0=B0=20-=20=D0=AD=D1=82=D0=BE=20=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=82=D0=B5=D1=80=D0=B5=D1=81=D0=BD=D0=BE=20-=20=D0=B2?=
 =?UTF-8?q?=20=D0=BE=D1=82=D0=B4=D0=B5=D0=BB=D1=8C=D0=BD=D1=83=D1=8E=20?=
 =?UTF-8?q?=D0=B2=D1=8C=D1=8E=D1=85=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 views/article.php            | 11 +----------
 views/error404.php           | 13 ++-----------
 views/point.php              | 12 +-----------
 views/pointsTemplate.php     | 11 +----------
 views/randomPoint.php        | 14 ++++++++++++++
 views/user/favorites.php     | 11 +----------
 views/user/index.php         | 17 ++---------------
 views/user/notifications.php | 17 ++---------------
 8 files changed, 24 insertions(+), 82 deletions(-)
 create mode 100644 views/randomPoint.php

diff --git a/views/article.php b/views/article.php
index 3924516..411f6ae 100644
--- a/views/article.php
+++ b/views/article.php
@@ -36,14 +36,5 @@
 		</div>
 	</div>
 	<hr/>
-	<div class="row">
-		<div class="col-md-12">
-			<a href="/point/<?= $randomPoint->id ?>" style="float: left; margin: 0 20px 0 0;"><img src="<?= $randomPoint->getImg() ?>" style="width: 200px;"/></a>
-			<h3 style="margin-top: 0;">Это интересно: <?= $randomPoint->name ?></h3>
-			<p>
-				<?= mb_substr($randomPoint->description, 0, 400, 'UTF-8') ?>…
-				<a class="" href="/point/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
-			</p>
-		</div>
-	</div>
+	<?= self::renderPartial('randomPoint.php', array('randomPoint'=>$randomPoint), true)?>
 </div>
diff --git a/views/error404.php b/views/error404.php
index e12d380..47c1cba 100644
--- a/views/error404.php
+++ b/views/error404.php
@@ -1,18 +1,9 @@
 <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; min-height: 100%;">
-<noindex>
+	<noindex>
 		<div style="text-align: center;">
 			<img src="/img/404.png" style="margin: 50px 0;"/>
 		</div>
 	</noindex>
-	<div class="row">
-		<div class="col-md-12">
-			<a href="/point/<?= $randomPoint->id ?>" style="float: left; margin: 0 20px 0 0;"><img src="<?= $randomPoint->getImg() ?>" style="width: 200px;"/></a>
-			<h3 style="margin-top: 0;">Это интересно: <?= $randomPoint->name ?></h3>
-			<p>
-				<?= mb_substr($randomPoint->description, 0, 400, 'UTF-8') ?>…
-				<a class="" href="/point/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
-			</p>
-		</div>
-	</div>
+	<?= self::renderPartial('randomPoint.php', array('randomPoint'=>$randomPoint), true)?>
 </div>
\ No newline at end of file
diff --git a/views/point.php b/views/point.php
index a77ba38..2cf622b 100644
--- a/views/point.php
+++ b/views/point.php
@@ -162,17 +162,7 @@ $index = 0;
 	</div>
 	<hr/>
 	<?php endif; ?>
-
-	<div class="row">
-		<div class="col-md-12">
-			<a href="/point/<?= $randomPoint->id ?>" style="float: left; margin: 0 20px 0 0;"><img src="<?= $randomPoint->getImg() ?>" style="width: 200px;"/></a>
-			<h3 style="margin-top: 0;">Это интересно: <?= $randomPoint->name ?></h3>
-			<p>
-				<?= mb_substr($randomPoint->description, 0, 400, 'UTF-8') ?>…
-				<a class="" href="/point/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
-			</p>
-		</div>
-	</div>
 	<!--/noindex-->
 	<!--googleon: all-->
+	<?= self::renderPartial('randomPoint.php', array('randomPoint'=>$randomPoint), true)?>
 </div>
diff --git a/views/pointsTemplate.php b/views/pointsTemplate.php
index 5fb0e97..78fe241 100644
--- a/views/pointsTemplate.php
+++ b/views/pointsTemplate.php
@@ -107,14 +107,5 @@ $oldIndex = $pagesCount+1;
 		</div>
 	</div>
 	<hr/>
-	<div class="row">
-		<div class="col-md-12">
-			<a href="/point/<?= $randomPoint->id ?>" style="float: left; margin: 0 20px 0 0;"><img src="<?= $randomPoint->getImg() ?>" style="width: 200px;"/></a>
-			<h3 style="margin-top: 0;">Это интересно: <?= $randomPoint->name ?></h3>
-			<p>
-				<?= mb_substr($randomPoint->description, 0, 400, 'UTF-8') ?>…
-				<a class="" href="/point/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
-			</p>
-		</div>
-	</div>
+	<?= self::renderPartial('randomPoint.php', array('randomPoint'=>$randomPoint), true)?>
 </div>
diff --git a/views/randomPoint.php b/views/randomPoint.php
new file mode 100644
index 0000000..191570c
--- /dev/null
+++ b/views/randomPoint.php
@@ -0,0 +1,14 @@
+<!--googleoff: all-->
+<!--noindex-->
+<div class="row">
+	<div class="col-md-12">
+		<a href="/point/<?= $randomPoint->id ?>" style="float: left; margin: 0 20px 0 0;"><img src="<?= $randomPoint->getImg() ?>" style="width: 200px;"/></a>
+		<h3 style="margin-top: 0;">Это интересно: <?= $randomPoint->name ?></h3>
+		<p>
+			<?= mb_substr($randomPoint->description, 0, 400, 'UTF-8') ?>…
+			<a class="" href="/point/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
+		</p>
+	</div>
+</div>
+<!--/noindex-->
+<!--googleon: all-->
diff --git a/views/user/favorites.php b/views/user/favorites.php
index c5b4662..91066a1 100644
--- a/views/user/favorites.php
+++ b/views/user/favorites.php
@@ -27,14 +27,5 @@
 		</div>
 	</div>
 	<hr/>
-	<div class="row">
-		<div class="col-md-12">
-			<a href="/point/<?= $randomPoint->id ?>" style="float: left; margin: 0 20px 0 0;"><img src="<?= $randomPoint->getImg() ?>" style="width: 200px;"/></a>
-			<h3 style="margin-top: 0;">Это интересно: <?= $randomPoint->name ?></h3>
-			<p>
-				<?= mb_substr($randomPoint->description, 0, 400, 'UTF-8') ?>…
-				<a class="" href="/point/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
-			</p>
-		</div>
-	</div>
+	<?= self::renderPartial('randomPoint.php', array('randomPoint'=>$randomPoint), true)?>
 </div>
diff --git a/views/user/index.php b/views/user/index.php
index 64620d8..a28163b 100644
--- a/views/user/index.php
+++ b/views/user/index.php
@@ -73,19 +73,6 @@ $statuses = array(
 	</div>
 	<?php endif; ?>
 
-	<hr style="margin-bottom: 50px;"/>
-	<!--googleoff: all-->
-	<!--noindex-->
-	<div class="row">
-		<div class="col-md-12">
-			<a href="/point/<?= $randomPoint->id ?>" style="float: left; margin: 0 20px 0 0;"><img src="<?= $randomPoint->getImg() ?>" style="width: 200px;"/></a>
-			<h3 style="margin-top: 0;">Это интересно: <?= $randomPoint->name ?></h3>
-			<p>
-				<?= mb_substr($randomPoint->description, 0, 400, 'UTF-8') ?>…
-				<a class="" href="/point/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
-			</p>
-		</div>
-	</div>
-	<!--/noindex-->
-	<!--googleon: all-->
+	<hr style="margin-bottom: 25px;"/>
+	<?= self::renderPartial('randomPoint.php', array('randomPoint'=>$randomPoint), true)?>
 </div>
diff --git a/views/user/notifications.php b/views/user/notifications.php
index 4286137..06769a9 100644
--- a/views/user/notifications.php
+++ b/views/user/notifications.php
@@ -16,19 +16,6 @@
 		</div>
 	</div>
 
-	<hr style="margin-bottom: 50px;"/>
-	<!--googleoff: all-->
-	<!--noindex-->
-	<div class="row">
-		<div class="col-md-12">
-			<a href="/point/<?= $randomPoint->id ?>" style="float: left; margin: 0 20px 0 0;"><img src="<?= $randomPoint->getImg() ?>" style="width: 200px;"/></a>
-			<h3 style="margin-top: 0;">Это интересно: <?= $randomPoint->name ?></h3>
-			<p>
-				<?= mb_substr($randomPoint->description, 0, 400, 'UTF-8') ?>…
-				<a class="" href="/point/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
-			</p>
-		</div>
-	</div>
-	<!--/noindex-->
-	<!--googleon: all-->
+	<hr style="margin-bottom: 25px;"/>
+	<?= self::renderPartial('randomPoint.php', array('randomPoint'=>$randomPoint), true)?>
 </div>