dapal

[deb/hackedgotchi.git] / templates / index.html.dj

diff --git a/templates/index.html.dj b/templates/index.html.dj
index c88f8161d02a95884e4edf968932c0dbb8ab34db..35bfb1114ea83f8f8dbfc5b34b5ac8ae1b1df9b4 100644 (file)
--- a/templates/index.html.dj
+++ b/templates/index.html.dj
@@ -24,22 +24,21 @@
   <div id="header">
    <div id="upperheader">
     <div id="logo">
-               <a href="./" title="Debian Home"><img src="common/Pics/openlogo-50.png" alt="Debian" width="50" height="61" /></a> 
+               <a href="http://www.debian.org/" title="Debian Home"><img src="common/Pics/openlogo-50.png" alt="Debian" width="50" height="61" /></a> 
     </div><!-- end logo -->
-    <p class="section">planet</p>
+    <p class="section"><a href="/">planet</a></p>
    </div><!-- end upperheader -->
    <div id="navbar">
     <p class="hidecss"><a href="#inner">Skip Quicknav</a></p>
     <ul>
-       <li><a href="http://www.debian.org/intro/about">About Debian</a></li>
+     <li><a href="http://www.debian.org/intro/about">About Debian</a></li>
      <li><a href="http://www.debian.org/distrib/">Getting Debian</a></li>
-     <li><a href="http://www.debian.org/doc/">Documentation</a></li>
      <li><a href="http://www.debian.org/support">Support</a></li>
-     <li><a href="http://www.debian.org/devel/">Development</a></li>
+     <li><a href="http://www.debian.org/devel/">Developers'&nbsp;Corner</a></li>
     </ul>
    </div><!-- end navbar -->
-  </div><!-- end header -->
   <p id="breadcrumbs"><a href="http://planet.debian.org/">Planet Debian</a></p>
+  </div><!-- end header -->
    <div id="content">
 
     {% for item in Items %}
@@ -57,7 +56,7 @@
      </a>
       {% endif %}
      <h2 class="planet-title">
-      <a href="{{ item.channel_link }}" title="{{ item.channel_title }}">{{ item.channel_name|safe }}</a>
+      <a href="{{ item.channel_link }}" title="{{ item.channel_title|safe }}">{{ item.channel_name|safe }}</a>
        <script type="text/javascript">
          <!--
                 document.write( "<a href=\"#\" id=\"{{ item.link }}_hide\" onClick=\"exclude( '{{ item.link }}' ); hideHosts(); return false;\"><img src=\"common/minus-8.png\" style=\"border: none;\" title=\"Hide Author\" alt=\"Hide Author\" height=\"8\" width=\"8\"><\/a> <a href=\"#\" id=\"{{ item.link }}_show\"  style=\"display:none;\" onClick=\"show( '{{ item.link }}' );  return false;\"><img src=\"common/plus-8.png\" style=\"border: none;\" title=\"Show Author\" alt=\"Show Author\" height=\"8\" width=\"8\"><\/a>" );
@@ -68,7 +67,7 @@
      <div id="{{ item.link }}" class="{{ item.link }}">
       <div class="entry">
        <h3 class="entry-title">
-        <a href="{{ item.link}}">{{ item.title }}</a>
+        <a href="{{ item.link }}">{{ item.title|safe }}</a>
        </h3>
        <div class="content">
         {{ item.content|safe }}
@@ -87,7 +86,7 @@
    <div id="sidebar">
     {% if Config.search %}
      <h1>{{ Config.searchtext }}</h1>
-     <form method="GET" action="/cgi-bin/search.cgi">
+     <form method="GET" action="http://planet-search.debian.org/cgi-bin/search.cgi">
       <input type="text" name="terms" value="">
      </form>
     <hr />
@@ -119,7 +118,7 @@
    <h2>{{ Config.subscriptionstext }}</h2>
    <ul>
     {% for channel in Channels %}
-    <li><a href="{{ channel.link }}" title="{{ channel.title }}">{{ channel.name|safe }}</a> <a href="{{ channel.url }}">({{ Config.feedtext }})</a></li>
+    <li><a href="{{ channel.link }}" title="{{ channel.title|safe }}">{{ channel.name|safe }}</a> <a href="{{ channel.url }}">({{ Config.feedtext }})</a></li>
     {% endfor %}
    </ul>
   </div>