Cleaned up the edit account area and gave it a new interface

这个提交包含在:
Peter Goodhall 2020-09-15 17:04:38 +01:00
父节点 f98063fd56
当前提交 dd09ca6350
共有 2 个文件被更改,包括 210 次插入128 次删除

查看文件

@ -170,7 +170,7 @@ class User extends CI_Controller {
} }
if($this->input->post('user_lastname', true)) { if($this->input->post('user_lastname', true)) {
$data['user_lastname'] = $this->input->post('user_lastname', tue); $data['user_lastname'] = $this->input->post('user_lastname', true);
} else { } else {
$data['user_lastname'] = $q->user_lastname; $data['user_lastname'] = $q->user_lastname;
} }

查看文件

@ -1,6 +1,10 @@
<div class="container"> <div class="container">
<br> <br>
<h3>
Edit Account
<small class="text-muted"><?php echo $user_name; ?></small>
</h3>
<?php if($this->session->flashdata('message')) { ?> <?php if($this->session->flashdata('message')) { ?>
<!-- Display Message --> <!-- Display Message -->
<div class="alert-message error"> <div class="alert-message error">
@ -8,42 +12,31 @@
</div> </div>
<?php } ?> <?php } ?>
<div class="card"> <?php if(validation_errors()) { ?>
<div class="card-header"> <div class="alert alert-danger">
Edit User <a class="close" data-dismiss="alert">x</a>
</div>
<div class="card-body">
<h5 class="card-title"></h5>
<p class="card-text"></p>
<?php echo validation_errors(); ?> <?php echo validation_errors(); ?>
</div>
<?php } ?>
<?php $this->load->helper('form'); ?> <?php $this->load->helper('form'); ?>
<form method="post" action="<?php echo site_url('user/edit')."/".$this->uri->segment(3); ?>" name="users" autocomplete="off"> <form method="post" action="<?php echo site_url('user/edit')."/".$this->uri->segment(3); ?>" name="users" autocomplete="off">
<br>
<div class="row">
<div class="col">
<div class="card">
<div class="card-header">
Account Information
</div>
<div class="card-body">
<div class="form-group"> <div class="form-group">
<label>Username</label> <label>Username</label>
<input class="form-control" type="text" name="user_name" value="<?php if(isset($user_name)) { echo $user_name; } ?>" /> <input class="form-control" type="text" name="user_name" value="<?php if(isset($user_name)) { echo $user_name; } ?>" />
<?php if(isset($username_error)) { echo "<div class=\"small error\">".$username_error."</div>"; } ?> <?php if(isset($username_error)) { echo "<div class=\"small error\">".$username_error."</div>"; } ?>
</div> </div>
<div class="form-group">
<label>Level</label>
<?php if($this->session->userdata('user_type') == 99) { ?>
<select class="form-control" name="user_type">
<?php
$levels = $this->config->item('auth_level');
while (list($key, $val) = each($levels)) {
?>
<option value="<?php echo $key; ?>" <?php if($user_type == $key) { echo "selected=\"selected\""; } ?>><?php echo $val; ?></option>
<?php } ?>
</select>
<?php } else {
$l = $this->config->item('auth_level');
echo $l[$user_type];
}?>
</div>
<div class="form-group"> <div class="form-group">
<label>Email</label> <label>Email</label>
<input class="form-control" type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" /> <input class="form-control" type="text" name="user_email" value="<?php if(isset($user_email)) { echo $user_email; } ?>" />
@ -57,7 +50,47 @@
<div class="small">Leave blank to keep existing password</div></td> <div class="small">Leave blank to keep existing password</div></td>
<?php } ?> <?php } ?>
</div> </div>
</div>
</div>
</div>
<div class="col">
<div class="card">
<div class="card-header">
Roles
</div>
<div class="card-body">
<div class="form-group">
<label>Level</label>
<?php if($this->session->userdata('user_type') == 99) { ?>
<select class="form-control" name="user_type">
<?php
$levels = $this->config->item('auth_level');
while (list($key, $val) = each($levels)) {
?>
<option value="<?php echo $key; ?>" <?php if($user_type == $key) { echo "selected=\"selected\""; } ?>><?php echo $val; ?></option>
<?php } ?>
</select>
<?php } else {
$l = $this->config->item('auth_level');
echo $l[$user_type];
}?>
</div>
</div>
</div>
</div>
</div>
<br>
<div class="row">
<!-- Personal Information -->
<div class="col">
<div class="card">
<div class="card-header">
Personal Information
</div>
<div class="card-body">
<div class="form-group"> <div class="form-group">
<label>First name</label> <label>First name</label>
<input class="form-control" type="text" name="user_firstname" value="<?php if(isset($user_firstname)) { echo $user_firstname; } ?>" /> <input class="form-control" type="text" name="user_firstname" value="<?php if(isset($user_firstname)) { echo $user_firstname; } ?>" />
@ -85,12 +118,44 @@
<?php if(isset($locator_error)) { echo "<div class=\"small error\">".$locator_error."</div>"; } else { ?> <?php if(isset($locator_error)) { echo "<div class=\"small error\">".$locator_error."</div>"; } else { ?>
<?php } ?> <?php } ?>
</div> </div>
</div>
</div>
</div>
<div class="col">
<div class="card">
<div class="card-header">
Cloudlog Preferences
</div>
<div class="card-body">
<div class="form-group"> <div class="form-group">
<label>Timezone</label> <label>Timezone</label>
<?php echo form_dropdown('user_timezone', $timezones, $user_timezone); ?> <?php echo form_dropdown('user_timezone', $timezones, $user_timezone); ?>
</div> </div>
<div class="form-group">
<label for="user_measurement_base">Measurement preference</label>
<select class="custom-select" id="user_measurement_base" name="user_measurement_base" required>
<option value='K' <?php if($user_measurement_base == "K") { echo "selected=\"selected\""; } ?>>Kilometers</option>
<option value='M' <?php if($user_measurement_base == "M") { echo "selected=\"selected\""; } ?>>Miles</option>
<option value='N' <?php if($user_measurement_base == "N") { echo "selected=\"selected\""; } ?>>Nautical miles</option>
</select>
<small id="user_measurement_base_Help" class="form-text text-muted">Choose which unit distances will be shown in.</small>
</div>
</div>
</div>
</div>
</div>
<br>
<div class="row">
<!-- Logbook of the World -->
<div class="col">
<div class="card">
<div class="card-header">
Logbook of the World
</div>
<div class="card-body">
<div class="form-group"> <div class="form-group">
<label>Logbook of The World (LoTW) Username</label> <label>Logbook of The World (LoTW) Username</label>
<input class="form-control" type="text" name="user_lotw_name" value="<?php if(isset($user_lotw_name)) { echo $user_lotw_name; } ?>" /> <input class="form-control" type="text" name="user_lotw_name" value="<?php if(isset($user_lotw_name)) { echo $user_lotw_name; } ?>" />
@ -104,7 +169,17 @@
<div class="small">Leave blank to keep existing password</div></td> <div class="small">Leave blank to keep existing password</div></td>
<?php } ?> <?php } ?>
</div> </div>
</div>
</div>
</div>
<!-- eQSL -->
<div class="col">
<div class="card">
<div class="card-header">
eQSL
</div>
<div class="card-body">
<div class="form-group"> <div class="form-group">
<label>eQSL.cc Username</label> <label>eQSL.cc Username</label>
<input class="form-control" type="text" name="user_eqsl_name" value="<?php if(isset($user_eqsl_name)) { echo $user_eqsl_name; } ?>" /> <input class="form-control" type="text" name="user_eqsl_name" value="<?php if(isset($user_eqsl_name)) { echo $user_eqsl_name; } ?>" />
@ -118,7 +193,20 @@
<div class="small">Leave blank to keep existing password</div></td> <div class="small">Leave blank to keep existing password</div></td>
<?php } ?> <?php } ?>
</div> </div>
</div>
</div>
</div>
</div>
<br>
<div class="row">
<!-- Logbook of the World -->
<div class="col">
<div class="card">
<div class="card-header">
Clublog
</div>
<div class="card-body">
<div class="form-group"> <div class="form-group">
<label>Club Log Email/Callsign</label> <label>Club Log Email/Callsign</label>
<input class="form-control" type="text" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" /> <input class="form-control" type="text" name="user_clublog_name" value="<?php if(isset($user_clublog_name)) { echo $user_clublog_name; } ?>" />
@ -134,23 +222,17 @@
<div class="small">Leave blank to keep existing password</div></td> <div class="small">Leave blank to keep existing password</div></td>
<?php } ?> <?php } ?>
</div> </div>
</div>
<div class="form-group"> </div>
<label for="user_measurement_base">Measurement preference</label> </div>
<select class="custom-select" id="user_measurement_base" name="user_measurement_base" required>
<option value='K' <?php if($user_measurement_base == "K") { echo "selected=\"selected\""; } ?>>Kilometers</option>
<option value='M' <?php if($user_measurement_base == "M") { echo "selected=\"selected\""; } ?>>Miles</option>
<option value='N' <?php if($user_measurement_base == "N") { echo "selected=\"selected\""; } ?>>Nautical miles</option>
</select>
<small id="user_measurement_base_Help" class="form-text text-muted">Choose which unit distances will be shown in.</small>
</div> </div>
<input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" /> <input type="hidden" name="id" value="<?php echo $this->uri->segment(3); ?>" />
<button type="submit" class="btn btn-primary">Update Account</button> <br>
<button type="submit" class="btn btn-success"><i class="fas fa-save"></i> Save Account Changes</button>
<br>
<br>
</form> </form>
</div>
</div>
</div> </div>