Skip to content

O
OKU-GIS
Commit 85e29181 authored by prabaswara's avatar prabaswara
Browse files
Options

redesign

parent 55dea877
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 572 additions and 239 deletions
OKU/settings.py
View file @ 85e29181
......@@ -42,7 +42,7 @@ INSTALLED_APPS = [
'Application',
'API',
'myauth.apps.MyauthConfig',
'widget_tweaks'
'widget_tweaks',
]
MIDDLEWARE = [
......
requirements deleted 100644 → 0
View file @ 55dea877
asgiref==3.4.0
Django==3.2.4
djangorestframework==3.12.4
pytz==2021.1
sqlparse==0.4.1
typing-extensions==3.10.0.0
static/js/scripts.js
View file @ 85e29181
......@@ -79,23 +79,26 @@ $("#button_unhide").click(function() {
})
$("#button_hide_panel").click(function() {
$("#panel-samping").css('display', 'none');
$("#panel-samping").toggleClass("move");
// $("#panel-samping").css('display', 'none');
$("#button_unhide_panel").css('display', 'block');
$("#button_hide_panel").css('display', 'none');
$("#thisFooter").css('left', '0px');
$('#legenda').css('left', '0px');
// $("#thisFooter").css('left', '0px');
// $('#legenda').css('left', '0px');
})
$("#button_unhide_panel").click(function() {
$("#panel-samping").css('display', 'block');
$("#button_unhide").css('display', 'none');
$("#button_hide_panel").css('display', 'block');
$("#thisFooter").css('left', '380px');
$("#thisFooter").css('max-width', '900px');
$('#legenda').css('left', '380px');
$("#legenda").css('max-width', '900px');
$("#panel-samping").toggleClass("move");
$(this).toggleClass("move-btn");
// $("#panel-samping").css('display', 'block');
// $("#button_unhide").css('display', 'none');
// $("#button_hide_panel").css('display', 'block');
// $("#thisFooter").css('left', '380px');
// $("#thisFooter").css('max-width', '900px');
// $('#legenda').css('left', '380px');
// $("#legenda").css('max-width', '900px');
})
......
templates/includes/css-o.html
View file @ 85e29181
<style>
.footer {
background: #ffffffa6;
background: #ffffff00;
position: fixed;
left: 0px;
right: 0px;
bottom: 0;
width: 1000px;
width: 100%;
max-width: 100%;
overflow-x: clip;
height: 170px;
z-index: 999;
}
.legenda {
background: #ffffffa6;
background: #ffffff00;
position: fixed;
left: 20px;
bottom: 0;
......@@ -66,7 +68,7 @@
display: block;
}
#button_hide {
/* #button_hide {
line-height: 15px;
width: 40px;
font-size: 10pt;
......@@ -78,8 +80,8 @@
right: 0;
z-index: 99999999;
}
#button_unhide {
*/
/* #button_unhide {
line-height: 15px;
width: 40px;
font-size: 10pt;
......@@ -88,7 +90,7 @@
position: absolute;
bottom: 0;
z-index: 99999999;
}
} */
.dataTables_length {
margin: 0 0 0px 0px;
......@@ -143,7 +145,20 @@
}
#btn_edit_kelurahan {
display: none;
display: block;
position: relative;
top: 0;
right: 0;
width: 100px;
background-color: #fff;
border-radius: 36px;
height: 36px;
cursor: inherit;
}
#btn_edit_kelurahan :hover{
border-color: #DADCE0;
background-color: #F1F3F4;
}
#btn_edit_tuplah {
......
templates/includes/js-m.html
View file @ 85e29181
......@@ -439,7 +439,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -819,7 +819,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -1199,7 +1199,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -1579,7 +1579,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -2002,7 +2002,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
......@@ -2410,7 +2410,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -2789,7 +2789,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -3153,7 +3153,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -3479,7 +3479,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -3785,7 +3785,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f4 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f4 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -4140,7 +4140,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src="static/img/image/` + feature.administrasi.f8 + `" alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -4573,7 +4573,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......
templates/includes/js-o.html
View file @ 85e29181
......@@ -154,16 +154,20 @@
<script>
function panel_samp() {
if ($('#panel-samping').css('display') == 'block') {
$("#thisFooter").css('left', '380px');
$("#thisFooter").css('max-width', '900px');
$('#button_unhide').css('right', '85px');
$('#legenda').css('left', '380px');
$("#legenda").css('max-width', '900px');
// $("#panel-samping").toggleClass("move");
// $("#button_unhide_panel").toggleClass("move-btn");
// $("#thisFooter").css('left', '380px');
// $("#thisFooter").css('max-width', '900px');
// $('#button_unhide').css('right', '85px');
// $('#legenda').css('left', '380px');
// $("#legenda").css('max-width', '900px');
} else {
$("#thisFooter").css('left', '0px');
$("#thisFooter").css('max-width', '900px');
$('#button_unhide').css('right', '365px');
$('#legenda').css('left', '0px');
// $("#panel-samping").toggleClass("move");
// $("#button_unhide_panel").toggleClass("move-btn");
// $("#thisFooter").css('left', '0px');
// $("#thisFooter").css('max-width', '900px');
// $('#button_unhide').css('right', '365px');
// $('#legenda').css('left', '0px');
}
}
......@@ -208,14 +212,11 @@
content = `
<a href="/editkelurahan/?kode_dagri=` + encodeURIComponent(feature.administrasi.f1) + `" id='btn_edit_kelurahan' class='btn
btn-default btn_edit_kelurahan' style="position: absolute;
top: 6px;right: 5px;width: 60px;">Edit</a>
<table class="table table-hover tasks-list">
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 237px;height:237"> </th>
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 368px;height:368"> </th>
</tr>
</thead>
<tbody>
......@@ -259,6 +260,12 @@
</div>
</th>
</tr>
<tr>
<td>
<a href="/editkelurahan/?kode_dagri=` + encodeURIComponent(feature.administrasi.f1) + `" id='btn_edit_kelurahan' class='btn
btn-default btn_edit_kelurahan'>Edit</a>
</td>
</tr>
<tr>
<th>
<label class="text-semibold" style="margin-left:10px">Informasi Penduduk
......@@ -531,8 +538,8 @@
</table>`;
$("#panel-samping").css("display", "block");
$("#button_hide_panel").css("display", "block")
$("#thisFooter").css('left', '380px');
$("#thisFooter").css('width', '930px');
// $("#thisFooter").css('left', '380px');
// $("#thisFooter").css('width', '930px');
$("#thisFooter").css('display', 'none');
$("#button_unhide").css('display', 'block')
$("#isi_panel").html(content)
......@@ -544,7 +551,7 @@
mouseover: function(e) {
var info_foot = `
<div class="col-xs-12">
<div class="row">
<div class="col-md-5" style="min-width: 300px;">
<div class="form-group">
<label class="text-semibold">Informasi</label>
......@@ -624,6 +631,7 @@
</b></i>
</div>
</div>
</div>
`;
$('#info-footer').html(info_foot)
......@@ -994,7 +1002,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -1383,7 +1391,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -1805,7 +1813,7 @@
<thead style="text-align: center;">
<tr>
<th style="padding: 0 0 0 0px;">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 237px;height:237">
<img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 368px;height:368">
</th>
</tr>
</thead>
......@@ -2283,7 +2291,7 @@
// <thead style="text-align: center;">
// <tr>
// <th style="padding: 0 0 0 0px;">
// <img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 237px;height:237">
// <img src=` + path_img + ` alt="Image" style="width: 100%;max-height: 368px;height:368">
// </th>
// </tr>
// </thead>
......
templates/includes/navbar.html
View file @ 85e29181
{% load static %}
<!-- Main navbar -->
<div class="navbar navbar-inverse">
<div class="navbar navbar-inverse navbar-fixed-top bg-none">
<div class="navbar-header">
<a class="navbar-brand" href="{% url 'apps:dashboard' %}">
<a class="navbar-brand gradient-text " href="{% url 'apps:dashboard' %}">
<!-- <h3>NationalAddress</h3> -->
<i class=" icon-location4"></i>
<i class="icon-location4 fa-gradient"></i>
<b>&nbsp;&nbsp;OKU-GIS</b>
</a>
......@@ -14,7 +14,7 @@
</div>
<div class="navbar-collapse collapse" id="navbar-mobile">
<p class="navbar-text"><span class="label bg-success-400">Online</span></p>
<!-- <p class="navbar-text"><span class="label bg-success-400">Online</span></p> -->
<ul class="nav navbar-nav navbar-right">
<li class="dropdown dropdown-user">
......
templates/includes/o.html
View file @ 85e29181
This diff is collapsed.
templates/includes/plugin.html
View file @ 85e29181
{% load static %}
<div class="fixed-plugin" style="position: absolute;z-index: 999;right: 0px;background-color: #40777c;border-top-left-radius: 10px;border-bottom-left-radius: 10px;margin-top: 5px;">
<ul class="dock" style="right: 0;position: absolute;">
<li class="fixed-plugin" style="top: 100px;">
<div class="dropdown show-dropdown">
<a href="#" data-toggle="dropdown">
<i class="fa fa-map-o fa-2x" style="color: white;
......@@ -7,10 +8,7 @@
border-radius: 0 0 6px 6px;
width: auto;"> </i>
</a>
<ul class="dropdown-menu" x-placement="bottom-start" style="right: 50px;
position: absolute;
margin-left: -757px !important;
margin-top: -47px !important;">
<ul class="dropdown-menu" x-placement="bottom-start" >
<li class="header-title text-center">Maps BaseLayer</li>
<div class="dropdown-content-body">
<div class="row text-center">
......@@ -57,15 +55,8 @@
</div>
</ul>
</div>
</div>
<div class="fixed-plugin" style="position: absolute;
z-index: 999;
right: 0px;
background-color: #40777c;
border-top-left-radius: 10px;
border-bottom-left-radius: 10px;
top: 105px;
width: 50px;">
</li>
<li class="fixed-plugin" style="top: 160px;">
<div class="dropdown show-dropdown">
<a href="#" data-toggle="dropdown">
......@@ -74,11 +65,7 @@
margin: 4px;
margin-left: 10px;"> </i>
</a>
<ul class="dropdown-menu" style="float: right;
position: absolute;
width: 550px;
margin-left: -550px !important;
margin-top: -46px !important;">
<ul class="dropdown-menu" >
<li class="header-title text-center">Sidebar Filters</li>
<!-- <div id="sidebar" onmouseleave="overll()">
<div class="sidebar-wrapper">
......@@ -246,7 +233,7 @@
</ul>
</div>
</div>
</ul>
<!-- Second navbar -->
<div class="navbar navbar-default" id="navbar-second" style="display: none;">
<ul class="nav navbar-nav no-border visible-xs-block">
......@@ -277,5 +264,4 @@
</div>
</div>
</div>
\ No newline at end of file
templates/layout/layout.html
View file @ 85e29181
This diff is collapsed.
templates/layout/user_layout.html
View file @ 85e29181
......@@ -114,7 +114,7 @@
<a class="navbar-brand" href="{% url 'apps:dashboard' %}">
<!-- <h3>NationalAddress</h3> -->
<i class=" icon-location4"></i>
<b>&nbsp;&nbsp;OKU-GIS</b>
<b>&nbsp;&nbsp;OKU-GISs</b>
</a>
<ul class="nav navbar-nav pull-right visible-xs-block">
......
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