Merge remote-tracking branch 'upstream/master'

Conflicts:
	pyaggr3g470r/controllers/feed.py
	pyaggr3g470r/templates/home.html

19 files changed, 75 insertions, 178 deletions

diff --git a/pyaggr3g470r/templates/about.html b/pyaggr3g470r/templates/about.html
index 84315271..08b80fbb 100644
--- a/pyaggr3g470r/templates/about.html
+++ b/pyaggr3g470r/templates/about.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h1>{{ _('About') }}</h1>
         <p>
         {{ _('pyAggr3g470r is a news aggregator platform and can be shared between several users.') }}
@@ -13,13 +13,13 @@
         according to the <a href="https://www.gnu.org/licenses/agpl-3.0.html">Affero GPL</a> license.') }}</p>
         <p>{{ _('Found a bug? Report it <a href="https://bitbucket.org/cedricbonhomme/pyaggr3g470r/issues">here</a>.') }}</p>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         <h1>{{ _('Help') }}</h1>
         <p>{{ _('If you have any problem, <a href="http://wiki.cedricbonhomme.org/contact">contact</a> the administrator.') }}</p>
         <p>{{ _('The documentation of the RESTful API is <a href="https://pyaggr3g470r.readthedocs.org/en/latest/web-services.html">here</a>.') }}</p>
         <p>{{ _('You can subscribe to new feeds with a bookmarklet. Drag <a href="%(bookmarklet)s">this link</a> to your browser bookmarks.', bookmarklet='javascript:window.location="https://pyaggr3g470r.herokuapp.com/bookmarklet?url="+encodeURIComponent(document.location)') }}</p>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         <h1>{{ _('Donation') }}</h1>
         <p>{{ _('If you wish and if you like pyAggr3g470r, you can donate via bitcoin <a href="https://blockexplorer.com/address/1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ">1GVmhR9fbBeEh7rP1qNq76jWArDdDQ3otZ</a>. Thank you!') }}</p>
     </div>
diff --git a/pyaggr3g470r/templates/admin/create_user.html b/pyaggr3g470r/templates/admin/create_user.html
index 833ae601..1d6d6c11 100644
--- a/pyaggr3g470r/templates/admin/create_user.html
+++ b/pyaggr3g470r/templates/admin/create_user.html
@@ -4,7 +4,7 @@
 {% endblock %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h2>{{ message | safe }}</h2>
         <form action="" method="post" name="saveprofileform" id="profileform">
             {{ form.hidden_tag() }}
diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html
index 046093e1..f20d53dd 100644
--- a/pyaggr3g470r/templates/admin/user.html
+++ b/pyaggr3g470r/templates/admin/user.html
@@ -4,7 +4,7 @@
 {% endblock %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <a href="/admin/edit_user/{{ user.id }}" class="btn btn-default">{{ _('Edit this user') }}</a>
         <h2>{{ _('Membership') }}</h2>
         <div class="row">
@@ -14,7 +14,7 @@
             </div>
         </div>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         {% if user.feeds.all()|count == 0 %}
             <h1>{{ _('This user is not subscribed to any feed.') }}</h1>
         {% else %}
diff --git a/pyaggr3g470r/templates/article.html b/pyaggr3g470r/templates/article.html
index 101cf628..92014599 100644
--- a/pyaggr3g470r/templates/article.html
+++ b/pyaggr3g470r/templates/article.html
@@ -5,7 +5,7 @@
 {% endblock %}
 {% block content %}
 <div class="container" data-article="{{ article.id }}">
-    <div class="jumbotron">
+    <div class="well">
         <h2><a href="{{ article.link  }}" target="_blank">{{ article.title|safe }}</a></h2>
         <h3>{{ _('from') }} <a href="/feed/{{ article.source.id }}">{{ article.source.title }}</a></h3>
         <a href="/delete/{{ article.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>
@@ -21,10 +21,10 @@
         {% endif %}
         <h6>{{ article.date | datetime }}</h6>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         {{ article.content | safe }}
     </div>
-    <div class="jumbotron">
+    <div class="well">
         <div class="row">
             <div class="col-md-6">
                 {{ _('Next post:') }} <a href="/article/{{ next_article.id }}">{{ next_article.title }}</a>
@@ -34,7 +34,7 @@
             </div>
         </div>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         <a href="https://api.pinboard.in/v1/posts/add?url={{ article.link  }}&description={{ article.title }}" rel="noreferrer" target="_blank">
             <img src="/static/img/pinboard.png" title="{{ _('Share on') }} Pinboard" />
         </a>
diff --git a/pyaggr3g470r/templates/articles.html b/pyaggr3g470r/templates/articles.html
index eecb9579..383c28a4 100644
--- a/pyaggr3g470r/templates/articles.html
+++ b/pyaggr3g470r/templates/articles.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h2><a href="{{ feed.site_link }}">{{ feed.title|safe }}</a></h2>
         <a href="/feed/{{ feed.id }}"><i class="glyphicon glyphicon-info-sign" title="Details"></i></a>
         <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="Edit this feed"></i></a>
diff --git a/pyaggr3g470r/templates/duplicates.html b/pyaggr3g470r/templates/duplicates.html
index a7eff2d0..4d7ac650 100644
--- a/pyaggr3g470r/templates/duplicates.html
+++ b/pyaggr3g470r/templates/duplicates.html
@@ -8,16 +8,20 @@
                 <thead>
                     <tr>
                         <th>#</th>
-                        <th></th>
-                        <th></th>
+                        <th align="center">
+                            <span class="delete-all btn btn-default">{{ _('Delete all in this column') }}</span>
+                        </th>
+                        <th align="center">
+                            <span class="delete-all btn btn-default">{{ _('Delete all in this column') }}</span>
+                        </th>
                     </tr>
                 </thead>
                 <tbody>
                 {% for pair in duplicates %}
                     <tr>
                         <td>{{ loop.index }}</td>
-                        <td><a href="/delete/{{ pair[0].id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>&nbsp;<a href="/article/{{ pair[0].id }}">{{ pair[0].title }}</a></td>
-                        <td><a href="/delete/{{ pair[1].id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>&nbsp;<a href="/article/{{ pair[1].id }}">{{ pair[1].title }}</a></td>
+                        <td id="{{ pair[0].id }}"><a href="/delete/{{ pair[0].id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>&nbsp;<a href="/article/{{ pair[0].id }}">{{ pair[0].title }}</a> ({{ pair[0].retrieved_date }})</td>
+                        <td id="{{ pair[1].id }}"><a href="/delete/{{ pair[1].id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this article') }}"></i></a>&nbsp;<a href="/article/{{ pair[1].id }}">{{ pair[1].title }}</a> ({{ pair[1].retrieved_date }})</td>
                     </tr>
                 {% endfor %}
                 </tobdy>
diff --git a/pyaggr3g470r/templates/edit_feed.html b/pyaggr3g470r/templates/edit_feed.html
index a6b28ded..e9a90960 100644
--- a/pyaggr3g470r/templates/edit_feed.html
+++ b/pyaggr3g470r/templates/edit_feed.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h1>{{ action }}</h1>
         <form action="" method="post" name="save">
             {{ form.hidden_tag() }}
diff --git a/pyaggr3g470r/templates/errors/404.html b/pyaggr3g470r/templates/errors/404.html
index 49c9ef5a..c64a2be8 100644
--- a/pyaggr3g470r/templates/errors/404.html
+++ b/pyaggr3g470r/templates/errors/404.html
@@ -4,7 +4,7 @@
 {% endblock %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h1>Page Not Found</h1>
         <p>What you were looking for is just not there, go to the <a href="{{ url_for('home') }}">home page</a>.</p>
     </div>
diff --git a/pyaggr3g470r/templates/errors/500.html b/pyaggr3g470r/templates/errors/500.html
index 1fa6acc9..417fc0c7 100644
--- a/pyaggr3g470r/templates/errors/500.html
+++ b/pyaggr3g470r/templates/errors/500.html
@@ -4,7 +4,7 @@
 {% endblock %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h1>Internal Server Error</h1>
         <p>Something bad just happened! Go to the <a href="{{ url_for('home') }}">home page</a>.</p>
     </div>
diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html
index 4b050573..268cbf7d 100644
--- a/pyaggr3g470r/templates/feed.html
+++ b/pyaggr3g470r/templates/feed.html
@@ -1,19 +1,22 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h2>{{ feed.title }}</h2>
         {% if feed.description %} <p>{{ feed.description }}</p> {% endif %}
         <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
         <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         <p>
-        {{ _('This feed contains') }} {{ feed.articles.all()|count }} <a href="/articles/{{ feed.id }}/100">{{ _('articles') }}</a>
-        {% if nb_articles != 0 %}
-            ({{ ((feed.articles.all()|count * 100 ) / nb_articles) | round(2, 'floor') }}% {{ _('of the database') }}).<br />
+        {{ _('This feed contains') }} {{ feed.articles.all()|count }} <a href="/articles/{{ feed.id }}/100">{{ _('articles') }}</a>.<br />
+        {{ _('Address of the feed') }}: <a href="{{ feed.link }}" target="_blank">{{ feed.link }}</a><br />
+        {% if feed.site_link != "" %}
+            {{ _('Address of the site') }}: <a href="{{ feed.site_link }}" target="_blank">{{ feed.site_link }}</a><br />
         {% endif %}
 
+        <br />
+
         {% if feed.last_retrieved %}
             {{ _("Last download:") }} {{ feed.last_retrieved | datetime }}<br />
         {% endif %}
@@ -28,18 +31,13 @@
             {{ _("Here's the last error encountered while retrieving this feed:") }} <pre>{{ feed.last_error }}</pre><br />
         {% endif %}
 
-        {{ _('Address of the feed') }}: <a href="{{ feed.link }}">{{ feed.link }}</a><br />
-        {% if feed.site_link != "" %}
-            {{ _('Address of the site') }}: <a href="{{ feed.site_link }}">{{ feed.site_link }}</a><br />
-        {% endif %}
-
         {% if feed.articles.all()|count != 0 %}
             {{ _('The last article was posted') }} {{ elapsed.days }} {{ _('day(s) ago.') }}<br />
             {{ _('Daily average') }}: {{ average }}, {{ _('between the') }} {{ first_post_date | datetime }} {{ _('and the') }} {{ end_post_date | datetime }}.
         {% endif %}
         </p>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         {% if feed.articles.all()|count != 0 %}
             <div>{{ tag_cloud|safe }}</div>
         {% endif %}
diff --git a/pyaggr3g470r/templates/history.html b/pyaggr3g470r/templates/history.html
index 0194cb89..6be54d71 100644
--- a/pyaggr3g470r/templates/history.html
+++ b/pyaggr3g470r/templates/history.html
@@ -1,74 +1,26 @@
- {% extends "layout.html" %}
- {% block head %}
-{{ super() }}
-<script type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
-<style type="text/css">
-rect {
-        fill:  purple ;
-        padding: 7px;
-        margin: 2px;
-        color: white;
-    }
-rect:hover
-    {
-        opacity : 0.5;
-    }
-</style>
-{% endblock %}
-
+{% extends "layout.html" %}
 {% block content %}
 <div class="container">
-<h1>History</h1>
-<div align="center" id="pie_chart">
-    <div class="chart">
- </div>
-
-
-<script type="text/javascript">
-function createGraph(dataset, w, h) {
-    var barPadding = 1;
-
-    //Create SVG element
-    var svg = d3.select("#pie_chart .chart")
-                .append("svg")
-                .attr("width", w)
-                .attr("height", h);
-
-    svg.selectAll("rect")
-        .data(dataset)
-        .enter()
-        .append("rect")
-        .on("click", clickEvent)
-        .attr("x", function(d, i) {
-            return i * (w / dataset.length);
-        })
-        .attr("y", function(d) {
-            return h - (d * 4);
-        })
-        .attr("width", w / dataset.length - barPadding)
-        .attr("height", function(d) {
-            return d * 4;
-        });
-}
-
-function clickEvent(d){
-        //var op = prompt("Please enter the value", "");
-        alert(d);
-
-};
-
-
-
-var w = 800;
-var h = 100;
-var dataset = [ 12, 10, 13, 19, 21, 25, 22, 18, 15, 13,
-                    11, 12, 15, 20, 18, 17, 16, 18, 23, 25 ];
-
-createGraph(dataset, w, h);
-
-
-</script>
-
-
-</div>
-{% endblock %}
\ No newline at end of file
+    <h1>{{ _('History') }}</h1>
+    {% if month != None %}
+        <h2><a href="/history/{{ year }}"><span class="glyphicon glyphicon-chevron-left"></span> {{ year }}</a></h2>
+        <h3>{{ month | month_name }}</h3>
+    {% elif year != None %}
+        <h2><a href="/history"><span class="glyphicon glyphicon-chevron-left"></span>&nbsp{{ _('all years') }}</a></h2>
+        <h3>{{ year }}</h3>
+    {% endif %}
+    <ul class="list-group">
+    {% for article in articles_counter %}
+        {% if year == None %}
+            <li class="list-group-item"><a href="/history/{{ article }}">{{ article }}</a> : {{ articles_counter[article] }} articles</li>
+        {% elif month == None %}
+            <li class="list-group-item"><a href="/history/{{ year }}/{{ article }}">{{ article | month_name  }}</a> : {{ articles_counter[article] }} articles</li>
+        {% else %}
+            {% for article in articles | sort(attribute="date", reverse = True) %}
+                <li class="list-group-item">{{ article.date | datetime }} - <a href="/article/{{ article.id }}">{{ article.title | safe }}</a></li>
+            {% endfor %}
+        {% endif %}
+     {% endfor %}
+     </ul>
+</div><!-- /.container -->
+{% endblock %}
diff --git a/pyaggr3g470r/templates/home.html b/pyaggr3g470r/templates/home.html
index d2a961ab..69ca582b 100644
--- a/pyaggr3g470r/templates/home.html
+++ b/pyaggr3g470r/templates/home.html
@@ -22,7 +22,7 @@
             <li class="feed-menu"><a href="{{ gen_url(feed=fid) }}">
                 {% if feed_id == fid %}<b>{% endif %}
                     {% if in_error.get(fid, 0) > 0 %}
-                        <span style="background-color: {{ "red" if in_error[fid] > 5 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }}</span>
+                        <span style="background-color: {{ "red" if in_error[fid] > 5 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} {{ _("error") }}{% if in_error[fid] > 1 %}s{% endif %}</span>
                     {% endif %}
                     <span id="unread-{{ fid }}" class="badge pull-right">{{ nbunread }}</span>
                     {{ feeds[fid]|safe }}
@@ -40,7 +40,7 @@
         {% for fid, ftitle in feeds|dictsort(case_sensitive=False, by='value') if not fid in unread %}
             <li class="feed-menu"><a href="{{ gen_url(feed=fid) }}">
                 {% if in_error.get(fid, 0) > 0 %}
-                    <span style="background-color: {{ "red" if in_error[fid] > 5 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }}</span>
+                    <span style="background-color: {{ "red" if in_error[fid] > 5 else "orange" }} ;" class="badge pull-right" title="Some errors occured while trying to retrieve that feed.">{{ in_error[fid] }} {{ _("error") }}{% if in_error[fid] > 1 %}s{% endif %}</span>
                 {% endif %}
                 {% if feed_id == fid %}<b>{% endif %}
                     {{ ftitle|safe }}
diff --git a/pyaggr3g470r/templates/inactives.html b/pyaggr3g470r/templates/inactives.html
index e6897281..6a4ff055 100644
--- a/pyaggr3g470r/templates/inactives.html
+++ b/pyaggr3g470r/templates/inactives.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <form method=get action="/inactives">
             <p>{{ _('Days of inactivity') }}:</p>
             <input type="number" name="nb_days" class="form-control" value="{{ nb_days }}" min="0" max="1000000" step="1" size="4" style="text-align: center" />
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html
index 6b929bf3..60efa69e 100644
--- a/pyaggr3g470r/templates/layout.html
+++ b/pyaggr3g470r/templates/layout.html
@@ -11,71 +11,12 @@
     <!-- Bootstrap core CSS -->
     <link href="{{ url_for('static', filename = 'css/bootstrap.css') }}" rel="stylesheet" media="screen" />
     <!-- Add custom CSS here -->
-    <style>
-        body {
-            margin-top: 60px;
-        }
-        div.top {
-            position: relative;
-            top:-60px;
-            display: block;
-            height: 0;
-        }
-        ul.affix {
-            position: fixed;
-            top: 0px;
-        }
-        ul.affix-top {
-            position: static;
-        }
-        ul.affix-bottom {
-            position: absolute;
-        }
-        /* First level of nav */
-        .sidenav {
-            margin-top: 10px;
-            margin-bottom: 0px;
-            padding-top:    10px;
-            padding-bottom: 0px;
-            overflow-y: auto;
-            height: 90%;
-            z-index: 1000;
-            background-color: #ffffff;
-            border-radius: 2px;
-            font-size: 100%;
-        }
-        /* All levels of nav */
-        .sidebar .nav > li > a {
-            display: block;
-            color: #716b7a;
-            padding: 5px 20px;
-        }
-        .sidebar .nav > li > a:hover,
-        .sidebar .nav > li > a:focus {
-            text-decoration: none;
-            background-color: #e5e3e9;
-        }
-        .sidebar .nav > .active > a,
-        .sidebar .nav > .active:hover > a,
-        .sidebar .nav > .active:focus > a {
-            font-weight: bold;
-            color: #563d7c;
-            background-color: transparent;
-        }
-        /* Nav: second level */
-        .sidebar .nav .nav {
-            margin-bottom: 8px;
-        }
-        .sidebar .nav .nav > li > a {
-            padding-top:    3px;
-            padding-bottom: 3px;
-            font-size: 80%;
-        }
-    </style>
+    <link href="{{ url_for('static', filename = 'css/customized-bootstrap.css') }}" rel="stylesheet" media="screen" />
+    <link href="{{ url_for('static', filename = 'css/side-nav.css') }}" rel="stylesheet" media="screen" />
   {% endblock %}
   </head>
-  <body data-spy="scroll" data-target="#affix-nav">
-    <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
+  <body>
+    <nav class="navbar navbar-inverse navbar-fixed-top navbar-custom" role="navigation">
       <div class="container-fluid">
         <div class="navbar-header">
           <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
@@ -118,7 +59,7 @@
                 <li><a href="{{ url_for('logout') }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                        <button class="btn btn-default btn-xs" type="submit"><span class="glyphicon glyphicon-search"></span></button> <b class="caret"></b>
+                        <div><span class="glyphicon glyphicon-search"></span>&nbsp;<b class="caret"></b></div>
                     </a>
                     <ul class="dropdown-menu">
                         <li>
@@ -138,6 +79,8 @@
       </div><!-- /.container -->
     </nav>
 
+    <br />
+
     <div class="container">
     {% with messages = get_flashed_messages(with_categories=true) %}
     {% if messages %}
diff --git a/pyaggr3g470r/templates/login.html b/pyaggr3g470r/templates/login.html
index ae0797a5..c37d6937 100644
--- a/pyaggr3g470r/templates/login.html
+++ b/pyaggr3g470r/templates/login.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h2>{{ _('Log In') }}</h2>
         <form action="{{ url_for('login') }}" method=post>
             {{ form.hidden_tag() }}
@@ -27,4 +27,4 @@
     &nbsp;
     <a href="/recover" class="btn btn-default">{{ _('Forgot password') }}</a>
 </div><!-- /.container -->
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html
index 4a2de617..722300af 100644
--- a/pyaggr3g470r/templates/management.html
+++ b/pyaggr3g470r/templates/management.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h1>{{ _('Your subscriptions') }}</h1>
         <p>{{ _('You are subscribed to') }} {{ nb_feeds }} <a href="/feeds">{{ _('feeds') }}</a>. {{ _('Add a') }} <a href="/create_feed">{{ _('feed') }}</a>.</p>
         <p>{{ nb_articles }} {{ _('articles are stored in the database with') }} {{ nb_unread_articles }} <a href="/unread">{{ _('unread articles') }}</a>.</p>
@@ -10,7 +10,7 @@
         {% endif %}
         <a href="/expire_articles?weeks=10" class="btn btn-default" onclick="return confirm('{{ _('You are going to delete old articles.') }}');">{{ _('Delete articles older than 10 weeks') }}</a>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         <h1>{{ _('Your Profile') }}</h1>
         <div class="row">
             <div class="col-md-6">
@@ -25,7 +25,7 @@
             </div>
        </div>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         <h1 id="import">{{ _('OPML import/export') }}</h1>
         <form action="" method="post" id="formImportOPML" enctype="multipart/form-data">
             <span class="btn btn-default btn-file">{{ _('Batch import feeds from OPML') }} (<span class="text-info">*.xml {{ _('or') }} *.opml</span>)<input type="file" name="opmlfile" /></span>
@@ -41,7 +41,7 @@
         <br />
         <a href="/export?format=JSON" class="btn btn-default">{{ _('Export account to JSON') }}</a>
     </div>
-    <div class="jumbotron">
+    <div class="well">
         <h1>{{ _('Export articles') }}</h1>
         <a href="/export?format=HTML" class="btn btn-default">HTML</a>
     </div>
diff --git a/pyaggr3g470r/templates/profile.html b/pyaggr3g470r/templates/profile.html
index f879b054..971c4e64 100644
--- a/pyaggr3g470r/templates/profile.html
+++ b/pyaggr3g470r/templates/profile.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h2>Edit your profile</h2>
         <form action="" method="post" name="save">
             {{ form.hidden_tag() }}
diff --git a/pyaggr3g470r/templates/recover.html b/pyaggr3g470r/templates/recover.html
index 1098ffef..c1176d55 100644
--- a/pyaggr3g470r/templates/recover.html
+++ b/pyaggr3g470r/templates/recover.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="jumbotron">
+    <div class="well">
         <h2>{{ _('Recover your account') }}</h2>
         {% for message in form.email.errors %}
             <div class="flash">{{ message }}</div>
@@ -15,4 +15,4 @@
         </form>
     </div>
 </div><!-- /.container -->
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/pyaggr3g470r/templates/signup.html b/pyaggr3g470r/templates/signup.html
index dd8154e2..3962c42a 100644
--- a/pyaggr3g470r/templates/signup.html
+++ b/pyaggr3g470r/templates/signup.html
@@ -1,7 +1,7 @@
 {% extends "layout.html" %}
 {% block content %}
 <div class="container">
-    <div class="form jumbotron">
+    <div class="form well">
         <form action="" method="post" name="save">
             {{ form.hidden_tag() }}
             <div class="form-group">