Update modules templates

diff --git a/templates/modules/ads/download-splash.html b/templates/modules/ads/download-splash.html
index 2caf0f2ebbb3c8b32d876b3804f09ea1ff676ec9..be58e3f70a9432ae5f221bb3e558c861ece911e2 100644 (file)
--- a/templates/modules/ads/download-splash.html
+++ b/templates/modules/ads/download-splash.html
@@ -1,5 +1,5 @@
 <div class="row">
-       <div class="span6 offset3">
+       <div class="col-lg-6 col-md-6 col-lg-offset-3">
                <div class="alert alert-info ac">
                        <strong>{{ _("Advertisement") }}</strong><br>
                        {{ _("This download is sponsored by:") }}

diff --git a/templates/modules/donation-box.html b/templates/modules/donation-box.html
index 84ecea46cc84288a52e6e153f71c68977344719e..2f41770e28adf0525a860c29ab84086e9f19c32c 100644 (file)
--- a/templates/modules/donation-box.html
+++ b/templates/modules/donation-box.html
@@ -1,6 +1,6 @@
 <div class="well">
-       <div class="row-fluid">
-               <div class="span6 ac">
+       <div class="row">
+               <div class="col-lg-6 col-md-6 ac">
                        <h4>{{ _("Donate with PayPal or Credit Card") }}</h4>
                        <br>
 
@@ -60,7 +60,7 @@
                        {% end %}
                </div>
 
-               <div class="span6 ac">
+               <div class="col-lg-6 col-md-6 ac">
                        <h4>{{ _("Donate by Bank Transfer") }}</h4>
                        <br>
 

diff --git a/templates/modules/menu.html b/templates/modules/menu.html
index 80ede3be47869aff4caaf17ffb09ebd38edaa41c..a95e725337da8f6ec3b513950e739dc006a42c3f 100644 (file)
--- a/templates/modules/menu.html
+++ b/templates/modules/menu.html
@@ -1,5 +1,5 @@
-<ul class="nav">
-       {% if hostname in ("www.ipfire.org", "dev.ipfire.org") %}
+<ul class="navbar-nav nav">
+       {% if hostname in ("www.ipfire.org:8001", "www.ipfire.org", "dev.ipfire.org") %}
                <li>
                        <a href="/download">{{ _("Download") }}</a>
                </li>
@@ -16,26 +16,26 @@
                        <ul class="dropdown-menu">
                                <li>
                                        <a href="http://www.lightningwirelabs.com" target="_blank">
-                                               <i class="icon-star-empty"></i>
+                                               <i class="glyphicon glyphicon-star-empty"></i>
                                                {{ _("Commercial support") }}
                                        </a>
                                </li>
                                <li class="divider"></li>
                                <li>
                                        <a href="http://wiki.ipfire.org/">
-                                               <i class="icon-align-justify"></i>
+                                               <i class="glyphicon glyphicon-align-justify"></i>
                                                {{ _("Wiki") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="http://forum.ipfire.org/">
-                                               <i class="icon-question-sign"></i>
+                                               <i class="glyphicon glyphicon-question-sign"></i>
                                                {{ _("Forum") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="/chat">
-                                               <i class="icon-comment"></i>
+                                               <i class="glyphicon glyphicon-comment"></i>
                                                {{ _("Chat") }}
                                        </a>
                                </li>
@@ -43,13 +43,13 @@
                                <li class="divider"></li>
                                <li>
                                        <a href="/donate">
-                                               <i class="icon-arrow-right"></i>
+                                               <i class="glyphicon glyphicon-arrow-right"></i>
                                                {{ _("Donate") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="http://wishlist.ipfire.org/">
-                                               <i class="icon-gift"></i>
+                                               <i class="glyphicon glyphicon-gift"></i>
                                                {{ _("Wishlist") }}
                                        </a>
                                </li>
@@ -61,70 +61,70 @@
                                {{ _("More") }} <b class="caret"></b>
                        </a>
                        <ul class="dropdown-menu">
-                               <li class="nav-header">
+                               <li class="dropdown-header">
                                        {{ _("Development") }}
                                </li>
                                <li>
                                        <a href="/development">
-                                               <i class="icon-info-sign"></i>
+                                               <i class="glyphicon glyphicon-info-sign"></i>
                                                {{ _("Overview") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="https://pakfire.ipfire.org/">
-                                               <i class="icon-cog"></i>
+                                               <i class="glyphicon glyphicon-cog"></i>
                                                {{ _("Pakfire Build Service") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="https://bugzilla.ipfire.org/">
-                                               <i class="icon-th-list"></i>
+                                               <i class="glyphicon glyphicon-th-list"></i>
                                                {{ _("Bugtracker") }}
                                        </a>
                                </li>
 
-                               <li class="nav-header">
+                               <li class="dropdown-header">
                                         {{ _("Miscellaneous") }}
                                </li>
                                <li>
                                        <a href="http://planet.ipfire.org/">
-                                               <i class="icon-globe"></i>
+                                               <i class="glyphicon glyphicon-globe"></i>
                                                {{ _("Planet") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="http://fireinfo.ipfire.org/">
-                                               <i class="icon-signal"></i>
+                                               <i class="glyphicon glyphicon-signal"></i>
                                                {{ _("Fireinfo") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="http://lists.ipfire.org/">
-                                               <i class="icon-envelope"></i>
+                                               <i class="glyphicon glyphicon-envelope"></i>
                                                {{ _("Mailing lists") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="http://mirrors.ipfire.org/">
-                                               <i class="icon-download-alt"></i>
+                                               <i class="glyphicon glyphicon-download-alt"></i>
                                                {{ _("Mirrors") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="/artwork">
-                                               <i class="icon-pencil"></i>
+                                               <i class="glyphicon glyphicon-pencil"></i>
                                                {{ _("Artwork") }}
                                        </a>
                                </li>
                                <li>
                                        <a href="/cebit">
-                                               <i class="icon-eye-open"></i>
+                                               <i class="glyphicon glyphicon-eye-open"></i>
                                                {{ _("CeBIT") }} 2010
                                        </a>
                                </li>
                                <li>
                                        <a href="http://tracker.ipfire.org/">
-                                               <i class="icon-download-alt"></i>
+                                               <i class="glyphicon glyphicon-download-alt"></i>
                                                {{ _("Tracker") }}
                                        </a>
                                </li>
@@ -139,21 +139,21 @@
        {% end %}
 </ul>
 
-{% if hostname == "www.ipfire.org" or hostname == "dev.ipfire.org" %}
-       <ul class="nav pull-right">
-               <li>
-                       <a href="http://www.lightningwirelabs.com" target="_blank">
-                               <strong>{{ _("Professional support available!") }}</strong>
-                       </a>
-               </li>
-       </ul>
+{% if hostname in ("www.ipfire.org:8001", "www.ipfire.org", "dev.ipfire.org") %}
+<ul class="nav navbar-nav navbar-right">
+       <li>
+       <a href="http://www.lightningwirelabs.com" target="_blank">
+       <strong>{{ _("Professional support available!") }}</strong>
+       </a>
+       </li>
+</ul>  
 {% else  %}
-       <ul class="nav pull-right">
-               <li>
-                       <a href="http://www.ipfire.org">
-                               <i class="icon-home icon-white"></i> &nbsp;
-                               www.ipfire.org
-                       </a>
-               </li>
-       </ul>
+<ul class="nav navbar-nav navbar-right">
+       <li>
+       <a href="http://www.ipfire.org">
+               <i class="glyphicon glyphicon-home glyphicon-white"></i> &nbsp;
+               www.ipfire.org
+       </a>
+       </li>
+</ul>  
 {% end %}

diff --git a/templates/modules/news-item.html b/templates/modules/news-item.html
index 1716fa5bd5cf4a82773f0d5da9772982f256b60d..7fbd41be20b7679295427e021796898c768b8bf8 100644 (file)
--- a/templates/modules/news-item.html
+++ b/templates/modules/news-item.html
@@ -1,5 +1,5 @@
 <div class="row">
-       <div class="span12">
+       <div class="col-lg-12 col-md-12">
                {% if show_heading %}
                        <h2>
                                {% if announcement %}
@@ -13,7 +13,7 @@
        </div>
 </div>
 <div class="row">
-       <div class="span12">
+       <div class="col-lg-12 col-md-12">
                <p class="pull-right">
                        <a href="/author/{{ item.author_id }}">{{ item.author }}</a> -
                        {{ locale.format_date(item.published, full_format=True) }}

diff --git a/templates/modules/news-table.html b/templates/modules/news-table.html
index e4317193beb2deb51e5f802bedb694130eae45a2..49c4bbcdec5263577ec563c50236bd591c4a2b4a 100644 (file)
--- a/templates/modules/news-table.html
+++ b/templates/modules/news-table.html
@@ -1,4 +1,4 @@
-<ul class="unstyled">
+<ul class="list-unstyled">
        {% for n in news %}
                <li>
                        <a href="/news/{{ n.slug }}"><strong>{{ n.title }}</strong></a>

diff --git a/templates/modules/release-item.html b/templates/modules/release-item.html
index c09f82cfe495b45eb46ac53650cbcb5fbab1ad01..4be7c27e6b3bc64eded78c9aff75306320bdf7ed 100644 (file)
--- a/templates/modules/release-item.html
+++ b/templates/modules/release-item.html
@@ -50,7 +50,7 @@
                                        <hr>
 
                                        <div class="row">
-                                               <div class="span6 offset3">
+                                               <div class="col-lg-6 col-md-6col-lg-offset-3">
                                                        <div class="alert alert-error">
                                                                <strong>{{ _("Caution!") }}</strong>
 
@@ -87,10 +87,10 @@
                                                                                {% if file.torrent_hash %}
                                                                                        <p class="pull-right">
                                                                                                <a href="{{ file.magnet_link }}">
-                                                                                                       <i class="icon-magnet"></i>
+                                                                                                       <i class="glyphicon glyphicon-magnet"></i>
                                                                                                </a>
                                                                                                <a href="http://tracker.ipfire.org/{{ file.torrent_hash }}/download">
-                                                                                                       <i class="icon-download-alt"></i>
+                                                                                                       <i class="glyphicon glyphicon-download-alt"></i>
                                                                                                </a>
                                                                                        </p>
                                                                                {% end %}
@@ -111,15 +111,15 @@
 
                                        <p class="pull-right">
                                                <strong>{{ _("Legend:") }}</strong>
-                                               <i class="icon-magnet"></i> {{ _("Magnet link") }},
-                                               <i class="icon-download-alt"></i> {{ _("Torrent download") }}
+                                               <i class="glyphicon glyphicon-magnet"></i> {{ _("Magnet link") }},
+                                               <i class="glyphicon glyphicon-download-alt"></i> {{ _("Torrent download") }}
                                        </p>
                                </div>
                        {% end %}
                </div>
        </div>
 {% else %}
-       <div class="alert">
+       <div class="alert alert-warning">
                {{ _("There are no downloads available for this release.") }}
        </div>
 {% end %}

diff --git a/templates/modules/stasy-table-devices.html b/templates/modules/stasy-table-devices.html
index 99d196dada2e7d5bcac44fdc3f801b82da81e77d..e68f06d548b279ee954db1aa1444aae00173a36c 100644 (file)
--- a/templates/modules/stasy-table-devices.html
+++ b/templates/modules/stasy-table-devices.html
@@ -1,5 +1,5 @@
 <div class="row">
-       <div class="span12">
+       <div class="col-lg-12 col-md-12">
                <table class="table">
                        <thead>
                                <th colspan="2">&nbsp;</th>

diff --git a/templates/modules/stasy-table-geo.html b/templates/modules/stasy-table-geo.html
index 90d2e8ec4d47a15e0365c3755f0454739a6ee3e0..f2afa968c808d8c0fd705f5a3546b5d873dca42e 100644 (file)
--- a/templates/modules/stasy-table-geo.html
+++ b/templates/modules/stasy-table-geo.html
@@ -7,7 +7,7 @@
                        </td>
                        <td class="bar">
                                <div class="progress">
-                                       <div class="bar" style="{{ "width: %.2f%%" % country.value }}"></div>
+                                       <div class="progress-bar" style="{{ "width: %.2f%%" % country.value }}"></div>
                                </div>
                        </td>
                        <td class="val">{{ "%.2f" % country.value }}%</td>

diff --git a/templates/modules/stasy-table.html b/templates/modules/stasy-table.html
index d8ab9f51643a68fe2718cbe3b0d5008b34c1aebc..7ee4bce19e66114b1365a76b8ba649a6a3b768e1 100644 (file)
--- a/templates/modules/stasy-table.html
+++ b/templates/modules/stasy-table.html
@@ -9,7 +9,7 @@
                        </td>
                        <td class="bar">
                                <div class="progress">
-                                       <div class="bar" style="{{ "width: %.2f%%" % v }}"></div>
+                                       <div class="progress-bar" style="{{ "width: %.2f%%" % v }}"></div>
                                </div>
                        </td>
                        <td class="val">{{ "%.2f" % v }}%</td>