Chaned options to settings. Tweaked label for FAR threshold.

templates/admin/base_site.html

@@ -19,7 +19,7 @@
     <li id="nav-create"><a href="{% url create %}">Create</a></li>
     <li id="nav-reports"><a href="{% url reports %}">Reports</a></li>
     <li id="nav-feeds"><a href="{% url feeds %}">RSS</a></li>
-    <li id="nav-userprofile"><a href="{% url userprofile-home %}">Options</a></li>
+    <li id="nav-userprofile"><a href="{% url userprofile-home %}">Settings</a></li>
     {% if ligouser %}<li id="nav-user">Authenticated as: {{ ligouser.name }}</li>{% endif %}
 <ul>
 {% endblock %}

templates/base.html

@@ -36,7 +36,7 @@ function changeTime(obj, label) {
     <li id="nav-reports"><a href="{% url reports %}">Reports</a></li>
     <li id="nav-feeds"><a href="{% url feeds %}">RSS</a></li>
     <li id="nav-latest"><a href="{% url latest %}">Latest</a></li>
-    <li id="nav-userprofile"><a href="{% url userprofile-home %}">Options</a></li>
+    <li id="nav-userprofile"><a href="{% url userprofile-home %}">Settings</a></li>
     {% if ligouser %}<li id="nav-user">Authenticated as: {{ ligouser.name }}</li>{% endif %}
 </ul>
 <center>

templates/gracedb/index.html

@@ -26,7 +26,7 @@ You can read about using the service on the
 <div class="text">
 To receive email alerts when GraCEDb events are created, sign up
 on the <a target="_blank" href="http://listserv.ligo.org/cgi-bin/mailman/listinfo/gracedb">gracedb mailing list</a> or set up your own alert under the
-<a href="{% url userprofile-home %}">Options</a> menu item.
+<a href="{% url userprofile-home %}">Settings</a> menu item.
 </div>
 
 {% endblock %}

templates/profile/createNotification.html

 {% extends "base.html" %}
 
-{% block title %}Options | Create {{ creating }}{% endblock %}
+{% block title %}Settings | Create {{ creating }}{% endblock %}
 {% block heading %}Create {{ creating }}{% endblock %}
 {% block pageid %}userprofile{% endblock %}
 

templates/profile/notifications.html

 {% extends "base.html" %}
 
-{% block title %}Options | Notifications{% endblock %}
+{% block title %}Settings | Notifications{% endblock %}
 {% block heading %}Notifications{% endblock %}
 {% block pageid %}userprofile{% endblock %}
 

urls.py

@@ -17,7 +17,7 @@ urlpatterns = patterns('',
     url (r'^$', 'gracedb.views.index', name="home"),
     (r'^events/', include('gracedb.urls')),
     (r'^api/', include('gracedb.urls_rest')),
-    (r'^options/', include('userprofile.urls')),
+    (r'^settings/', include('userprofile.urls')),
     (r'^cli/create', 'gracedb.views.create'),
     (r'^cli/ping', 'gracedb.views.ping'),
     (r'^cli/log', 'gracedb.views.log'),

userprofile/forms.py

@@ -6,6 +6,7 @@ from django.forms.models import modelformset_factory
 
 def triggerFormFactory(postdata=None, user=None):
     class TF(forms.ModelForm):
+        farThresh = forms.FloatField(label='FAR Threshold')
         class Meta:
             model = Trigger
             exclude = ['user', 'triggerType']