Merge branch 'master' of http://git.khansia.co.id/Nahrowi/oku-gis

.vscode/launch.json

+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Python: Current File",
+            "type": "python",
+            "request": "launch",
+            "program": "${file}",
+            "console": "integratedTerminal"
+        }
+    ]
+}
\ No newline at end of file

OKU/settings.py

@@ -85,10 +85,10 @@ DATABASES = {
         'NAME': 'oku_gis_new',
         'USER': 'postgres',
         'PASSWORD' : 'khansia215758',
-        'HOST': '30.10.20.102',
-        'PORT': '5432',
-        # 'HOST': '103.126.28.66',
-        # 'PORT': '8082',       
+        # 'HOST': '30.10.20.102',
+        # 'PORT': '5432',
+        'HOST': '103.126.28.66',
+        'PORT': '8082',       
     }
 }
 

static/css/layout-style.css

@@ -809,10 +809,14 @@ li.active>a:after {
 }
 
 .modal-login {
-    top: 80%;
+    bottom: 0;
     background-color: white;
-    z-index: 999;
-    border-radius: 8px
+    z-index:999;
+    border-radius:8px;
+    margin-bottom: 16px;
+    display: block;
+    position: absolute;
+
 }
 
 #btn-signin {
@@ -828,6 +832,8 @@ li.active>a:after {
     display: -ms-flexbox;
     display: -webkit-flex;
     display: flex;
+    margin-left: 16px !important;
+    margin-right: 16px !important;
 }
 
 .img-centered {
@@ -889,6 +895,11 @@ body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
     margin-left: -270px!important;
 }
 
+#searchbar{
+    margin: 16px;
+    margin-top: 8px;
+}
+
 
 /* 
 #DataTables_Table_0>thead>tr>th:nth-child(1) {
@@ -932,6 +943,10 @@ body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
         background-color: white;
         z-index: 999;
         border-radius: 8px;
+        width: 90%;
+        bottom: auto;
+        display: block;
+        position: sticky;    
     }
     #btn-signin {
         border-radius: 5px;
@@ -939,12 +954,7 @@ body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
         color: white;
         padding-right: 16px;
     }
-    #searchbar {
-        margin-left: 16px;
-        margin-right: 16px;
-    }
-    .centered {
-        top: 50% !important;
+    .centered{        top: 50% !important;
         transform: translateY(-50%) !important;
         margin-left: auto !important;
         margin-right: auto !important;
@@ -979,11 +989,7 @@ body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
     .navbar .navbar-inverse {
         display: block
     }
-    #map>div.row>div.col-sm-4.input-group.content-group.head {
-        width: 80%;
-        margin-top: -15px;
-        margin-left: 60px;
-    }
+
     .user-p-nav {
         display: none
     }
@@ -1085,6 +1091,17 @@ body>ul>li.fixed-plugin.no3d.overlay-cek>div.dropdown.show-dropdown.open>ul {
     #modal_detail_non_kelurahan>div>div>div.modal-body>fieldset>div>div:nth-child(2)>div>div {
         margin-left: 5px
     }
+
+    .modal-login{
+        background-color: white;
+        z-index:999;
+        border-radius:8px;
+        width: 90%;
+        bottom: auto;
+        display: block;
+        position: sticky;
+    
+    }
     #panel-sm2>div:nth-child(2) {
         max-height: 103vh;
         height: 103vh!important;

templates/layout/layout.html

@@ -130,7 +130,7 @@
                 <div class="content">
                     <div id="map">
                         <div class="help_bangunan" style="position: absolute;z-index: 999;top: 0px;right: 60px;"></div>
-                        <div class="row" style="margin-top: 20px;">
+                        <div class="row" id="searchbar">
                             <div class="col-sm-4 head">
 
                             </div>
@@ -193,18 +193,17 @@
 
                         <!-- <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="col-md-1">
+                                <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;">
                                 </div>
-                                <div class="col-md-9">
-                                    <div style="font-size: 15px;margin: 8px;">
+                                <div class="col-md-9 col-sm-12">
+                                    <div style="font-size: 15px;margin: 8px; text-align: left;">
                                         <span><b>Welcome to TEMANKU!</b>
                                             Login untuk menikmati fitur lengkap TEMANKU                                        
                                         </span>
                                     </div>
                                 </div>
-                                <div class="col-md-2">
+                                <div class="col-md-2 col-sm-12">
                                     <a href="{% url 'login' %}" class="btn btn-primary vertical-centered" id="btn-signin">SIGN IN</a>
                                 </div>
                             </div>