]> git.ipfire.org Git - people/shoehn/ipfire.org.git/commitdiff
projects / people / shoehn / ipfire.org.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 985edd9)
Update base templates
authorpebosi <mail@pebosi.net>
Tue, 14 Jan 2014 22:23:42 +0000 (23:23 +0100)
committerpebosi <mail@pebosi.net>
Tue, 14 Jan 2014 22:23:42 +0000 (23:23 +0100)
templates/base-2.html patch | blob | blame | history
templates/base.html patch | blob | blame | history

diff --git a/templates/base-2.html b/templates/base-2.html
index 11b05fef1ab8a2cd770b0a03715ff9e66e5f706f..f2c5ff5ead29489ac529081a531e246c0f935a7d 100644 (file)
--- a/templates/base-2.html
+++ b/templates/base-2.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
 
 {% block body %}
-       <div class="row">
-               <div class="span9">
+       <div>
+               <div class="col-lg-9 col-md-9">
                        {% block bodyA %}{% end block %}
                </div>
 
-               <div class="span3">
+               <div class="col-lg-3 col-md-3">
                        {% block bodyB %}{% end block %}
                </div>
        </div>
diff --git a/templates/base.html b/templates/base.html
index 3a921f4dbac28e1e54776780c486db619ab9f084..d1353b9302341f0fbbe2ed7094189a1186d9cb53 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -12,9 +12,9 @@
                <meta name="description" content="{{ _("IPFire is a free firewall distribution based on Linux.") }}" />
 
                <!-- styling stuff -->
-               <link rel="stylesheet" type="text/css" href="{{ static_url("css/bootstrap.min.css") }}" />
+               <link href="//netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css" rel="stylesheet">          
+               <!-- <link rel="stylesheet" type="text/css" href="{{ static_url("css/bootstrap.min.css") }}" /> -->
                <link rel="stylesheet" type="text/css" href="{{ static_url("css/style.css") }}" />
-               <link rel="stylesheet" type="text/css" href="{{ static_url("css/bootstrap-responsive.min.css") }}" />
                <link href="http://fonts.googleapis.com/css?family=Ubuntu" rel="stylesheet" type="text/css">
                <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -24,16 +24,19 @@
        </head>
 
        <body data-spy="scroll" data-target=".sidebar">
-               <div class="navbar navbar-fixed-top">
-                       <div class="navbar-inner">
+               <div class="navbar navbar-fixed-top navbar-inverse" role="navigation">
+                       <div>
                                <div class="container">
-                                       <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                                               <span class="icon-bar"></span>
-                                               <span class="icon-bar"></span>
-                                               <span class="icon-bar"></span>
-                                       </a>
-                                       <a class="brand" href="/">{{ hostname }}</a>
-                                       <div class="nav-collapse">
+                                 <div class="navbar-header">
+                                       <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar">
+                                         <span class="sr-only">Toggle navigation</span>
+                                         <span class="icon-bar"></span>
+                                         <span class="icon-bar"></span>
+                                         <span class="icon-bar"></span>
+                                       </button>
+                                       <a class="navbar-brand" href="/">{{ hostname }}</a>
+                                 </div>                                        
+                                       <div class="collapse navbar-collapse" id="navbar">
                                                {% block menu %}
                                                        {% module Menu() %}
                                                {% end block %}
@@ -51,7 +54,7 @@
                {% end block %}
 
                {% block footer %}
-                       <footer class="footer">
+                       <footer class="footer navbar-default">
                                <div class="container">
                                        <div class="pull-right">
                                                <a href="https://www.facebook.com/IPFire.org"><img src="{{ static_url("images/icons/social/facebook.png") }}" alt="Facebook"></a>
@@ -68,12 +71,12 @@
                                                        <li>
                                                                <a href="/press">{{ _("Press") }}</a>
                                                        </li>
-                                                       <li class="muted">&middot;</li>
+                                                       <li class="text-muted">&middot;</li>
                                                {% end %}
                                                <a href="http://www.ipfire.org/imprint">{{ _("Imprint") }}</a>
 
                                                {% if hostname == "wishlist.ipfire.org" %}
-                                                       <li class="muted">&middot;</li>
+                                                       <li class="text-muted">&middot;</li>
                                                        <li>
                                                                <a href="/terms">{{ _("Terms & Conditions") }}</a>
                                                        </li>
@@ -82,7 +85,7 @@
                                                {% if not hostname == "planet.ipfire.org" %}
                                                        {% for l in ("en", "de") %}
                                                                {% if not l == lang %}
-                                                                       <li class="muted">&middot;</li>
+                                                                       <li class="text-muted">&middot;</li>
                                                                        <li>
                                                                                <a href="?locale={{ l }}">
                                                                                        <img src="{{ static_url("images/flags/%s.png" % l) }}" alt="{{ l }}">
Sven's copy of the ipfire.org website