mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-25 19:42:30 +00:00
Merge pull request #203 from AndreasK79/new_user_default_confirmation
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
<div class="container">
|
||||
<h3>
|
||||
<?php if (isset($user_add)) {
|
||||
<?php if (isset($user_add)) {
|
||||
echo lang('account_create_user_account');
|
||||
} else {
|
||||
echo lang('account_edit_account')." <small class=\"text-muted\">".$user_name."</small>";
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
|
||||
</h3>
|
||||
|
||||
<?php if($this->session->flashdata('success')) { ?>
|
||||
@@ -59,15 +59,15 @@
|
||||
<input class="form-control" type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" />
|
||||
<?php if(isset($email_error)) { echo "<small class=\"badge bg-danger\">".$email_error."</small>"; } ?>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="mb-3">
|
||||
<label><?php echo lang('account_password'); ?></label>
|
||||
<div class="input-group">
|
||||
<input class="form-control" type="password" name="user_password" />
|
||||
<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
|
||||
</div>
|
||||
<?php if(isset($password_error)) {
|
||||
echo "<small class=\"badge bg-danger\">".$password_error."</small>";
|
||||
<?php if(isset($password_error)) {
|
||||
echo "<small class=\"badge bg-danger\">".$password_error."</small>";
|
||||
} else if (!isset($user_add)) { ?>
|
||||
<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
|
||||
<?php } ?>
|
||||
@@ -181,9 +181,9 @@
|
||||
|
||||
<div class="mb-3">
|
||||
<label><?php echo lang('account_timezone'); ?></label>
|
||||
<?php
|
||||
<?php
|
||||
if(!isset($user_timezone)) { $user_timezone='151'; }
|
||||
echo form_dropdown('user_timezone', $timezones, $user_timezone);
|
||||
echo form_dropdown('user_timezone', $timezones, $user_timezone);
|
||||
?>
|
||||
</div>
|
||||
|
||||
@@ -424,7 +424,7 @@
|
||||
<option value="0" <?php if ($user_show_notes == 0) { echo " selected =\"selected\""; } ?>><?php echo lang('general_word_no'); ?></option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
|
||||
<hr/>
|
||||
|
||||
<div class="mb-3">
|
||||
@@ -478,7 +478,7 @@
|
||||
<input type="hidden" name="user_map_station_icon" value="<?php echo $user_map_station_icon; ?>">
|
||||
<div class="form-select icon_overSelect"><?php echo (($user_map_station_icon=="0")?substr($this->lang->line('general_word_not_display'),0,10).'.':("<i class='".$user_map_station_icon."'></i>")); ?></div>
|
||||
</div>
|
||||
<div class="col-md-3 icon_selectBox_data" data-boxcontent="station">
|
||||
<div class="col-md-3 icon_selectBox_data" data-boxcontent="station">
|
||||
<?php foreach($map_icon_select['station'] as $val) {
|
||||
echo "<label data-value='".$val."'>".(($val=="0")?$this->lang->line('general_word_not_display'):("<i class='".$val."'></i>"))."</label>";
|
||||
} ?>
|
||||
@@ -496,7 +496,7 @@
|
||||
<input type="hidden" name="user_map_qso_icon" value="<?php echo $user_map_qso_icon; ?>">
|
||||
<div class="form-select icon_overSelect"><?php echo "<i class='".$user_map_qso_icon."'></i>"; ?></div>
|
||||
</div>
|
||||
<div class="col-md-3 icon_selectBox_data" data-boxcontent="qso">
|
||||
<div class="col-md-3 icon_selectBox_data" data-boxcontent="qso">
|
||||
<?php foreach($map_icon_select['qso'] as $val) {
|
||||
echo "<label data-value='".$val."'><i class='".$val."'></i></label>";
|
||||
} ?>
|
||||
@@ -516,7 +516,7 @@
|
||||
<input type="hidden" name="user_map_qsoconfirm_icon" value="<?php echo $user_map_qsoconfirm_icon; ?>">
|
||||
<div class="form-select icon_overSelect"><?php echo (($user_map_qsoconfirm_icon=="0")?$this->lang->line('general_word_no'):("<i class='".$user_map_qsoconfirm_icon."'></i>")); ?></div>
|
||||
</div>
|
||||
<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm">
|
||||
<div class="col-md-3 icon_selectBox_data" data-boxcontent="qsoconfirm">
|
||||
<?php foreach($map_icon_select['qsoconfirm'] as $val) {
|
||||
echo "<label data-value='".$val."'>".(($val=="0")?$this->lang->line('general_word_no'):("<i class='".$val."'></i>"))."</label>";
|
||||
} ?>
|
||||
@@ -597,6 +597,8 @@
|
||||
<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qsl" id="user_default_confirmation_qsl"';
|
||||
if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Q') !== false) {
|
||||
echo ' checked';
|
||||
} else if (!isset($user_default_confirmation)) {
|
||||
echo ' checked';
|
||||
}
|
||||
echo '>'; ?>
|
||||
<label class="form-check-label" for="user_default_confirmation_qsl"><?php echo lang('gen_hamradio_qsl'); ?></label>
|
||||
@@ -605,6 +607,8 @@
|
||||
<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_lotw" id="user_default_confirmation_lotw"';
|
||||
if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'L') !== false) {
|
||||
echo ' checked';
|
||||
} else if (!isset($user_default_confirmation)) {
|
||||
echo ' checked';
|
||||
}
|
||||
echo '>'; ?>
|
||||
<label class="form-check-label" for="user_default_confirmation_lotw"><?php echo lang('lotw_short'); ?></label>
|
||||
@@ -621,7 +625,7 @@
|
||||
<?php echo '<input class="form-check-input" type="checkbox" name="user_default_confirmation_qrz" id="user_default_confirmation_qrz"';
|
||||
if (isset($user_default_confirmation) && strpos($user_default_confirmation, 'Z') !== false) {
|
||||
echo ' checked';
|
||||
}
|
||||
}
|
||||
echo '>'; ?>
|
||||
<label class="form-check-label" for="user_default_confirmation_qrz">QRZ.com</label>
|
||||
</div>
|
||||
@@ -659,8 +663,8 @@
|
||||
<input class="form-control" type="password" name="user_lotw_password" />
|
||||
<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
|
||||
</div>
|
||||
<?php if(isset($lotwpassword_error)) {
|
||||
echo "<small class=\"badge bg-danger\">".$lotwpassword_error."</small>";
|
||||
<?php if(isset($lotwpassword_error)) {
|
||||
echo "<small class=\"badge bg-danger\">".$lotwpassword_error."</small>";
|
||||
} else if (!isset($user_add)) { ?>
|
||||
<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
|
||||
<?php } ?>
|
||||
@@ -686,8 +690,8 @@
|
||||
<input class="form-control" type="password" name="user_eqsl_password" />
|
||||
<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
|
||||
</div>
|
||||
<?php if(isset($eqslpassword_error)) {
|
||||
echo "<small class=\"badge bg-danger\">".$eqslpassword_error."</small>";
|
||||
<?php if(isset($eqslpassword_error)) {
|
||||
echo "<small class=\"badge bg-danger\">".$eqslpassword_error."</small>";
|
||||
} else if (!isset($user_add)) { ?>
|
||||
<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
|
||||
<?php } ?>
|
||||
@@ -714,8 +718,8 @@
|
||||
<input class="form-control" type="password" name="user_clublog_password" />
|
||||
<span class="input-group-btn"><button class="btn btn-default btn-pwd-showhide" type="button"><i class="fa fa-eye-slash"></i></button></span>
|
||||
</div>
|
||||
<?php if(isset($clublogpassword_error)) {
|
||||
echo "<small class=\"badge bg-danger\">".$clublogpassword_error."</small>";
|
||||
<?php if(isset($clublogpassword_error)) {
|
||||
echo "<small class=\"badge bg-danger\">".$clublogpassword_error."</small>";
|
||||
} else if (!isset($user_add)) { ?>
|
||||
<small class="form-text text-muted"><?php echo lang('account_leave_blank_to_keep_existing_password'); ?></small>
|
||||
<?php } ?>
|
||||
|
||||
Reference in New Issue
Block a user