diff options
Diffstat (limited to 'src/web')
| -rw-r--r-- | src/web/templates/layout.html | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html index 3dc1ff71..ad0b0ea0 100644 --- a/src/web/templates/layout.html +++ b/src/web/templates/layout.html @@ -4,23 +4,20 @@ {% block head %} <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <meta name="description" content="Newspipe is a web-based news aggregator." /> + <meta name="description" content="Newspipe is a web news aggregator and reader." /> <meta name="author" content="" /> <title>Newspipe{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %}</title> <link rel="shortcut icon" href="{{ url_for("static", filename="img/favicon.ico") }}" /> <!-- Bootstrap core CSS --> - - <!-- Add custom CSS here --> <link href="{{ url_for("static", filename="css/bootstrap.min.css") }}" rel="stylesheet" media="screen" /> + <!-- Add custom CSS here --> <link href="{{ url_for("static", filename="css/customized-bootstrap.css") }}" rel="stylesheet" media="screen" /> - + <!-- jquery, bootstrap, datatables --> <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> <link rel="stylesheet" type="text/css" href="{{ url_for("static", filename="bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css") }}"> <script type="text/javascript" src="{{ url_for("static", filename="bower_components/datatables.net/js/jquery.dataTables.min.js") }}"></script> <script type="text/javascript" src="{{ url_for("static", filename="bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js") }}"></script> - - {% endblock %} </head> <body> @@ -28,7 +25,7 @@ <nav id="newspipenav" class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <div class="container-fluid"> <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> @@ -41,9 +38,8 @@ </p> {% endif %} </div> - <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse navbar-ex1-collapse"> + <div id="navbar" class="navbar-collapse collapse"> <ul class="nav navbar-nav navbar-right"> {% if current_user.is_authenticated %} {% if conf.CRAWLING_METHOD == "classic" and (not conf.ON_HEROKU or current_user.is_admin) %} @@ -59,7 +55,7 @@ <div class="input-group input-group-inline"> <input class="form-control" name="url" type="url" placeholder="{{_("Site or feed url")}}" required="required"/> <span class="input-group-btn"> - <button type="submit" class="btn btn-default" /><span class="glyphicon glyphicon-plus"></span></button> + <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span></button> </span> </div><!-- /input-group --> </form> @@ -76,7 +72,7 @@ <div class="input-group input-group-inline"> <input class="form-control" name="name" type="text" placeholder="{{_("Category name")}}" required="required"/> <span class="input-group-btn"> - <button type="submit" class="btn btn-default" /><span class="glyphicon glyphicon-plus"></span></button> + <button type="submit" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span></button> </span> </div><!-- /input-group --> </form> @@ -114,7 +110,7 @@ {% endif %} </ul> </div><!-- /.navbar-collapse --> - </div><!-- /.container --> + </div><!-- /.container-fluid --> </nav> {% endblock %} <br /> @@ -136,7 +132,6 @@ {% block content %}{% endblock %} - <!-- Bootstrap core JavaScript --> <!-- Placed at the end of the document so the pages load faster --> <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> |