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

FIX - большая порция правок по вёрстке. Прячу некоторые кнопки из правой навигации на мееньких разрешениях, переставил кнопки местами

This commit is contained in:
Krivchikov Dmitry 2015-11-23 00:00:21 +03:00
parent 72dc6ed07b
commit 40e9f7b759
6 changed files with 63 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/controllers/IndexController.php
View File

@ -37,6 +37,7 @@ class IndexController extends Controller
self::addStyle('/css/MarkerCluster.css');
self::addStyle('/css/MarkerCluster.Default.css');
self::addStyle('/css/fotorama.css');
self::addStyle('/css/indexMap.css');
if (!App::$user)
self::addScript('//ulogin.ru/js/ulogin.js');

1
ground/controllers/PageController.php
View File

@ -12,6 +12,7 @@ class PageController extends Controller
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');
self::addStyle('/css/bootstrap.min.css');
self::addStyle('/css/bootstrap-theme.min.css');

35
ground/views/indexTemplate.php
View File

@ -7,32 +7,35 @@ 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 _b glyphicon-font boxButtonArticles" title="Лента статей" onclick="location.href='/feed/'"></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 _t boxButtonLayers" onclick="openBox('Layers')" title="Слои карты"><img src="/img/buttons/layers.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _c boxButtonFilter" title="Фильтры и поиск" onclick="openBox('Filter')"><img src="/img/buttons/search.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _b" id="showMeOnTheMap" title="Я на карте" onclick="showMeOnTheMap(false)"><img src="/img/buttons/myPosition.png" style="margin-top: -20px; height: 21px;" /></div>
<div class="glyphicon boxButtonRoute" title="Маршрут" onclick="openBox('Route')"><img src="/img/buttons/route.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _c glyphicon-font boxButtonArticles onlyBigScreen" title="Лента статей" onclick="location.href='/feed/'"></div>
<?php if ($user): ?>
<div class="glyphicon _t" id="addPointButton" title="Добавить точку" onclick="<?= $addWithoutConfirm ? 'activateAddPoint()' : 'showPointagreement()'; ?>"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
<div class="glyphicon glyphicon-star _c boxButtonFavorites" onclick="openBox('Favorites')" title="Хочу посетить"></div>
<div class="glyphicon glyphicon-cloud-download _c boxButtonRoutes" onclick="openBox('Routes')" title="Мои маршруты"></div>
<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 _t" id="addPointButton" onclick="$('#loginModal').modal('show');" title="Добавить точку"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
<div class="glyphicon glyphicon-user _b" id="loginButton" onclick="$('#loginModal').modal('show');" title="Войти для добавления точки"></div>
<?php endif; ?>
<a href="https://vk.com/wikipoints" target="_blank"><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 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 _t boxButtonLayers" onclick="openBox('Layers')" title="Слои карты"><img src="/img/buttons/layers.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _c boxButtonFilter" title="Фильтры и поиск" onclick="openBox('Filter')"><img src="/img/buttons/search.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<div class="glyphicon _c" id="showMeOnTheMap" title="Я на карте" onclick="showMeOnTheMap(false)"><img src="/img/buttons/myPosition.png" style="margin-top: -20px; height: 21px;" /></div>
<div class="glyphicon _b boxButtonRoute" title="Маршрут" onclick="openBox('Route')"><img src="/img/buttons/route.png" style="margin-top: -10px; margin-left: -5px; width: 30px;" /></div>
<?php if ($user): ?>
<div class="glyphicon _t" id="addPointButton" title="Добавить точку" onclick="<?= $addWithoutConfirm ? 'activateAddPoint()' : 'showPointagreement()'; ?>"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
<div class="glyphicon glyphicon-star _c boxButtonFavorites" onclick="openBox('Favorites')" title="Хочу посетить"></div>
<div class="glyphicon _b glyphicon-cloud-download _c boxButtonRoutes" onclick="openBox('Routes')" title="Мои маршруты"></div>
<?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();">&times;</span>

20
ground/views/rightNavigation.php
View File

@ -8,17 +8,21 @@ if (App::$user && App::$user->id) {
}
?>
<div id="control">
<div id="control" class="onlyBigScreen">
<div class="glyphicon _t glyphicon-info-sign boxButtonInfo" title="Информация" onclick="openBox('Info')"></div>
<div class="glyphicon _b glyphicon-font" title="Лента статей" onclick="location.href='/feed/'"></div>
<div class="glyphicon _c glyphicon-font" 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; ?>
<?php if (App::$user): ?>
<div class="glyphicon _t" id="addPointButton" title="Добавить точку" onclick="location.href='/'"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
<div class="glyphicon glyphicon-star _c boxButtonFavorites" onclick="openBox('Favorites')" title="Хочу посетить"></div>
<div class="glyphicon glyphicon-user _b boxButtonUser" onclick="location.href='/user/'" title="Профиль"></div>
<?php else: ?>
<div class="glyphicon _t" id="addPointButton" onclick="location.href='/'" title="Добавить точку"><img src="/img/buttons/addPoint.png" style="margin-top: -10px; height: 30px;" /></div>
<div class="glyphicon glyphicon-user _b" id="loginButton" onclick="$('#loginModal').modal('show');" title="Войти для добавления точки"></div>
<div class="glyphicon glyphicon-star boxButtonFavorites" onclick="openBox('Favorites')" title="Хочу посетить"></div>
<?php endif; ?>
<a href="https://vk.com/wikipoints" target="_blank"><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>

27
public/css/indexMap.css Normal file
View File

@ -0,0 +1,27 @@
@media screen and (max-width:815px) {
.onlyBigScreen {
display: none;
}
div.header{
padding: 5px 7px;
left: 20px;
}
div.header a img {
margin-bottom: 5px;
}
}
@media screen and (max-width:500px) {
div.header{
padding: 2px 5px;
left: 10px;
}
div.header a img {
width: 70px;
height: 42px;
margin-bottom: 2px;
}
}

23
public/css/style.css
View File

@ -142,6 +142,8 @@ img.imageInArticle {border: solid 3px white;}
}
@media screen and (max-width:815px) {
.onlyBigScreen {display: none;}
body {
padding: 0!important;
}
@ -154,28 +156,9 @@ img.imageInArticle {border: solid 3px white;}
padding: 50px 5px;
}
div.header{
padding: 5px 7px;
left: 20px;
}
div.header a img {
width: 115px;
height: 69px;
margin-bottom: 5px;
margin-bottom: 10px;
}
}
@media screen and (max-width:500px) {
div.header{
padding: 2px 5px;
left: 10px;
}
div.header a img {
width: 70px;
height: 42px;
margin-bottom: 2px;
}
}