Update support page.

diff --git a/www/static/css/style.css b/www/static/css/style.css
index ce0b1e55054c16e2bfc1372b270d713f0adb5ca0..9896bfab5a67808640119026ea85e3f2f374bd63 100644 (file)
--- a/www/static/css/style.css
+++ b/www/static/css/style.css
@@ -62,6 +62,7 @@ div.line {
 
 img {
        padding: 3px;
+       border: 0;
 }
 
 img.floatTL {

diff --git a/www/static/images/icons/forum.png b/www/static/images/icons/forum.png
new file mode 100644 (file)
index 0000000..70ab2f5
Binary files /dev/null and b/www/static/images/icons/forum.png differ

diff --git a/www/static/images/icons/irc.png b/www/static/images/icons/irc.png
new file mode 100644 (file)
index 0000000..0c66bbb
Binary files /dev/null and b/www/static/images/icons/irc.png differ

diff --git a/www/static/images/icons/wiki.png b/www/static/images/icons/wiki.png
new file mode 100644 (file)
index 0000000..8090b87
Binary files /dev/null and b/www/static/images/icons/wiki.png differ

diff --git a/www/templates/static/support.html b/www/templates/static/support.html
index 990f185ebb5cc3a1c21694d48cb0805413665ae5..c9e9f19648be598605beaceab251566c7625a1f1 100644 (file)
--- a/www/templates/static/support.html
+++ b/www/templates/static/support.html
@@ -3,93 +3,79 @@
 {% block title %}{{ _("Getting support") }}{% end block %}
 
 {% block content %}
-       <h3>{{ _("Getting support") }}</h3>
+       <h3>{{ _("Documentation") }}</h3>
+       <a href="http://wiki.ipfire.org/{{ lang }}/start" target="_blank">
+               <img class="floatTR" src="{{ static_url("images/icons/wiki.png") }}" alt="wiki" />
+       </a>
 
-       <table>
-               <tr>
-                       <td>
-                               <!-- XXX need an image right here -->
-                               <a href="http://wiki.ipfire.org/{{ lang }}/start" target="_blank">WIKI</a>
-                       </td>
-                       <td>
-                               {% if lang == "de" %}
-                                       <p>
-                                               Die erste Anlaufstelle für Probleme ist das <a href="http://wiki.ipfire.org/{{ lang }}/start">Wiki</a>. Das Wiki enthält für die meisten Fragen die passende Antwort.
-                                       </p>
-                               {% else %}
-                                       <p>
-                                               The first place to go when you need help is the <a href="http://wiki.ipfire.org/{{ lang }}/start">wiki</a>.
-                                               It is a collection of pages which will answer most of the question that may come up.
-                                       </p>
-                               {% end %}
-                               <p>
-                                       {{ _("Really important guides are:") }}
-                               </p>
-                               <ul class="list">
-                                       <li><a href="http://wiki.ipfire.org/{{ lang }}/installation/start">{{ _("Installation guide") }}</a>
-                                               - {{ _("Learn how to start.") }}</li>
-                                       <!-- XXX need to find some more -->
-                                       <li>...</li>
-                               </ul>
+       {% if lang == "de" %}
+               <p>
+                       Die erste Anlaufstelle für Probleme ist das <a href="http://wiki.ipfire.org/{{ lang }}/start">Wiki</a>. Das Wiki enthält für die meisten Fragen die passende Antwort.
+               </p>
+       {% else %}
+               <p>
+                       The first place to go when you need help is the <a href="http://wiki.ipfire.org/{{ lang }}/start">wiki</a>.
+                       It is a collection of pages which will answer most of the question that may come up.
+               </p>
+       {% end %}
+       <p>
+               {{ _("Really important guides are:") }}
+       </p>
+       <ul class="list">
+               <li><a href="http://wiki.ipfire.org/{{ lang }}/installation/start" target="_blank">{{ _("Installation guide") }}</a>
+                       - {{ _("Learn how to start.") }}</li>
+               <li><a href="http://wiki.ipfire.org/{{ lang }}/configuration/start" target="_blank">{{ _("Configuration") }}</a></li>
+               <li><a href="http://wiki.ipfire.org/{{ lang }}/hardware/start" target="_blank">{{ _("Hardware") }}</a></li>
+       </ul>
 
-                               <br class="clear" />
+       <br class="clear" />
 
-                               <p class="note">
-                                       {% if lang == "de" %}
-                                               Die Dokumentation im Wiki wird von der Community gepflegt. Jedem steht es offen sich
-                                               mit seinem Account anzumelden und sein Wissen zu teilen. Das ist die beste Möglichkeit
-                                               um das Wiki zu der umfassendsten Resource für Informationen rund um IPFire zu machen.
-                                       {% else %}
-                                               The wiki is maintained by the community. Feel free to log on with your account and share your
-                                               knowledge. This is the only way to get the wiki to the best source of information about IPFire.
-                                       {% end %}
-                               </p>
-                       </td>
-               </tr>
-               <tr>
-                       <td>
-                               <a href="http://forum.ipfire.org/" target="_blank">FORUM</a>
-                       </td>
-                       <td>
-                               {% if lang == "de" %}
-                                       <p>
-                                               Die zweite Informationsquelle ist das <a href="http://forum.ipfire.org">Forum</a>.
-                                               Spezielle Fragen, die nicht im Wiki beantwortet wurden, können hier gestellt werden.
-                                       </p>
-                               {% else %}
-                                       <p>
-                                               The second place is the <a href="http://forum.ipfire.org">forum</a>. If your question was not 
-                                               answered in the wiki you may probably want to ask it there.
-                                       </p>
-                               {% end %}
-                       </td>
-               </tr>
-               <tr>
-                       <td colspan="2">&nbsp; <!-- just some space --></td>
-               </tr>
-               <tr>
-                       <td>
-                               IRC
-                       </td>
-                       <td>
-                               {% if lang == "de" %}
-                                       <p>
-                                               Für prompten Support gibt es einen IRC-Channel, wo sich andere Benutzer
-                                               finden lassen, die Hilfestellung geben können.
-                                       </p>
-                               {% else %}
-                                       <p>
-                                               If you need immediate help there is the IRC channel where you can meet fellow IPFire users
-                                               that may get their hands on your configuration and check it out together.
-                                       </p>
-                               {% end %}
-                               <p>
-                                       <strong>{{ _("Server") }}:</strong> irc.freenode.net
-                                       <br />
-                                       <strong>{{ _("Channel") }}:</strong> #ipfire
-                               </p>
-                       </td>
-               </tr>
-       </table>
+       <p class="note">
+               {% if lang == "de" %}
+                       Die Dokumentation im Wiki wird von der Community gepflegt. Jedem steht es offen sich
+                       mit seinem Account anzumelden und sein Wissen zu teilen. Das ist die beste Möglichkeit
+                       um das Wiki zu der umfassendsten Resource für Informationen rund um IPFire zu machen.
+               {% else %}
+                       The wiki is maintained by the community. Feel free to log on with your account and share your
+                       knowledge. This is the only way to get the wiki to the best source of information about IPFire.
+               {% end %}
+       </p>
 
+
+       <h3>{{ _("Forum") }}</h3>
+       <a href="http://wiki.ipfire.org/{{ lang }}/start" target="_blank">
+               <img class="floatTR" src="{{ static_url("images/icons/forum.png") }}" alt="forum" />
+       </a>
+
+       {% if lang == "de" %}
+               <p>
+                       Die zweite Informationsquelle ist das <a href="http://forum.ipfire.org">Forum</a>.
+                       Spezielle Fragen, die nicht im Wiki beantwortet wurden, können hier gestellt werden.
+               </p>
+       {% else %}
+               <p>
+                       The second place is the <a href="http://forum.ipfire.org">forum</a>. If your question was not 
+                       answered in the wiki you may probably want to ask it there.
+               </p>
+       {% end %}
+
+       <h3>{{ _("Internet relay chat") }}</h3>
+       <img class="floatTR" src="{{ static_url("images/icons/irc.png") }}" alt="IRC" />
+
+       {% if lang == "de" %}
+               <p>
+                       Für prompten Support gibt es einen IRC-Channel, wo sich andere Benutzer
+                       finden lassen, die Hilfestellung geben können.
+               </p>
+       {% else %}
+               <p>
+                       If you need immediate help there is the IRC channel where you can meet fellow IPFire users
+                       that may get their hands on your configuration and check it out together.
+               </p>
+       {% end %}
+       <p>
+               <strong>{{ _("Server") }}:</strong> irc.freenode.net
+               <br />
+               <strong>{{ _("Channel") }}:</strong> #ipfire
+       </p>
 {% end block %}

diff --git a/www/translations/de_DE.csv b/www/translations/de_DE.csv
index 7b861c24ea408653fd3fee4001f89b9e206a0d82..922ba8ea4df71e789f57038268192095588a2760 100644 (file)
--- a/www/translations/de_DE.csv
+++ b/www/translations/de_DE.csv
@@ -254,3 +254,5 @@
 "Kernels","Kernel"
 "fireinfo statistics","Fireinfo-Statistiken"
 "Go to the wiki","Zum Wiki"
+"Documentation","Dokumentation"
+"Configuration","Konfiguration"