diff --git a/RIGS/templates/RIGS/index.html b/RIGS/templates/RIGS/index.html index 27f404de..ae979f3d 100644 --- a/RIGS/templates/RIGS/index.html +++ b/RIGS/templates/RIGS/index.html @@ -32,7 +32,8 @@
-

Search Rigboard

+

Search Rigboard +

diff --git a/RIGS/templates/RIGS/search_help.html b/RIGS/templates/RIGS/search_help.html new file mode 100644 index 00000000..9b460043 --- /dev/null +++ b/RIGS/templates/RIGS/search_help.html @@ -0,0 +1,70 @@ +{% extends request.is_ajax|yesno:"base_ajax.html,base.html" %} + +{% block title %}Search Help{% endblock %} + +{% block content %} +
+ {% if not request.is_ajax %} +
+

Search Help

+
+ {% endif %} +
+
+
+

Searching Events

+
+
+

+ Searches for entire query in: + + and + +

+

You can search for an event by by entering an integer, or using the format N01234

+

On the search results page you can also specify the date range for the of the event

+

Events are sorted in reverse order (most recent events at the top)

+
+
+ +
+
+

Searching People/Organisations/Venues

+
+
+

+ Searches for entire search phrase in: + + + + and + +

+

You can search for an entry by by entering an integer

+

Entries are sorted in alphabetical order by

+
+
+ + {% if perms.RIGS.view_invoice %} +
+
+

Searching Invoices

+
+
+

+ Searches for entire search phrase in: + +

+

You can search for an event's invoice by entering the using the format N01234

+

You can search for an invoice by using the format #01234

+

Entering a raw integer will search by both and

+

Entries are sorted in reverse order

+
+
+ {% endif %} + + + +
+
+{% endblock %} \ No newline at end of file diff --git a/RIGS/urls.py b/RIGS/urls.py index 4338df08..c76e8ea8 100644 --- a/RIGS/urls.py +++ b/RIGS/urls.py @@ -13,6 +13,8 @@ urlpatterns = patterns('', url('^$', login_required(views.Index.as_view()), name='index'), url(r'^closemodal/$', views.CloseModal.as_view(), name='closemodal'), + url(r'^search_help/$', views.SearchHelp.as_view(), name='search_help'), + url('^user/login/$', 'RIGS.views.login', name='login'), url(r'^user/password_reset/$', 'django.contrib.auth.views.password_reset', {'password_reset_form':forms.PasswordReset}), diff --git a/RIGS/views.py b/RIGS/views.py index 0dca4adc..de47db5f 100644 --- a/RIGS/views.py +++ b/RIGS/views.py @@ -35,6 +35,9 @@ def login(request, **kwargs): return login(request) +class SearchHelp(generic.TemplateView): + template_name = 'RIGS/search_help.html' + """ Called from a modal window (e.g. when an item is submitted to an event/invoice). May optionally also include some javascript in a success message to cause a load of