diff options
Diffstat (limited to 'src/web/templates/layout.html')
| -rw-r--r-- | src/web/templates/layout.html | 73 |
1 files changed, 22 insertions, 51 deletions
diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html index 15cf3e97..feb370e3 100644 --- a/src/web/templates/layout.html +++ b/src/web/templates/layout.html @@ -1,5 +1,5 @@ <!DOCTYPE html> -<html> +<html lang="en"> <head> {% block head %} <meta charset="utf-8"> @@ -7,16 +7,15 @@ <meta name="description" content="JARR is a web-based news aggregator." /> <meta name="author" content="" /> <title>JARR{% if head_titles %} - {{ ' - '.join(head_titles) }}{% endif %}</title> - <link rel="shortcut icon" href="{{ url_for('static', filename='img/favicon.png') }}" /> + <link rel="shortcut icon" href="{{ url_for("static", filename="img/favicon.png") }}" /> <!-- Bootstrap core CSS --> - <link href="{{ url_for('static', filename='css/bootstrap.css') }}" rel="stylesheet" media="screen" /> + <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" /> - <link href="{{ url_for('static', filename='css/side-nav.css') }}" rel="stylesheet" media="screen" /> + <link href="{{ url_for("static", filename="css/customized-bootstrap.css") }}" rel="stylesheet" media="screen" /> {% endblock %} </head> <body> - <nav class="navbar navbar-inverse navbar-fixed-top navbar-custom" role="navigation"> + <nav id="jarrnav" 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"> @@ -55,11 +54,6 @@ </li> </ul> </li> - {% if page_to_render == "favorites" %} - <li><a href="{{ url_for("home") }}"><span class="glyphicon glyphicon-home"></span> {{ _('Home') }}</a></li> - {% else %} - <li><a href="{{ url_for("favorites") }}"><span class="glyphicon glyphicon-star"></span> {{ _('Favorites') }}</a></li> - {% endif %} {% if conf.CRAWLING_METHOD == "classic" and (not conf.ON_HEROKU or g.user.is_admin()) %} <li><a href="/fetch"><span class="glyphicon glyphicon-import"></span> {{ _('Fetch') }}</a></li> {% endif %} @@ -71,8 +65,8 @@ <li><a href="{{ url_for("feeds.update", action="read", nb_days="5") }}">{{ gettext('Mark all as read older than %(days)s days', days=5) }}</a></li> <li><a href="{{ url_for("feeds.update", action="read", nb_days="10") }}">{{ gettext('Mark all as read older than %(days)s days', days=10) }}</a></li> <li role="presentation" class="divider"></li> - <li><a href="{{ url_for("inactives") }}">{{ _('Inactive') }}</a></li> - <li><a href="{{ url_for("history") }}">{{ _('History') }}</a></li> + <li><a href="{{ url_for("feeds.inactives") }}">{{ _('Inactive') }}</a></li> + <li><a href="{{ url_for("articles.history") }}">{{ _('History') }}</a></li> <li><a href="{{ url_for("feeds.feeds") }}">{{ _('All') }}</a></li> </ul> </li> @@ -81,40 +75,17 @@ <div><span class="glyphicon glyphicon-user"></span> <b class="caret"></b></div> </a> <ul class="dropdown-menu"> - <li><a href="{{ url_for("profile") }}"><span class="glyphicon glyphicon-user"></span> {{ _('Profile') }}</a></li> - <li><a href="{{ url_for("management") }}"><span class="glyphicon glyphicon-cog"></span> {{ _('Your data') }}</a></li> + <li><a href="{{ url_for("user.profile") }}"><span class="glyphicon glyphicon-user"></span> {{ _('Profile') }}</a></li> + <li><a href="{{ url_for("user.management") }}"><span class="glyphicon glyphicon-cog"></span> {{ _('Your data') }}</a></li> <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span> {{ _('About') }}</a></li> {% if g.user.is_admin() %} <li role="presentation" class="divider"></li> - <li><a href="{{ url_for("dashboard") }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li> + <li><a href="{{ url_for("admin.dashboard") }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li> <li role="presentation" class="divider"></li> {% endif %} <li><a href="{{ url_for("logout") }}"><span class="glyphicon glyphicon-log-out"></span> {{ _('Logout') }}</a></li> </ul> </li> - - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - <div><span class="glyphicon glyphicon-search"></span> <b class="caret"></b></div> - </a> - <ul class="dropdown-menu"> - <li> - <form class="navbar-form" method=get action="{{ url_for("search") }}" role="search"> - <div class="input-group"> - {% if filter_ %}<input type="hidden" name="filter_" value="{{ filter_ }}" />{% endif %} - {% if limit %}<input type="hidden" name="limit" value="{{ limit }}" />{% endif %} - {% if feed_id %}<input type="hidden" name="feed_id" value="{{ feed_id }}" />{% endif %} - <label for="search_title">{{ _("Title") }}</label> - <input type="checkbox" name="search_title" {% if search_title == 'on' or not (search_title == 'on' or search_content == 'on') %}checked{%endif%}/> - <br /> - <label for="search_content">{{ _("Content") }}</label> - <input type="checkbox" name="search_content" {% if search_content == 'on' %}checked{%endif%}/> - <input type="text" class="form-control" name="query" placeholder="{{ _("Search") }}" {% if search_query %} value="{{ search_query }}"{% endif %} /> - </div> - </form> - </li> - </ul> - </li> {% else %} <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span> {{ _('About') }}</a></li> {% endif %} @@ -125,18 +96,18 @@ <br /> <div class="container 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 %} + {% 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 %} |