UI Improvements

pull/106/merge
Peter Goodhall 2011-11-08 15:45:22 +00:00
rodzic 77f2b61bfd
commit b07978cc95
4 zmienionych plików z 101 dodań i 215 usunięć

Wyświetl plik

@ -75,8 +75,8 @@
<div id="map" style="width: 100%; height: 300px"></div>
<!-- Log Data -->
<div class="row show-grid">
<div class="span11">
<div class="row" style="margin-top: 10px;">
<div class="span10" style="padding-left: 15px; padding-right: 25px; border-right: 1px solid #dfdfdf;">
<table width="100%" class="zebra-striped">
<tr class="titles">
<td>Date</td>

Wyświetl plik

@ -44,7 +44,7 @@
<div id="container">
<h2>Add QSO</h2>
<?php if($notice) { ?>
<div class="alert-message info">
@ -60,23 +60,23 @@
<div class="row show-grid">
<div class="span6">
<h2>Add QSO</h2>
<form id="qso_input" method="post" action="<?php echo site_url('qso'); ?>" name="qsos">
<table>
<table style="margin-bottom: 0px;">
<tr>
<td>Date</td>
<td class="title">Date</td>
<td><input class="input_date" type="text" name="start_date" value="<?php echo date('d-m-Y'); ?>" size="10" /> - <input class="input_time" type="text" name="start_time" value="" size="7" /></td>
</tr>
<tr>
<td>Callsign</td>
<td class="title">Callsign</td>
<td><input size="10" id="callsign" type="text" name="callsign" value="" /></td>
</tr>
<tr>
<td>Mode</td>
<td class="title">Mode</td>
<td><select name="mode" class="mode">
<option value="SSB" <?php if($this->session->userdata('mode') == "" || $this->session->userdata('mode') == "SSB") { echo "selected=\"selected\""; } ?>>SSB</option>
<option value="AM" <?php if($this->session->userdata('mode') == "AM") { echo "selected=\"selected\""; } ?>>AM</option>
@ -95,7 +95,7 @@
<option value="PKT" <?php if($this->session->userdata('mode') == "PKT") { echo "selected=\"selected\""; } ?>>PKT</option>
</select>
Band
<span class="title">Band</span>
<select name="band" class="band">
<option value="160m" <?php if($this->session->userdata('band') == "160m") { echo "selected=\"selected\""; } ?>>160m</option>
<option value="80m" <?php if($this->session->userdata('band') == "80m") { echo "selected=\"selected\""; } ?>>80m</option>
@ -117,27 +117,27 @@
</tr>
<tr>
<td>RST (S)</td>
<td><input class="rst" name="rst_sent" type="text" size="3" value="59"> RST (R) <input class="rst" name="rst_recv" type="text" size="3" value="59"></td>
<td class="title">RST (S)</td>
<td><input class="rst" name="rst_sent" type="text" size="3" value="59"> <span class="title">RST (R)</span> <input class="rst" name="rst_recv" type="text" size="3" value="59"></td>
</tr>
<tr>
<td>Name</td>
<td class="title">Name</td>
<td><input id="name" type="text" name="name" value="" /></td>
</tr>
<tr>
<td>QTH</td>
<td class="title">QTH</td>
<td><input id="qth" type"text" name"qth" value"" /></td>
</tr>
<tr>
<td>QRA</td>
<td class="title">QRA</td>
<td><input id="locator" type="text" name="locator" value="" size="7" /></td>
</tr>
<tr>
<td>Comment</td>
<td class="title">Comment</td>
<td><input id="comment" type="text" name="comment" value="" /></td>
</tr>
</table>
@ -197,26 +197,13 @@
<option value="Y">Yes</option>
<option value="R">Requested</option>
</select></td>
<td>Recv</td>
<td><select name="qsl_recv">
<option value="N" selected="selected">No</option>
<option value="Y">Yes</option>
<option value="R">Requested</option>
</select></td>
</tr>
<tr>
<td></td>
<td>Method</td>
<td><select name="qsl_sent_method">
<option value="" selected="selected">Method</option>
<option value="D">Direct</option>
<option value="B">Bureau</option>
</select></td>
<td></td>
<td><select name="qsl_recv_method">
<option value="" selected="selected">Method</option>
<option value="D">Direct</option>
<option value="B">Bureau</option>
</select></td>
</tr>
</table>
</div>
@ -229,7 +216,10 @@
</div>
<div class="span9 offset1">
<div id="partial_view"><table class="zebra-striped" width="100%">
<div id="partial_view">
<h2>Last 10 QSOs</h2>
<table class="zebra-striped" width="100%">
<tr class="log_title titles">
<td>Date</td>
<td>Time</td>

Wyświetl plik

@ -19,6 +19,22 @@
},
"buffers":
[
{
"file": "application/views/layout/header.php",
"settings":
{
"buffer_size": 4064,
"line_ending": "Windows"
}
},
{
"file": "application/views/search/main.php",
"settings":
{
"buffer_size": 2036,
"line_ending": "Windows"
}
},
{
"file": "application/views/notes/main.php",
"settings":
@ -26,46 +42,6 @@
"buffer_size": 745,
"line_ending": "Windows"
}
},
{
"file": "application/views/qso/index.php",
"settings":
{
"buffer_size": 13016,
"line_ending": "Windows"
}
},
{
"file": "application/controllers/qso.php",
"settings":
{
"buffer_size": 3270,
"line_ending": "Windows"
}
},
{
"file": "js/global.js",
"settings":
{
"buffer_size": 502,
"line_ending": "Windows"
}
},
{
"file": "css/main.css",
"settings":
{
"buffer_size": 483,
"line_ending": "Windows"
}
},
{
"file": "application/views/layout/header.php",
"settings":
{
"buffer_size": 4384,
"line_ending": "Windows"
}
}
],
"build_system": "",
@ -100,8 +76,13 @@
},
"file_history":
[
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/add.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/main.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/qso/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/header.php",
"/C/Users/Peter/git/HRD-Web-Frontend/css/main.css",
"/C/Users/Peter/git/HRD-Web-Frontend/js/global.js",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/qso.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/add.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/api/help.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/adif/main.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/adif_view.php",
@ -110,23 +91,18 @@
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/backup/main.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/user/edit.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/user/add.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/main.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/user/main.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/setup/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/user/login.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/user/delete.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/statistics/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/js/global.js",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/dashboard/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/css/main.css",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/view.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/notes/edit.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/qso.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/logbook.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/view_log/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/layout/footer.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/dashboard.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/views/qso/index.php",
"/C/Users/Peter/git/HRD-Web-Frontend/application/libraries/Qra.php",
"/C/Users/Peter/git/HRD-Web-Frontend/css/global.css",
"/C/Users/Peter/git/HRD-Web-Frontend/application/controllers/search.php",
@ -226,11 +202,64 @@
"groups":
[
{
"selected": 5,
"selected": 1,
"sheets":
[
{
"buffer": 0,
"file": "application/views/layout/header.php",
"settings":
{
"buffer_size": 4064,
"regions":
{
},
"selection":
[
[
3125,
3125
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 1,
"file": "application/views/search/main.php",
"settings":
{
"buffer_size": 2036,
"regions":
{
},
"selection":
[
[
346,
346
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 2,
"file": "application/views/notes/main.php",
"settings":
{
@ -241,8 +270,8 @@
"selection":
[
[
640,
659
20,
0
]
],
"settings":
@ -255,140 +284,6 @@
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 1,
"file": "application/views/qso/index.php",
"settings":
{
"buffer_size": 13016,
"regions":
{
},
"selection":
[
[
1875,
1883
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 1032.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 2,
"file": "application/controllers/qso.php",
"settings":
{
"buffer_size": 3270,
"regions":
{
},
"selection":
[
[
1826,
1826
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 18.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 3,
"file": "js/global.js",
"settings":
{
"buffer_size": 502,
"regions":
{
},
"selection":
[
[
114,
114
]
],
"settings":
{
"syntax": "Packages/JavaScript/JavaScript.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 4,
"file": "css/main.css",
"settings":
{
"buffer_size": 483,
"regions":
{
},
"selection":
[
[
62,
62
]
],
"settings":
{
"syntax": "Packages/CSS/CSS.tmLanguage",
"translate_tabs_to_spaces": false
},
"translation.x": 0.0,
"translation.y": 0.0,
"zoom_level": 1.0
},
"type": "text"
},
{
"buffer": 5,
"file": "application/views/layout/header.php",
"settings":
{
"buffer_size": 4384,
"regions":
{
},
"selection":
[
[
4249,
4249
]
],
"settings":
{
"syntax": "Packages/PHP/PHP.tmLanguage"
},
"translation.x": 0.0,
"translation.y": 1192.0,
"zoom_level": 1.0
},
"type": "text"
}
]
}

Wyświetl plik

@ -3,6 +3,7 @@
#footer { width: 940px; margin: 0 auto; text-align: right; }
table .titles { font-weight: bold; color: #439BF6; }
table .title { font-weight: bold; color: #439BF6; }
.markItUp { width: 580px !important; }
.markItUpEditor { width: 520px !important; }
@ -11,6 +12,6 @@ table .titles { font-weight: bold; color: #439BF6; }
.rst { width: 50px !important; }
.input_date { width: 70px !important; }
.input_time { width: 55px !important; }
.band { width: 60px; }
.mode { width: 60px; }
.band { width: 80px; }
.mode { width: 80px; }
#callsign { text-transform: uppercase; }