diff options
Diffstat (limited to 'src/web/templates')
| -rw-r--r-- | src/web/templates/home2.html | 1 | ||||
| -rw-r--r-- | src/web/templates/layout.html | 1 | ||||
| -rw-r--r-- | src/web/templates/layout.html.orig | 149 |
3 files changed, 1 insertions, 150 deletions
diff --git a/src/web/templates/home2.html b/src/web/templates/home2.html index 673d9041..36dd8f19 100644 --- a/src/web/templates/home2.html +++ b/src/web/templates/home2.html @@ -12,6 +12,7 @@ <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/one-page-app.css") }}" rel="stylesheet" media="screen" /> {% endblock %} </head> <body> diff --git a/src/web/templates/layout.html b/src/web/templates/layout.html index 4b9f1a4c..ac943d54 100644 --- a/src/web/templates/layout.html +++ b/src/web/templates/layout.html @@ -12,7 +12,6 @@ <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" /> {% endblock %} </head> <body> diff --git a/src/web/templates/layout.html.orig b/src/web/templates/layout.html.orig deleted file mode 100644 index 1abb0b68..00000000 --- a/src/web/templates/layout.html.orig +++ /dev/null @@ -1,149 +0,0 @@ - <!DOCTYPE html> -<html> - <head> - {% block head %} - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0" /> - <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') }}" /> - <!-- Bootstrap core CSS --> - <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" /> - {% endblock %} - </head> - <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"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="{{ url_for("home") }}">JARR</a> - {% if head_titles %} - <p class="navbar-text" style="max-height: 20px; overflow: hidden"> - {{ " - ".join(head_titles) }} - </p> - {% endif %} - </div> - - <!-- Collect the nav links, forms, and other content for toggling --> - <div class="collapse navbar-collapse navbar-ex1-collapse"> - <ul class="nav navbar-nav navbar-right"> - {% if g.user.is_authenticated %} - <!-- <li><a href="{{ url_for("feed.form") }}"><span class="glyphicon glyphicon-plus-sign"></span> {{ _('Add a feed') }}</a></li> --> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - <div><span class="glyphicon glyphicon-plus-sign"></span> {{ _('Add a feed') }}</div> - </a> - <ul class="dropdown-menu"> - <li> - <form action="{{ url_for('feed.bookmarklet') }}" class="navbar-form navbar-left" method="GET" name="save"> - <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> - </span> - </div><!-- /input-group --> - </form> - </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 %} - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ _('Feed') }} <b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="{{ url_for("feeds.update", action="read") }}">{{ _('Mark all as read') }}</a></li> - <li><a href="{{ url_for("feeds.update", action="read", nb_days="1") }}">{{ _('Mark all as read older than yesterday') }}</a></li> - <li><a href="{{ url_for("feeds.update", action="read", nb_days="10") }}">{{ _('Mark all as read older than 10 days') }}</a></li> - <li role="presentation" class="divider"></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> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"> - <div><span class="glyphicon glyphicon-user"></span> <b class="caret"></b></div> - </a> - <ul class="dropdown-menu"> - <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("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 %} - </ul> - </div><!-- /.navbar-collapse --> - </div><!-- /.container --> - </nav> - <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 %} - </div> - - {% 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/jquery.js") }}"></script> - <script type="text/javascript" src="{{ url_for("static", filename="js/bootstrap.min.js") }}"></script> - <script type="text/javascript" src="{{ url_for("static", filename="js/bundle.min.js") }}"></script> - </body> -</html> |