euscanwww: Fixed CSS stylesheet

Added Twitter Bootstrap and tweaked the layout to use the grid layout

Signed-off-by: volpino <fox91@anche.no>

euscanwww/djeuscan/templates/_base.html

@@ -10,6 +10,7 @@
     <link rel="alternate" type="application/atom+xml" title="Global log" href="{% url "global_feed" %}" />
     {% endblock %}
     {% block css %}
+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/bootstrap.min.css" media="screen" title="Normal" />
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}css/style.css" media="screen" title="Normal" />
     {% endblock %}
     {% block javascript %}
@@ -22,53 +23,65 @@
       </a>
       {% block header %}<h1>Ebuild Upstream Scanner (euscan)</h1>{% endblock %}
     </div>
-    <div id="content">
-      {% block content %}{% endblock %}
-    </div>
-    <div id="menus">
-      {% block menus %}
-        <div class="menu">
-          <ul>
-            {% block menu %}
-              <li><a href="{% url "index" %}">Home</a></li>
-              <li><a href="{% url "categories" %}">Categories</a></li>
-              <li><a href="{% url "herds" %}">Herds</a></li>
-              <li><a href="{% url "maintainers" %}">Maintainers</a></li>
-              <li><a href="{% url "overlays" %}">Overlays</a></li>
-              <li><a href="{% url "world" %}">Scan World</a></li>
-              <li><a href="{% url "statistics" %}">Statistics</a></li>
-
-              <li>---</li>
-
-              {% if user.is_authenticated %}
-                <li><a href="{% url "accounts_index" %}">{{ user }}'s profile</a></li>
-                <ul class="submenu">
-                  <li><a href="{% url "accounts_categories" %}">Categories</a></li>
-                  <li><a href="{% url "accounts_herds" %}">Herds</a></li>
-                  <li><a href="{% url "accounts_maintainers" %}">Maintainers</a></li>
-                  <li><a href="{% url "accounts_packages" %}">Packages</a></li>
-                </ul>
-                <li><a href="{% url "django.contrib.auth.views.logout" %}">Logout</a></li>
-              {% else %}
-                <li><a href="{% url "django.contrib.auth.views.login" %}?next={% url "accounts_index" %}">Login</a></li>
-                <li><a href="{% url "registration.views.register" %}">Register</a></li>
-              {% endif %}
-
-              <li>---</li>
-
-              {% block menu_feed %}
-                <li>
-                  <img src="{{ STATIC_URL }}img/feed.png" alt="feed" />
-                  <a title="Global Feed" href="{% url "global_feed" %}">Global Feed</a>
-                </li>
-              {% endblock %}
-              <li>---</li>
-              <li><a href="{% url "api" %}">API</a></li>
-              <li><a href="{% url "about" %}">About</a></li>
-            {% endblock %}
-          </ul>
+    <div class="row-fluid">
+      <div class="span10">
+        <div class="row-fluid">
+          <div class="span1"></div>
+          <div id="content" class="rounded span11">
+            {% block content %}{% endblock %}
+          </div>
         </div>
-      {% endblock %}
+      </div>
+      <div class="span2">
+        <div class="row-fluid">
+          <div id="menus" class="span11">
+            {% block menus %}
+              <div class="menu rounded">
+                <ul>
+                  {% block menu %}
+                    <li><a href="{% url "index" %}">Home</a></li>
+                    <li><a href="{% url "categories" %}">Categories</a></li>
+                    <li><a href="{% url "herds" %}">Herds</a></li>
+                    <li><a href="{% url "maintainers" %}">Maintainers</a></li>
+                    <li><a href="{% url "overlays" %}">Overlays</a></li>
+                    <li><a href="{% url "world" %}">Scan World</a></li>
+                    <li><a href="{% url "statistics" %}">Statistics</a></li>
+
+                    <li>---</li>
+
+                    {% if user.is_authenticated %}
+                      <li><a href="{% url "accounts_index" %}">{{ user }}'s profile</a></li>
+                      <ul class="submenu">
+                        <li><a href="{% url "accounts_categories" %}">Categories</a></li>
+                        <li><a href="{% url "accounts_herds" %}">Herds</a></li>
+                        <li><a href="{% url "accounts_maintainers" %}">Maintainers</a></li>
+                        <li><a href="{% url "accounts_packages" %}">Packages</a></li>
+                      </ul>
+                      <li><a href="{% url "django.contrib.auth.views.logout" %}">Logout</a></li>
+                    {% else %}
+                      <li><a href="{% url "django.contrib.auth.views.login" %}?next={% url "accounts_index" %}">Login</a></li>
+                      <li><a href="{% url "registration.views.register" %}">Register</a></li>
+                    {% endif %}
+
+                    <li>---</li>
+
+                    {% block menu_feed %}
+                      <li>
+                        <img src="{{ STATIC_URL }}img/feed.png" alt="feed" />
+                        <a title="Global Feed" href="{% url "global_feed" %}">Global Feed</a>
+                      </li>
+                    {% endblock %}
+                    <li>---</li>
+                    <li><a href="{% url "api" %}">API</a></li>
+                    <li><a href="{% url "about" %}">About</a></li>
+                  {% endblock %}
+                </ul>
+              </div>
+            {% endblock %}
+          </div>
+          <div class="span1"></div>
+        </div>
+      </div>
     </div>
     <div id="footer">
       <p>

euscanwww/djeuscan/templates/euscan/_datatable.html

@@ -24,7 +24,7 @@
 
 {% block menus %}
 {{ block.super }}
-<div class="menu">
+<div class="menu notfirst-menu rounded">
   <ul>
     <li><img src="{{ STATIC_URL }}img/gentoo-icon.png" /> Gentoo</li>
     <li><img src="{{ STATIC_URL }}img/overlay-icon.png" /> Overlays</li>

euscanwww/djeuscan/templates/euscan/package.html

@@ -28,13 +28,13 @@
   {{ package.category }}/{{ package.name }}
 
   {% if user.is_authenticated %}
-    <button class="refresh-button" data-package="{{ package.category }}/{{ package.name }}">
+    <button class="btn refresh-button" data-package="{{ package.category }}/{{ package.name }}">
       Refresh
     </button>
-    <button class="favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_package" package.category package.name %}">
+    <button class="btn favourite-button {% if favourited %}hide{% endif %}" data-url="{% url "favourite_package" package.category package.name %}">
       Add to favourites
     </button>
-    <button class="unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_package" package.category package.name %}">
+    <button class="btn unfavourite-button {% if not favourited %}hide{% endif %}" data-url="{% url "unfavourite_package" package.category package.name %}">
       Remove from favourites
     </button>
   {% endif %}

euscanwww/djeuscan/templates/euscan/statistics.html

@@ -3,7 +3,6 @@
 {% load url from future %}
 
 {% block content %}
-<h2>What's euscan ?</h2>
 <h2>Statistics</h2>
 
 <h3>Current statistics</h3>

euscanwww/djeuscan/templates/registration/login.html

@@ -22,14 +22,20 @@
       <tr>
         <td></td>
         <td>
-          <input type="submit" value="Login" />
+          <input class="btn pull-right" type="submit" value="Login" />
+        </td>
+      </tr>
+      <tr>
+        <td>&nbsp;</td>
+      </tr>
+      <tr>
+        <td>
+        </td>
+        <td>
+          <a class="pull-right" href="{% url "django.contrib.auth.views.password_reset" %}">Forgot password</a>
         </td>
       </tr>
     </table>
     <input type="hidden" name="next" value="/" />
   </form>
-
-  <a href="{% url "registration.views.register" %}">Register</a>
-  <a href="{% url "django.contrib.auth.views.password_reset" %}">Forgot password</a>
-
 {% endblock %}

euscanwww/djeuscan/templates/registration/registration_form.html

@@ -11,7 +11,7 @@
       <tr>
         <td></td>
         <td>
-          <input type="submit" value="Send activation email" />
+          <input class="btn pull-right" type="submit" value="Send activation email" />
         </td>
       </tr>
     </form>