From: pebosi <mail@pebosi.net>
Date: Tue, 14 Jan 2014 22:15:19 +0000 (+0100)
Subject: Update static templates
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94cf85accfd5011b9b6164e903316be9cb438a3e;p=ipfire.org.git

Update static templates
---

diff --git a/templates/static/artwork.html b/templates/static/artwork.html
index 4da0aadf..3b7a14d0 100644
--- a/templates/static/artwork.html
+++ b/templates/static/artwork.html
@@ -38,7 +38,7 @@
 
 	<ul class="thumbnails">
 		{% for i in ("512x512", "256x256", "128x128", "64x64", "32x32") %}
-			<li class="span4">
+			<li class="col-lg-4 col-md-4">
 				<a class="thumbnail" href="{{ static_url("images/tux/ipfire_tux_%s.png" % i) }}">
 					<img src="{{ static_url("images/tux/ipfire_tux_%s.png" % i) }}" alt="{{ _("Logo") }}">
 				</a>
@@ -64,7 +64,7 @@
 
 	<ul class="thumbnails">
 		{% for i in ("rollup", "flyer", "cd_schuber", "cd_label") %}
-			<li class="span6">
+			<li class="col-lg-6 col-md-6">
 				<a class="thumbnail" href="{{ static_url("images/artwork/%s.pdf" % i) }}">
 					<img src="{{ static_url("images/artwork/%s_tn.png" % i) }}" alt="{{ _("Artwork") }}">
 				</a>
diff --git a/templates/static/cebit.html b/templates/static/cebit.html
index de94a0de..df9d92f2 100644
--- a/templates/static/cebit.html
+++ b/templates/static/cebit.html
@@ -51,7 +51,7 @@
 	<hr>
 
 	<div class="row">
-		<div class="span8 offset2 ac">
+		<div class="col-lg-8 col-md-8 col-lg-offset-2 ac">
 			<iframe width="640" height="360" src="http://www.youtube.com/embed/9zUcQouQ1sE?rel=0" frameborder="0" allowfullscreen></iframe>
 			<br>
 			<a href="http://eine-minute.blogspot.com/2010/03/ipfire-eine-utm-auf-opensource-basis.html">"eine-minute" Blog</a>
@@ -60,13 +60,13 @@
 
 	<hr>
 
-	<ul class="thumbnails">
+	<div class="row">
 		{% for i in range(1, 5) %}
-			<li class="span3">
+			<div class="col-lg-3 col-md-3 col-sm-6">
 				<a class="thumbnail" href="{{ static_url("images/cebit/cebit_2010_%d.jpg" % i) }}">
 					<img src="{{ static_url("images/cebit/cebit_2010_%d_tn.jpg" % i) }}" alt="{{ _("CeBIT") }}">
 				</a>
-			</li>
+			</div>
 		{% end %}
-	</ul>
+	</div>
 {% end block %}
diff --git a/templates/static/chat.html b/templates/static/chat.html
index 4df6ff6e..a9ea7ddc 100644
--- a/templates/static/chat.html
+++ b/templates/static/chat.html
@@ -37,7 +37,7 @@
 		</li>
 	</ul>
 
-	<a class="btn" href="http://webchat.freenode.net/?channels=ipfire">
+	<a class="btn btn-default" href="http://webchat.freenode.net/?channels=ipfire">
 		{{ _("Use the web client") }}
 	</a>
 {% end block %}
diff --git a/templates/static/development.html b/templates/static/development.html
index 2b12df48..6a09e3be 100644
--- a/templates/static/development.html
+++ b/templates/static/development.html
@@ -12,7 +12,7 @@
 
 {% block body %}
 	<div class="row">
-		<div class="span9">
+		<div class="col-lg-9 col-md-9">
 			<section id="intro">
 				{% if lang == "de" %}	
 					<p>
@@ -114,7 +114,7 @@
 				{% end %}
 
 				<p class="ac">
-					<a class="btn" href="http://git.ipfire.org/" target="_blank">
+					<a class="btn btn-default" href="http://git.ipfire.org/" target="_blank">
 						{{ _("IPFire Git repositories") }}
 					</a>
 				</p>
@@ -139,7 +139,7 @@
 				{% end %}
 
 				<p class="ac">
-					<a class="btn" href="https://github.com/ipfire" target="_blank">
+					<a class="btn btn-default" href="https://github.com/ipfire" target="_blank">
 						{{ _("ipfire on GitHub") }}
 					</a>
 				</p>
@@ -251,21 +251,21 @@
 			</section>
 		</div>
 
-		<div class="span3 sidebar">
+		<div class="col-lg-3 col-md-3 sidebar">
 			<ul class="nav nav-list sidenav">
 				<li>
 					<a href="#tools">
-						<i class="icon-chevron-left"></i> {{ _("Development tools") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Development tools") }}
 					</a>
 				</li>
 				<li>
 					<a href="#sources">
-						<i class="icon-chevron-left"></i> {{ _("Source Code") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Source Code") }}
 					</a>
 				</li>
 				<li>
 					<a href="#build">
-						<i class="icon-chevron-left"></i> {{ _("How to build IPFire?") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("How to build IPFire?") }}
 					</a>
 				</li>
 			</ul>
diff --git a/templates/static/donation.html b/templates/static/donation.html
index d6d0311e..e3bf56a1 100644
--- a/templates/static/donation.html
+++ b/templates/static/donation.html
@@ -61,7 +61,7 @@
 	<hr>
 
 	<div class="row">
-		<div class="span10 offset1">
+		<div class="col-lg-10 col-md-10 col-lg-offset-1">
 			{% module DonationBox() %}
 
 			<p class="ac">
diff --git a/templates/static/features.html b/templates/static/features.html
index b0fd67c8..2f89f603 100644
--- a/templates/static/features.html
+++ b/templates/static/features.html
@@ -15,7 +15,7 @@
 
 {% block body %}
 	<div class="row">
-		<div class="span9">
+		<div class="col-lg-9 col-md-9">
 			<section id="about">
 				<div class="page-header">
 					<h1>
@@ -291,17 +291,17 @@
 				<hr class="separator">
 
 				<ul class="thumbnails">
-					<li class="span3">
+					<li class="col-lg-3 col-md-3">
 						<a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/edit-portfw-rule-1.png") }}">
 							<img src="{{ static_url("images/screenshots/en/firewall/edit-portfw-rule-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
 						</a>
 					</li>
-					<li class="span3">
+					<li class="col-lg-3 col-md-3">
 						<a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/dmz-holes-1.png") }}">
 							<img src="{{ static_url("images/screenshots/en/firewall/dmz-holes-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
 						</a>
 					</li>
-					<li class="span3">
+					<li class="col-lg-3 col-md-3">
 						<a class="thumbnail" href="{{ static_url("images/screenshots/en/firewall/connections-1.png") }}">
 							<img src="{{ static_url("images/screenshots/en/firewall/connections-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
 						</a>
@@ -414,12 +414,12 @@
 				<hr class="separator">
 
 				<ul class="thumbnails">
-					<li class="span3">
+					<li class="col-lg-3 col-md-3">
 						<a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1.png") }}">
 							<img src="{{ static_url("images/screenshots/en/pakfire/pakfire-overview-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
 						</a>
 					</li>
-					<li class="span3">
+					<li class="col-lg-3 col-md-3">
 						<a class="thumbnail" href="{{ static_url("images/screenshots/en/pakfire/addon-services-1.png") }}">
 							<img src="{{ static_url("images/screenshots/en/pakfire/addon-services-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
 						</a>
@@ -1166,7 +1166,7 @@
 				<hr class="separator">
 
 				<ul class="thumbnails">
-					<li class="span3">
+					<li class="col-lg-3 col-md-3">
 						<a class="thumbnail" href="{{ static_url("images/screenshots/en/hardware/hwtemp-1.png") }}">
 							<img src="{{ static_url("images/screenshots/en/hardware/hwtemp-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
 						</a>
@@ -1298,7 +1298,7 @@
 				<hr class="separator">
 
 				<ul class="thumbnails">
-					<li class="span3">
+					<li class="col-lg-3 col-md-3">
 						<a class="thumbnail" href="{{ static_url("images/screenshots/en/virtualization/virt-manager-1.png") }}">
 							<img src="{{ static_url("images/screenshots/en/virtualization/virt-manager-1_thumb.png") }}" alt="{{ _("Screenshot") }}">
 						</a>
@@ -1342,71 +1342,71 @@
 			</section>
 		</div>
 
-		<div class="span3 sidebar">
+		<div class="col-lg-3 col-md-3 sidebar">
 			<ul class="nav nav-list sidenav">
 				<li>
 					<a href="#about">
-						<i class="icon-chevron-left"></i> {{ _("About IPFire") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("About IPFire") }}
 					</a>
 				</li>
 				<li>
 					<a href="#security">
-						<i class="icon-chevron-left"></i> {{ _("Security") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Security") }}
 					</a>
 				</li>
 				<li>
 					<a href="#firewall">
-						<i class="icon-chevron-left"></i> {{ _("Firewall") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Firewall") }}
 					</a>
 				</li>
 				<li>
 					<a href="#pakfire">
-						<i class="icon-chevron-left"></i> {{ _("Pakfire") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Pakfire") }}
 					</a>
 				</li>
 				<li>
 					<a href="#updates">
-						<i class="icon-chevron-left"></i> {{ _("Updates") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Updates") }}
 					</a>
 				</li>
 				<li>
 					<a href="#dialup">
-						<i class="icon-chevron-left"></i> {{ _("Dialup") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Dialup") }}
 					</a>
 				</li>
 				<li>
 					<a href="#proxy">
-						<i class="icon-chevron-left"></i> {{ _("Web Proxy") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Web Proxy") }}
 					</a>
 				</li>
 				<li>
 					<a href="#vpn">
-						<i class="icon-chevron-left"></i> {{ _("VPN") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("VPN") }}
 					</a>
 				</li>
 				<li>
 					<a href="#ids">
-						<i class="icon-chevron-left"></i> {{ _("Intrusion Detection") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Intrusion Detection") }}
 					</a>
 				</li>
 				<li>
 					<a href="#qos">
-						<i class="icon-chevron-left"></i> {{ _("Quality of Service") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Quality of Service") }}
 					</a>
 				</li>
 				<li>
 					<a href="#hardware">
-						<i class="icon-chevron-left"></i> {{ _("Hardware") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Hardware") }}
 					</a>
 				</li>
 				<li>
 					<a href="#virtualization">
-						<i class="icon-chevron-left"></i> {{ _("Virtualization") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Virtualization") }}
 					</a>
 				</li>
 				<li>
 					<a href="#wlanap">
-						<i class="icon-chevron-left"></i> {{ _("Wireless Access Point") }}
+						<i class="glyphicon glyphicon-chevron-left"></i> {{ _("Wireless Access Point") }}
 					</a>
 				</li>
 			</ul>
diff --git a/templates/static/getinvolved.html b/templates/static/getinvolved.html
index 5f7f9602..fae154f2 100644
--- a/templates/static/getinvolved.html
+++ b/templates/static/getinvolved.html
@@ -15,7 +15,7 @@
 
 {% block body %}
 	<div class="row">
-		<div class="span7">
+		<div class="col-lg-7 col-md-7">
 			{% if lang == "de" %}
 				<p>
 					Die Basis des IPFire-Projekts sind seine Nutzer und
@@ -91,7 +91,7 @@
 			</ul>
 		</div>
 
-		<div class="span5">
+		<div class="col-lg-5 col-md-5">
 			<div class="well">
 				<h4>
 					<a href="/donate">{{ _("Donations") }}</a>
@@ -149,7 +149,7 @@
 	<h3>{{ _("Contribute yourself") }}</h3>
 
 	<div class="row">
-		<div class="span4">
+		<div class="col-lg-4 col-md-4">
 			<h4>{{ _("Development") }}</h4>
 			{% if lang == "de" %}
 				<p>
@@ -171,7 +171,7 @@
 			{% end %}
 		</div>
 
-		<div class="span4">
+		<div class="col-lg-4 col-md-4">
 			<h4>{{ _("Translation") }}</h4>
 			{% if lang == "de" %}
 				<p>
@@ -186,13 +186,13 @@
 			{% end %}
 
 			<p class="ac">
-				<a class="btn" href="http://wiki.ipfire.org/projects/translation/start">
-					<i class="icon-user"></i> {{ _("Translation team") }}
+				<a class="btn btn-default" href="http://wiki.ipfire.org/projects/translation/start">
+					<i class="glyphicon glyphicon-user"></i> {{ _("Translation team") }}
 				</a>
 			</p>
 		</div>
 
-		<div class="span4">
+		<div class="col-lg-4 col-md-4">
 			<h4>{{ _("Promotion") }}</h4>
 			{% if lang == "de" %}
 				<p>
diff --git a/templates/static/imprint.html b/templates/static/imprint.html
index d7ecb7a0..8db1907b 100644
--- a/templates/static/imprint.html
+++ b/templates/static/imprint.html
@@ -18,50 +18,50 @@
 	{% end %}
 
 	<div class="row">
-		<div class="span3">
+		<div class="col-lg-3 col-md-3 col-sm-3 col-xs-6">
 			<address>
 				<strong>Michael Tremer</strong><br>
 				Gerhardstraße 8<br>
 				D-45711 Datteln<br>
 			
 				<a href="mailto:michael.tremer@ipfire.org">
-					<i class="icon-envelope"></i>
+					<i class="glyphicon glyphicon-envelope"></i>
 					{{ _("Mail") }}
 				</a>
 			</address>
 		</div>
 
-		<div class="span3">
+		<div class="col-lg-3 col-md-3 col-sm-3 col-xs-6">
 			<address>
 				<strong>Christian Schmidt</strong><br>
 				Mathildenstraße 25<br>
 				D-90489 Nürnberg<br>
 				<a href="mailto:christian.schmidt@ipfire.org">
-					<i class="icon-envelope"></i>
+					<i class="glyphicon glyphicon-envelope"></i>
 					{{ _("Mail") }}
 				</a>
 			</address>
 		</div>
 
-		<div class="span3">
+		<div class="col-lg-3 col-md-3 col-sm-3 col-xs-6">
 			<address>
 				<strong>Arne Fitzenreiter</strong><br>
 				Hauptstraße 4<br>
 				D-99735 Friedrichsthal<br>
 				<a href="mailto:arne.fitzenreiter@ipfire.org">
-					<i class="icon-envelope"></i>
+					<i class="glyphicon glyphicon-envelope"></i>
 					{{ _("Mail") }}
 				</a>
 			</address>
 		</div>
 
-		<div class="span3">
+		<div class="col-lg-3 col-md-3 col-sm-3 col-xs-6">
 			<address>
 				<strong>Stefan Schantl</strong><br>
 				Beethovenstraße 6<br>
 				A-8605 Kapfenberg<br>
 				<a href="mailto:stefan.schantl@ipfire.org">
-					<i class="icon-envelope"></i>
+					<i class="glyphicon glyphicon-envelope"></i>
 					{{ _("Mail") }}
 				</a>
 			</address>
@@ -72,7 +72,7 @@
 
 	<h2>Haftungsausschluss</h2>
 	{% if not lang == "de" %}
-		<div class="alert">
+		<div class="alert alert-warning">
 			This is some legal stuff that is required by the laws of Germany.
 			where this project and website are located.
 		</div>
diff --git a/templates/static/press.html b/templates/static/press.html
index 368abe61..a3993c5a 100644
--- a/templates/static/press.html
+++ b/templates/static/press.html
@@ -27,7 +27,7 @@
 		D-45711 Datteln<br>
 	
 		<a href="mailto:michael.tremer@ipfire.org">
-			<i class="icon-envelope"></i>
+			<i class="glyphicon glyphicon-envelope"></i>
 			{{ _("Mail") }}
 		</a>
 	</address>