diff --git a/administration/templates/edit_kontributor.html b/administration/templates/edit_kontributor.html
deleted file mode 100644
index 47e16ef164f42dc12bc70358741ae0ca3a566c9d..0000000000000000000000000000000000000000
--- a/administration/templates/edit_kontributor.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{% extends 'administration/base_administrasi.html' %}
-{% load static %}
-
-{% block content %}
-<div class="card shadow mb-4">
- <div class="card-header py-3">
- <h6 class="m-0 font-weight-bold text-primary">
- Edit {{ page_title }}
- </h6>
- </div>
- <div class="card-body">
- <form method="POST">
- {% csrf_token %}
- {{ item.name }}
- <div class="status d-flex align-items-baseline">
- {{ form.is_active }} <br> Active
- </div>
- <div class="">
- <button class="btn-sm btn-primary rounded p-12" type="submit">
- <i class="far fa-save" aria-hidden="true"></i>
- Simpan
- </button>
- </div>
- </form>
- </div>
-</div>
-{% endblock %}
\ No newline at end of file
diff --git a/administration/templates/kelola_admin.html b/administration/templates/kelola_admin.html
index dd020c9771ca6b73161182317499809216bf6e16..320b37e2db12b7e9067ee3c81de0430cdff2e6c9 100644
--- a/administration/templates/kelola_admin.html
+++ b/administration/templates/kelola_admin.html
@@ -1,5 +1,4 @@
{% extends 'administration/base_administrasi2.html' %}
-{% load static %}
{% block title %}
<title>Kelola Admin | Digipus</title>
diff --git a/administration/templates/registrasi_admin.html b/administration/templates/registrasi_admin.html
index 659c58865f762f7ffe3ca580fa47189fc9da113c..3a14f4caafaeb9bc7d7fde1fff17de5a17728972 100644
--- a/administration/templates/registrasi_admin.html
+++ b/administration/templates/registrasi_admin.html
@@ -1,290 +1,89 @@
-{% load static %}
-
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <meta name="description" content="">
- <meta name="author" content="">
-
- <title>Dasbor - Kelola Admin</title>
-
- <!-- Custom fonts for this template -->
- <link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
-
- <!-- Custom styles for this template -->
- <link rel="icon" type="image/png" href="{% static 'images/icons/logo.ico' %}" />
- <link href="{% static 'css/sb-admin-2.min.css' %}" rel="stylesheet">
- <link rel="stylesheet" href="{% static 'css/button.css' %}">
-
- <!-- Custom styles for this page -->
- <link href="{% static 'vendor/datatables/dataTables.bootstrap4.min.css' %}" rel="stylesheet">
-
-</head>
-
-<body id="page-top" style="font-family: 'Poppins', sans-serif;">
-
- <!-- Page Wrapper -->
- <div id="wrapper">
-
- <!-- Sidebar -->
- <ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
-
- <!-- Sidebar - Brand -->
- <a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'daftar_katalog' %}">
- <div class="sidebar-brand-icon rotate-n-15">
+{% extends 'administration/base_administrasi2.html' %}
+
+{% block title %}
+<title>Dasbor - Kelola Admin</title>
+{% endblock %}
+
+{% block content %}
+ <h1 class="h3 mb-2 text-gray-800">Registrasi Admin</h1>
+ <div class="form-margin"></div>
+ <div class="container admin-page">
+ <div class="col-20">
+ <form id="add_form" method="POST" novalidate enctype="multipart/form-data">
+ {% csrf_token %}
+ <div class="col-md-6 admin-page">
+ <div class="fieldWrapper">
+ {{ form.name.errors }}
+ <label for="{{ form.subject.id_for_label }}">Nama:</label>
+ {{ form.name }}
+ </div>
</div>
- <div class="sidebar-brand-text mx-3">Digipus</div>
- </a>
-
- <!-- Divider -->
- <hr class="sidebar-divider my-0">
-
- <!-- Nav Item - Dashboard -->
- <li class="nav-item">
- <a class="nav-link" href="/administration/">
- <span>Verifikasi Materi</span></a>
- </li>
-
- <li class="nav-item">
- <a class="nav-link" href="#">
- <span>Statistik Materi</span></a>
- </li>
-
- <li class="nav-item">
- <a class="nav-link" href="/administration/laporan-materi/">
- <span>Laporan Materi</span></a>
- </li>
-
- <!-- Divider -->
- <hr class="sidebar-divider my-0">
-
- <li class="nav-item">
- <a class="nav-link" href="/administration/setting/verification/">
- <span>Pengaturan Verifikasi</span></a>
- </li>
-
- <li class="nav-item">
- <a class="nav-link" href="/administration/setting/category/">
- <span>Pengaturan Kategori</span></a>
- </li>
-
- <!-- Divider -->
- <hr class="sidebar-divider my-0">
-
- <li class="nav-item">
- <a class="nav-link" href="/administration/kelola-kontributor/">
- <span>Kelola Kontributor</span></a>
- </li>
-
- <li class="nav-item">
- <a class="nav-link" href="/administration/kelola-admin/">
- <span>Kelola Admin</span></a>
- </li>
-
- <!-- Divider -->
- <hr class="sidebar-divider my-0">
-
- </ul>
- <!-- End of Sidebar -->
-
- <!-- Content Wrapper -->
- <div id="content-wrapper" class="d-flex flex-column">
-
- <!-- Main Content -->
- <div id="content">
-
- <!-- Topbar -->
- <nav class="navbar navbar-expand navbar-light bg-white topbar mb-4 static-top shadow">
-
- <!-- Sidebar Toggle (Topbar) -->
- <button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3">
- <em class="fa fa-bars"></em>
- </button>
-
- <div class="sidebar-brand-text mx-3">Diskominfo Kota Depok</div>
-
- <!-- Topbar Navbar -->
- <ul class="navbar-nav ml-auto">
-
- <li class="nav-item">
- <a class="nav-link" href="/dashboard/">
- <span class="mr-2 d-none d-lg-inline text-gray-600 small">Administrasi</span>
- </a>
- </li>
-
- <li class="nav-item">
- <a class="nav-link" href="/profil/">
- <span class="mr-2 d-none d-lg-inline text-gray-600 small">Profil</span>
- </a>
- </li>
-
- <li class="nav-item">
- <a class="nav-link" href="/logout/">
- <span class="mr-2 d-none d-lg-inline text-gray-600 small">Logout</span>
- </a>
- </li>
-
- <div class="topbar-divider d-none d-sm-block"></div>
-
- <!-- Nav Item - User Information -->
- <li class="nav-item dropdown no-arrow">
- <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown"
- aria-haspopup="true" aria-expanded="false">
- <span class="mr-2 d-none d-lg-inline text-gray-600 small">{{ user.name }}</span>
- {% if not user.default_profile_picture %}
- <img class="img-profile rounded-circle" src="https://i.ibb.co/9wgPzyZ/default-image.png" alt="User profile picture">
- {% else %}
- <img class="img-profile rounded-circle" src="{{ user.profile_picture.url }}" alt="User profile picture">
- {% endif %}
- </a>
- </li>
-
- </ul>
-
- </nav>
- <!-- End of Topbar -->
-
- <!-- Begin Page Content -->
- <div class="container-fluid">
-
- <!-- Page Heading -->
- <h1 class="h3 mb-2 text-gray-800">Registrasi Admin</h1>
- <div class="form-margin"></div>
- <div class="container admin-page">
- <div class="col-20">
- <form id="add_form" method="POST" novalidate enctype="multipart/form-data">
- {% csrf_token %}
- <div class="col-md-6 admin-page">
- <div class="fieldWrapper">
- {{ form.name.errors }}
- <label for="{{ form.subject.id_for_label }}">Nama:</label>
- {{ form.name }}
- </div>
- </div>
- <div class="col-md-6 admin-page">
- <div class="fieldWrapper">
- {{ form.instansi.errors }}
- <label for="{{ form.subject.id_for_label }}">Instansi:</label>
- {{ form.instansi }}
- </div>
- </div>
- <div class="col-md-6 admin-page">
- <div class="fieldWrapper">
- {{ form.nik.errors }}
- <label for="{{ form.subject.id_for_label }}">NIK:</label>
- {{ form.nik }}
- </div>
- </div>
- <div class="col-md-6 admin-page">
- <div class="fieldWrapper">
- {{ form.alamat.errors }}
- <label for="{{ form.subject.id_for_label }}">Alamat:</label>
- {{ form.alamat }}
- </div>
- </div>
- <div class="col-md-6 admin-page">
- <div class="fieldWrapper">
- {{ form.email.errors }}
- <label for="{{ form.subject.id_for_label }}">Email:</label>
- {{ form.email }}
- </div>
- </div>
- <div class="col-md-6 admin-page">
- <div class="fieldWrapper">
- {{ form.nomor_telpon.errors }}
- <label for="{{ form.subject.id_for_label }}">Nomor Telepon:</label>
- {{ form.nomor_telpon }}
- </div>
- </div>
- <div class="col-md-6 admin-page">
- <div class="fieldWrapper">
- {{ form.password.errors }}
- <label for="{{ form.subject.id_for_label }}">Kata Sandi:</label>
- {{ form.password }}
- </div>
- </div>
- <div class="col-md-6 admin-page">
- <div class="fieldWrapper">
- {{ form.password2.errors }}
- <label for="{{ form.subject.id_for_label }}">Ulang Kata Sandi:</label>
- {{ form.password2 }}
- </div>
- </div>
-
- <div class="form-margin"></div>
- <div class="col-md-6 admin-page">
- <div class="d-flex flex-row">
- <div class="p-2">
- <button type="submit" class="btn btn-success btn-edit" style="background-color: #615CFD; border-color: #615CFD;">Simpan</button>
- </div>
- <div class="p-2">
- <a href="/administrasi/kelola-admin" class="btn btn-secondary">Kembali Ke Kelola Admin</a>
- </div>
- </div>
- <div class="fieldWrapper">
-
- </div>
- </div>
- </form>
- </div>
- </div>
+ <div class="col-md-6 admin-page">
+ <div class="fieldWrapper">
+ {{ form.instansi.errors }}
+ <label for="{{ form.subject.id_for_label }}">Instansi:</label>
+ {{ form.instansi }}
+ </div>
+ </div>
+ <div class="col-md-6 admin-page">
+ <div class="fieldWrapper">
+ {{ form.nik.errors }}
+ <label for="{{ form.subject.id_for_label }}">NIK:</label>
+ {{ form.nik }}
+ </div>
+ </div>
+ <div class="col-md-6 admin-page">
+ <div class="fieldWrapper">
+ {{ form.alamat.errors }}
+ <label for="{{ form.subject.id_for_label }}">Alamat:</label>
+ {{ form.alamat }}
+ </div>
+ </div>
+ <div class="col-md-6 admin-page">
+ <div class="fieldWrapper">
+ {{ form.email.errors }}
+ <label for="{{ form.subject.id_for_label }}">Email:</label>
+ {{ form.email }}
+ </div>
+ </div>
+ <div class="col-md-6 admin-page">
+ <div class="fieldWrapper">
+ {{ form.nomor_telpon.errors }}
+ <label for="{{ form.subject.id_for_label }}">Nomor Telepon:</label>
+ {{ form.nomor_telpon }}
+ </div>
+ </div>
+ <div class="col-md-6 admin-page">
+ <div class="fieldWrapper">
+ {{ form.password.errors }}
+ <label for="{{ form.subject.id_for_label }}">Kata Sandi:</label>
+ {{ form.password }}
+ </div>
+ </div>
+ <div class="col-md-6 admin-page">
+ <div class="fieldWrapper">
+ {{ form.password2.errors }}
+ <label for="{{ form.subject.id_for_label }}">Ulang Kata Sandi:</label>
+ {{ form.password2 }}
+ </div>
</div>
- <!-- /.container-fluid -->
- </div>
- <!-- End of Main Content -->
+ <div class="form-margin"></div>
+ <div class="col-md-6 admin-page">
+ <div class="d-flex flex-row">
+ <div class="p-2">
+ <button type="submit" class="btn btn-success btn-edit"
+ style="background-color: #615CFD; border-color: #615CFD;">Simpan</button>
+ </div>
+ <div class="p-2">
+ <a href="/administration/kelola-admin" class="btn btn-secondary">Kembali Ke Kelola Admin</a>
+ </div>
+ </div>
+ <div class="fieldWrapper">
- <!-- Footer -->
- <footer class="sticky-footer bg-white">
- <div class="container my-auto">
- <div class="copyright text-center my-auto">
- <span>Copyright © Diskominfo Kota Depok 2020</span>
</div>
</div>
- </footer>
- <!-- End of Footer -->
-
+ </form>
</div>
- <!-- End of Content Wrapper -->
-
</div>
- <!-- End of Page Wrapper -->
-
- <!-- Scroll to Top Button-->
- <a class="scroll-to-top rounded" href="#page-top">
- <em class="fas fa-angle-up"></em>
- </a>
-
- <!-- Bootstrap core JavaScript-->
- <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
- integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
- crossorigin="anonymous"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
- integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
- crossorigin="anonymous"></script>
- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
- integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
- crossorigin="anonymous"></script>
-
- <!-- Core plugin JavaScript-->
- <script src="https://code.jquery.com/jquery-3.5.0.min.js"
- integrity="sha256-xNzN2a4ltkB44Mc/Jz3pT4iU1cmeR0FkXs4pru/JxaQ=" crossorigin="anonymous"></script>
-
- <!-- Custom scripts for all pages-->
- <script src="{% static 'js/sb-admin-2.min.js' %}"></script>
-
- <!-- Page level plugins -->
- <script src="{% static 'vendor/datatables/jquery.dataTables.min.js' %}"></script>
- <script src="{% static 'vendor/datatables/dataTables.bootstrap4.min.js' %}"></script>
-
- <!-- Page level custom scripts -->
- <script src="{% static 'js/demo/datatables-demo.js' %}"></script>
-
-</body>
-
-</html>
\ No newline at end of file
+{% endblock %}
\ No newline at end of file
diff --git a/administration/views.py b/administration/views.py
index 43a42b877c2b712001de03d85c77c362a8fab0b7..87cef5829487c57d581a5dc9b51f202ae4d1694f 100644
--- a/administration/views.py
+++ b/administration/views.py
@@ -421,7 +421,7 @@ class EditAdminStatusView(TemplateView):
class EditKontributorStatusView(TemplateView):
- template_name = "edit_kontributor.html"
+ template_name = "edit_admin.html"
def dispatch(self, request, *args, **kwargs):
if not request.user.is_authenticated or not request.user.is_admin:
diff --git a/app/templates/app/base_admin.html b/app/templates/app/base_admin.html
deleted file mode 100644
index ff080f96ee2d739e2d7837189a7f9df131341030..0000000000000000000000000000000000000000
--- a/app/templates/app/base_admin.html
+++ /dev/null
@@ -1,165 +0,0 @@
-{% load static %}
-
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
- <title>Digipus</title>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge">
- <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
- <meta name="description" content="">
- <meta name="author" content="">
-
- {% block title %}{% endblock %}
-
- <!-- Custom fonts for this template -->
- <link href="https://fonts.googleapis.com/css2?family=Poppins&display=swap" rel="stylesheet">
-
- <!-- Custom styles for this template -->
- <link rel="icon" type="image/png" href="{% static 'images/icons/logo.ico' %}" />
- <link href="{% static 'css/sb-admin-2.min.css' %}" rel="stylesheet">
- <link rel="stylesheet" href="{% static 'css/button.css' %}">
-
- <!-- Custom styles for this page -->
- <link href="{% static 'vendor/datatables/dataTables.bootstrap4.min.css' %}" rel="stylesheet">
-
-</head>
-
-<body id="page-top" style="font-family: 'Poppins', sans-serif;">
-
- <!-- Page Wrapper -->
- <div id="wrapper">
-
- <!-- Sidebar -->
- <ul class="navbar-nav bg-gradient-primary sidebar sidebar-dark accordion" id="accordionSidebar">
-
- <!-- Sidebar - Brand -->
- <a class="sidebar-brand d-flex align-items-center justify-content-center" href="{% url 'daftar_katalog' %}">
- <div class="sidebar-brand-icon rotate-n-15">
- </div>
- <div class="sidebar-brand-text mx-3">Digipus</div>
- </a>
-
- <!-- Divider -->
- <hr class="sidebar-divider my-0">
-
- <!-- Nav Item - Dashboard -->
- <li class="nav-item">
- <a class="nav-link" href="/profil/">
- <span>Halaman Profil</span></a>
- </li>
-
- <li class="nav-item">
- <a class="nav-link" href="/sunting/">
- <span>Sunting Profil</span></a>
- </li>
-
- </ul>
- <!-- End of Sidebar -->
-
- <!-- Content Wrapper -->
- <div id="content-wrapper" class="d-flex flex-column">
-
- <!-- Main Content -->
- <div id="content">
-
- <!-- Topbar -->
- <nav class="navbar navbar-expand navbar-light bg-white topbar mb-4 static-top shadow">
- <!-- Sidebar Toggle (Topbar) -->
- <button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3">
- <em class="fa fa-bars"></em>
- </button>
- <div class="sidebar-brand-text mx-3">Diskominfo Kota Depok</div>
- <!-- Topbar Navbar -->
- <ul class="navbar-nav ml-auto">
- <li class="nav-item">
- <a class="nav-link" href="/administration/">
- <span class="mr-2 d-none d-lg-inline text-gray-600 small">Administrasi</span>
- </a>
- </li>
- <li class="nav-item">
- <a class="nav-link" href="/profil/">
- <span class="mr-2 d-none d-lg-inline text-gray-600 small">Profil</span>
- </a>
- </li>
- <li class="nav-item">
- <a class="nav-link" href="/logout/">
- <span class="mr-2 d-none d-lg-inline text-gray-600 small">Logout</span>
- </a>
- </li>
- <div class="topbar-divider d-none d-sm-block"></div>
- <!-- Nav Item - User Information -->
- <li class="nav-item dropdown no-arrow">
- <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown"
- aria-haspopup="true" aria-expanded="false">
- <span class="mr-2 d-none d-lg-inline text-gray-600 small">{{ user.name }}</span>
- {% if not user.default_profile_picture %}
- <img class="img-profile rounded-circle" src="https://i.ibb.co/9wgPzyZ/default-image.png" alt="User profile picture">
- {% else %}
- <img class="img-profile rounded-circle" src="{{ user.profile_picture.url }}" alt="User profile picture">
- {% endif %}
- </a>
- </li>
- </ul>
- </nav>
- <!-- End of Topbar -->
-
- <!-- Begin Page Content -->
- <div class="container-fluid">
- {% block content %}{% endblock %}
- </div>
- <!-- /.container-fluid -->
-
- </div>
- <!-- End of Main Content -->
-
- <!-- Footer -->
- <footer class="sticky-footer bg-white">
- <div class="container my-auto">
- <div class="copyright text-center my-auto">
- <span>Copyright © Diskominfo Kota Depok 2020</span>
- </div>
- </div>
- </footer>
- <!-- End of Footer -->
-
- </div>
- <!-- End of Content Wrapper -->
-
- </div>
- <!-- End of Page Wrapper -->
-
- <!-- Scroll to Top Button-->
- <a class="scroll-to-top rounded" href="#page-top">
- <em class="fas fa-angle-up"></em>
- </a>
-
- <!-- Bootstrap core JavaScript-->
- <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
- integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
- crossorigin="anonymous"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js"
- integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1"
- crossorigin="anonymous"></script>
- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
- integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
- crossorigin="anonymous"></script>
-
- <!-- Core plugin JavaScript-->
- <script src="https://code.jquery.com/jquery-3.5.0.min.js"
- integrity="sha256-xNzN2a4ltkB44Mc/Jz3pT4iU1cmeR0FkXs4pru/JxaQ=" crossorigin="anonymous"></script>
-
- <!-- Custom scripts for all pages-->
- <script src="{% static 'js/sb-admin-2.min.js' %}"></script>
-
- <!-- Page level plugins -->
- <script src="{% static 'vendor/datatables/jquery.dataTables.min.js' %}"></script>
- <script src="{% static 'vendor/datatables/dataTables.bootstrap4.min.js' %}"></script>
-
- <!-- Page level custom scripts -->
- <script src="{% static 'js/demo/datatables-demo.js' %}"></script>
-
-</body>
-
-</html>
\ No newline at end of file