Merged with archweb trunk

5 files changed, 48 insertions, 51 deletions

diff --git a/templates/public/about.html b/templates/public/about.html
index 5c9dc16d..a01a33fe 100644
--- a/templates/public/about.html
+++ b/templates/public/about.html
@@ -57,5 +57,6 @@
     </ul> 
 
 </div>
+<br /><br />
 {% endblock %}
 
diff --git a/templates/public/developer_list.html b/templates/public/developer_list.html
index 2abbbfe4..5aa4c6b2 100644
--- a/templates/public/developer_list.html
+++ b/templates/public/developer_list.html
@@ -4,7 +4,7 @@
     <p>
     {% for dev in dev_list %}
     <a href="#{{ dev.username }}" title="Jump to profile for {{ dev.get_full_name }}">
-        {{ dev.first_name }}{{ dev.last_name.0|capfirst}}</a> &nbsp;&nbsp;
+        {{ dev.first_name }} {{ dev.last_name }}</a> &nbsp;&nbsp;
     {% endfor %}
     </p>
 </div>
@@ -21,7 +21,7 @@
             <table class="bio bio-{{ dev.username }}" cellspacing="0">
                 <tr>
                     <th>Name:</th>
-                    <td>{{ dev.get_full_name }}</td>
+                    <td>{{ dev.get_full_name }}{% if prof.latin_name %} ({{ prof.latin_name}}){% endif %}</td>
                 </tr><tr>
                     <th>Alias:</th>
                     <td>{{ prof.alias }}</td>
diff --git a/templates/public/download.html b/templates/public/download.html
index 7c123b3f..7a1cd855 100644
--- a/templates/public/download.html
+++ b/templates/public/download.html
@@ -9,7 +9,8 @@
 
     <h2>Parabola Downloads</h2>
 
-    {% with "2010.12.29" as version %} <h3>Release Info</h3>
+    {% with "2010.12.29" as version %}
+    <h3>Release Info</h3>
 
     <p>All available images can be burned to a CD, mounted as an ISO file,
     or be directly written to a USB stick using a utility like `dd`. These
@@ -89,35 +90,22 @@
                 <td class="wrap">
                     Downloads and installs packages versions via FTP for absolute freshness.
                 </td>
-            </tr>
-            <tr>
+            </tr><tr>
                 <td>
                     Core Image
-                </td>
-
-                <td class="cpu-arch">
+                </td><td class="cpu-arch">
                     <a href="http://repo.parabolagnulinux.org/isos/i686/parabola-{{version}}-core-i686.iso.torrent" 
                     title="Download for i686 architecture">Download</a>
-                </td>
-                
-                <td class="cpu-arch">
+                </td><td class="cpu-arch">
                     <a href="http://repo.parabolagnulinux.org/isos/x86_64/parabola-{{version}}-core-x86_64.iso.torrent" 
                     title="Download for x86-64 architecture">Download</a>
-                </td>
-
-                <td class="magnet-link">
-                    <a
-                        href="magnet:?xt=urn:btih:d9bb9f9641a222d2d302988da95225f570bcdb6d&dn=parabola-2010.12.29-core-i686.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
+                </td><td class="magnet-link">
+                    <a href="magnet:?xt=urn:btih:d9bb9f9641a222d2d302988da95225f570bcdb6d&dn=parabola-2010.12.29-core-i686.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
                     title="Magnet Link for ISO image">i686 Magnet</a>
-                </td>
-
-                <td class="magnet-link">
-                    <a
-                        href="magnet:?xt=urn:btih:fae6de60f0dfa703165e94df5a77e9bd607ef4cf&dn=parabola-2010.12.29-core-x86_64.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
+                </td><td class="magnet-link">
+                    <a href="magnet:?xt=urn:btih:fae6de60f0dfa703165e94df5a77e9bd607ef4cf&dn=parabola-2010.12.29-core-x86_64.iso&tr=http%3A%2F%2Ftracker.publicbt.com%2Fannounce"
                     title="Magnet Link for ISO image">x86_64 Magnet</a>
-                </td>
-
-                <td class="wrap">
+                </td><td class="wrap">
                     Core packages are included on the media. Good for basic off-line installation.
                 </td>
             </tr>
diff --git a/templates/public/index.html b/templates/public/index.html
index 6254d7b0..3805b997 100644
--- a/templates/public/index.html
+++ b/templates/public/index.html
@@ -33,17 +33,40 @@
 
 <div id="news">
 
-    <h3>Latest News <span class="more">(<a href="{% url news-list %}"
-                title="Browse the news archives">more</a>)</span></h3>
+    <h3>
+        <a href="{% url news-list %}" title="Browse the news archives">Latest News</a>
+        <span class="arrow"></span>
+    </h3>
 
     <a href="/feeds/news/" title="Parabola News RSS Feed"
         class="rss-icon"><img src="{% cdnprefix %}/media/rss.png" alt="RSS Feed" /></a>
 
     {% for news in news_updates %}
-    <h4><a href="{{ news.get_absolute_url }}"
-            title="View full article: {{ news.title }}">{{ news.title }}</a></h4>
+    {% if forloop.counter0 < 5 %}
+    <h4>
+        <a href="{{ news.get_absolute_url }}"
+            title="View full article: {{ news.title }}">{{ news.title }}</a>
+    </h4>
     <p class="timestamp">{{ news.postdate|date }}</p>
     <div class="article-content">{{ news.content|markdown|truncatewords_html:75 }}</div>
+    {% else %}
+    {% if forloop.counter0 == 5 %}
+    <h3>
+        <a href="{% url news-list %}"
+            title="Browse the news archives">Older News</a>
+        <span class="arrow"></span>
+    </h3>
+    <dl class="newslist">
+    {% endif %}
+        <dt>{{ news.postdate|date }}</dt>
+        <dd>
+            <a href="{{ news.get_absolute_url }}"
+                title="View full article: {{ news.title }}">{{ news.title }}</a>
+        </dd>
+    {% if forloop.last %}
+    </dl>
+    {% endif %}
+    {% endif %}
     {% endfor %}
 
 </div><!-- #news -->
@@ -75,7 +98,7 @@
         {% for update in pkg_updates %}
         <tr>
             <td class="pkg-name"><span class="{{ update.repo|lower }}">{{ update.pkgbase }} {{ update.version }}</span></td>
-			<td class="pkg-arch">
+            <td class="pkg-arch">
                 {% for pkg in update.package_links %}<a href="{{ pkg.get_absolute_url }}"
                     title="Details for {{ pkg.pkgname }} [{{ pkg.repo|lower }}]">{{ pkg.arch }}</a>{% if not forloop.last %}/{% endif %}{% endfor %}
             </td>
@@ -100,27 +123,13 @@
     <h4>Community</h4>
 
     <ul>
-        <li>
-            <a href="http://list.parabolagnulinux.org/listinfo.cgi"
-                title="Community and developer mailing lists">Mailing
-                Lists</a>
-        </li>
-
-        <li>
-            <a
-            href="http://list.parabolagnulinux.org/pipermail/dev-parabolagnulinux.org/"
-            title="dev mailing list archives">Dev Archives</a>
-        </li>
-
-        <li>
-            <a href="http://wiki.parabolagnulinux.org/IRC_Channels"
-            title="Official and regional IRC communities">IRC Channels</a>
-        </li>
-
-        <li>
-            <a href="http://identi.ca/group/parabola" title="Parabola at
-                identi.ca">Identi.ca group</a>
-        </li>
+        <li><a href="http://list.parabolagnulinux.org/listinfo.cgi"
+                title="Community and developer mailing lists">Mailing Lists</a></li>
+        <li><a href="http://list.parabolagnulinux.org/pipermail/dev-parabolagnulinux.org/"
+            title="dev mailing list archives">Dev Archives</a></li>
+        <li><a href="http://wiki.parabolagnulinux.org/IRC_Channels"
+            title="Official and regional IRC communities">IRC Channels</a></li>
+        <li><a href="http://identi.ca/group/parabola" title="Parabola at identi.ca">Identi.ca group</a></li>
     </ul>
 
     <h4>Support</h4>
diff --git a/templates/public/userlist.html b/templates/public/userlist.html
index 66543191..cfb08d80 100644
--- a/templates/public/userlist.html
+++ b/templates/public/userlist.html
@@ -14,7 +14,6 @@
     {% with users as dev_list %}
     {% include 'public/developer_list.html' %}
     {% endwith %}
-
 </div>
 {% endcache %}
 {% endblock %}