Merge pull request #775 from 18F/add-tock-change-request

Add multiple links to Tock Change Request Form
18F · Apr 4, 2018 · c489dbe · c489dbe
2 parents 22410a0 + 12ceb1a
commit c489dbe
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/tock/tock/context_processors.py b/tock/tock/context_processors.py
@@ -18,3 +18,8 @@ def version_url(request):
         response['x_tock_release_name'] = name[:7]
 
     return response
+
+def tock_request_form_url(request):
+    return {
+        'x_tock_change_request_form_url': settings.TOCK_CHANGE_REQUEST_FORM,
+    }
diff --git a/tock/tock/settings/base.py b/tock/tock/settings/base.py
@@ -62,6 +62,7 @@
                 'django.contrib.messages.context_processors.messages',
                 'django.template.context_processors.request',
                 'tock.context_processors.version_url',
+                'tock.context_processors.tock_request_form_url',
             ],
         },
     },
@@ -120,3 +121,5 @@
 UAA_CLIENT_SECRET = env.get_credential('UAA_CLIENT_SECRET', None)
 UAA_AUTH_URL = 'https://login.fr.cloud.gov/oauth/authorize'
 UAA_TOKEN_URL = 'https://uaa.fr.cloud.gov/oauth/token'
+
+TOCK_CHANGE_REQUEST_FORM = 'https://docs.google.com/a/gsa.gov/forms/d/1EpVTxXgRNgYfoSA2J8Oi-csjhFKqFm5DT542vIlahpU/viewform?edit_requested=true'
diff --git a/tock/tock/templates/_navigation.html b/tock/tock/templates/_navigation.html
@@ -30,6 +30,11 @@
           <span>Log out</span>
         </a>
       </li>
+      <li>
+        <a class="usa-external_link usa-nav-link" href="{{ x_tock_change_request_form_url }}" target="_blank">
+          <span>Tock Change Request Form</span>
+        </a>
+      </li>
       {% if request.user.is_superuser %}
       <li>
         <button class="

diff --git a/tock/tock/templates/base.html b/tock/tock/templates/base.html
@@ -63,11 +63,14 @@
   <div class="usa-grid">
     <nav class=" usa-width-one-whole">
       <ul class="usa-unstyled-list">
-        <li class="usa-width-one-half">
-          <p><i>The current release is <code>{{ x_tock_release_name }}</code>, <a href="{{ x_tock_release_url }}" title="{{ x_tock_release_name }}">view this release on GitHub</a></i>.</p>
+        <li class="usa-width-one-third">
+          <p><i>The current release is <code>{{ x_tock_release_name }}</code>, <a class="usa-external_link" href="{{ x_tock_release_url }}" title="{{ x_tock_release_name }}" target="_blank">view this release on GitHub</a></i>.</p>
         </li>
-        <li class="usa-width-one-half">
-          <p><i>For questions, suggestions, or bug reports, please <a href="https://github.com/18f/tock/issues">file an issue</a>.</i></p>
+        <li class="usa-width-one-third">
+          <p><i>For questions, suggestions, or bug reports, please <a class="usa-external_link" href="https://github.com/18f/tock/issues" target="_blank">file an issue</a>.</i></p>
+        </li>
+        <li class="usa-width-one-third">
+          <p><i>To change your previously submitted hours in Tock, please <a class="usa-external_link" href="{{ x_tock_change_request_form_url }}" target="_blank">use the Tock Change Request Form</a>.</i></p>
         </li>
       </ul>
     </nav>