mirror of
https://github.com/magicbug/Cloudlog
synced 2024-11-23 10:08:38 +00:00
Revert "Merge pull request #1403 from AndreasK79/dxcc_add_text_deleted"
This reverts commita6faa1310b
, reversing changes made to6b0e9b5eeb
.
This commit is contained in:
parent
768e570d9c
commit
33130201f6
@ -60,11 +60,7 @@
|
||||
<option value="All">All</option>
|
||||
<?php
|
||||
foreach($dxcc as $d){
|
||||
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
|
||||
if ($d->Enddate != null) {
|
||||
echo ' (deleted dxcc)';
|
||||
}
|
||||
echo '</option>';
|
||||
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
|
||||
}
|
||||
?>
|
||||
|
||||
|
@ -33,11 +33,7 @@
|
||||
<option value="All">All</option>
|
||||
<?php
|
||||
foreach($dxcc as $d){
|
||||
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
|
||||
if ($d->Enddate != null) {
|
||||
echo ' (deleted dxcc)';
|
||||
}
|
||||
echo '</option>';
|
||||
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
|
||||
}
|
||||
?>
|
||||
|
||||
|
@ -14,11 +14,7 @@
|
||||
|
||||
<?php
|
||||
foreach($dxcc as $d){
|
||||
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
|
||||
if ($d->Enddate != null) {
|
||||
echo ' (deleted dxcc)';
|
||||
}
|
||||
echo '</option>';
|
||||
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
|
||||
}
|
||||
?>
|
||||
|
||||
|
@ -266,11 +266,7 @@
|
||||
if ($qso->COL_DXCC == $d->adif) {
|
||||
echo " selected=\"selected\"";
|
||||
}
|
||||
echo '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name));
|
||||
if ($d->Enddate != null) {
|
||||
echo ' (deleted dxcc)';
|
||||
}
|
||||
echo '</option>';
|
||||
echo '>' . $d->prefix . ' - ' . $d->name . '</option>';
|
||||
}
|
||||
?>
|
||||
|
||||
|
@ -258,11 +258,7 @@
|
||||
<option value="0">None</option>
|
||||
<?php
|
||||
foreach($dxcc as $d){
|
||||
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name)));
|
||||
if ($d->Enddate != null) {
|
||||
echo ' (deleted dxcc)';
|
||||
}
|
||||
echo '</option>';
|
||||
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
|
||||
}
|
||||
?>
|
||||
|
||||
|
@ -46,8 +46,7 @@
|
||||
<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
|
||||
<option value="0" selected>NONE</option>
|
||||
<?php foreach ($dxcc_list->result() as $dxcc) { ?>
|
||||
<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
|
||||
</option>
|
||||
<option value="<?php echo $dxcc->adif; ?>"><?php echo $dxcc->name; ?></option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
<?php } ?>
|
||||
|
@ -57,8 +57,7 @@
|
||||
<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
|
||||
<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
|
||||
<?php foreach ($dxcc_list->result() as $dxcc) { ?>
|
||||
<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
|
||||
</option>
|
||||
<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo $dxcc->name; ?></option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
<?php } ?>
|
||||
|
@ -21,7 +21,7 @@
|
||||
<?php
|
||||
if ($dxcc_list->num_rows() > 0) {
|
||||
foreach ($dxcc_list->result() as $dxcc) {
|
||||
echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix;
|
||||
echo '<option value=' . $dxcc->adif . '> ' . $dxcc->name . ' - ' . $dxcc->prefix;
|
||||
if ($dxcc->end != null) {
|
||||
echo ' (deleted)';
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user