From cc50064291ba600e04df611d4e74103578bf0a76 Mon Sep 17 00:00:00 2001
From: "de@itstall.de" <de@itstall.de>
Date: Sat, 24 Feb 2018 13:28:11 +0100
Subject: [PATCH] Fixed sort by date
---
application/views/admin/auth/login.php | 187 ++++++++----------
application/views/admin/keys/keys_list.php | 4 +
.../views/admin/members/member_list.php | 21 +-
3 files changed, 99 insertions(+), 113 deletions(-)
diff --git a/application/views/admin/auth/login.php b/application/views/admin/auth/login.php
index 78381b5..6e0710b 100644
--- a/application/views/admin/auth/login.php
+++ b/application/views/admin/auth/login.php
@@ -2,120 +2,101 @@
<html lang="en">
<head>
<title><?=isset($title)?$title:'Codeigniter AdminLTE' ?></title>
- <!-- Tell the browser to be responsive to screen width -->
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
- <!-- Bootstrap 3.3.6 -->
<link rel="stylesheet" href="<?= base_url() ?>public/bootstrap/css/bootstrap.min.css">
- <!-- Theme style -->
<link rel="stylesheet" href="<?= base_url() ?>public/dist/css/AdminLTE.min.css">
- <!-- Custom CSS -->
<link rel="stylesheet" href="<?= base_url() ?>public/dist/css/style.css">
- <!-- jQuery 2.2.3 -->
<script src="<?= base_url() ?>public/plugins/jQuery/jquery-2.2.3.min.js"></script>
-
</head>
-<body style="">
- <div class="container">
- <div class="row">
-
- <div class="col-md-4 col-md-offset-4 text-center">
- <div class="login-title">
- <h3><span>AdminLTE</span>USER MANAGEMENT SYSTEM</h3>
- </div>
- <?php if(isset($msg) || validation_errors() !== ''): ?>
- <div class="alert alert-warning alert-dismissible">
- <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
- <h4><i class="icon fa fa-warning"></i> Alert!</h4>
- <?= validation_errors();?>
- <?= isset($msg)? $msg: ''; ?>
- </div>
- <?php endif; ?>
- <div class="form-box">
- <?php echo form_open(base_url('admin/auth/login'), 'class="login-form" '); ?>
- <div class="input-group">
- <input type="email" name="email" id="email" class="form-control" placeholder="Email" >
- <input type="password" name="password" id="password" class="form-control" placeholder="Password" >
- <input type="submit" name="submit" id="submit" class="form-control" value="Submit">
- </div>
- <?php echo form_close(); ?>
+ <body style="">
+ <div class="container">
+ <div class="row">
+ <div class="col-md-4 col-md-offset-4 text-center">
+ <div class="login-title">
+ <h3><span>OpenVerein</span>Anmeldung</h3>
+ </div>
+ <?php if(isset($msg) || validation_errors() !== ''): ?>
+ <div class="alert alert-warning alert-dismissible">
+ <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+ <h4><i class="icon fa fa-warning"></i> Alert!</h4>
+ <?= validation_errors();?>
+ <?= isset($msg)? $msg: ''; ?>
+ </div>
+ <?php endif; ?>
+ <div class="form-box">
+ <?php echo form_open(base_url('admin/auth/login'), 'class="login-form" '); ?>
+ <div class="input-group">
+ <input type="email" name="email" id="email" class="form-control" placeholder="Email" >
+ <input type="password" name="password" id="password" class="form-control" placeholder="Password" >
+ <input type="submit" name="submit" id="submit" class="form-control" value="Submit">
+ </div>
+ <?php echo form_close(); ?>
+ </div>
</div>
</div>
</div>
- </div>
-</body>
-
- <!-- Bootstrap 3.3.6 -->
+ </body>
<script src="<?= base_url() ?>public/bootstrap/js/bootstrap.min.js"></script>
-
- <!-- AdminLTE App -->
<script src="<?= base_url() ?>public/dist/js/app.min.js"></script>
-
-
<style type="text/css">
-
- body{
- background:url('<?= base_url('public/dist/img/wildernessculture.jpg')?>');
- background-position: center;
- background-size: cover;
- }
- .login-title{
- padding-top: 80px;
- color: #fff;
- }
- .login-title span{
- font-size: 30px;
- line-height: 1.9;
- display: block;
- font-weight: 700;
- }
- .form-box{
- position: relative;
- background: #ffffffa6;
- max-width: 375px;
- width: 100%;
- box-shadow: 0 0 3px rgba(0, 0, 0, 0.1);
- padding: 51px 20px 41px 20px;
- }
-
-
- .form-control{
- background: #ffffffd6;
- }
- .login-form input[type=text], .login-form input[type=password]{
- margin-bottom:10px;
- }
-
- .login-form input {
- outline: none;
- display: block;
- width: 100%;
- border: 1px solid #d9d9d9;
- margin: 0 0 20px;
- padding: 10px 15px;
- box-sizing: border-box;
- border-radius: 0;
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- min-height: 40px;
- font-wieght: 400;
- -webkit-transition: 0.3s ease;
- transition: 0.3s ease;
- }
-
- .login-form input[type=submit]{
- cursor: pointer;
- background: #33b5e5;
- width: 100%;
- border: 0;
- padding: 8px 15px;
- color: #ffffff;
- -webkit-transition: 0.3s ease;
- transition: 0.3s ease;
- border-radius: 0;
- -moz-border-radius: 0;
- -webkit-border-radius: 0;
- min-height: 40px;
-
- }
+ body {
+ background:url('<?= base_url('public/dist/img/wildernessculture.jpg')?>');
+ background-position: center;
+ background-size: cover;
+ }
+ .login-title {
+ padding-top: 80px;
+ color: #fff;
+ }
+ .login-title span {
+ font-size: 30px;
+ line-height: 1.9;
+ display: block;
+ font-weight: 700;
+ }
+ .form-box {
+ position: relative;
+ background: #ffffffa6;
+ max-width: 375px;
+ width: 100%;
+ box-shadow: 0 0 3px rgba(0, 0, 0, 0.1);
+ padding: 51px 20px 41px 20px;
+ }
+ .form-control {
+ background: #ffffffd6;
+ }
+ .login-form input[type=text], .login-form input[type=password] {
+ margin-bottom:10px;
+ }
+ .login-form input {
+ outline: none;
+ display: block;
+ width: 100%;
+ border: 1px solid #d9d9d9;
+ margin: 0 0 20px;
+ padding: 10px 15px;
+ box-sizing: border-box;
+ border-radius: 0;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ min-height: 40px;
+ font-wieght: 400;
+ -webkit-transition: 0.3s ease;
+ transition: 0.3s ease;
+ }
+ .login-form input[type=submit] {
+ cursor: pointer;
+ background: #33b5e5;
+ width: 100%;
+ border: 0;
+ padding: 8px 15px;
+ color: #ffffff;
+ -webkit-transition: 0.3s ease;
+ transition: 0.3s ease;
+ border-radius: 0;
+ -moz-border-radius: 0;
+ -webkit-border-radius: 0;
+ min-height: 40px;
+ }
</style>
</html>
\ No newline at end of file
diff --git a/application/views/admin/keys/keys_list.php b/application/views/admin/keys/keys_list.php
index 7ba51bb..3e9ccb7 100644
--- a/application/views/admin/keys/keys_list.php
+++ b/application/views/admin/keys/keys_list.php
@@ -58,8 +58,12 @@
<script src="<?= base_url() ?>public/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="<?= base_url() ?>public/plugins/datatables/dataTables.bootstrap.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment.min.js"></script>
+<script src="//cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
+
<script>
$(function () {
+ $.fn.dataTable.moment( 'DD.MM.YYYY' );
$("#example1").DataTable({
"language": {
"url": "//cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/German.json"
diff --git a/application/views/admin/members/member_list.php b/application/views/admin/members/member_list.php
index 19ec014..f11707b 100644
--- a/application/views/admin/members/member_list.php
+++ b/application/views/admin/members/member_list.php
@@ -59,7 +59,6 @@
<!-- /.box -->
</section>
-
<!-- Modal -->
<div id="confirm-delete" class="modal fade" role="dialog">
<div class="modal-dialog">
@@ -77,29 +76,31 @@
<a class="btn btn-danger btn-ok">Yes</a>
</div>
</div>
-
</div>
</div>
-
<!-- DataTables -->
<script src="<?= base_url() ?>public/plugins/datatables/jquery.dataTables.min.js"></script>
<script src="<?= base_url() ?>public/plugins/datatables/dataTables.bootstrap.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment.min.js"></script>
+<script src="//cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
+
<script>
$(function () {
- $("#example1").DataTable({
+ $.fn.dataTable.moment( 'DD.MM.YYYY' );
+ $("#example1").DataTable({
"language": {
"url": "//cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/German.json"
}
});
});
</script>
- <script type="text/javascript">
- $('#confirm-delete').on('show.bs.modal', function(e) {
- $(this).find('.btn-ok').attr('href', $(e.relatedTarget).data('href'));
+<script type="text/javascript">
+ $('#confirm-delete').on('show.bs.modal', function(e) {
+ $(this).find('.btn-ok').attr('href', $(e.relatedTarget).data('href'));
});
- </script>
+</script>
<script>
-$("#view_users").addClass('active');
-</script>
+ $("#view_users").addClass('active');
+</script>
\ No newline at end of file
--
GitLab