lucaspalomodevelop/indico-plugins
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/indico-plugins.git synced 2026-03-13 07:29:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.0-maintenance' into next

Browse Source
This commit is contained in:
Adrian Moennich 2018-06-11 13:39:52 +02:00
commit a3ca1ba131
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_meta/setup.py
View File

@ -32,7 +32,7 @@ plugins_require = [
'indico-plugin-piwik==1.0',
'indico-plugin-previewer-code==1.0',
'indico-plugin-previewer-jupyter==1.0',
'indico-plugin-search==1.0',
'indico-plugin-search==1.0.1',
'indico-plugin-vc-vidyo==1.0',
]
extras_require = {
@ -43,7 +43,7 @@ extras_require = {
setup(
name='indico-plugins',
version='2.0',
version='2.0.1',
description='A meta-package containing the official Indico plugins',
url='https://github.com/indico/indico-plugins',
license='https://www.gnu.org/licenses/gpl-3.0.txt',

2
search/indico_search/templates/results.html
View File

@ -35,7 +35,7 @@
{% block banner %}{% endblock %}
</div>
{{ form_header(form, method='get', i_form=false) }}
{{ form_header(form, method='get', i_form=false, disable_if_locked=false) }}
<div>
{{ form.phrase() }}
<input type="submit" value="{% trans %}Search{% endtrans %}">

3
search/indico_search/templates/searchbox_category.html
View File

@ -1,6 +1,7 @@
{% from 'forms/_form.html' import form_header, form_footer %}
{{ form_header(form, method='get', action=url_for_plugin('search.search'), id='category-search-form', i_form=false) }}
{{ form_header(form, method='get', action=url_for_plugin('search.search'), id='category-search-form', i_form=false,
disable_if_locked=false) }}
<div class="search-box" id="category-search-box">
<div class="search-controls">
<div class="search-button icon-search"></div>

3
search/indico_search/templates/searchbox_conference.html
View File

@ -1,6 +1,7 @@
{% from 'forms/_form.html' import form_header, form_footer %}
{{ form_header(form, method='get', action=url_for_plugin('search.search', event), i_form=false) }}
{{ form_header(form, method='get', action=url_for_plugin('search.search', event), i_form=false,
disable_if_locked=false) }}
<div class="toolbar thin f-j-end">
<div class="group">
{{ form.phrase(id='conference-search-phrase', placeholder=_("Search...")) }}

2
search/setup.py
View File

@ -21,7 +21,7 @@ from setuptools import find_packages, setup
setup(
name='indico-plugin-search',
version='1.0',
version='1.0.1',
description='Framework for searching content in Indico',
url='https://github.com/indico/indico-plugins',
license='https://www.gnu.org/licenses/gpl-3.0.txt',