Browse Source

관리자 변경중

master
Jang SeonGeun 6 years ago
parent
commit
95c6c8c5c2
  1. 9
      _src/admin/js/admin.js
  2. 13
      _src/admin/scss/components/_form.scss
  3. 2
      public_html/assets/css/admin.min.css
  4. 2
      public_html/assets/css/admin.min.css.map
  5. BIN
      public_html/assets/images/admin/frm-select-arrow.png
  6. 2
      public_html/assets/js/admin.min.js
  7. 2
      public_html/assets/js/admin.min.js.map
  8. 9
      wheeparam/application/controllers/admin/Members.php
  9. 8
      wheeparam/views/themes/admin/members/lists.php

9
_src/admin/js/admin.js

@ -85,7 +85,12 @@ APP.initPlugins = function() {
$.datepicker.setDefaults($.datepicker.regional['ko']); $.datepicker.setDefaults($.datepicker.regional['ko']);
$('[data-toggle="datepicker"]').datepicker();
$('[data-toggle="datepicker"]').each(function(){
$(this).formatter({
pattern : '{{9999}}-{{99}}-{{99}}',
persistent:true
}).datepicker();
});
$("body").on("click", '[data-toggle="datepicker"]', function(){ $("body").on("click", '[data-toggle="datepicker"]', function(){
if (!$(this).hasClass("hasDatepicker")) if (!$(this).hasClass("hasDatepicker"))
@ -95,7 +100,6 @@ APP.initPlugins = function() {
} }
}); });
/*
$('[data-toggle="formatter"]').each(function(){ $('[data-toggle="formatter"]').each(function(){
if( $(this).data('pattern') ) if( $(this).data('pattern') )
{ {
@ -106,6 +110,7 @@ APP.initPlugins = function() {
} }
}); });
/*
$.datetimepicker.setLocale('kr'); $.datetimepicker.setLocale('kr');
$('[data-toggle="datetimepicker"]').datetimepicker({ $('[data-toggle="datetimepicker"]').datetimepicker({
format:'Y-m-d H:i' format:'Y-m-d H:i'

13
_src/admin/scss/components/_form.scss

@ -9,7 +9,7 @@
color: #495057; color: #495057;
background-color: #fff; background-color: #fff;
background-clip: padding-box; background-clip: padding-box;
border: 1px solid #ced4da;
border: 1px solid #dcdcdc;
border-radius: $input-btn-border-radius; border-radius: $input-btn-border-radius;
box-shadow:none; box-shadow:none;
@include transition(); @include transition();
@ -61,6 +61,17 @@
} }
select.form-control { select.form-control {
background-image:url(../images/admin/frm-select-arrow.png);
background-position: 95% center;
background-repeat: no-repeat;
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
&::-ms-expand {
display:none;
}
&:focus::-ms-value { &:focus::-ms-value {
color: #495057; color: #495057;
background-color: #fff; background-color: #fff;

2
public_html/assets/css/admin.min.css
File diff suppressed because it is too large
View File

2
public_html/assets/css/admin.min.css.map
File diff suppressed because it is too large
View File

BIN
public_html/assets/images/admin/frm-select-arrow.png

After

Width: 10  |  Height: 6  |  Size: 176 B

2
public_html/assets/js/admin.min.js
File diff suppressed because it is too large
View File

2
public_html/assets/js/admin.min.js.map
File diff suppressed because it is too large
View File

9
wheeparam/application/controllers/admin/Members.php

@ -32,9 +32,18 @@ class Members extends WB_Controller {
{ {
$this->load->model('member_model'); $this->load->model('member_model');
$this->data['sdate'] = $this->input->get('sdate', TRUE);
$this->data['startdate'] = $this->input->get('startdate', TRUE);
$this->data['enddate'] = $this->input->get('enddate', TRUE);
if( $this->data['sdate'] && $this->data['startdate'] ) $param['where']['mem_' . $this->data['sdate'] . ' >=' ] = $this->data['startdate'] . " 00:00:00";
if( $this->data['sdate'] && $this->data['enddate'] ) $param['where']['mem_' . $this->data['sdate'] . ' <=' ] = $this->data['enddate'] . " 23:59:59";
// 정보 넣기 // 정보 넣기
$param['page'] = $this->input->get('page', TRUE, 1); $param['page'] = $this->input->get('page', TRUE, 1);
$param['page_rows'] = 20; $param['page_rows'] = 20;
$param['limit'] = TRUE;
// 회원목록 가져오기 // 회원목록 가져오기
$this->data['member_list'] = $this->member_model->member_list($param); $this->data['member_list'] = $this->member_model->member_list($param);

8
wheeparam/views/themes/admin/members/lists.php

@ -13,17 +13,17 @@
<div data-ax-td-label>기간 검색</div> <div data-ax-td-label>기간 검색</div>
<div data-ax-td-wrap> <div data-ax-td-wrap>
<select class="form-control form-control-sm" name="sdate"> <select class="form-control form-control-sm" name="sdate">
<option value="regtime">가입일</option>
<option value="logtime">최근로그인</option>
<option value="regtime" <?=$sdate=='regtime'?'selected':''?>>가입일</option>
<option value="logtime" <?=$sdate=='logtime'?'selected':''?>>최근로그인</option>
</select> </select>
</div> </div>
</div> </div>
<div data-ax-td> <div data-ax-td>
<div data-ax-td-wrap> <div data-ax-td-wrap>
<input class="form-control form-control-sm" name="startdate" data-toggle="datepicker" value="">
<input class="form-control form-control-sm" name="startdate" data-toggle="datepicker" value="<?=$startdate?>">
</div> </div>
<div data-ax-td-wrap> <div data-ax-td-wrap>
<input class="form-control form-control-sm" name="enddate" data-toggle="datepicker" value="">
<input class="form-control form-control-sm" name="enddate" data-toggle="datepicker" value="<?=$enddate?>">
</div> </div>
</div> </div>
<div data-ax-td> <div data-ax-td>

Loading…
Cancel
Save