The following commit has been merged in the master branch:
commit b2dc274b7f8024e238b014d2014e6dab9a90e48d
Author: Iain R. Learmonth <[email protected]>
Date: Wed May 13 12:09:48 2015 +0100
hamradio: Added a page for the tasks, more updates to new website
diff --git a/www/hamradio/css/hamradio.css b/www/hamradio/css/hamradio.css
index af80f98..0ae426d 100644
--- a/www/hamradio/css/hamradio.css
+++ b/www/hamradio/css/hamradio.css
@@ -25,7 +25,7 @@ span.download {
position: absolute;
right: 13px;
font-size: 0.75em;
- line-height: 2;
+ line-height: 1.1;
background-color: white;
margin-top: 10px;
}
@@ -35,7 +35,8 @@ span.download a {
text-decoration: none;
border: 0.15em solid #339900;
display: block;
- background: transparent url('../img/downloads.png') no-repeat 5px 5px;
+ background: transparent url('../img/downloads.png') no-repeat 5px 12px;
+ padding-top: 7px;
padding-left: 30px;
padding-right: 1em;
color:#339900;
@@ -50,7 +51,7 @@ span.download a em {
font-weight: normal;
clear: right;
color: #339900;
- line-height: 0.5em;
+ line-height: 1;
font-style: normal;
display: block;
margin-bottom: 1em;
@@ -61,7 +62,8 @@ span.download a:hover em {
}
/*********************************************/
-pre, div.codearea { // from the wiki
+/* from the wiki */
+pre, div.codearea {
padding: 1em;
margin: 2em 1.5em 2em 1.5em;
line-height: 1.5em;
@@ -72,4 +74,22 @@ pre, div.codearea { // from the wiki
line-height: 2em;
}
+span.sep {
+ margin-right: 0.25em;
+ margin-left: 0.25em;
+}
+/*********************************************/
+
+.homepagenav {
+ width: 100%;
+}
+
+.homepagenav li {
+ display: inline-block;
+ width: 33%;
+}
+
+.homepagenav li:before {
+ content: "ยป ";
+}
diff --git a/www/hamradio/index.new.html b/www/hamradio/index.new.html
index 258e29f..cd3f587 100644
--- a/www/hamradio/index.new.html
+++ b/www/hamradio/index.new.html
@@ -10,7 +10,7 @@
<body>
<div id="header">
<div id="wikisection">
- <p class="section"><a href="/" title="Debian Hamradio Pure Blend">Hamradio
Pure Blend</a></p>
+ <p class="section"><a href="/hamradio/" title="Debian Hamradio Pure
Blend">Hamradio Pure Blend</a></p>
</div>
<div id="upperheader">
<div id="logo">
@@ -21,8 +21,8 @@
<p class="hidecss"><a href="#content">Skip Quicknav</a></p>
<ul>
<li><a href="/hamradio">Home</a></li>
- <li><a href="/hamradio/task.html">Tasks</a></li>
- <li><a href="/hamradio/live.html">Live CDs</a></li>
+ <li><a href="/hamradio/tasks.html">Packages</a></li>
+ <li><a href="/hamradio/live.html">Live DVDs</a></li>
<li><a href="/hamradio/dev.html">Development</a></li>
</ul>
</div> <!-- end navbar -->
@@ -30,7 +30,7 @@
</div>
<div id="content">
- <span class="download"><a href="#">Download Hamradio Jessie
Preview<em>(64-bit Live DVD)</em></a> </span>
+ <span class="download"><a href="#">Download Debian Hamradio<br>Pure
Blend Jessie Preview<em>(64-bit Live DVD)</em></a> </span>
<div id="splash">
<h1>Debian Hamradio Pure Blend</h1>
</div>
@@ -42,10 +42,16 @@
subset of Debian that is configured to support a particular target group
out-of-the-box. This blend aims to support the needs of radio
amateurs.</p>
+ <ul class="homepagenav">
+ <li><a href="/hamradio/tasks.html">Packages</a></li>
+ <li><a href="/hamradio/live.html">Live DVDs</a></li>
+ <li><a href="/hamradio/development.html">Development</a></li>
+ </ul>
+
<h2>News</h2>
<tt>[13 May 2015]</tt> <strong><a
href="https://lists.debian.org/debian-hams/2015/05/msg00140.html";>ITP:
debian-hamradio -- Debian Hamradio Pure Blend Metapackages</a></strong><br>
<tt>[02 Dec 2014]</tt> <strong><a
href="https://lists.debian.org/debian-devel/2014/12/msg00063.html";>Announcing a
Debian Hamradio Blend</a></strong><br>
-
+ <br>
</div>
<div id="footer">
diff --git a/www/hamradio/tasks.html b/www/hamradio/tasks.html
new file mode 100644
index 0000000..25bb07f
--- /dev/null
+++ b/www/hamradio/tasks.html
@@ -0,0 +1,152 @@
+<html>
+<head>
+ <title>Debian Hamradio Pure Blend</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta name="robots" content="noindex" />
+<link href="css/debian.css" rel="stylesheet" type="text/css">
+<link href="css/hamradio.css" rel="stylesheet" type="text/css">
+<link rel="shortcut icon" href="img/favicon.ico">
+</head>
+<body>
+<div id="header">
+ <div id="wikisection">
+ <p class="section"><a href="/hamradio/" title="Debian Hamradio Pure
Blend">Hamradio Pure Blend</a></p>
+ </div>
+ <div id="upperheader">
+ <div id="logo">
+ <a href="http://www.debian.org"; title="Debian Home"><img
src="img/openlogo-50.png" alt="Debian" width="50" height="61"></a>
+ </div>
+ </div> <!-- end upperheader -->
+ <div id="navbar">
+ <p class="hidecss"><a href="#content">Skip Quicknav</a></p>
+ <ul>
+ <li><a href="/hamradio">Home</a></li>
+ <li><a href="/hamradio/tasks.html">Packages</a></li>
+ <li><a href="/hamradio/live.html">Live DVDs</a></li>
+ <li><a href="/hamradio/dev.html">Development</a></li>
+ </ul>
+ </div> <!-- end navbar -->
+ <p id="breadcrumbs"> hamradio pure blend <span class="sep">/</span>
packages</p>
+</div>
+
+<div id="content">
+ <h1>Debian Hamradio Pure Blend Packages</h1>
+ <p><b>Packages in the Debian Hamradio Pure Blend</b> are split into
+ tasks, like "Rig Control" and "Packet Modes", and you can see the full
+ list of these below. Each task contains software that is useful for a
+ particular activity. Some software may be in two tasks where it is
+ useful for both.</p>
+
+ <table>
+ <tr><th>Task
name</th><th>Metapackage</th><th>Description</th><th>Catalogue</th></tr>
+ <tr>
+ <td>Antennas</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-antenna";><code>hamradio-antenna</code></a></td>
+ <td>This task contains packages that are useful for
antenna modelling.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/antenna";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Data Modes</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-datamodes";><code>hamradio-datamodes</code></a></td>
+ <td>This task contains packages that are useful for
using data modes, such as
+ RTTY and SSTV, including weak signal modes,
such as JT65.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/datamodes";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Digital Voice</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-digitalvoice";><code>hamradio-digitalvoice</code></a></td>
+ <td>This task contains packages that are useful for
using
+ digital voice modes on RF and for Internet
linking.
+ <td><a
href="http://blends.debian.org/hamradio/tasks/digitalvoice";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Logging</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-logging";><code>hamradio-logging</code></a></td>
+ <td>This task contains packages that are useful for
logging (including for
+ contests).</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/logging";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Morse</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-morse";><code>hamradio-morse</code></a></td>
+ <td>This task contains packages that are useful for CW
operation and
+ for learning morse.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/morse";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Non-Amateur Modes</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-nonamateur";><code>hamradio-nonamateur</code></a></td>
+ <td>This task contains packages that are useful for
listening to non-amateur
+ modes such as AIS and ADS-B.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/nonamateur";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Packet Modes</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-packetmodes";><code>hamradio-packetmodes</code></a></td>
+ <td>This task contains packages that are useful for
using AX.25, including IPv4
+ over AX.25 and APRS.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/packetmodes";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Rig Control</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-rigcontrol";><code>hamradio-rigcontrol</code></a></td>
+ <td>This task contains packages that are useful for rig
control and
+ programming.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/rigcontrol";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Satellite operation</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-satellite";><code>hamradio-satellite</code></a></td>
+ <td>This task contains packages that are useful for
amateur satellite operation.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/satellite";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Software-Defined Radio</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-sdr";><code>hamradio-sdr</code></a></td>
+ <td>This task contains packages that are useful for
working with software-defined radio.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/sdr";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Tools</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-tools";><code>hamradio-tools</code></a></td>
+ <td>This task contains packages that provide useful
hamradio related tools.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/tools";>Link</a></td>
+ </tr>
+ <tr>
+ <td>Training</td>
+ <td><a
href="https://packages.debian.org/unstable/hamradio-training";><code>hamradio-training</code></a></td>
+ <td>This task contains packages that are useful when
training
+ for hamradio exams.</td>
+ <td><a
href="http://blends.debian.org/hamradio/tasks/training";>Link</a></td>
+ </tr>
+ </table>
+
+ <h3>Installing Metapackages</h3>
+
+ <p><i>Note: The metapackages have only recently been submitted to the
Debian archives and may not be available yet. These will only be available in
Debian stretch (testing), and are not available in Debian jessie
(stable).</i></p>
+
+ <p>To install any of the task metapackages, use your favourite package
management tool as you would with any other Debian package. For
<code>apt-get</code>:</p>
+
+ <pre>apt-get install hamradio-<task></pre>
+
+ <p>If you want to install the entire blend:</p>
+
+ <pre>apt-get install hamradio-antenna hamradio-datamodes
hamradio-digitalvoice hamradio-logging hamradio-morse hamradio-nonamateur
hamradio-packetmodes hamradio-rigcontrol hamradio-satellite hamradio-sdr
hamradio-tasks hamradio-tools hamradio-training</pre>
+
+</div>
+
+<div id="footer">
+<div id="fineprint">
+ <p>
+ The source code powering these pages is available <a
href="http://anonscm.debian.org/cgit/blends/website.git";>here</a>.
+ <br />
+ Contact: <a href="mailto:[email protected]";>Debian Hamradio
Maintainers</a> or <a href="irc://irc.debian.org/#debian-hams">#debian-hams</a>
on irc.debian.org.
+ <br />
+ Debian is a registered trademark of <a
href="http://www.spi-inc.org/";>Software in the Public Interest</a>.
+ </p>
+</div>
+</div>
+
+</body>
+</html>
+
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
