관리자 변경중

_src/admin/scss/_variables.scss

@@ -35,27 +35,27 @@ $table-cell-padding:          .75rem !default;
 $table-cell-padding-sm:       .3rem !default;
 
 // 버튼 및 INPUT
-$input-btn-padding-y  : $font-size-base * 0.375 !default; // 상하
-$input-btn-padding-x  : $font-size-base * 0.75 !default; // 좌우
-$input-btn-font-size  : $font-size-base !default;
+$input-btn-padding-y  : 7px !default; // 상하
+$input-btn-padding-x  : 24px !default; // 좌우
+$input-btn-font-size  : 15px !default;
 $input-btn-line-height: $line-height-base !default;
 $input-btn-border-radius : 4px !default;
 
-$input-btn-padding-y-xs:      $font-size-base * 0.125 !default;
-$input-btn-padding-x-xs:      $font-size-base * 0.25 !default;
-$input-btn-font-size-xs:      $font-size-base * 0.75 !default;
+$input-btn-padding-y-xs:      4px !default;
+$input-btn-padding-x-xs:      12px !default;
+$input-btn-font-size-xs:      11px !default;
 $input-btn-line-height-xs:    $line-height-base !default;
 $input-btn-border-radius-xs : 2px !default;
 
-$input-btn-padding-y-sm:      $font-size-base * 0.25 !default;
-$input-btn-padding-x-sm:      $font-size-base * 0.5 !default;
-$input-btn-font-size-sm:      $font-size-base * 0.875 !default;
+$input-btn-padding-y-sm:      6.5px !default;
+$input-btn-padding-x-sm:      17px !default;
+$input-btn-font-size-sm:      13px !default;
 $input-btn-line-height-sm:    $line-height-base !default;
 $input-btn-border-radius-sm : 3px !default;
 
-$input-btn-padding-y-lg:      $font-size-base * 0.5 !default;
-$input-btn-padding-x-lg:      $font-size-base !default;
-$input-btn-font-size-lg:      $font-size-base * 1.25 !default;
+$input-btn-padding-y-lg:      12px !default;
+$input-btn-padding-x-lg:      25px !default;
+$input-btn-font-size-lg:      15px !default;
 $input-btn-line-height-lg:    $line-height-base !default;
 $input-btn-border-radius-lg : 6px !default;
 
@@ -68,8 +68,7 @@ $theme-colors: map-merge((
         "warning":    $color-warning,
         "danger":     $color-danger,
         "light" : $color-light,
-        "dark" : $color-dark,
-        "default" : $color-light
+        "dark" : $color-dark
 ), $theme-colors);
 
 $brand-primary : $color-primary;

_src/admin/scss/admin.scss

@@ -16,6 +16,7 @@
 @import "components/dropdown";
 @import "components/grid";
 @import "components/form";
+@import "components/pagination";
 
 // 각종 플러그인 SCSS 및 플러그인 커스텀
 @import "plugins/jquery_ui";

_src/admin/scss/common/_layout.scss

@@ -196,7 +196,7 @@ $nav-height : 59px;
 }
 
 .page-header {
-  margin-bottom:30px;
+  margin-bottom:15px;
 
   .page-title {
     font-size:23px;
@@ -210,3 +210,11 @@ $nav-height : 59px;
     }
   }
 }
+
+.box {
+  position:relative;
+  padding:30px;
+  background:#fff;
+  border-radius:4px;
+  border:1px solid #e6e6e6;
+}

_src/admin/scss/components/_buttons.scss

@@ -51,6 +51,10 @@ fieldset:disabled a.btn {
   }
 }
 
+.btn-default {
+  @include button-variant(#fff, #979797);
+}
+
 .btn-xs {
   @include button-size($input-btn-padding-y-xs, $input-btn-padding-x-xs, $input-btn-font-size-xs, $input-btn-line-height-xs, $input-btn-border-radius-xs);
 }

_src/admin/scss/components/_form.scss

@@ -1,4 +1,96 @@
+.form-control {
+  display: block;
+  width: 100%;
+  height: 38px;
+  padding: $input-btn-padding-y ( $input-btn-padding-x / 2);
+  font-size: $input-btn-font-size;
+  font-weight: $font-weight-base;
+  line-height: $input-btn-line-height;
+  color: #495057;
+  background-color: #fff;
+  background-clip: padding-box;
+  border: 1px solid #ced4da;
+  border-radius: $input-btn-border-radius;
+  box-shadow:none;
+  @include transition();
+
+  &::-ms-expand {
+    background-color: transparent;
+    border: 0;
+  }
+
+  &:focus {
+    border-color: #80bdff;
+    outline: 0;
+  }
+
+  &::placeholder {
+    color: #6c757d;
+    opacity: 1;
+  }
+
+  &:disabled,
+  &[readonly] {
+    background-color: #e9ecef;
+    opacity: 1;
+  }
+
+  &.form-control-sm {
+    height: 34px;
+    padding: $input-btn-padding-y-sm ($input-btn-padding-x-sm /2 );
+    font-size: $input-btn-font-size-sm;
+    line-height: $input-btn-line-height-sm;
+    border-radius:$input-btn-border-radius-sm;
+  }
+
+  &.form-control-xs {
+    height: 26px;
+    padding: $input-btn-padding-y-xs ($input-btn-padding-x-xs /2 );
+    font-size: $input-btn-font-size-xs;
+    line-height: $input-btn-line-height-xs;
+    border-radius:$input-btn-border-radius-xs;
+  }
+
+  &.form-control-lg {
+    height: 48px;
+    padding: $input-btn-padding-y-lg ( $input-btn-padding-x-lg / 2);
+    font-size: $input-btn-font-size-lg;
+    line-height: $input-btn-line-height-lg;
+    border-radius:$input-btn-border-radius-lg;
+  }
+}
 
+select.form-control {
+  &:focus::-ms-value {
+    color: #495057;
+    background-color: #fff;
+  }
+}
+
+.bottom-actions {
+  @include display-flex();
+  align-items: center;
+
+  .left,
+  .right {
+    -webkit-flex:1;
+    -ms-flex:1;
+    flex:1;
+  }
+  .center {
+    -webkit-flex:2;
+    -ms-flex:2;
+    flex:2;
+  }
+
+  .left {
+    text-align:left;
+  }
+
+  .right {
+    text-align:right;
+  }
+}
 
 //버튼그룹
 .ax-button-group {

_src/admin/scss/components/_pagination.scss

@@ -0,0 +1,41 @@
+.pagination {
+  display:block;
+  width:100%;
+  text-align:center;
+  list-style:none;
+  margin:0;
+  padding:0;
+  font-size:0;
+
+  li {
+    display:inline-block;
+    font-size:0;
+    margin:0 3px;
+
+    a,
+    span {
+      display:block;
+      font-size:15px;
+      color:#979797;
+      padding:5px 10px;
+      background-color:#f4f8f9;
+      border-radius:2px;
+      border:1px solid #979797;
+    }
+
+    &.active {
+      a, span {
+        background-color:$brand-primary;
+        color:#fff;
+        border-color:$brand-primary;
+      }
+    }
+
+    &.disabled {
+      a,span {
+        cursor:not-allowed;
+        opacity:0.4;
+      }
+    }
+  }
+}

wheeparam/application/helpers/admin_helper.php

@@ -4,7 +4,7 @@ function display_member_menu($mem_idx, $mem_name, $mem_status='Y')
     $CI =& get_instance();
 
     $str = '<div class="btn-group ML10 ">';
-    $str .= '<button type="button" class="btn btn-xs btn-primary dropdown-toggle" data-toggle="dropdown">'.$mem_name.' <span class="caret"></span></button>';
+    $str .= '<button type="button" class="btn dropdown-toggle" data-toggle="dropdown">'.$mem_name.' <i class="fas fa-angle-down"></i></button>';
     $str .= '<ul class="dropdown-menu dropdown-menu-dark">';
     $str .= '<li><a href="javascript:;" onclick="APP.MEMBER.POP_INFO_ADMIN('.$mem_idx.');">회원정보</a></li>';
     $str .= '<li><a href="javascript:;" onclick="APP.MEMBER.POP_MODIFY_ADMIN('.$mem_idx.');">정보수정</a></li>';

wheeparam/application/libraries/Paging.php

@@ -9,10 +9,10 @@ class Paging
     protected $display_always   = TRUE; // 페이지가 1페이지만 있어도 출력할건지 여부
     protected $fixed_page_num       = 10;    // 한번에 표시할 페이지 수
 
-    protected $first_link = "처음";     // [처음] 버튼에 표시할 문자
-    protected $next_link = '다음';               // [다음] 버튼에 표시할 문자
-    protected $prev_link = '이전';                // [이전] 버튼에 표시할 문자
-    protected $last_link = '마지막';    // [마지막] 버튼에 표시할 문자
+    protected $first_link = "<i class='far fa-chevron-double-left'></i>";     // [처음] 버튼에 표시할 문자
+    protected $next_link = '<i class="far fa-chevron-right"></i>';               // [다음] 버튼에 표시할 문자
+    protected $prev_link = '<i class="far fa-chevron-left"></i>';                // [이전] 버튼에 표시할 문자
+    protected $last_link = '<i class="far fa-chevron-double-right"></i>';    // [마지막] 버튼에 표시할 문자
 
     protected $full_tag_open = '<ul class="pagination pagination-sm">';   // 전체를 감싸는 여는 태그
     protected $full_tag_close = '</ul>';                    // 전체를 감싸는 닫는 태그

wheeparam/views/themes/admin/management/popup.php

@@ -8,7 +8,7 @@
         <h4>팝업 관리</h4>
     </div>
     <div class="right">
-        <a class="btn btn-secondary" href="<?=base_url('admin/management/popup_form')?>"><i class="far fa-plus-circle"></i> 신규 팝업 등록</a>
+        <a class="btn btn-primary" href="<?=base_url('admin/management/popup_form')?>"><i class="far fa-plus-circle"></i> 신규 팝업 등록</a>
     </div>
 </div>
 
@@ -44,9 +44,9 @@
                 <label class="label label-default">미 표시중</label>
                 <?php endif;?>
             </td>
-            <td class="text-center W150">
-                <a class="btn btn-default btn-xs" href="<?=base_url('admin/management/popup_form/'.$row['pop_idx'])?>"><i class="far fa-pencil"></i> 수정</a>
-                <a class="btn btn-danger btn-xs" onclick="return confirm('해당 팝업을 삭제하시겠습니까?');" href="<?=base_url('admin/management/popup_delete/'.$row['pop_idx'])?>"><i class="far fa-trash"></i> 삭제</a>
+            <td class="text-center W200">
+                <a class="btn btn-default btn-sm" href="<?=base_url('admin/management/popup_form/'.$row['pop_idx'])?>"><i class="far fa-pencil"></i> 수정</a>
+                <a class="btn btn-danger btn-sm" onclick="return confirm('해당 팝업을 삭제하시겠습니까?');" href="<?=base_url('admin/management/popup_delete/'.$row['pop_idx'])?>"><i class="far fa-trash"></i> 삭제</a>
             </td>
         </tr>
         <?php endforeach;?>

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

@@ -1,23 +1,32 @@
 <div class="page-header">
-    <h1 class="page-title">회원 목록</h1>
+    <h1 class="page-title">회원 목록<small>회원관리 &gt; 회원목록</small></h1>
 </div>
 
+<div class="box">
     <?=form_open(NULL, array("method"=>'get','class'=>'form-flex','autocomplete'=>'off'))?>
-<div class="form-group">
-    <label class="control-label">기간 검색</label>
-    <div class="controls">
-        <select class="form-control form-control-inline" name="sdate">
+    <div data-ax-tbl>
+        <div data-ax-tr>
+            <div data-ax-td>
+                <div data-ax-td-label>기간 검색</div>
+                <div data-ax-td-wrap>
+                    <select class="form-control form-control-sm" name="sdate">
                         <option value="regtime">가입일</option>
                         <option value="logtime">최근로그인</option>
                     </select>
-        <input class="form-control form-control-inline" name="startdate" data-toggle="datepicker" value="">
-        <input class="form-control form-control-inline" name="enddate" data-toggle="datepicker" value="">
                 </div>
             </div>
-<div class="form-group">
-    <label class="control-label">권한</label>
-    <div class="controls">
-        <select class="form-control form-control-inline" name="mem_auth">
+            <div data-ax-td>
+                <div data-ax-td-wrap>
+                    <input class="form-control form-control-sm" name="startdate" data-toggle="datepicker" value="">
+                </div>
+                <div data-ax-td-wrap>
+                    <input class="form-control form-control-sm" name="enddate" data-toggle="datepicker" value="">
+                </div>
+            </div>
+            <div data-ax-td>
+                <div data-ax-td-label>권한 그룹</div>
+                <div data-ax-td-wrap>
+                    <select class="form-control form-control-sm" name="mem_auth">
                         <option value="">전체보기</option>
                         <?php for($i=1; $i<=10; $i++) :?>
                             <option value="<?=$i?>"><?=$i?></option>
@@ -25,16 +34,30 @@
                     </select>
                 </div>
             </div>
-
-<div class="form-group">
-    <label class="control-label">검색어 입력</label>
-    <div class="controls">
-        <select class="form-control form-control-inline" name="sc">
+        </div>
+        <div data-ax-tr>
+            <div data-ax-td>
+                <div data-ax-td-label>검색</div>
+                <div data-ax-td-wrap>
+                    <select class="form-control form-control-sm" name="sc">
                         <option value="mem_nickname">닉네임</option>
                         <option value="mem_userid">아이디</option>
                     </select>
-        <input class="form-control form-control-inline" name="st" value="">
-        <button class="btn btn-default btn-lg">필터적용</button>
+                </div>
+            </div>
+            <div data-ax-td>
+                <div data-ax-td-wrap>
+                    <input class="form-control form-control-sm" name="st" value="">
+                </div>
+            </div>
+        </div>
+        <div data-ax-tr>
+            <div data-ax-td>
+                <div data-ax-td-label>필터적용</div>
+                <div data-ax-td-wrap>
+                    <button class="btn btn-default btn-sm"><i class="far fa-search"></i> 필터적용</button>
+                </div>
+            </div>
         </div>
     </div>
     <?=form_close()?>
@@ -43,9 +66,7 @@
 
     <div class="ax-button-group">
         <div class="left">
-        <button type="button" class="btn btn-default btn-xs"><i class="far fa-gift"></i> 선택 <?=$this->site->config('point_name')?> 지급</button>
-        <button type="button" class="btn btn-default btn-xs"><i class="far fa-mobile-phone"></i> 선택 SMS 발송</button>
-        <button type="button" class="btn btn-default btn-xs"><i class="far fa-envelope-o"></i> 선택 메일 발송</button>
+            <h4>회원 검색결과 <small>(<?=number_format($member_list['total_count'])?> 명)</small></h4>
         </div>
     </div>
 
@@ -67,6 +88,7 @@
                 <th class="hidden-xs W125">가입 IP</th>
                 <th class="hidden-xs W150">최근로그인</th>
                 <th class="hidden-xs W125">최근로그인 IP</th>
+                <th class="W100"></th>
             </tr>
             </thead>
             <tbody>
@@ -74,7 +96,7 @@
             <tr>
                 <td class="text-center hidden-xs"><input type="checkbox" data-checkbox="member" name="mem_idx[]" value="<?=$row['mem_idx']?>"></td>
                 <td><?=$row['mem_userid']?></td>
-            <td><?=$row['mem_nickname']?><?=display_member_menu($row['mem_idx'], '<i class="far fa-cog"></i>', $row['mem_status'])?></td>
+                <td><?=display_member_menu($row['mem_idx'], $row['mem_nickname'], $row['mem_status'])?></td>
                 <td><?=$row['mem_email']?></td>
                 <td class="text-center">
                     <?php if($row['mem_status'] == 'Y') : ?>
@@ -109,6 +131,7 @@
                 <td class="hidden-xs text-center"><?=long2ip($row['mem_regip'])?></td>
                 <td class="hidden-xs text-center"><?=date('Y.m.d H:i', strtotime($row['mem_logtime']))?></td>
                 <td class="hidden-xs text-center"><?=long2ip($row['mem_logip'])?></td>
+                <td class="text-center"><button type="button" class="btn btn-sm btn-danger"><i class="far fa-trash"></i> 삭제</button></td>
             </tr>
             <?php endforeach;?>
             </tbody>
@@ -117,13 +140,17 @@
 
     <div class="H10"></div>
 
-<div class="ax-button-group ax-button-group-bottom">
+    <div class="bottom-actions">
         <div class="left">
+            <button type="button" class="btn btn-default btn-sm"><i class="far fa-gift"></i> 선택 <?=$this->site->config('point_name')?> 지급</button>
+            <button type="button" class="btn btn-default btn-sm"><i class="fas fa-mobile-alt"></i> 선택 SMS 발송</button>
+            <button type="button" class="btn btn-default btn-sm"><i class="fas fa-envelope"></i> 선택 메일 발송</button>
+        </div>
+        <div class="center">
             <?=$pagination?>
         </div>
         <div class="right">
-        <a href="<?=base_url('admin/members/add')?>" class="btn btn-default"><i class="far fa-plus-circle"></i> 신규 회원 등록</a>
+            <a href="<?=base_url('admin/members/add')?>" class="btn btn-primary"><i class="far fa-plus-circle"></i> 신규 회원 등록</a>
+        </div>
     </div>
 </div>
-
-<div class="H30"></div>