Skip to content

Commit 0339b2c

Browse files
committed
Корректировки полей
1 parent 2a998e8 commit 0339b2c

File tree

6 files changed

+65
-2
lines changed

6 files changed

+65
-2
lines changed

system/controllers/admin/grids/grid_users.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function grid_users($controller){
3939
'ip' => array(
4040
'title' => LANG_USERS_PROFILE_LAST_IP,
4141
'width' => 130,
42-
'class' => 'd-none d-lg-table-cell',
42+
'class' => 'd-none d-xxl-table-cell',
4343
'filter' => 'like',
4444
'handler' => function($value){
4545
if(!$value){
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php if($field->title){ ?><label for="<?php echo $field->id; ?>"><?php echo $field->title; ?></label><?php } ?>
2+
3+
<?php echo html_datepicker($field->data['fname_date'], $field->data['date'], array('id'=>$field->id), array('minDate'=>date('d.m.Y', 86400))); ?>
4+
5+
<?php if($field->data['show_time']){ ?>
6+
<?php echo html_select_range($field->data['fname_hours'], 0, 23, 1, true, $field->data['hours']); ?> :
7+
<?php echo html_select_range($field->data['fname_mins'], 0, 59, 1, true, $field->data['mins']); ?>
8+
<?php } ?>
9+
10+
<a class="ajaxlink" onclick="return parser_current_time_<?php echo $field->id; ?>(this);" href="#"><?php echo LANG_PARSER_CURRENT_TIME; ?></a>
11+
<script type="text/javascript">
12+
function parser_current_time_<?php echo $field->id; ?>(a){
13+
var now = new Date();
14+
var p = $(a).parent();
15+
p.find('input:eq(0)').val((now.getDate()+'.'+(now.getMonth()+1)+'.'+now.getFullYear()).replace(/(\b\d\b)/g, '0$1'));
16+
<?php if($field->data['show_time']){ ?>
17+
p.find('select:eq(0) > option:selected').attr('selected', false);
18+
p.find('select:eq(0) > option[value='+(now.getHours()+'').replace(/(\b\d\b)/g, '0$1')+']').prop('selected', true);
19+
p.find('select:eq(1) > option:selected').attr('selected', false);
20+
var mins = now.getMinutes(), last = p.find('select:eq(1) > option[value=00]');
21+
p.find('select:eq(1) > option').each(function(){
22+
if($(this).val()*1 > mins){
23+
last.prop('selected', true);
24+
return;
25+
}
26+
last = $(this);
27+
});
28+
if(last.not(':selected')){
29+
last.prop('selected', true);
30+
}
31+
<?php } ?>
32+
return false;
33+
}
34+
</script>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php if ($field->title) { ?><label class="d-block" for="<?php echo $field->id; ?>"><?php echo $field->title; ?></label><?php } ?>
2+
<div class="d-flex align-items-center">
3+
<span class="mr-2"><?php echo LANG_FROM; ?></span>
4+
<?php echo html_datepicker($field->element_name.'[from]', $from, array('id' => $field->id.'_from')).' '; ?>
5+
<span class="mx-2"><?php echo LANG_TO; ?></span>
6+
<?php echo html_datepicker($field->element_name.'[to]', $to, array('id' => $field->id.'_to')); ?>
7+
</div>
8+
9+
10+

templates/admincoreui/assets/fields/listgroups.tpl.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?php if ($field->title) { ?><label for="<?php echo $field->id; ?>"><?php echo $field->title; ?></label><?php } ?>
2-
<?php echo html_select_multiple($field->element_name, $field->data['groups'], $value, array('id'=>$field->id)); ?>
2+
<div class="mt-2">
3+
<?php echo html_select_multiple($field->element_name, $field->data['groups'], $value, array('id'=>$field->id)); ?>
4+
</div>
35

46
<script type="text/javascript">
57
$(function() {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php if ($field->title) { ?><label for="<?php echo $field->id; ?>" class="d-block"><?php echo $field->title; ?></label><?php } ?>
2+
<div class="d-flex align-items-center">
3+
<span class="mr-2"><?php echo LANG_FROM; ?></span>
4+
<?php echo html_input('text', $field->element_name.'[from]', $from, array('class'=>'short-input')); ?>
5+
<span class="mx-2"><?php echo LANG_TO; ?></span>
6+
<div class="input-group">
7+
<?php echo html_input('text', $field->element_name.'[to]', $to, array('class'=>'short-input')); ?>
8+
<?php if($field->data['units']){ ?>
9+
<div class="input-group-append">
10+
<span class="input-group-text input-number-units"><?php echo $field->data['units']; ?></span>
11+
</div>
12+
<?php } ?>
13+
</div>
14+
</div>

templates/admincoreui/controllers/admin/styles.css

+3
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@
153153
border-top: none;
154154
margin: 0 0 0 1.5rem !important;
155155
}
156+
.sidebar-minimized .fixed_toolbar {
157+
left: 50px;
158+
}
156159
#fixed_toolbar_spacer {
157160
margin: 0.5rem 0 !important;
158161
height: 45px;

0 commit comments

Comments
 (0)