diff options
author | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-07-02 18:56:27 +0200 |
---|---|---|
committer | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-07-02 18:56:27 +0200 |
commit | b43010d2da88d91e8934ba7214a823453cbf6031 (patch) | |
tree | 6e8e1fd8d45832a59f8ec37e2009cc68069f2375 /pyaggr3g470r/templates/layout.html | |
parent | Display a picto when a feed is disabled due to errors when retrieving. (diff) | |
parent | using conf.DEFAULT_MAX_ERROR in feed template (diff) | |
download | newspipe-b43010d2da88d91e8934ba7214a823453cbf6031.tar.gz newspipe-b43010d2da88d91e8934ba7214a823453cbf6031.tar.bz2 newspipe-b43010d2da88d91e8934ba7214a823453cbf6031.zip |
Merged in jaesivsm/pyaggr3g470r (pull request #14)
Master
Diffstat (limited to 'pyaggr3g470r/templates/layout.html')
-rw-r--r-- | pyaggr3g470r/templates/layout.html | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html index 80c74703..fcdbee32 100644 --- a/pyaggr3g470r/templates/layout.html +++ b/pyaggr3g470r/templates/layout.html @@ -129,29 +129,31 @@ </div><!-- /.navbar-collapse --> </div><!-- /.container --> </nav> - <br /> - <div class="container"> - {% with messages = get_flashed_messages(with_categories=true) %} - {% if messages %} - {% for category, message in messages %} - <div class="alert alert-{{category}}"> - <button type="button" class="close" data-dismiss="alert">×</button> - {{ message }} - </div> - {% endfor %} - {% endif %} - {% endwith %} + <div class="container-fluid not-at-home"> + {% block messages %} + {% with messages = get_flashed_messages(with_categories=true) %} + {% if messages %} + {% for category, message in messages %} + <div class="alert alert-{{category}}"> + <button type="button" class="close" data-dismiss="alert">×</button> + {{ message }} + </div> + {% endfor %} + {% endif %} + {% endwith %} + {% endblock %} </div> {% block content %}{% endblock %} <!-- Bootstrap core JavaScript --> <!-- Placed at the end of the document so the pages load faster --> - <script src="{{ url_for('static', filename = 'js/jquery.js') }}"></script> - <script src="{{ url_for('static', filename = 'js/bootstrap.js') }}"></script> - <script src="{{ url_for('static', filename = 'js/articles.js') }}"></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> + <script type="text/javascript" src="{{ url_for('static', filename = 'js/articles.js') }}"></script> + <script type="text/javascript" src="{{ url_for('static', filename = 'js/feed.js') }}"></script> <script type="text/javascript" class="source"> var filter_ = {% if filter_ %}"{{ filter_ }}"{% else %}undefined{% endif %}; if (filter_ == undefined) { |