ADD topNavigation на страницу с картой
This commit is contained in:
parent
ba28ebcb3a
commit
36771767d8
|
|
@ -31,8 +31,6 @@ class IndexController extends Controller
|
|||
|
||||
// self::addStyle('/css/style.css?ver=' . App::getConfig('version'));
|
||||
self::addStyle('/css/leaflet.css');
|
||||
self::addStyle('/css/bootstrap.min.css');
|
||||
self::addStyle('/css/bootstrap-theme.min.css');
|
||||
self::addStyle('/css/leaflet-routing-machine.css');
|
||||
self::addStyle('/css/MarkerCluster.css');
|
||||
self::addStyle('/css/MarkerCluster.Default.css');
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ div.leaflet-popup-content button:hover span.label {display: inline;}
|
|||
#routes .route span {font-weight: bold; color: red;}
|
||||
|
||||
/*Controls for BOX*/
|
||||
div#control {width: 50px; position: absolute; top: 0; right: 0;bottom: 50px; color: white; font-size: 20px; padding-top: 10px;}
|
||||
div#control {width: 50px; position: absolute; top: 0; right: 0;bottom: 50px; color: white; font-size: 20px; padding-top: 60px;}
|
||||
body.openBox div#control {right: 250px;}
|
||||
div#control div {background-color: rgba(15, 15, 15, 0.65); border-radius: 8px 0 0 8px; width: auto; padding: 10px; margin-left: 10px; margin-bottom: 8px; cursor: pointer;}
|
||||
div#control div:before {cursor: pointer;}
|
||||
|
|
@ -84,7 +84,7 @@ div#control div#notify {position: absolute; background-color: red;color: white;b
|
|||
|
||||
/*BOX*/
|
||||
body.openBox div#box {display: block; z-index: 100; overflow-y: scroll;overflow-x: hidden;}
|
||||
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: 60px 7px 0 7px;}
|
||||
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 div{display: block;}
|
||||
|
|
|
|||
|
|
@ -6,18 +6,6 @@ if (App::$user) {
|
|||
?>
|
||||
<div id="map"></div>
|
||||
<div id="control">
|
||||
<div class="glyphicon _t glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
|
||||
<div class="glyphicon _c glyphicon-font boxButtonArticles onlyBigScreen" title="Лента статей" onclick="location.href='/feed/'"></div>
|
||||
<?php if ($user): ?>
|
||||
<div class="glyphicon glyphicon-user _b boxButtonUser" onclick="location.href='/user/'" title="Профиль">
|
||||
<?php if(Notifications::getUnreadedCount()): ?>
|
||||
<div id="notify"><?= Notifications::getUnreadedCount(); ?></div>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
<?php else: ?>
|
||||
<div class="glyphicon glyphicon-user _b" id="loginButton" onclick="$('#loginModal').modal('show');" title="Войти для добавления точки"></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<div class="glyphicon glyphicon-plus big _t" title="Приблизить" onclick="myMap.zoomIn()"></div>
|
||||
<div class="glyphicon glyphicon-minus big _b" title="Отдалить" onclick="myMap.zoomOut()"></div>
|
||||
|
||||
|
|
@ -34,32 +22,9 @@ if (App::$user) {
|
|||
<?php else: ?>
|
||||
<div class="glyphicon" id="addPointButton" onclick="$('#loginModal').modal('show');" title="Добавить точку"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<a href="https://vk.com/wikipoints" target="_blank" class="onlyBigScreen"><img src="/img/vkBigLogo.png?2" usemap="#vkbutton" style="margin-left: 285px; margin-top: 0px; position: absolute; display: none;" id="vkBigLogo" /><div class="glyphicon" style="line-height: 0;" title="WikiPoints вКонтакте"><img src="/img/b.png?v=2" style="margin-left: -5px; margin-top: 0px; height: 20px;" /></div></a>
|
||||
</div>
|
||||
<div id="box">
|
||||
<span id="boxClose" onclick="closeBox();">×</span>
|
||||
<div id="boxInfo">
|
||||
<h3>Информация</h3>
|
||||
<a href="/article/1">О проекте</a><br/>
|
||||
<a onclick="showArticle(2);" href="#">Как пользоваться</a><br/>
|
||||
<a onclick="$('#categoriesModal').modal('show');" href="#">Легенда</a><br/>
|
||||
<a href="/page/points">Список точек</a><br/>
|
||||
<?php if (App::$user && App::$user->isAdmin): ?>
|
||||
<a href="/articles">Статьи</a><br/>
|
||||
<?php endif; ?>
|
||||
<br/>
|
||||
<a href="/?point=random" onclick="showRandomPoint();
|
||||
return false;">Случайная точка</a>
|
||||
<br/><br/><br/>
|
||||
<a href="https://vk.com/wikipoints" target="_blank"><img src="/img/vk-flat.png" width="24" height="24"/> Группа ВКонтакте</a>
|
||||
<br/><br/>
|
||||
<a href="https://instagram.com/wikipoints/" target="_blank"><img src="/img/instagram-flat.png" width="24" height="24"/> Instagram</a>
|
||||
<br/><br/><br/>
|
||||
<h3>Контакты</h3>
|
||||
EMail: <a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a><br/>
|
||||
VK: <a href="https://vk.com/all4dk" target="_blank">https://vk.com/all4dk</a><br/>
|
||||
</div>
|
||||
<div id="boxLayers">
|
||||
<h3>Карты</h3>
|
||||
<div onclick="setLayer('quest')" class="layers questLayer">map Quest</div>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@
|
|||
|
||||
<script src="/js/jquery-2.1.0.min.js" type="text/javascript"></script>
|
||||
<link href="/css/style.css?ver=<?= App::getConfig('version') ?>" media="all" rel="stylesheet" type="text/css" />
|
||||
<link href="/css/bootstrap.min.css?ver=<?= App::getConfig('version') ?>" media="all" rel="stylesheet" type="text/css" />
|
||||
<link href="/css/bootstrap-theme.min.css?ver=<?= App::getConfig('version') ?>" media="all" rel="stylesheet" type="text/css" />
|
||||
|
||||
<?php if (isset($data['og']) && $data['og']): ?>
|
||||
<meta property="og:title" content="<?= $data['og']['title'] ?>" />
|
||||
|
|
@ -44,11 +46,7 @@
|
|||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="header">
|
||||
<h1 class="hdn">Карта с достопримечательностями</h1>
|
||||
<a href="/feed/"><img src="/img/logo.png" title="Лента wikipoints" /></a>
|
||||
</div>
|
||||
|
||||
<?= self::renderPartial('topNavigation.php', array(), true) ?>
|
||||
<?= isset($content) && !empty($content) ? $content : 'No content =(' ?>
|
||||
<?= self::renderPartial('metrika.php', array(), true) ?>
|
||||
<?= self::renderPartial('ganalytics.php', array(), true) ?>
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@
|
|||
<link rel="apple-touch-icon" sizes="152x152" href="/img/touch-icon-ipad-retina.png" />
|
||||
</head>
|
||||
<body style="padding: 60px 25px 10px 25px; overflow-y: scroll;">
|
||||
<?= self::renderPartial('rightNavigation.php', array(), true) ?>
|
||||
<?= self::renderPartial('topNavigation.php', array(), true) ?>
|
||||
<?= isset($content) && !empty($content) ? $content : 'No content =(' ?>
|
||||
<?= self::renderPartial('metrika.php', array(), true) ?>
|
||||
<?= self::renderPartial('ganalytics.php', array(), true) ?>
|
||||
|
|
|
|||
|
|
@ -10,29 +10,32 @@ if (App::$user && App::$user->id) {
|
|||
<div class="container2">
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
|
||||
<span class="sr-only">Toggle navigation</span>
|
||||
<span class="sr-only">Показать / Скрыть</span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="/" style="background-image: url(/img/whiteLogo.png); width: 130px;background-size: contain;background-repeat: no-repeat;background-position-x: 50%; background-position-y: 1px;"></a>
|
||||
<h1 class="hdn">Карта с достопримечательностями</h1>
|
||||
<a class="navbar-brand" href="/" style="background-image: url(/img/whiteLogo.png); width: 130px;background-size: contain;background-repeat: no-repeat;background-position-x: 50%; background-position-y: 1px;" title="Карта с достопримечательностями"></a>
|
||||
</div>
|
||||
<div id="navbar" class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a href="/">Карта</a></li>
|
||||
<li class="<?= App::ic('feed')?' active ':'' ?>"><a href="/feed/">Лента</a></li>
|
||||
<li class="<?= App::ic('index')?' active ':'' ?>"><a href="/">Карта</a></li>
|
||||
<li class="<?= App::ic('feed')?' active ':'' ?>"><a href="/feed/">Статьи и блоги</a></li>
|
||||
|
||||
<li class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Инфо <span class="caret"></span></a>
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Информация <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="/article/1">О проекте</a></li>
|
||||
<li><a href="#" onclick="showArticle(2);">Как пользоваться</a></li>
|
||||
<li><a href="/page/points/">Список точек</a></li>
|
||||
<li><a onclick="$('#categoriesModal').modal('show');" href="#">Легенда</a></li>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li><a href="/?point=random">Случайная точка</a></li>
|
||||
<li><a href="/?point=random" onclick="showRandomPoint(); return false;">Случайная точка</a></li>
|
||||
<li role="separator" class="divider"></li>
|
||||
<li><a href="https://vk.com/wikipoints" target="_blank">Группа в VK</a></li>
|
||||
<li><a href="https://instagram.com/wikipoints/" target="_blank">Мы в Instargam</a></li>
|
||||
<li><a href="mailto:info@wikipoints.ru">info@wikipoints.ru</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
|
||||
|
|
@ -63,7 +66,7 @@ if (App::$user && App::$user->id) {
|
|||
</ul>
|
||||
</li>
|
||||
<?php else: ?>
|
||||
<li><a href="#" onclick="$('#loginModal').modal('show');">Вход</a></li>
|
||||
<li><a href="#" onclick="$('#loginModal').modal('show');"><span class="glyphicon glyphicon-user"></span> Вход</a></li>
|
||||
<?php endif; ?>
|
||||
</ul>
|
||||
</div><!--/.nav-collapse -->
|
||||
Loading…
Reference in New Issue