Add a sticky footer, reindent some template files, fix trailing LF

ffdnispdb/static/css/style.css

@@ -178,6 +178,72 @@ input#search-input {
 
 
 /*
+ * Sticky footer
+ */
+
+#wrap {
+    min-height: 100%;
+    height: auto !important;
+    height: 100%;
+    margin: 0 auto -80px;
+}
+
+#push {
+    height: 160px;
+}
+
+footer {
+    height: 64px;
+    padding-top: 16px;
+    background-color: #f3f3f3;
+    font-size: 11px;
+}
+
+footer .bracket:before {
+    content: '{';
+    font-family: Inconsolata;
+    font-size: 60px;
+    float: left;
+    margin: 8px 0 0 26px;
+    color: #cccccc;
+    transition-duration: 300ms;
+}
+
+footer:hover .bracket:before {
+    color: #666666;
+    transition-delay: 100ms;
+    transition-duration: 300ms;
+}
+
+footer p {
+    padding: 0;
+    margin: 0;
+    opacity: 0.4;
+    margin-left: 60px;
+    line-height: 16px;
+    transition-duration: 300ms;
+}
+
+footer:hover p {
+    opacity: 1;
+    transition-delay: 100ms;
+    transition-duration: 300ms;
+}
+
+@media (max-width: 767px) {
+    #push {
+        height: 120px;
+    }
+    footer {
+        margin-left: -20px;
+        margin-right: -20px;
+        padding-left: 20px;
+        padding-right: 20px;
+    }
+}
+
+
+/*
  * Main
  */
 

ffdnispdb/templates/add_project.html

@@ -2,23 +2,23 @@
 
 {% block page_title %}{{ _("Add a project") }}{% endblock %}
 {% block body %}
-<div class="row-fluid">
-  <div class="span5 offset1 project-choice">
-    <h3>{{ _("Automatically from a JSON file") }}</h3>
-    <p>{% trans format_spec=url_for('format') %}You only have to give us the link to the hostname where you implement the <a href="{{ format_spec }}">ISP Format</a>, and we will crawl it periodicaly to update your informations.{% endtrans %}</p>
-    <br />
-    <br />
-    <p class="text-center">
-      <a class="btn btn-large btn-primary" href="{{ url_for('create_project_json') }}">{{ _("Heck yeah") }}</a>
-    </p>
-  </div>
-  <div class="span5 project-choice">
-    <h3>{{ _("Manually by filling a form") }}</h3>
-    <p>{% trans %}Don't have the ressources or time to host an <em>ISP Format</em> JSON file ? Don't worry, you can also fill our simple form to give us the informations about your local ISP. Only problem, you'll have to come back here if you want to update it.{% endtrans %}</p>
-    <br />
-    <p class="text-center">
-      <a class="btn btn-large btn-primary" href="{{ url_for('create_project_form') }}">{{ _("That JSON thing is too cool for me") }}</a>
-    </p>
-  </div>
-</div>
+      <div class="row-fluid">
+        <div class="span5 offset1 project-choice">
+          <h3>{{ _("Automatically from a JSON file") }}</h3>
+          <p>{% trans format_spec=url_for('format') %}You only have to give us the link to the hostname where you implement the <a href="{{ format_spec }}">ISP Format</a>, and we will crawl it periodicaly to update your informations.{% endtrans %}</p>
+          <br />
+          <br />
+          <p class="text-center">
+            <a class="btn btn-large btn-primary" href="{{ url_for('create_project_json') }}">{{ _("Heck yeah") }}</a>
+          </p>
+        </div>
+        <div class="span5 project-choice">
+          <h3>{{ _("Manually by filling a form") }}</h3>
+          <p>{% trans %}Don't have the ressources or time to host an <em>ISP Format</em> JSON file ? Don't worry, you can also fill our simple form to give us the informations about your local ISP. Only problem, you'll have to come back here if you want to update it.{% endtrans %}</p>
+          <br />
+          <p class="text-center">
+            <a class="btn btn-large btn-primary" href="{{ url_for('create_project_form') }}">{{ _("That JSON thing is too cool for me") }}</a>
+          </p>
+        </div>
+      </div>
 {% endblock %}

ffdnispdb/templates/format_spec.html

@@ -1,10 +1,10 @@
 {% extends "layout.html" %}
 {% block container %}
-  <div class="row-fluid">
-    <div class="span12">
-      <div id="format_spec" class="rst">
-        {{ spec }}
+    <div class="row-fluid">
+      <div class="span10 offset1">
+        <div id="format_spec" class="rst">
+          {{ spec }}
+        </div>
       </div>
     </div>
-  </div>
 {% endblock %}

ffdnispdb/templates/gen_edit_token.html

@@ -1,21 +1,20 @@
 {% extends "layout.html" %}
 {% import "form_macros.html" as fm %}
 {% block container %}
-<div class="row">
-  <div class="span11 well">
-    <form method="post" class="form-horizontal">
-      {{ form.csrf_token }}
-      <fieldset>
-        <legend>{{ _("Edit your ISP") }}</legend>
-        <p>To edit your ISP, you need to give us the email provided while registering and we will send you a link to edit it.</p>
-        {{ fm.render_field(form.tech_email) }}
-        <div class="form-actions">
-          <input type="submit" class="btn btn-primary" value="{{ _("Submit") }}" />
-          <input type="reset" class="btn" value="{{ _("Cancel") }}" />
-        </div>
-      </fieldset>
-    </form>
-  </div>
-</div>
-
-{% endblock %}
+    <div class="row">
+      <div class="span11 well">
+        <form method="post" class="form-horizontal">
+          {{ form.csrf_token }}
+          <fieldset>
+            <legend>{{ _("Edit your ISP") }}</legend>
+            <p>To edit your ISP, you need to give us the email provided while registering and we will send you a link to edit it.</p>
+            {{ fm.render_field(form.tech_email) }}
+            <div class="form-actions">
+              <input type="submit" class="btn btn-primary" value="{{ _("Submit") }}" />
+              <input type="reset" class="btn" value="{{ _("Cancel") }}" />
+            </div>
+          </fieldset>
+        </form>
+      </div>
+    </div>
+{%- endblock %}

ffdnispdb/templates/layout.html

@@ -1,6 +1,6 @@
 {% macro menu_item(name, endpoint=None) -%}
 <li{% if request.endpoint == endpoint %} class="active"{% endif %}><a href="{{ url_for(endpoint) if endpoint else "#" }}">{{ name }}</a></li>
-{%- endmacro %}
+{%- endmacro -%}
 <!doctype html>
 <html lang="fr">
   <head>
@@ -21,56 +21,67 @@
     {%- endblock %}
   </head>
 <body>
-
-<div class="navbar navbar-static-top">
-  <div class="navbar-inner">
-    <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="/"><span id="ffdn-header"><span>F</span><span>F</span><span>D</span><span>N</span></span> Database</a>
-      <div class="nav-collapse collapse">
-        <form method="get" action="/search" class="navbar-search pull-right">
-          <input type="text" id="search-input" class="search-query input-medium" name="q" placeholder="{{ _("Search") }}" />
-        </form>
-        <ul class="nav pull-right">
-          {{ menu_item(_("Home"), 'home') }}
-          {{ menu_item(_("Project List"), 'project_list') }}
-          {{ menu_item(_("Format"), 'format') }}
-          {{ menu_item(_("API")) }}
-          <li class="divider-vertical"></li>
-        </ul>
+<div id="wrap">
+  <div class="navbar navbar-static-top">
+    <div class="navbar-inner">
+      <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="/"><span id="ffdn-header"><span>F</span><span>F</span><span>D</span><span>N</span></span> Database</a>
+        <div class="nav-collapse collapse">
+          <form method="get" action="/search" class="navbar-search pull-right">
+            <input type="text" id="search-input" class="search-query input-medium" name="q" placeholder="{{ _("Search") }}" />
+          </form>
+          <ul class="nav pull-right">
+            {{ menu_item(_("Home"), 'home') }}
+            {{ menu_item(_("Project List"), 'project_list') }}
+            {{ menu_item(_("Format"), 'format') }}
+            {{ menu_item(_("API")) }}
+            <li class="divider-vertical"></li>
+          </ul>
+        </div>
       </div>
     </div>
   </div>
-</div>
 
-<div id="main-container" class="container">
-{% with messages = get_flashed_messages(with_categories="true") %}
-  {% if messages %}
-    {% for category, message in messages %}
+  <div id="main-container" class="container">
+    {%- with messages = get_flashed_messages(with_categories="true") -%}
+    {%- if messages -%}
+    {%- for category, message in messages %}
     <div class="alert alert-{{ category }} fade in">
       <button class="close" data-dismiss="alert">×</button>
       {{ message }}
     </div>
-    {% endfor %}
-  {% endif %}
-{% endwith %}
-{%- block container %}
-<div class="page-header">
-  {% block page_header -%}
-  <h2>{% block page_title %}{% endblock %}</h2>
-  {%- endblock %}
-</div>
-<div class="container">
-{% block body %}{% endblock %}
-</div>
+    {%- endfor -%}
+    {%- endif -%}
+    {% endwith %}
+    {%- block container %}
+    <div class="page-header">
+      {% block page_header -%}
+      <h2>{% block page_title %}{% endblock %}</h2>
+      {%- endblock %}
+    </div>
+    <div class="container">
+    {%- block body %}{% endblock %}
+    </div>
+    {%- endblock container %}
+  </div>
 
-{% endblock container %}
+  <div id="push"></div>
 </div>
 
+<footer>
+  <div class="container">
+    <div class="bracket"></div>
+    <p class="credit">Developped for the <a href="//ffdn.org">FDN Federation</a> by <a href="http://gu1.aeroxteam.fr">Gu1</a>@<a href="https://www.cafai.fr">CAFAI</a> and <a href="/humans.txt">Many contributors</a>.</p>
+    <p class="license"><a href="https://dev.cafai.fr/gitweb/?p=ffdn-db.git">Source code</a> licensed under the <a href="http://opensource.org/licenses/BSD-3-Clause">3-clause BSD license</a>.</p>
+    <p class="contact">You can contact us at <a href="mailto:contact@db.ffdn.org">contact@db.ffdn.org</a>.</p>
+  </div>
+</footer>
+
 {% block script -%}
 <script type="text/javascript" src="{{ url_for('static', filename='js/jquery.js') }}"></script>
 <script type="text/javascript" src="{{ url_for('static', filename='js/bootstrap.js') }}"></script>

ffdnispdb/templates/project_detail.html

@@ -89,4 +89,4 @@
       </dl>
     </div>
   </div>
-{% endblock %}
+{%- endblock %}

ffdnispdb/templates/project_form_generic.html

@@ -69,5 +69,4 @@
     </form>
   </div>
 </div>
-
-{% endblock %}
+{%- endblock %}

ffdnispdb/templates/project_json_form_generic.html

@@ -17,4 +17,4 @@
     </form>
   </div>
 </div>
-{% endblock %}
+{%- endblock %}