From 20c00aeb4e081f8a91683bc8244a1768df25096d Mon Sep 17 00:00:00 2001
From: Krivchikov Dmitry <KrivchikovDA@gmail.com>
Date: Sun, 15 Mar 2015 23:52:06 +0300
Subject: [PATCH] =?UTF-8?q?ADD=20articles=20-=20=D0=BF=D0=B5=D1=80=D0=B2?=
 =?UTF-8?q?=D0=B0=D1=8F=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0=D1=86?=
 =?UTF-8?q?=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ground/controllers/PageController.php | 40 +++++++++++++++++++++++++++
 ground/models/Article.php             | 18 ++++++++++++
 ground/views/article.php              | 29 +++++++++++++++++++
 ground/views/layoutPage.php           |  2 +-
 public/css/style.css                  |  2 +-
 5 files changed, 89 insertions(+), 2 deletions(-)
 create mode 100644 ground/models/Article.php
 create mode 100644 ground/views/article.php

diff --git a/ground/controllers/PageController.php b/ground/controllers/PageController.php
index 33008fa..29d7c79 100644
--- a/ground/controllers/PageController.php
+++ b/ground/controllers/PageController.php
@@ -120,6 +120,46 @@ class PageController extends Controller
 		}
 	}
 
+	static function actionArticle()
+	{
+		self::$layout = 'layoutPage.php';
+
+		$articleId = (int) App::getParam('id');
+		if ($articleId)
+		{
+			self::addScript('/js/jquery-2.1.0.min.js');
+			self::addScript('/js/jquery-ui-1.10.4.custom.min.js');
+			self::addScript('/js/bootstrap.min.js');
+
+			self::addScript('/js/app.js?ver=' . App::getConfig('version'));
+			self::addScript('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.js');
+
+			self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
+			self::addStyle('/css/bootstrap.min.css');
+			self::addStyle('/css/bootstrap-theme.min.css');
+			self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css');
+
+			$article = Article::model()->getByPK($articleId);
+
+			if ($article->id == NULL)
+			{
+				App::error404();
+			}
+
+			App::setConfig('title', $article->title. ' - wikipoints.ru');
+
+			self::render('article.php', array(
+				'article' => $article,
+				'randomPoint' => Point::model()->getRandom(),
+//				'og' => Helper::buildOG($point),
+//				'user' => App::$user,
+			));
+		} else
+		{
+			App::error404();
+		}
+	}
+
 	static function action404($message)
 	{
 		self::renderPartial('error404.php', array(
diff --git a/ground/models/Article.php b/ground/models/Article.php
new file mode 100644
index 0000000..a95aedf
--- /dev/null
+++ b/ground/models/Article.php
@@ -0,0 +1,18 @@
+<?php
+
+class Article extends Model
+{
+	function __construct($fromArray = array())
+	{
+		$this->_tableName_ = 'articles';
+		parent::__construct($fromArray);
+		$this->setRelation('authorUser', 'author', 'User', 'id', self::TO_ONE);
+	}
+
+	static function model()
+	{
+		return new self();
+	}
+
+}
+
diff --git a/ground/views/article.php b/ground/views/article.php
new file mode 100644
index 0000000..733e1bf
--- /dev/null
+++ b/ground/views/article.php
@@ -0,0 +1,29 @@
+<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;">
+	<div class="row">
+		<div class="col-md-12">
+			<h1 style="text-align: right;"><?= $article->title ?></h1>
+			<div class="coords-container">
+				Вернуться <a href="/<?= $point->id ?>">на карту</a>.
+			</div>
+
+			<div style="text-align: justify;">
+				<?php
+					print $article->text;
+				?>
+			</div>
+
+		</div>
+	</div>
+	<hr/>
+	<div class="row">
+		<div class="col-md-12">
+			<a href="/page/point/id/<?= $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="/page/point/id/<?= $randomPoint->id ?>" role="button"><nobr> читать далее »</nobr></a>
+			</p>
+		</div>
+	</div>
+</div>
diff --git a/ground/views/layoutPage.php b/ground/views/layoutPage.php
index 7638b05..01b3cb6 100644
--- a/ground/views/layoutPage.php
+++ b/ground/views/layoutPage.php
@@ -42,7 +42,7 @@
     </head>
     <body style="padding: 10px 25px; overflow-y: scroll;">
 		<div class="header">
-			<a href="/"><img src="/img/logo_page.png" title="WIKIPOINTS.RU" /></a>
+			<a href="/"><img src="/img/logo.png" title="WIKIPOINTS.RU" /></a>
 		</div>
 		<?= isset($content) && !empty($content) ? $content : 'No content =(' ?>
 		<?= self::renderPartial('modals/about.php', array(), true) ?>
diff --git a/public/css/style.css b/public/css/style.css
index 9c1713a..245a26b 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -19,7 +19,7 @@ div.infoCard h3 {text-align: center; margin-top: 0;}
 div.infoCard img {width: 200px; float: left; margin: 0 10px 5px 0; cursor: pointer;}
 div.infoCard .photosCount {position: absolute;margin: 3px;color: white;background-color: black;border-radius: 3px;padding: 2px 4px;opacity: 0.5;}
 div.header {display: block; position: absolute; top: 0px; left: 40px; z-index: 1000; background-color: rgba(255,255,255,0.7); padding: 5px 10px; border-radius: 0 0 5px 5px;}
-div.header img {height: 99px;}
+div.header img {height: 89px;}
 div.add {cursor: pointer;}
 
 .fotorama {display: inline-block;}