All4DK
/
wikipoints
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ADD правое меню для страниц с точками и статьями

This commit is contained in:
Krivchikov Dmitry 2015-10-31 23:16:35 +03:00
parent 25d6cc1bd7
commit 822b7c035f
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/controllers/FeedController.php
View File

@ -59,6 +59,7 @@ class FeedController extends Controller
self::addScript('/js/jquery-ui-1.10.4.custom.min.js'); self::addScript('/js/jquery-ui-1.10.4.custom.min.js');
self::addScript('/js/bootstrap.min.js'); self::addScript('/js/bootstrap.min.js');
self::addScript('/js/jquery.cookie.js'); self::addScript('/js/jquery.cookie.js');
self::addScript('/js/app.js?ver=' . App::getConfig('version'));
self::addStyle('/css/style.css?ver=' . App::getConfig('version')); self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version')); self::addStyle('/css/pageStyle.css?ver=' . App::getConfig('version'));
self::addStyle('/css/feed.css?ver=' . App::getConfig('version')); self::addStyle('/css/feed.css?ver=' . App::getConfig('version'));

11
ground/controllers/IndexController.php
View File

@ -44,16 +44,13 @@ class IndexController extends Controller
$category = Category::model()->getAll(array('order' => 'ord ASC')); $category = Category::model()->getAll(array('order' => 'ord ASC'));
$routes = array(); $routes = array();
if (App::$user && App::$user->id) {
$routes = Route::model()->getByAuthor(App::$user->id);
self::addVar('user', App::$user->id);
} else {
self::addVar('user', '0');
}
$favorites = array(); $favorites = array();
if (App::$user && App::$user->id) { if (App::$user && App::$user->id) {
self::addVar('user', App::$user->id);
$routes = Route::model()->getByAuthor(App::$user->id);
$favorites = Favorite::model()->getAllMy(); $favorites = Favorite::model()->getAllMy();
} else {
self::addVar('user', '0');
} }
App::setConfig('title', App::$defaultTitle); App::setConfig('title', App::$defaultTitle);

3
ground/views/indexTemplate.php
View File

@ -6,7 +6,8 @@ if (App::$user) {
?> ?>
<div id="map"></div> <div id="map"></div>
<div id="control"> <div id="control">
<div class="glyphicon glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div> <div class="glyphicon _t glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
<div class="glyphicon _b glyphicon-font boxButtonInfo" title="Лента статей" onclick="location.href='/feed/'"></div>
<div class="glyphicon glyphicon-plus big _t" title="Приблизить" onclick="myMap.zoomIn()"></div> <div class="glyphicon glyphicon-plus big _t" title="Приблизить" onclick="myMap.zoomIn()"></div>
<div class="glyphicon glyphicon-minus big _b" title="Отдалить" onclick="myMap.zoomOut()"></div> <div class="glyphicon glyphicon-minus big _b" title="Отдалить" onclick="myMap.zoomOut()"></div>

2
ground/views/layouts/page.php
View File

@ -48,7 +48,7 @@
<div class="header"> <div class="header">
<a href="/"><img src="/img/logo.png" title="Карта wikipoints" /></a> <a href="/"><img src="/img/logo.png" title="Карта wikipoints" /></a>
</div> </div>
<?= self::renderPartial('rightNavigation.php', array(), true) ?>
<?= isset($content) && !empty($content) ? $content : 'No content =(' ?> <?= isset($content) && !empty($content) ? $content : 'No content =(' ?>
<?= self::renderPartial('metrika.php', array(), true) ?> <?= self::renderPartial('metrika.php', array(), true) ?>
<?= self::renderPartial('ganalytics.php', array(), true) ?> <?= self::renderPartial('ganalytics.php', array(), true) ?>

2
public/css/style.css
View File

@ -79,7 +79,7 @@ div#control div.space {height: 10px; background-color: transparent; padding: 0;}
div#control div._t2 {background-color: rgba(200, 200, 200, 0.65); border-radius: 8px 0 0 0;border-bottom: solid 1px #ddd; margin-bottom: 0;} div#control div._t2 {background-color: rgba(200, 200, 200, 0.65); border-radius: 8px 0 0 0;border-bottom: solid 1px #ddd; margin-bottom: 0;}
/*BOX*/ /*BOX*/
body.openBox div#box {display: block;} body.openBox div#box {display: block; z-index: 100;}
div#box {width: 250px; display: none; position: absolute; top: 0; right: 0;bottom: 0px; border-left: 2px solid rgba(45, 45, 45, 0.8); padding: 0 7px;} div#box {width: 250px; display: none; position: absolute; top: 0; right: 0;bottom: 0px; border-left: 2px solid rgba(45, 45, 45, 0.8); padding: 0 7px;}
div#box #boxClose {position: absolute; right: 7px; top: 7px; color: #999; font-size: 18px; font-weight: bolder; cursor: pointer;} div#box #boxClose {position: absolute; right: 7px; top: 7px; color: #999; font-size: 18px; font-weight: bolder; cursor: pointer;}
div#box div {display: none;} div#box div {display: none;}