aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyaggr3g470r/templates/about.html6
-rw-r--r--pyaggr3g470r/templates/admin/create_user.html2
-rw-r--r--pyaggr3g470r/templates/admin/user.html4
-rw-r--r--pyaggr3g470r/templates/article.html8
-rw-r--r--pyaggr3g470r/templates/articles.html2
-rw-r--r--pyaggr3g470r/templates/edit_feed.html2
-rw-r--r--pyaggr3g470r/templates/errors/404.html2
-rw-r--r--pyaggr3g470r/templates/errors/500.html2
-rw-r--r--pyaggr3g470r/templates/feed.html6
-rw-r--r--pyaggr3g470r/templates/inactives.html2
-rw-r--r--pyaggr3g470r/templates/login.html4
-rw-r--r--pyaggr3g470r/templates/management.html8
-rw-r--r--pyaggr3g470r/templates/profile.html2
-rw-r--r--pyaggr3g470r/templates/recover.html4
-rw-r--r--pyaggr3g470r/templates/signup.html2
15 files changed, 28 insertions, 28 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/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 c7dfecc2..268cbf7d 100644
--- a/pyaggr3g470r/templates/feed.html
+++ b/pyaggr3g470r/templates/feed.html
@@ -1,13 +1,13 @@
{% 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>.<br />
{{ _('Address of the feed') }}: <a href="{{ feed.link }}" target="_blank">{{ feed.link }}</a><br />
@@ -37,7 +37,7 @@
{% 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/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/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">
bgstack15