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

Merge remote-tracking branch 'upstream/master' into lotw_web_import

浏览代码
这个提交包含在：
Corby Krick 2013-02-20 19:29:52 -06:00
当前提交 fbaabac51f
共有 2 个文件被更改，包括 238 次插入 和 194 次删除
显示统计信息 下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

86
application/views/qso/edit.php
查看文件

@ -1,22 +1,46 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<div style="float: right; padding-right: 60px; padding-top: 30px;"> <!-- JS -->
<script type="text/javascript" src="<?php echo base_url(); ?>js/jquery-1.5.1.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>js/jquery-ui-1.8.12.custom.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>js/bootstrap-dropdown.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>js/bootstrap-tabs.js"></script>
<script type="text/javascript">
$(function () {
$('.tabs').tabs()
})
</script>
<!-- CSS Files -->
<link type="text/css" href="<?php echo base_url(); ?>css/flick/jquery-ui-1.8.12.custom.css" rel="stylesheet" />
<link rel="stylesheet" href="<?php echo base_url();?>css/bootcamp/bootstrap.css" type="text/css" />
</head>
<body>
<!-- Option to Delete QSO -->
<div style="float: right; padding-right: 60px; padding-top: 30px;">
<p><a href="<?php echo site_url('qso/delete'); ?>/<?php echo $COL_PRIMARY_KEY; ?>" >Delete QSO <img src="<?php echo base_url(); ?>/images/delete.png" width="16" height="16" alt="Delete" /></a></p> <p><a href="<?php echo site_url('qso/delete'); ?>/<?php echo $COL_PRIMARY_KEY; ?>" >Delete QSO <img src="<?php echo base_url(); ?>/images/delete.png" width="16" height="16" alt="Delete" /></a></p>
</div> </div>
<h2>Edit QSO</h2>
<div class="wrap_content"> <?php echo validation_errors(); ?>
<?php echo validation_errors(); ?> <form method="post" action="<?php echo site_url('qso/edit'); ?>" name="qsos">
<form method="post" action="<?php echo site_url('qso/edit'); ?>" name="qsos">
<table> <table>
<tr> <tr>
<td>Start Date</td> <td>Start Date</td>
<td><input type="text" name="time_on" value="<?php echo $COL_TIME_ON; ?>" /></td> <td>End Date</td>
</tr> </tr>
<tr> <tr>
<td>End Date</td> <td><input type="text" name="time_on" value="<?php echo $COL_TIME_ON; ?>" /></td>
<td><input type="text" name="time_off" value="<?php echo $COL_TIME_OFF; ?>" /></td> <td><input type="text" name="time_off" value="<?php echo $COL_TIME_OFF; ?>" /></td>
</tr> </tr>
</table>
<table>
<tr> <tr>
<td>Callsign</td> <td>Callsign</td>
<td><input type="text" name="callsign" value="<?php echo $COL_CALL; ?>" /></td> <td><input type="text" name="callsign" value="<?php echo $COL_CALL; ?>" /></td>
@ -83,17 +107,21 @@
<td>Comment</td> <td>Comment</td>
<td><input type="text" name="comment" value="<?php echo $COL_COMMENT; ?>" /></td> <td><input type="text" name="comment" value="<?php echo $COL_COMMENT; ?>" /></td>
</tr> </tr>
</table>
<table>
<tr> <tr>
<td>Sat Name</td> <td>Sat Name</td>
<td><input type="text" name="sat_name" value="<?php echo $COL_SAT_NAME; ?>" /></td> <td>Sat Mode</td>
</tr> </tr>
<tr> <tr>
<td>Sat Mode</td> <td><input type="text" name="sat_name" value="<?php echo $COL_SAT_NAME; ?>" /></td>
<td><input type="text" name="sat_mode" value="<?php echo $COL_SAT_MODE; ?>" /></td> <td><input type="text" name="sat_mode" value="<?php echo $COL_SAT_MODE; ?>" /></td>
</tr> </tr>
</table>
<table>
<tr> <tr>
<td>IOTA</td> <td>IOTA</td>
<td><input type="text" name="iota_ref" value="<?php echo $COL_IOTA; ?>" /></td> <td><input type="text" name="iota_ref" value="<?php echo $COL_IOTA; ?>" /></td>
@ -104,10 +132,18 @@
<td><input type="text" name="country" value="<?php echo $COL_COUNTRY; ?>" /></td> <td><input type="text" name="country" value="<?php echo $COL_COUNTRY; ?>" /></td>
</tr> </tr>
</table> </table>
<h3>QSLing</h3> <h3>QSLing</h3>
<h4>Paper</h4>
<ul class="tabs">
<li class="active"><a href="#paper">Paper</a></li>
<li><a href="#eqsl">eQSL</a></li>
<li><a href="#lotw">LoTW</a></li>
</ul>
<div class="pill-content">
<div class="active" id="paper">
<table> <table>
<tr> <tr>
<td>Sent</td> <td>Sent</td>
@ -149,9 +185,9 @@
</select></td> </select></td>
</tr> </tr>
</table> </table>
</div>
<h4>eQSL.cc</h4> </div>
<div id="eqsl">
<table> <table>
<tr> <tr>
<td>Sent</td> <td>Sent</td>
@ -172,8 +208,8 @@
</select></td> </select></td>
</tr> </tr>
</table> </table>
</div>
<h4>LOTW</h4> <div id="lotw">
<table> <table>
<tr> <tr>
<td>Sent</td> <td>Sent</td>
@ -194,9 +230,17 @@
</select></td> </select></td>
</tr> </tr>
</table> </table>
</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); ?>" />
<div><input type="submit" value="Submit" onclick="closeME();" /></div>
<div class="actions">
<input type="submit" class="btn primary" value="Save changes" onclick="closeME();">
</div>
</form>
</body>
</html>
</form>
</div> </div>

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

@ -17,7 +17,7 @@
$(".editbox").fancybox({ $(".editbox").fancybox({
'autoDimensions' : false, 'autoDimensions' : false,
'width' : 450, 'width' : 600,
'height' : 550, 'height' : 550,
'transitionIn' : 'fade', 'transitionIn' : 'fade',
'transitionOut' : 'fade', 'transitionOut' : 'fade',