goodspeed/Cloudlog
1
0
派生 0
代码 工单 合并请求 项目 版本发布 软件包 百科 动态 Actions

Revert "Merge pull request #1403 from AndreasK79/dxcc_add_text_deleted"

浏览代码 
This reverts commit a6faa1310b, reversing
changes made to 6b0e9b5eeb.
这个提交包含在：
Peter Goodhall 2022-02-20 11:57:09 +00:00
父节点 768e570d9c
当前提交 33130201f6
共有 8 个文件被更改，包括 8 次插入 和 30 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

6
application/views/dxatlas/index.php
查看文件

@ -60,11 +60,7 @@
<option value="All">All</option> <option value="All">All</option>
<?php <?php
foreach($dxcc as $d){ foreach($dxcc as $d){
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
if ($d->Enddate != null) {
echo ' (deleted dxcc)';
}
echo '</option>';
} }
?> ?>

6
application/views/kml/index.php
查看文件

@ -33,11 +33,7 @@
<option value="All">All</option> <option value="All">All</option>
<?php <?php
foreach($dxcc as $d){ foreach($dxcc as $d){
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
if ($d->Enddate != null) {
echo ' (deleted dxcc)';
}
echo '</option>';
} }
?> ?>

6
application/views/lookup/index.php
查看文件

@ -14,11 +14,7 @@
<?php <?php
foreach($dxcc as $d){ foreach($dxcc as $d){
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
if ($d->Enddate != null) {
echo ' (deleted dxcc)';
}
echo '</option>';
} }
?> ?>

6
application/views/qso/edit_ajax.php
查看文件

@ -266,11 +266,7 @@
if ($qso->COL_DXCC == $d->adif) { if ($qso->COL_DXCC == $d->adif) {
echo " selected=\"selected\""; echo " selected=\"selected\"";
} }
echo '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name)); echo '>' . $d->prefix . ' - ' . $d->name . '</option>';
if ($d->Enddate != null) {
echo ' (deleted dxcc)';
}
echo '</option>';
} }
?> ?>

6
application/views/qso/index.php
查看文件

@ -258,11 +258,7 @@
<option value="0">None</option> <option value="0">None</option>
<?php <?php
foreach($dxcc as $d){ foreach($dxcc as $d){
echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>';
if ($d->Enddate != null) {
echo ' (deleted dxcc)';
}
echo '</option>';
} }
?> ?>

3
application/views/station_profile/create.php
查看文件

@ -46,8 +46,7 @@
<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp"> <select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp">
<option value="0" selected>NONE</option> <option value="0" selected>NONE</option>
<?php foreach ($dxcc_list->result() as $dxcc) { ?> <?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 value="<?php echo $dxcc->adif; ?>"><?php echo $dxcc->name; ?></option>
</option>
<?php } ?> <?php } ?>
</select> </select>
<?php } ?> <?php } ?>

3
application/views/station_profile/edit.php
查看文件

@ -57,8 +57,7 @@
<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp"> <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> <option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
<?php foreach ($dxcc_list->result() as $dxcc) { ?> <?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 value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo $dxcc->name; ?></option>
</option>
<?php } ?> <?php } ?>
</select> </select>
<?php } ?> <?php } ?>

2
application/views/timeplotter/index.php
查看文件

@ -21,7 +21,7 @@
<?php <?php
if ($dxcc_list->num_rows() > 0) { if ($dxcc_list->num_rows() > 0) {
foreach ($dxcc_list->result() as $dxcc) { 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) { if ($dxcc->end != null) {
echo ' (deleted)'; echo ' (deleted)';
} }