Mercurial > kallithea
changeset 6499:43a86579f8fa
style: use popover for journal search help
Based on work by Dominik Ruf.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Thu, 16 Feb 2017 01:48:31 +0100 |
parents | 137ea21dfc10 |
children | 78f08233a28c |
files | kallithea/templates/admin/admin.html kallithea/templates/journal/journal.html |
diffstat | 2 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/admin/admin.html Tue Aug 16 20:05:48 2016 +0200 +++ b/kallithea/templates/admin/admin.html Thu Feb 16 01:48:31 2017 +0100 @@ -6,11 +6,11 @@ </%block> <%def name="breadcrumbs_links()"> - <form id="filter_form" class="form-inline"> - <input class="form-control q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/> - <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span> - <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/> - ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)} + <form id="filter_form" class="pull-left form-inline input-group-sm"> + <input class="form-control q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/> + <span data-toggle="popover" data-content="${h.journal_filter_help()}">?</span> + <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/> + ${_('Admin Journal')} - ${ungettext('%s Entry', '%s Entries', c.users_log.item_count) % (c.users_log.item_count)} </form> </%def>
--- a/kallithea/templates/journal/journal.html Tue Aug 16 20:05:48 2016 +0200 +++ b/kallithea/templates/journal/journal.html Thu Feb 16 01:48:31 2017 +0100 @@ -1,19 +1,23 @@ ## -*- coding: utf-8 -*- <%inherit file="/base/base.html"/> + <%block name="title"> ${_('Journal')} </%block> + <%def name="breadcrumbs_links()"> - <form id="filter_form" class="pull-left form-inline"> - <input class="form-control q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('quick filter...')}"/> - <span data-toggle="tooltip" title="${h.journal_filter_help()}">?</span> - <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/> - ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)} + <form id="filter_form" class="pull-left form-inline input-group-sm"> + <input class="form-control q_filter_box ${'' if c.search_term else 'initial'}" id="j_filter" size="15" type="text" name="filter" value="${c.search_term or _('journal filter...')}"/> + <span data-toggle="popover" data-content="${h.journal_filter_help()}">?</span> + <input type='submit' value="${_('Filter')}" class="btn btn-default btn-xs"/> + ${_('Journal')} - ${ungettext('%s Entry', '%s Entries', c.journal_pager.item_count) % (c.journal_pager.item_count)} </form> </%def> + <%block name="header_menu"> ${self.menu('journal')} </%block> + <%block name="head_extra"> <link href="${h.url('journal_atom', api_key=request.authuser.api_key)}" rel="alternate" title="${_('ATOM journal feed')}" type="application/atom+xml" /> <link href="${h.url('journal_rss', api_key=request.authuser.api_key)}" rel="alternate" title="${_('RSS journal feed')}" type="application/rss+xml" />