From 72e8f60ca55e8889cc13570a44420e24d95b0bb9 Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Thu, 17 Dec 2015 14:57:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20adSense?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D1=83=20=D1=82=D0=BE=D1=87=D0=BA=D0=B8.=20=D0=9F=D0=B5=D1=80?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=91=D1=81=20=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=D1=80=D0=B8=D0=B8=20=D0=BF=D0=BE=D0=B2=D1=8B=D1=88?=
 =?UTF-8?q?=D0=B5,=20=D0=B2=D1=8B=D0=BD=D0=B5=D1=81=20=D0=B8=D1=85=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D0=BD=D0=B5=D0=B8=D0=BD=D0=B4=D0=B5=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B8=D1=80=D1=83=D0=B5=D0=BC=D0=BE=D0=B3=D0=BE=20=D0=B1=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 controllers/PointController.php |  1 -
 views/article.php               | 13 ++++++-----
 views/modals/articleInfo.php    | 18 +++++-----------
 views/point.php                 | 38 ++++++++++++++++++---------------
 4 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/controllers/PointController.php b/controllers/PointController.php
index 2f224c9..528b2fa 100644
--- a/controllers/PointController.php
+++ b/controllers/PointController.php
@@ -112,7 +112,6 @@ class PointController extends Controller
 			'photoLinks' => $photoLinksRes,
 			'articles' => $articles,
 			'extraParams' => $point->getExtraParams(),
-			'goods' => Goods::model()->getRandom(6),
 		));
 	}
 
diff --git a/views/article.php b/views/article.php
index 411f6ae..152436e 100644
--- a/views/article.php
+++ b/views/article.php
@@ -15,13 +15,6 @@
 			</p>
 		</div>
 	</div>
-	<hr/>
-	<div class="row">
-		<div class="col-md-12">
-			<?= self::renderPartial('comments/all.php',array('parentId'=>$article->id, 'parentType' => 'article'),TRUE); ?>
-		</div>
-	</div>
-	<hr/>
 	<div class="row">
 		<div class="col-md-12" style="text-align: center;">
 			<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
@@ -35,6 +28,12 @@
 			</script>
 		</div>
 	</div>
+
+	<div class="row">
+		<div class="col-md-12">
+			<?= self::renderPartial('comments/all.php',array('parentId'=>$article->id, 'parentType' => 'article'),TRUE); ?>
+		</div>
+	</div>
 	<hr/>
 	<?= self::renderPartial('randomPoint.php', array('randomPoint'=>$randomPoint), true)?>
 </div>
diff --git a/views/modals/articleInfo.php b/views/modals/articleInfo.php
index 86201cc..ab67bd5 100644
--- a/views/modals/articleInfo.php
+++ b/views/modals/articleInfo.php
@@ -1,3 +1,5 @@
+<!--googleoff: all-->
+<!--noindex-->
 <div class="modal fade" id="articleInfoModal" tabindex="-1" role="dialog" aria-hidden="true">
 	<div class="modal-dialog">
 		<div class="modal-content">
@@ -58,18 +60,6 @@
 							<td>http://wikipoints.ru</td>
 							<td><a href="http://wikipoints.ru" target="_blank">http://wikipoints.ru</a></td>
 						</tr>
-<!--						<tr>
-							<td></td>
-							<td></td>
-						</tr>
-						<tr>
-							<td></td>
-							<td></td>
-						</tr>
-						<tr>
-							<td></td>
-							<td></td>
-						</tr>-->
 					</tbody>
 				</table>
 				<b style="color: red;">*</b> - в комментариях нельзя использваться заголовки и вставку картинок.
@@ -79,4 +69,6 @@
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
+<!--/noindex-->
+<!--googleon: all-->
diff --git a/views/point.php b/views/point.php
index 517f67b..121224a 100644
--- a/views/point.php
+++ b/views/point.php
@@ -110,7 +110,28 @@ $index = 0;
 			</p>
 		</div>
 	</div>
+	<div class="row">
+		<div class="col-md-12" style="text-align: center;">
+			<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
+			<!-- Point - DOWN -->
+			<ins class="adsbygoogle"
+				 style="display:block"
+				 data-ad-client="ca-pub-0069680015252793"
+				 data-ad-slot="4972494746"
+				 data-ad-format="auto"></ins>
+			<script>
+			(adsbygoogle = window.adsbygoogle || []).push({});
+			</script>
+		</div>
+	</div>
+
+	<div class="row">
+		<div class="col-md-12">
+			<?= self::renderPartial('comments/all.php',array('parentId'=>$point->id, 'parentType' => 'point'),TRUE); ?>
+		</div>
+	</div>
 	<hr/>
+
 	<!--googleoff: all-->
 	<!--noindex-->
 
@@ -136,23 +157,6 @@ $index = 0;
 	<hr/>
 	<?php endif; ?>
 
-	<div class="row">
-		<div class="col-md-12">
-			<?= self::renderPartial('comments/all.php',array('parentId'=>$point->id, 'parentType' => 'point'),TRUE); ?>
-		</div>
-	</div>
-	<hr/>
-
-	<?php if (!empty($goods)): ?>
-	<div class="row test-ulm-row">
-		<div class="col-md-12">
-			<h3 style="margin-top: 0;">В путешествии обязательно пригодится:</h3>
-				<?php foreach ($goods as $good): ?><a href="/go/away/?url=<?= $good->url ?>" target="_blank" class="test-ulm"><img src="<?= $good->img ?>" title="<?= $good->name ?>" class=""/><br/><?= $good->name ?><br/><nobr><b><?= $good->price ?> руб.</nobr></b></a><?php endforeach; ?>
-		</div>
-	</div>
-	<hr/>
-	<?php endif; ?>
-
 	<?php if (!$articles): ?>
 	<div class="row">
 		<div class="col-md-12">