diff options
| author | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-04-17 00:34:45 +0200 |
|---|---|---|
| committer | Cédric Bonhomme <kimble.mandel+bitbucket@gmail.com> | 2015-04-17 00:34:45 +0200 |
| commit | 6199b9ef59583d580f1b83afa436c0ccd60ddb76 (patch) | |
| tree | 1f5aad5dd88763f791c7d27a16ed44d1684f229d /pyaggr3g470r/templates/layout.html | |
| parent | 'CRAWLING_METHOD wasn't initialized on Heroku. (diff) | |
| parent | facto on config and more option in log levels (diff) | |
| download | newspipe-6199b9ef59583d580f1b83afa436c0ccd60ddb76.tar.gz newspipe-6199b9ef59583d580f1b83afa436c0ccd60ddb76.tar.bz2 newspipe-6199b9ef59583d580f1b83afa436c0ccd60ddb76.zip | |
Merged in jaesivsm/pyaggr3g470r (pull request #10)
misc fix and search integration in the new style page
Diffstat (limited to 'pyaggr3g470r/templates/layout.html')
| -rw-r--r-- | pyaggr3g470r/templates/layout.html | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pyaggr3g470r/templates/layout.html b/pyaggr3g470r/templates/layout.html index 484bbdc7..a54125ea 100644 --- a/pyaggr3g470r/templates/layout.html +++ b/pyaggr3g470r/templates/layout.html @@ -86,6 +86,7 @@ <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> {% if g.user.is_admin() %} + <li><a href="{{ url_for("about") }}"><span class="glyphicon glyphicon-question-sign"></span> {{ _('About') }}</a></li> <li role="presentation" class="divider"></li> <li><a href="{{ url_for("dashboard") }}"><span class="glyphicon glyphicon-dashboard"></span> {{ _('Dashboard') }}</a></li> <li role="presentation" class="divider"></li> @@ -101,9 +102,16 @@ </a> <ul class="dropdown-menu"> <li> - <form class="navbar-form" method=get action="/search" role="search"> + <form class="navbar-form" method=get action="{{ url_for("search") }}" role="search"> <div class="input-group"> - <input type="text" class="form-control" name="query" placeholder="Search"> + {% 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%}/> + <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> |