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 @@ +_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 @@ +
+
+
+
+

title ?>

+
+ Вернуться на карту. +
+ +
+ text; + ?> +
+ +
+
+
+
+
+ +

Это интересно: name ?>

+

+ description, 0, 400, 'UTF-8') ?>... + читать далее » +

+
+
+
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 @@
- +
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;}