www: Add icons to index and about page.

diff --git a/www/static/css/style.css b/www/static/css/style.css
index dc37c8a2ff11e3c76d4211f4ea05c3171e7ff3bc..08d57cd76b6dde4a4cb3bb2d6f02736e2a865b6a 100644 (file)
--- a/www/static/css/style.css
+++ b/www/static/css/style.css
@@ -897,6 +897,7 @@ table.blocks {
 table.blocks td.block {
        width: 33%;
        padding: 1.5em;
+       vertical-align: top;
 }
 
 table.blocks td.block p {

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

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

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

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

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

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

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

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

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

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

diff --git a/www/templates/index.html b/www/templates/index.html
index e81d55657e8cf7c1f5299ac1489c22d8a405f244..4d7a6519fb5a9387847ef63811bdb32a3462288d 100644 (file)
--- a/www/templates/index.html
+++ b/www/templates/index.html
@@ -43,6 +43,8 @@
        <table class="blocks">
                <tr>
                        <td class="block block1">
+                               <img src="{{ static_url("images/icons/security.png") }}" alt="{{ _("Security") }}" />
+                               <br class="clear" />
                                <span>{{ _("Security") }}</span>
                                <p>
                                        As the most important issue: Security updates
@@ -51,6 +53,8 @@
                                <a href="/about#security">{{ _("Learn more.") }}</a>
                        </td>
                        <td class="block block2">
+                               <img src="{{ static_url("images/icons/flexibility.png") }}" alt="{{ _("Flexibility") }}" />
+                               <br class="clear" />
                                <span>{{ _("Flexibility") }}</span>
                                <p>
                                        Nowadays it is also important to act flexible and fit
@@ -61,13 +65,15 @@
                                </p>
                        </td>
                        <td class="block block3">
+                               <img src="{{ static_url("images/icons/community.png") }}" alt="{{ _("Community") }}" />
+                               <br class="clear" />
                                <span>{{ _("Community") }}</span>
                                <p>
                                        The success of IPFire is based on the community that
                                        is working on the code an spreading IPFire to the world.
                                </p>
                                <p>
-                                       <a href="/about#community">{{ _("Get involved.") }}</a>
+                                       <a href="/about#itsfree">{{ _("Get involved.") }}</a>
                                </p>
                        </td>
                </tr>

diff --git a/www/templates/static/about.html b/www/templates/static/about.html
index 70d0bf18563f9e62bb730393039d38ea839b8bf3..170baad4177f0f17048a52078608fe6f00a93ee8 100644 (file)
--- a/www/templates/static/about.html
+++ b/www/templates/static/about.html
@@ -31,7 +31,6 @@
                        <li><a href="#vpn">{{ _("VPN") }}</a></li>
                        <li><a href="#hardware">{{ _("Hardware") }}</a></li>
                        <li><a href="#virtualization">{{ _("Virtualization") }}</a></li>
-                       <li><a href="#community">{{ _("Community") }}</a></li>
                        <li><a href="#itsfree">{{ _("It's free") }}</a></li>
                </ul>
                <div id="concept">
@@ -55,6 +54,7 @@
                        </p>
                </div>
                <div id="security">
+                       <img src="{{ static_url("images/icons/security.png") }}" class="floatTL" alt="{{ _("Security") }}" />
                        <p>
                                The matter that counts most in the development of IPFire is - of course - security. But
                                we don't believe that there is only one single way to achvieve security. It is more important
@@ -66,6 +66,7 @@
                        </p>
                </div>
                <div id="pakfire">
+                       <img src="{{ static_url("images/icons/pakfire.png") }}" class="floatTL" alt="{{ _("Pakfire") }}" />
                        <p>
                                From the technical point of view, IPFire is a very shrinked and hardened firewall system
                                which comes with an integrated package manager that is called <a href="/features/pakfire">Pakfire</a>.
@@ -93,6 +94,7 @@
                        </p>
                </div>
                <div id="firewall">
+                       <img src="{{ static_url("images/icons/firewall.png") }}" class="floatTL" alt="{{ _("Firewall") }}" />
                        <p>
                                IPFire comes with a SPI (stateful inspection) firewall which is built on top of the
                                Linux <a href="http://www.netfilter.org/">netfilter</a>.
@@ -135,6 +137,7 @@
                        </p>
                </div>
                <div id="vpn">
+                       <img src="{{ static_url("images/icons/vpn.png") }}" class="floatTL" alt="{{ _("VPN") }}" />
                        <p>
                                IPFire can be enhanced to a VPN (virtual private network) gateway that connects places and
                                persons to the local network. This could either be staff, friends and people you want to share
@@ -161,6 +164,7 @@
                        </p>
                </div>
                <div id="hardware">
+                       <img src="{{ static_url("images/icons/hardware.png") }}" class="floatTL" alt="{{ _("Hardware") }}" />
                        <p>
                                Based on a recent version of the Linux kernel 2.6 series, IPFire supports latest hardware
                                like 10G network cards and wireless hardware out of the box.
@@ -177,6 +181,7 @@
                        </p>
                </div>
                <div id="virtualization">
+                       <img src="{{ static_url("images/icons/virtualization.png") }}" class="floatTL" alt="{{ _("Virtualization") }}" />
                        <p>
                                IPFire can be run as a virtual guest on the following hypervisors:
                        </p>
@@ -191,25 +196,15 @@
                                It brings many frontend drivers for high performnce for all the hypervisors.
                        </p>
                </div>
-               <div id="community">
-                       <p>
-                               IPFire has got a great community which is a very important thing for the success of the project.
-                       </p>
-                       <p>
-                               There is a nice relationship between all people that are involved into the project
-                               so they are all pull together and make IPFire to the nice project that it is today.
-                       </p>
-                       <p>
-                               Everybody can become part of the community. <a href="/join">Learn more</a>.
-                       </p>
-               </div>
                <div id="itsfree">
+                       <img src="{{ static_url("images/icons/itsfree.png") }}" class="floatTL" alt="{{ _("It's free") }}" />
                        <p>
                                As IPFire is licensed under the <a href="http://www.gnu.org/licenses/gpl.html">GNU General
                                Public License</a> in version 3 it is free of charge.
                        </p>
                        <p>
-                               There is the opportunity to make a <a href="/donation">donation</a>.
+                               There is the opportunity to make a <a href="/donation">donation</a> to the
+                               community which is a very important thing for the success of the project.
                        </p>
                </div>
        </div>