Skip to content

O
OKU-GIS
Commit 86f32d88 authored by Manggar Mahardhika's avatar Manggar Mahardhika
Browse files
Options

8/11

parent 31d9e571
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 46 deletions
static/css/layout-style.css
View file @ 86f32d88
...@@ -1147,7 +1147,7 @@ body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul { ...@@ -1147,7 +1147,7 @@ body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
@media (min-width: 1025px) { @media (min-width: 1025px) {
#map>div.col-md-6.col-md-offset-3.modal-login.input-group.content-group.foot.centered { #map>div.col-md-6.col-md-offset-3.modal-login.input-group.content-group.foot.centered {
top: 75%; top: 80%;
} }
#map>div.col-md-6.col-md-offset-3.modal-login.input-group.content-group.foot.centered>div>div.col-md-1 { #map>div.col-md-6.col-md-offset-3.modal-login.input-group.content-group.foot.centered>div>div.col-md-1 {
padding: 20px; padding: 20px;
......
static/js/maps.js
View file @ 86f32d88
...@@ -22,7 +22,13 @@ function loaderPage(stat) { ...@@ -22,7 +22,13 @@ function loaderPage(stat) {
$("#sidebar").hide() $("#sidebar").hide()
//https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off //https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off
maps = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', { id: 'mapbox/light-v9', tileSize: 512, zoomOffset: -1 }).addTo(map);
// maps = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', { id: 'mapbox/light-v9', tileSize: 512, zoomOffset: -1 }).addTo(map);
maps = L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
maxZoom: 22,
minZoom: 3,
// tileSize: 512, zoomOffset: -1
}).addTo(map);
// BaseMap.onclick = function() { // BaseMap.onclick = function() {
// map.removeLayer(maps) // map.removeLayer(maps)
...@@ -37,6 +43,10 @@ maps = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?acce ...@@ -37,6 +43,10 @@ maps = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?acce
OpenStreetMap.onclick = function() { OpenStreetMap.onclick = function() {
map.removeLayer(maps) map.removeLayer(maps)
// maps = L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token=pk.eyJ1IjoibWFwYm94IiwiYSI6ImNpejY4NXVycTA2emYycXBndHRqcmZ3N3gifQ.rJcFIG214AriISLbB6B5aw', {
// id: 'mapbox/light-v9',
// tileSize: 512, zoomOffset: -1
// }).addTo(map);
//maps = L.tileLayer("https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off", { //maps = L.tileLayer("https://mt1.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&s=Gal&apistyle=s.t:0|s.e:l|p.v:off", {
maps = L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", { maps = L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
maxZoom: 22, maxZoom: 22,
......
templates/includes/css-m.html
View file @ 86f32d88
...@@ -46,19 +46,23 @@ ...@@ -46,19 +46,23 @@
height: 40px; height: 40px;
transform: translate3d(544px, 246px, 0px); transform: translate3d(544px, 246px, 0px);
z-index: 280; z-index: 280;
background-color: rgba(19, 146, 236, 0.6); background-color: rgba(224, 130, 63, 0.3);
border-radius: 20px; border-radius: 20px;
} }
.marker-cluster-adm div { .marker-cluster-adm div {
margin-top: 5px;
margin-left: 5px;
width: 30px; width: 30px;
height: 30px; height: 30px;
margin-left: 5px; /* background-image: url('static/img/icon-1/Buildings-tes.svg'); */
margin-top: 5px; background-color: rgba(242, 140, 66, 1.6);
background-position: center;
background-size: 36px;
text-align: center; text-align: center;
border-radius: 15px; border-radius: 15px;
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif; font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
background-color: rgba(19, 146, 236, 0.6); /* font-weight: bold; */
} }
/* #f78531;#ffb47d; */ /* #f78531;#ffb47d; */
.marker-cluster-adm span { .marker-cluster-adm span {
...@@ -72,7 +76,7 @@ ...@@ -72,7 +76,7 @@
height: 40px; height: 40px;
transform: translate3d(544px, 246px, 0px); transform: translate3d(544px, 246px, 0px);
z-index: 280; z-index: 280;
background-color: rgba(233, 4, 4, 0.6); background-color: rgba(248, 92, 92, 0.3);
border-radius: 20px; border-radius: 20px;
} }
...@@ -84,7 +88,7 @@ ...@@ -84,7 +88,7 @@
text-align: center; text-align: center;
border-radius: 15px; border-radius: 15px;
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif; font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
background-color: rgba(233, 4, 4, 0.6); background-color: rgba(248, 92, 92, 1.6);
} }
.marker-cluster-sakit span { .marker-cluster-sakit span {
...@@ -98,7 +102,7 @@ ...@@ -98,7 +102,7 @@
height: 40px; height: 40px;
transform: translate3d(544px, 246px, 0px); transform: translate3d(544px, 246px, 0px);
z-index: 280; z-index: 280;
background-color: rgba(12, 240, 12, 0.6); background-color: rgba(125, 199, 79, 0.3);
border-radius: 20px; border-radius: 20px;
} }
...@@ -110,7 +114,7 @@ ...@@ -110,7 +114,7 @@
text-align: center; text-align: center;
border-radius: 15px; border-radius: 15px;
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif; font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
background-color: rgba(12, 240, 12, 0.6); background-color: rgba(125, 199, 79, 1.6);
} }
.marker-cluster-ibdh span { .marker-cluster-ibdh span {
...@@ -124,7 +128,7 @@ ...@@ -124,7 +128,7 @@
height: 40px; height: 40px;
transform: translate3d(544px, 246px, 0px); transform: translate3d(544px, 246px, 0px);
z-index: 280; z-index: 280;
background-color: rgba(240, 194, 12, 0.6); background-color: rgba(91, 175, 104, 0.3);
border-radius: 20px; border-radius: 20px;
} }
...@@ -136,7 +140,7 @@ ...@@ -136,7 +140,7 @@
text-align: center; text-align: center;
border-radius: 15px; border-radius: 15px;
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif; font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
background-color: rgba(240, 194, 12, 0.6); background-color: rgba(91, 175, 104, 1.6);
} }
.marker-cluster-pend span { .marker-cluster-pend span {
......
templates/includes/modal.html
View file @ 86f32d88
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
</div> </div>
</div> </div>
{% if user.is_authenticated %}
<div class="modal fade" id="modal_option_create" tabindex="-1" role="dialog"> <div class="modal fade" id="modal_option_create" tabindex="-1" role="dialog">
<div class="modal-dialog modal-xs" style="width: 450px;"> <div class="modal-dialog modal-xs" style="width: 450px;">
<div class="modal-content"> <div class="modal-content">
...@@ -678,6 +678,7 @@ ...@@ -678,6 +678,7 @@
</div> </div>
</div> </div>
</div> </div>
{% endif %}
<div class="modal fade" id="modal__create" tabindex="-1" role="dialog" style="overflow-y: hidden;"> <div class="modal fade" id="modal__create" tabindex="-1" role="dialog" style="overflow-y: hidden;">
<div class="modal-dialog modal-md"> <div class="modal-dialog modal-md">
......
templates/includes/sidebar.html
View file @ 86f32d88
...@@ -34,43 +34,47 @@ background: none;border-color: transparent;"> ...@@ -34,43 +34,47 @@ background: none;border-color: transparent;">
<i class="icon-stack2"></i> <i class="icon-stack2"></i>
</a> </a>
</li> </li>
{% if user.is_authenticated %}
<li id="manage_perbaikan"> <li id="manage_perbaikan">
<a href="#panel-sm2" data-toggle="tab" aria-expanded="false" class="side-bar-but" id="perbaikan_manage"> <a href="#panel-sm2" data-toggle="tab" aria-expanded="false" class="side-bar-but" id="perbaikan_manage">
<i class="icon-pie-chart5"></i> <i class="icon-pie-chart5"></i>
</a> </a>
</li> </li>
{% endif %}
<li style="margin-top: 60vh;position: absolute;"> <li style="margin-top: 60vh;position: absolute;">
<a href="#" id="btn-hide-all" class="side-bar-but" style="position: absolute; margin-top: 0px; display: none;"> <a href="#" id="btn-hide-all" class="side-bar-but" style="position: absolute; margin-top: 0px; display: block;">
<i class="icon-arrow-left12"></i> <i class="icon-arrow-left12"></i>
</a> </a>
</li> </li>
</ul> </ul>
<ul class="navigation navigation-main navigation-accordion" style="height: 100px;"> <ul class="navigation navigation-main navigation-accordion" style="height: 100px;">
<li> <li>
<a href="#" class="side-bar-but" data-toggle="modal" data-target="#modal_help" data-backdrop="static" data-keyboard="false"> <a href="#" class="side-bar-but" data-toggle="modal" data-target="#modal_help" data-backdrop="static" data-keyboard="false">
<img src="{% static 'img/icon-1/Vectoriconwarning.svg' %}" alt="" style="height: 17.875003814697266px;width: 17.875003814697266px;margin-left: -8px;"> <img src="{% static 'img/icon-1/Vectoriconwarning.svg' %}" alt="" style="height: 17.875003814697266px;width: 17.875003814697266px;margin-left: -8px;">
</a> </a>
</li> </li>
{% if user.is_authenticated %}
<li> <li>
<a href="{% url 'logout' %}" class="side-bar-but"> <a href="{% url 'logout' %}" class="side-bar-but">
<img src="{% static 'img/icon-1/Vectoriconlogout.svg' %}" alt="" style="height: 17.875003814697266px;width: 17.875003814697266px;margin-left: -8px;"> <img src="{% static 'img/icon-1/Vectoriconlogout.svg' %}" alt="" style="height: 17.875003814697266px;width: 17.875003814697266px;margin-left: -8px;">
</a> </a>
</li> </li>
<hr>
<!-- <li> <!-- <li>
<a href="#" id="btn-hide-all" class="side-bar-but" style="position: absolute;margin-top: 1px; display: none;"> <a href="#" id="btn-hide-all" class="side-bar-but" style="position: absolute;margin-top: 1px; display: none;">
<i class="icon-arrow-left12"></i> <i class="icon-arrow-left12"></i>
</a> </a>
</li> --> </li> -->
{% endif %}
<hr>
</ul> </ul>
</div> </div>
</div> </div>
</div> </div>
<div id="panel-sm" class="sidebar-2" style="display:none;background: #1B1F2D;position: absolute;z-index: 9;width:330px;height:100vh;left: 0%;transition: all 0.5s ease;"> <div id="panel-sm" class="sidebar-2" style="display:block; background: #1B1F2D; position: absolute; z-index: 9; width:330px; height:100vh; left: 0%; transition: all 0.5s ease;">
<div style="margin-left: 50px;background: #1B1F2D;"> <div style="margin-left: 50px;background: #1B1F2D;">
<div class="header" style="margin-top: 25px;background: #2F3445;"> <div class="header" style="margin-top: 25px;background: #2F3445;">
...@@ -79,7 +83,7 @@ background: none;border-color: transparent;"> ...@@ -79,7 +83,7 @@ background: none;border-color: transparent;">
font-size: 14px; font-size: 14px;
line-height: 17px; line-height: 17px;
padding-top: 9px; padding-top: 9px;
padding-bottom: 9px;">Menu Layer<a class="heading-elements-toggle"><i class="icon-more"></i></a></h6> padding-bottom: 9px;">OGAN KOMERING ULU<a class="heading-elements-toggle"><i class="icon-more"></i></a></h6>
</div> </div>
<div class="bod" style="margin-top: 10px;margin-left:6px;"> <div class="bod" style="margin-top: 10px;margin-left:6px;">
<div class="tabbable"> <div class="tabbable">
...@@ -88,7 +92,7 @@ background: none;border-color: transparent;"> ...@@ -88,7 +92,7 @@ background: none;border-color: transparent;">
<li class=""><a href="#bottom-tab2" data-toggle="tab" aria-expanded="true" style="color: #ffff;">Point Of Interest</a></li> <li class=""><a href="#bottom-tab2" data-toggle="tab" aria-expanded="true" style="color: #ffff;">Point Of Interest</a></li>
</ul> </ul>
<div class="tab-content"> <div class="tab-content" style="height: 64vh; overflow-y: auto; overflow-x: hidden;">
<div class="tab-pane active" id="bottom-tab1"> <div class="tab-pane active" id="bottom-tab1">
<div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white"> <div class="row-bod row" style="border-bottom: 0.5pt solid #313649;color:white">
<div class="col-sm-1"></div> <div class="col-sm-1"></div>
...@@ -1316,6 +1320,7 @@ background: none;border-color: transparent;"> ...@@ -1316,6 +1320,7 @@ background: none;border-color: transparent;">
$("#manage_perbaikan").removeClass("active"); $("#manage_perbaikan").removeClass("active");
$("#panel-sm").removeClass("active"); $("#panel-sm").removeClass("active");
$("#panel-sm2").removeClass("active"); $("#panel-sm2").removeClass("active");
$("#panel-sm").css('display', 'none');
$(this).css('display', 'none'); $(this).css('display', 'none');
$(this).removeClass("hid"); $(this).removeClass("hid");
}); });
......
templates/layout/layout.html
View file @ 86f32d88
...@@ -122,15 +122,15 @@ ...@@ -122,15 +122,15 @@
<!-- Page content --> <!-- Page content -->
<div class="page-content" style="overflow: hidden;"> <div class="page-content" style="overflow: hidden;">
{% if user.is_authenticated %} {% include 'includes/sidebar.html' %} {% endif %}
{% include 'includes/sidebar.html' %}
<div class="content-wrapper"> <div class="content-wrapper">
<div class="content"> <div class="content">
<div id="map"> <div id="map">
<div class="help_bangunan" style="position: absolute;z-index: 999;top: 0px;right: 60px;"></div> <div class="help_bangunan" style="position: absolute;z-index: 999;top: 0px;right: 60px;"></div>
<div class="row" id="searchbar" style="margin-top: 2%;">
<div class="row" style="margin-top: 20px;">
<div class="col-sm-4 head"> <div class="col-sm-4 head">
</div> </div>
...@@ -146,6 +146,8 @@ ...@@ -146,6 +146,8 @@
<li><input type="hidden" value="point" /><a href="#"><i class="icon-location4 text-muted text-size-base" style="color: #5A9AFB;"></i> Point</a></li> <li><input type="hidden" value="point" /><a href="#"><i class="icon-location4 text-muted text-size-base" style="color: #5A9AFB;"></i> Point</a></li>
</ul> </ul>
</div> </div>
<!-- </div> -->
<input type="text" id="input_search" class="form-control" placeholder="search..."> <input type="text" id="input_search" class="form-control" placeholder="search...">
<input type="text" id="input_search_id" class="form-control hidden"> <input type="text" id="input_search_id" class="form-control hidden">
...@@ -163,6 +165,41 @@ ...@@ -163,6 +165,41 @@
</div> </div>
</div> </div>
<!-- </div> -->
<!-- <div class="row" id="searchbar" style="margin-top: 2%;">
<div class="col-sm-4 head">
</div>
<div class="col-sm-4 input-group content-group head">
<div class="input-group-btn">
<button type="button" class="btn btn-default dropdown-toggle btn-icon" data-toggle="dropdown" aria-expanded="true" id="btn_s_s">
<span class="caret" id="cari_caret"></span>
<span id="pilihcari"></span>
</button>
<ul class="dropdown-menu" id="search_spes">
<li><input type="hidden" value="bangunan" /><a href="#"><i class="icon-home4 text-muted text-size-base" style="color: #5A9AFB;"></i> Bangunan</a></li>
<li><input type="hidden" value="jalan" /><a href="#"><i class="icon-git-branch text-muted text-size-base" style="color: #5A9AFB;"></i> Jalan</a></li>
<li><input type="hidden" value="point" /><a href="#"><i class="icon-location4 text-muted text-size-base" style="color: #5A9AFB;"></i> Point</a></li>
</ul>
</div>
<input type="text" id="input_search" class="form-control" placeholder="search...">
<input type="text" id="input_search_id" class="form-control hidden">
<span class="input-group-btn">
<button type="submit" id="btn_search_spes" class="btn btn-primary " style="border-radius: 0px 10px 10px 0px;
outline: none;
background: linear-gradient(
201.55deg
, #72BBFF -24.21%, #3D5CCA 130.65%);">
<i class="icon-search4 text-muted text-size-base" style="color: white;"></i>
</button>
</span>
</div>
<div class="col-sm-4 head">
</div>
</div> -->
<!-- <div class="col-md-4 col-md-offset-4 input-group content-group head"> <!-- <div class="col-md-4 col-md-offset-4 input-group content-group head">
<div class="input-group-btn"> <div class="input-group-btn">
...@@ -189,15 +226,16 @@ ...@@ -189,15 +226,16 @@
</button> </button>
</span> </span>
</div> --> </div> -->
<!-- </div> -->
{% if user.is_authenticated %} {% else %}
<!-- <div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="z-index: 999;"> <!-- <div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="z-index: 999;">
<div class="row row-full-height" style="width: 100%;margin-left: 10px;"> --> <div class="row row-full-height" style="width: 100%;margin-left: 10px;"> -->
{% if user.is_authenticated %} {% else %}
<div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="height: fit-content;">
<!-- <div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered">
<div class="row row-full-height"> <div class="row row-full-height">
<div class="col-md-1 col-sm-12"> <div class="col-md-1 col-sm-12">
<img src="/static/img/logo-ok.png" alt="" class="img-centered" style="max-height: 28px;max-width: 21.999998092651367px;/* left: 27px; *//* top: 14px; */border-radius: 0px;"> <img src="/static/img/logo-ok.png" alt="" class="img-centered" style="max-height: 28px;max-width: 21.999998092651367px;/* left: 27px; *//* top: 14px; */border-radius: 0px;">
...@@ -213,30 +251,29 @@ ...@@ -213,30 +251,29 @@
<a href="{% url 'login' %}" class="btn btn-primary vertical-centered" id="btn-signin">SIGN IN</a> <a href="{% url 'login' %}" class="btn btn-primary vertical-centered" id="btn-signin">SIGN IN</a>
</div> </div>
</div> </div>
</div> --> </div>
{% endif %}
<div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="top: 80%;z-index:999;border-radius:8px"> </div>
<div class="row row-full-height"> <!-- <div class="col-md-6 col-md-offset-3 modal-login input-group content-group foot centered" style="z-index: 999;">
<div class="row row-full-height" style="width: 100%;margin-left: 10px;">
<div class="col-md-1"> <div class="col-md-1">
<img src="/static/img/logo-ok.png" alt="" style="margin-top: 18%;margin-left: 46%;max-height: 28px;max-width: 21.999998092651367px;/* left: 27px; *//* top: 14px; */border-radius: 0px;"> <img src="/static/img/logo-ok.png" alt="" class="img-centered" style="max-height: 28px;max-width: 21.999998092651367px;/* left: 27px; *//* top: 14px; */border-radius: 0px;">
</div> </div>
<div class="col-md-9"> <div class="col-md-9">
<div style="margin-top: 2%;font-size: 15px;margin-left: 3%; text-align: center;"> <div style="font-size: 14px;margin: 8px; text-align: center;">
<span><b>Welcome to TEMANKU!</b> <span><b>Welcome to TEMANKU!</b>
Login untuk menikmati fitur lengkap TEMANKU Login untuk menikmati fitur lengkap
</span> </span>
</div> </div>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<a href="{% url 'login' %}" class="btn btn-primary vertical-centered" style="margin-top: 3%;border-radius: 5px;background: linear-gradient(147.95deg, #4C97DC -38.4%, #4969DA 140.26%);margin-bottom: 3%;color: white;">SIGN IN</a> <a href="{% url 'login' %}" class="btn btn-primary vertical-centered" id="btn-signin">SIGN IN</a>
</div>
</div> </div>
</div> </div>
</div> -->
{% endif %} -->
</div>
{% if user.is_authenticated %} {% if user.is_authenticated %}
<div class="user-p-nav" style="height: 10%;width: 10%;position: absolute;top: 30px;right: 65px;z-index: 999;"> <div class="user-p-nav" style="height: 10%;width: 10%;position: absolute;top: 30px;right: 65px;z-index: 999;">
<!-- <a href="#"> <!-- <a href="#">
...@@ -2656,18 +2693,17 @@ ...@@ -2656,18 +2693,17 @@
}); });
</script> --> </script> -->
{% if user.is_authenticated %} {% else %}
<script>
$(".tombol-edit").html('ilang')
</script>
<style> <style>
@media (max-width: 720px) { @media (max-width: 720px) {
#map>div.row>div.col-sm-4.input-group.content-group.head { #map>div.row>div.col-sm-4.input-group.content-group.head {
width: 80%; width: 80%;
margin-top: -15px; margin-top: -15px;
margin-left: 10%; margin-left: 15%;
} }
} }
</style> </style>
{% if user.is_authenticated %} {% else %}
<script>
$(".tombol-edit").html('ilang')
</script>
{% endif %} {% endif %}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment