Public_Tools/wavelog
3
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-25 11:32:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #471 from phl0/fixMergeConflictsAlpha

Browse Source 
Fix merge conflicts
This commit is contained in:
Florian (DF2ET)
2024-06-14 09:28:32 +02:00
committed by GitHub
parent c1f8acab29 55d83a669e
commit 9299804ffe
3 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
application/controllers/Oqrs.php
View File

@@ -7,13 +7,8 @@ if ( ! defined('BASEPATH')) exit('No direct script access allowed');
class Oqrs extends CI_Controller {
<<<<<<< alpha
public function index() {
=======
function __construct() {
parent::__construct();
$this->lang->load('lotw');
$this->lang->load('eqsl');
// Commented out to get public access
// $this->load->model('user_model');
// if(!$this->user_model->authorize(2)) { $this->session->set_flashdata('notice', 'You\'re not allowed to do that!'); redirect('dashboard'); }
@@ -21,7 +16,6 @@ class Oqrs extends CI_Controller {
}
public function index() {
>>>>>>> dev
$this->load->model('oqrs_model');
$data['stations'] = $this->oqrs_model->get_oqrs_stations();

5
application/views/interface_assets/header.php
View File

@@ -399,14 +399,9 @@
<li><a class="dropdown-item" href="<?php echo site_url('oqrs/requests'); ?>" title="OQRS Requests"><i class="fa fa-id-card"></i> <?= __("OQRS Requests"); ?> <?php if ($oqrs_requests > 0) {
echo "<span class=\"badge text-bg-light\">" . $oqrs_requests . "</span>";
} ?></a></li>
<<<<<<< alpha
<li><a class="dropdown-item" href="<?php echo site_url('qslprint'); ?>" title="Print Requested QSLs"><i class="fas fa-print"></i> <?= __("Print Requested QSLs"); ?></a></li>
<li><a class="dropdown-item" href="<?php echo site_url('labels'); ?>" title="Label setup"><i class="fas fa-print"></i> <?= __("Labels"); ?></a></li>
=======
<?php } ?>
<li><a class="dropdown-item" href="<?php echo site_url('qslprint'); ?>" title="Print Requested QSLs"><i class="fas fa-print"></i> <?php echo lang('menu_print_requested_qsls'); ?></a></li>
<li><a class="dropdown-item" href="<?php echo site_url('labels'); ?>" title="Label setup"><i class="fas fa-print"></i> <?php echo lang('menu_labels'); ?></a></li>
>>>>>>> dev
<div class="dropdown-divider"></div>
<li><a class="dropdown-item dropdown-toggle" data-bs-toggle="dropdown"><i class="fas fa-sync"></i> <?= __("Third-Party Services"); ?></a>
<ul class="submenu submenu-left dropdown-menu">

9
application/views/user/edit.php
View File

@@ -204,17 +204,10 @@
<label for="user_measurement_base"><?= __("Measurement preference"); ?></label>
<?php if(!isset($user_measurement_base)) { $user_measurement_base='M'; }?>
<select class="form-select" id="user_measurement_base" name="user_measurement_base" aria-describedby="user_measurement_base_Help" required>
<<<<<<< alpha
<option value ''></option>
<option value=''></option>
<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>
=======
<option value=''></option>
<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>
>>>>>>> dev
</select>
<small id="user_measurement_base_Help" class="form-text text-muted"><?= __("Choose which unit distances will be shown in"); ?></small>
</div>