]> git.ipfire.org Git - ipfire.org.git/blobdiff - www/templates/static/development.html
Remove github icons.
[ipfire.org.git] / www / templates / static / development.html
index 35c3793b1d2a88af95c0f460be2a60fcaef2fc97..d237801c0669a81d8192dbf84aeeca5c6a566b11 100644 (file)
-{% extends "../base.html" %}
+{% extends "../base-1.html" %}
                
 {% block title %}{{ _("Development") }}{% end block %}
 
-{% block content %}
-       
-       
-       <div class="post">
-               <h3>{{ _("Development") }}</h3>
-               <img src="{{ static_url("images/page_icons/development.png") }}" class="floatTR" border="0" alt="{{ _("Development") }}" />
+{% block body %}
+       <img src="{{ static_url("images/icons/development.png") }}" class="pull-right" alt="{{ _("Development") }}">
+
+       <div class="page-header">
+               <h2>{{ _("Development") }}</h2>
+       </div>
+
+       {% if lang == "de" %}   
+               <p>
+                       Der Entwicklungsprozess der IPFire Distribution ist offen.
+                       Das bedeutet, dass Diskussionen öffentlich geführt werden,
+                       Entscheidungen transparent sein sollen und jeder eingeladen ist
+                       mitzumachen.
+                       Die Entwickler empfinden dieses Vorgehen als das Beste,
+                       um ein Softwareprojekt dieser Größe zu führen.
+               </p>
+       {% else %}
                <p>
+                       The development process of IPFire is open. This means that we discuss things openly,
+                       make decisions transparently and that everyone is welcome to join.
+                       The developers believe that this is the best way to run a software project as big as the IPFire project is.
+               </p>
+       {% end %}
+
+       <hr>
+
+       <h3>{{ _("Development tools") }}</h3>
+       {% if lang == "de" %}
+               <p>
+                       Dies sind die Werkzeuge, welche die IPFire Entwickler nutzen
+                       um Diskussionen zu führen:
+               </p>
+       {% else %}
+               <p>
+                       The tools the IPFire team uses to create software, make discussions are
+                       the bugtracker, the mailing list and IRC channel:
+               </p>
+       {% end %}
+
+       <div class="row">
+               <div class="span6">
+                       <h4>
+                               <a href="http://bugtracker.ipfire.org/">{{ _("Bugtracker") }}</a>
+                       </h4>
                        {% if lang == "de" %}
-                               Willkommen im Entwicklungsbereich des IPFire-Projekts.<br />
-                               Hier gibt es Zugriff auf alle Ressourcen für die Entwicklung.<br />
+                               <p>
+                                       Der Bugtracker ist ein Tool, welches helfen soll bei
+                                       der Fehlerbehebung nicht den Faden zu verlieren.
+                                       Jeder Schritt, der unternommen wird, kann hier nachverfolgt
+                                       werden.
+                               </p>
                        {% else %}
-                               Welcome to the development area of the ipfire project.<br />
-                               These are the development ressources.
+                               <p>
+                                       The bug tracker is a tool which helps to keep track of issues that
+                                       are currently going on in the development process.
+                                       You can find the history of a bug and what has been done to fix it,
+                                       as well as the integration process of new features.
+                               </p>
                        {% end %}
-               </p>
-       </div>
-       <br class="clear" />    
+               </div>
 
-       <div class="post">
-               <a name="{{ _("git") }}"></a><h3>{{ _("git") }}</h3>
-               <img src="      http://git.ipfire.org/git-logo.png" class="floatTL" alt="{{ _("git") }}" />
-               <p>
+               <div class="span6">
+                       <h4>
+                               <a href="http://lists.ipfire.org/mailman/listinfo/development">{{ _("Development Mailing List") }}</a>
+                       </h4>
                        {% if lang == "de" %}
-                               Das Quellcode-Repository wird durch
-                               <a href="http://git.or.cz" target="_blank">Git</a>
-                               verwaltet. Ein Howto zum Arbeiten mit Git findet man
-                               in unserem <a href="http://wiki.ipfire.org/de/development/git" target="_blank">Wiki</a>.
-                               <br />
-                               Den Source-Code findet man unter: <a href="http://git.ipfire.org/" target="_blank">http://git.ipfire.org/</a>
-                       {% else %}      
-                               Our source code repository is managed by
-                               <a href="http://git.or.cz" target="_blank">git</a>.
-                               Your will find a howto to work with git in our
-                               <a href="http://wiki.ipfire.org/en/development/git" target="_blank">wiki</a>.
-                               <br />
-                               You may find our source code on: <a href="http://git.ipfire.org/" target="_blank">http://git.ipfire.org/</a>
+                               <p>
+                                       Diskussionen rund um den Entwicklungsprozess werden
+                                       auf der IPFire Entwicklungsmailingliste geführt.
+                               </p>
+                       {% else %}
+                               <p>
+                                       The place for discussions around the development of IPFire
+                                       is the IPFire development mailing list.
+                                       Everyone is welcome to subscribe and take part in the conversation.
+                               </p>
                        {% end %}
-               </p>
+               </div>
        </div>
-       <br class="clear" />
 
+       <hr>
+
+       <h3>{{ _("Source code") }}</h3>
+       <div class="row">
+               <div class="span6">
+                       <h4>{{ _("Git") }}</h4>
 
-       <div class="post">
-               <a name="{{ _("source-code") }}"></a><h3>{{ _("source-code") }}</h3>
-               <p>
                        {% if lang == "de" %}
-                               Die Sourcecode-Tarballs der im IPFire verwendeten Tools findet man unter
-                               <a href="http://source.ipfire.org/" target="_target">http://source.ipfire.org/</a><br />
-                               Alle Patches, die in der Distribution Verwendung finden, werden in einem
-                               Git-Repository verwaltet (Siehe oben).
-                       {% else %}      
-                               The source code tarballs of the tools used in IPFire are available on
-                               <a href="http://source.ipfire.org/" target="_target">http://source.ipfire.org/</a>.<br />
-                               All patches that are used in our distribution are stored in a git repository (see above).
-                       {% end %}                       
-               </p>
-       </div>
-       
-       
-       <div class="post">
-               <a name="{{ _("bugtracker") }}"></a><h3>{{ _("bugtracker") }}</h3>
-               <img src="http://bugtracker.ipfire.org/images/mantis_logo.gif" class="floatTL" width="80" alt="{{ _("bugtracker") }}" />
-               <p>
+                               <p>
+                                       Die IPFire Entwickler nutzen <a href="http://www.git-scm.com/">Git</a>
+                                       für die Quellcodeverwaltung.
+                                       Jeder darf den Code unter den Bedingungen der beigelegten
+                                       Lizenzen herunterladen.
+                               </p>
+                       {% else %}
+                               <p>
+                                       The IPFire developers use <a href="http://www.git-scm.com/">Git</a>
+                                       for source code management.
+                                       Anyone may download the source code under terms of the accompanying, provided licenses.
+                               </p>
+                       {% end %}
+
+                       <p class="ac">
+                               <a class="btn" href="http://git.ipfire.org/" target="_blank">
+                                       {{ _("IPFire Git repositories") }}
+                               </a>
+                       </p>
+               </div>
+
+               <div class="span6">
+                       <h4>{{ _("GitHub") }}</h4>
+
                        {% if lang == "de" %}
-                                       Im <a href="http://bugtracker.ipfire.org" target="_blank">Bugtracker</a> findet man bekannte Fehler.<br />
-                                       Solltet ihr also einen Fehler oder auch Funktionsvorschlag haben so könnt ihr uns über den Bugtracker 
-                                       dies mitteilen. Für die Entwicklung ist es wichtig, dass es ausführliche Bug-Reports gibt,
-                                       die dann rasch bearbeitet werden können. 
-                       {% else %}      
-                                       We manage all issues in our <a href="http://bugtracker.ipfire.org" target="_blank">bugtracker</a>.<br />
-                                       Should you have a bug or feature proposal you can tell us about it by posting 
-                                       to the bugtracker. It is important for development to create a detailed bug reports so that
-                                       we can fix them fastly. 
-                       {% end %}               
-               </p>
-       </div>
-       <br class="clear" />
-       
-       
-       <div class="post">
-               <a name="{{ _("HowTos") }}"></a><h3>{{ _("HowTos") }}</h3>
-               <p>
-               {% if lang == "de" %}
-                       Im Wiki befinden sich viele weitere Howtos hier einmal die wichtigsten rund ums Entwickeln.
-                       <div class=pr_li>
-                               <ul>
-                                       <li><a href="http://wiki.ipfire.org/de/development/build" target="_blank">Building IPFire</a></li>
-                                       <li><a href="http://wiki.ipfire.org/de/development/addon" target="_blank">Building Addon</a></li>
-                                       <li><a href="http://wiki.ipfire.org/de/development/language" target="_blank">Creating language file</a></li>
-                               </ul>
-                       </div>
-               {% else %}      
-                       In the wiki there are many other howtos here folowing the important ons for development.
-                       <div class=pr_li>
-                               <ul>
-                                       <li><a href="http://wiki.ipfire.org/en/development/build" target="_blank">Building IPFire</a></li>
-                                       <li><a href="http://wiki.ipfire.org/en/development/addon" target="_blank">Building Addon</a></li>
-                                       <li><a href="http://wiki.ipfire.org/en/development/language" target="_blank">Creating language file</a></li>
-                               </ul>
-                       </div>
-               {% end %}
-               </p>
-       </div>
-       
-       
-       <div class="post">
-               <a name="{{ _("IPFire 3.x") }}"></a><h3>{{ _("IPFire 3.x") }}</h3>
-               <p>
-               {% if lang == "de" %}
-                       Unser nächstes Ziel ist die Entwicklung einer völlig neuen und komplett redesignten IPFire Version 3.<br />
-                       In der <a href="downloads/development" target="_blank">Download-Sektion</a> 
-                       gibt es aktuelle Entwicklungsversionen zum herunterladen.
-                       <div class=pr_li>
-                               <ul>
-                                       <li><a href="http://wiki.ipfire.org/de/development/3.0" target="_blank">Roadmap von IPFire 3.x</a></li>
-                               </ul>
-                       </div>
-               {% else %}      
-                       Our next goal is to develop a completely new and redesigned IPFire version 3.<br />
-                       In the <a href="downloads/development" target="_blank">download section</a> 
-                       you can get a curent development version.
-                       <div class=pr_li>
-                               <ul>
-                                       <li><a href="http://wiki.ipfire.org/en/development/3.0" target="_blank">Roadmap of IPFire 3.x</a></li>
-                               </ul>
-                       </div>
-               {% end %}
-       </div>
-       
-       <div class="post">
-               <a name="{{ _("Artwork") }}"></a><h3>{{ _("Artwork") }}</h3>
-               <p>
-               {% if lang == "de" %}
-                       Logos und Printmedien vom IPFire-Projekt gibt es auf der Seite <a href="artwork">Artwork</a>.
-               {% else %}      
-                       Logos and print media of the IPFire project can be found on the <a href="artwork">artwork</a> page.
-               {% end %}
-               </p>
+                               <p>
+                                       Seit Januar 2013 wird der IPFire Quellcode und verwandte Projekt
+                                       auf GitHub gespiegelt. Damit ist es ganz einfach sich eine Kopie
+                                       des Codes zu erstellen und ihn zu bearbeiten.
+                                       Pull-Requests sind gern willkommen!
+                               </p>
+                       {% else %}
+                               <p>
+                                       Since January 2013, the IPFire source code and related projects are mirrored on GitHub.
+                                       So it is easier to get your own working copy of the IPFire source and start hacking on it.
+                                       Pull requests are welcome!
+                               </p>
+                       {% end %}
+
+                       <p class="ac">
+                               <a class="btn" href="https://github.com/ipfire" target="_blank">
+                                       {{ _("ipfire on GitHub") }}
+                               </a>
+                       </p>
+               </div>
        </div>
-       
-                       
-{% end block %}
 
-{% block sidebar %}
-               <h4>{{ _("Development Area") }}</h4>
-        <ul class="links">              
-                         <li class="first"><a href="#{{ _("git") }}">{{ _("git") }}</a></li>
-                         <li><a href="#{{ _("source-code") }}">{{ _("source-code") }}</a></li>
-                         <li><a href="#{{ _("bugtracker") }}">{{ _("bugtracker") }}</a></li>
-                         <li><a href="#{{ _("IPFire 3.x") }}">{{ _("IPFire 3.x") }}</a></li>   
-                         <li><a href="#{{ _("Artwork") }}">{{ _("Artwork") }}</a></li> 
-                 <ul>
-                         <li><a href="http://www.ohloh.net/projects/compare?metric=Activity&amp;project_0=IPFire&amp;project_1=Smoothwall&amp;project_2=IPCop+Firewall" target="_blank">         
-                                 {% if lang == "de" %}
-                                         IPFire im Vergleich mit IPCop und Smoothwall auf ohloh.net
-                                 {% else %}      
-                                         Comparison of IPFire to IPCop and Smoothwall on ohloh.net
-                                 {% end %}
-                         </a></li>
-                 </ul>
-                 </ul>
+       <hr>
 
-               
-       
- {{ modules.SidebarBanner(banner) }}
+       <div class="row">
+               <div class="span4">
+                       <h4>{{ _("How to build IPFire?") }}</h4>
+                       {% if lang == "de" %}
+                               <p>
+                                       IPFire zu kompilieren ist ganz einfach, aber dauert seine
+                                       Zeit.
+                               </p>
+                               <p>
+                                       Einen Einblick dazu gibt es in der
+                                       <a href="http://wiki.ipfire.org/{{ lang }}/development/build">Bauanleitung</a>
+                                       im Wiki, welche Schritt für Schritt vorgeht.
+                               </p>
+                               <p>
+                                       Addonentwicklung ist erwünscht. Die Vorgehensweise
+                                       dafür findet sich in der entsprechenden
+                                       <a href="http://wiki.ipfire.org/{{ lang }}/development/addon#building_addon_-_howto">Anleitung</a>.
+                               </p>
+                       {% else %}
+                               <p>
+                                       Building IPFire is actually very easy, but it does take some time.
+                               </p>
+                               <p>
+                                       Have a look at the
+                                       <a href="http://wiki.ipfire.org/{{ lang }}/development/build">guide on our wiki</a>
+                                       and work through it at your own pace, step by step.
+                               </p>
+                               <p>
+                                       Add-on development is encouraged. Have a look at the
+                                       <a href="http://wiki.ipfire.org/{{ lang }}/development/addon#building_addon_-_howto">building an add-on guide on our wiki</a>
+                                       for more information.
+                               </p>
+                       {% end %}
+               </div>
+
+               <div class="span4">
+                       <h4>{{ _("How to submit patches?") }}</h4>
+                       {% if lang == "de" %}
+                               <p>
+                                       Die IPFire Entwickler freuen sich über jeden Beitrag zur Software.
+                                       Patches, welche Fehler beheben, Verbesserungen implementieren
+                                       oder neue Funktionen hinzufügen sind willkommen.
+                               </p>
+                               <p>
+                                       Um den Integrationsprozess in die Distribution verfolgen
+                                       zu können, bitten wir einen <a href="http://bugtracker.ipfire.org/">Bugreport</a>
+                                       zu eröffnen, an welchen der Patch angehangen worden ist, sowie alle
+                                       anderen benötigten Daten.
+                               </p>
+                       {% else %}
+                               <p>
+                                       The IPFire developers appreciate any and all contributions to the software.
+                                       Patches that fix bugs, add enhancements, or create new features are welcome.
+                               </p>
+                               <p>
+                                       To track the integration into the distribution properly,
+                                       we request that you create a new bug report in the
+                                       <a href="http://bugtracker.ipfire.org/">bugtracker</a>
+                                       and attach the patch file, as well as everything else that is needed.
+                               </p>
+                       {% end %}
+               </div>
+
+               <div class="span4">
+                       <h4>{{ _("How to translate IPFire?") }}</h4>
+
+                       {% if lang == "de" %}
+                               <h5>IPFire 2.x</h5>
+                               <p>
+                                       In der <a href="http://wiki.ipfire.org/{{ lang }}/development/language">Übersetzungsanleitung</a>
+                                       finden sich Informationen darüber, wie man das Webinterface von IPFire 2
+                                       übersetzt.
+                               </p>
+
+                               <h5>IPFire 3.x</h5>
+                               <p>
+                                       Auf <a href="http://www.transifex.net/projects/p/ipfire/">Transifex</a>
+                                       findet sich eine Reihe von Übersetzungsprojekten in Verbindung
+                                       mit IPFire 3.
+                               </p>
+
+                               <div class="alert alert-info">
+                                       Hilf dem <a href="http://wiki.ipfire.org/projects/translation/start">IPFire Übersetzungsteam</a>!
+                               </div>
+                       {% else %}
+                               <h5>IPFire 2.x</h5>
+                               <p>
+                                       Please read the <a href="http://wiki.ipfire.org/en/development/language">translation guide</a>
+                                       to learn how to translate the web interface of IPFire 2.
+                               </p>
 
+                               <h5>IPFire 3.x</h5>
+                               <p>
+                                       Head over to <a href="http://www.transifex.net/projects/p/ipfire/">Transifex</a>
+                                       to see a list of our translation projects and feel free to join.
+                               </p>
+
+                               <div class="alert alert-info">
+                                       Join the <a href="http://wiki.ipfire.org/projects/translation/start">IPFire translation team</a>!
+                               </div>
+                       {% end %}
+               </div>
+       </div>
 {% end block %}