From 3b9907872ba706a5f7199becea033aba5707a2d0 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 14 Jan 2011 23:44:34 +0100 Subject: [PATCH] Update support page. --- www/static/css/style.css | 1 + www/static/images/icons/forum.png | Bin 0 -> 2484 bytes www/static/images/icons/irc.png | Bin 0 -> 3907 bytes www/static/images/icons/wiki.png | Bin 0 -> 2650 bytes www/templates/static/support.html | 156 ++++++++++++++---------------- www/translations/de_DE.csv | 2 + 6 files changed, 74 insertions(+), 85 deletions(-) create mode 100644 www/static/images/icons/forum.png create mode 100644 www/static/images/icons/irc.png create mode 100644 www/static/images/icons/wiki.png diff --git a/www/static/css/style.css b/www/static/css/style.css index ce0b1e55..9896bfab 100644 --- 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 index 0000000000000000000000000000000000000000..70ab2f55fc7fcf02509e697f7f1acd649b7db0be GIT binary patch literal 2484 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 Rfi?gD002ovPDHLkV1j|kfS>>X literal 0 Hc-jL100001 diff --git a/www/static/images/icons/wiki.png b/www/static/images/icons/wiki.png new file mode 100644 index 0000000000000000000000000000000000000000..8090b87bc33f547af63731e10667708f38daf251 GIT binary patch literal 2650 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 IM6N<$f?5gbwg3PC literal 0 Hc-jL100001 diff --git a/www/templates/static/support.html b/www/templates/static/support.html index 990f185e..c9e9f196 100644 --- a/www/templates/static/support.html +++ b/www/templates/static/support.html @@ -3,93 +3,79 @@ {% block title %}{{ _("Getting support") }}{% end block %} {% block content %} -

{{ _("Getting support") }}

+

{{ _("Documentation") }}

+ + wiki + - - - - - - - - - - - - - - - - -
- - WIKI - - {% if lang == "de" %} -

- Die erste Anlaufstelle für Probleme ist das Wiki. Das Wiki enthält für die meisten Fragen die passende Antwort. -

- {% else %} -

- The first place to go when you need help is the wiki. - It is a collection of pages which will answer most of the question that may come up. -

- {% end %} -

- {{ _("Really important guides are:") }} -

- + {% if lang == "de" %} +

+ Die erste Anlaufstelle für Probleme ist das Wiki. Das Wiki enthält für die meisten Fragen die passende Antwort. +

+ {% else %} +

+ The first place to go when you need help is the wiki. + It is a collection of pages which will answer most of the question that may come up. +

+ {% end %} +

+ {{ _("Really important guides are:") }} +

+ -
+
-

- {% 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 %} -

-
- FORUM - - {% if lang == "de" %} -

- Die zweite Informationsquelle ist das Forum. - Spezielle Fragen, die nicht im Wiki beantwortet wurden, können hier gestellt werden. -

- {% else %} -

- The second place is the forum. If your question was not - answered in the wiki you may probably want to ask it there. -

- {% end %} -
 
- IRC - - {% if lang == "de" %} -

- Für prompten Support gibt es einen IRC-Channel, wo sich andere Benutzer - finden lassen, die Hilfestellung geben können. -

- {% else %} -

- 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. -

- {% end %} -

- {{ _("Server") }}: irc.freenode.net -
- {{ _("Channel") }}: #ipfire -

-
+

+ {% 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 %} +

+ +

{{ _("Forum") }}

+ + forum + + + {% if lang == "de" %} +

+ Die zweite Informationsquelle ist das Forum. + Spezielle Fragen, die nicht im Wiki beantwortet wurden, können hier gestellt werden. +

+ {% else %} +

+ The second place is the forum. If your question was not + answered in the wiki you may probably want to ask it there. +

+ {% end %} + +

{{ _("Internet relay chat") }}

+ IRC + + {% if lang == "de" %} +

+ Für prompten Support gibt es einen IRC-Channel, wo sich andere Benutzer + finden lassen, die Hilfestellung geben können. +

+ {% else %} +

+ 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. +

+ {% end %} +

+ {{ _("Server") }}: irc.freenode.net +
+ {{ _("Channel") }}: #ipfire +

{% end block %} diff --git a/www/translations/de_DE.csv b/www/translations/de_DE.csv index 7b861c24..922ba8ea 100644 --- 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" -- 2.47.3