diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000000000000000000000000000000000000..121531af8467c5344c1ddd59c7a6452793e15152
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+*.min.js
diff --git a/.eslintrc b/.eslintrc
deleted file mode 100644
index bb1dfd21b171b0ace8a047b35184844a05354c7e..0000000000000000000000000000000000000000
--- a/.eslintrc
+++ /dev/null
@@ -1,88 +0,0 @@
-{
- "extends": "eslint:recommended",
- "env": {
- "browser": true,
- "commonjs": true,
- "es6": true
- },
- "globals": {
- "jQuery": true
- },
- "rules": {
- // Errors.
- "array-bracket-spacing": [2, "never"],
- "block-scoped-var": 2,
- "brace-style": [2, "stroustrup", {"allowSingleLine": true}],
- "comma-dangle": [2, "never"],
- "comma-spacing": 2,
- "comma-style": [2, "last"],
- "computed-property-spacing": [2, "never"],
- "curly": [2, "all"],
- "eol-last": 2,
- "eqeqeq": [2, "smart"],
- "guard-for-in": 2,
- "indent": [2, 4, {"SwitchCase": 1}],
- "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
- "keyword-spacing": [2, {"before": true, "after": true}],
- "linebreak-style": [2, "unix"],
- "lines-around-comment": [2, {"beforeBlockComment": true, "afterBlockComment": false}],
- "new-parens": 2,
- "no-array-constructor": 2,
- "no-caller": 2,
- "no-catch-shadow": 2,
- "no-eval": 2,
- "no-extend-native": 2,
- "no-extra-bind": 2,
- "no-extra-parens": [2, "functions"],
- "no-implied-eval": 2,
- "no-iterator": 2,
- "no-label-var": 2,
- "no-labels": 2,
- "no-lone-blocks": 2,
- "no-loop-func": 2,
- "no-multi-spaces": 2,
- "no-multi-str": 2,
- "no-native-reassign": 2,
- "no-nested-ternary": 2,
- "no-new-func": 2,
- "no-new-object": 2,
- "no-new-wrappers": 2,
- "no-octal-escape": 2,
- "no-process-exit": 2,
- "no-proto": 2,
- "no-return-assign": 2,
- "no-script-url": 2,
- "no-sequences": 2,
- "no-shadow-restricted-names": 2,
- "no-spaced-func": 2,
- "no-trailing-spaces": 2,
- "no-undef-init": 2,
- "no-undefined": 2,
- "no-unused-expressions": 2,
- "no-unused-vars": [2, {"vars": "all", "args": "none"}],
- "no-with": 2,
- "object-curly-spacing": [2, "never"],
- "one-var": [2, "never"],
- "quote-props": [2, "consistent-as-needed"],
- "quotes": [2, "single", "avoid-escape"],
- "semi": [2, "always"],
- "semi-spacing": [2, {"before": false, "after": true}],
- "space-before-blocks": [2, "always"],
- "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}],
- "space-in-parens": [2, "never"],
- "space-infix-ops": 2,
- "space-unary-ops": [2, { "words": true, "nonwords": false }],
- "spaced-comment": [2, "always"],
- "strict": [2, "function"],
- "yoda": [2, "never"],
- // Warnings.
- "max-nested-callbacks": [1, 3],
- "valid-jsdoc": [1, {
- "prefer": {
- "returns": "return",
- "property": "prop"
- },
- "requireReturn": false
- }]
- }
-}
diff --git a/.eslintrc.yaml b/.eslintrc.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..25a8daf965b4f17cdd2db282a325e57e6e15fbd3
--- /dev/null
+++ b/.eslintrc.yaml
@@ -0,0 +1,146 @@
+extends: eslint:recommended
+env:
+ browser: true
+ commonjs: true
+ es6: true
+globals:
+ jQuery: true
+rules:
+ array-bracket-spacing:
+ - "error"
+ - never
+ block-scoped-var: "error"
+ brace-style:
+ - "error"
+ - stroustrup
+ - allowSingleLine: true
+ comma-dangle:
+ - "error"
+ - never
+ comma-spacing: "error"
+ comma-style:
+ - "error"
+ - last
+ computed-property-spacing:
+ - "error"
+ - never
+ curly:
+ - "error"
+ - all
+ eol-last: "error"
+ eqeqeq:
+ - "error"
+ - smart
+ guard-for-in: "error"
+ indent:
+ - "error"
+ - 4
+ - SwitchCase: 1
+ key-spacing:
+ - "error"
+ - beforeColon: false
+ afterColon: true
+ keyword-spacing:
+ - "error"
+ - before: true
+ after: true
+ linebreak-style:
+ - "error"
+ - unix
+ lines-around-comment:
+ - "error"
+ - beforeBlockComment: true
+ afterBlockComment: false
+ new-parens: "error"
+ no-array-constructor: "error"
+ no-caller: "error"
+ no-catch-shadow: "error"
+ no-eval: "error"
+ no-extend-native: "error"
+ no-extra-bind: "error"
+ no-extra-parens:
+ - "error"
+ - functions
+ no-implied-eval: "error"
+ no-iterator: "error"
+ no-label-var: "error"
+ no-labels: "error"
+ no-lone-blocks: "error"
+ no-loop-func: "error"
+ no-multi-spaces: "error"
+ no-multi-str: "error"
+ no-native-reassign: "error"
+ no-nested-ternary: "error"
+ no-new-func: "error"
+ no-new-object: "error"
+ no-new-wrappers: "error"
+ no-octal-escape: "error"
+ no-process-exit: "error"
+ no-proto: "error"
+ no-return-assign: "error"
+ no-script-url: "error"
+ no-sequences: "error"
+ no-shadow-restricted-names: "error"
+ no-spaced-func: "error"
+ no-trailing-spaces: "error"
+ no-undef-init: "error"
+ no-undefined: "error"
+ no-unused-expressions: "error"
+ no-unused-vars:
+ - "error"
+ - vars: all
+ args: none
+ no-with: "error"
+ object-curly-spacing:
+ - "error"
+ - never
+ one-var:
+ - "error"
+ - never
+ quote-props:
+ - "error"
+ - consistent-as-needed
+ quotes:
+ - "error"
+ - single
+ - avoid-escape
+ semi:
+ - "error"
+ - always
+ semi-spacing:
+ - "error"
+ - before: false
+ after: true
+ space-before-blocks:
+ - "error"
+ - always
+ space-before-function-paren:
+ - "error"
+ - anonymous: always
+ named: never
+ space-in-parens:
+ - "error"
+ - never
+ space-infix-ops: "error"
+ space-unary-ops:
+ - "error"
+ - words: true
+ nonwords: false
+ spaced-comment:
+ - "error"
+ - always
+ strict:
+ - "error"
+ - function
+ yoda:
+ - "error"
+ - never
+ max-nested-callbacks:
+ - "warn"
+ - 3
+ valid-jsdoc:
+ - "warn"
+ - prefer:
+ returns: return
+ property: prop
+ requireReturn: false
diff --git a/opentech/apply/activity/messaging.py b/opentech/apply/activity/messaging.py
index d3c24d144d5e1136b2f149fe2daa09130169a697..2401c66e20cdc05a06ba2e5ee7ad4360bab35ee1 100644
--- a/opentech/apply/activity/messaging.py
+++ b/opentech/apply/activity/messaging.py
@@ -7,6 +7,7 @@ from django.conf import settings
from django.contrib import messages
from django.contrib.auth import get_user_model
from django.template.loader import render_to_string
+from django.utils import timezone
from .models import INTERNAL, PUBLIC
from .options import MESSAGES
@@ -332,6 +333,7 @@ class ActivityAdapter(AdapterBase):
Activity.actions.create(
user=user,
submission=submission,
+ timestamp=timezone.now(),
message=message,
visibility=visibility,
related_object=related_object,
@@ -554,6 +556,8 @@ class EmailAdapter(AdapterBase):
MESSAGES.INVITED_TO_PROPOSAL: 'messages/email/invited_to_proposal.html',
MESSAGES.BATCH_READY_FOR_REVIEW: 'messages/email/batch_ready_to_review.html',
MESSAGES.READY_FOR_REVIEW: 'messages/email/ready_to_review.html',
+ MESSAGES.PARTNERS_UPDATED: 'partners_updated_applicant',
+ MESSAGES.PARTNERS_UPDATED_PARTNER: 'partners_updated_partner',
}
def get_subject(self, message_type, submission):
@@ -605,6 +609,11 @@ class EmailAdapter(AdapterBase):
# Only notify the applicant if the new phase can be seen within the workflow
if not submission.phase.permissions.can_view(submission.user):
return []
+
+ if message_type == MESSAGES.PARTNERS_UPDATED_PARTNER:
+ partners = kwargs['added']
+ return [partner.email for partner in partners]
+
return [submission.user.email]
def batch_recipients(self, message_type, submissions, **kwargs):
@@ -631,6 +640,18 @@ class EmailAdapter(AdapterBase):
if submission.phase.permissions.can_review(reviewer) and not reviewer.is_apply_staff
]
+ def partners_updated_applicant(self, added, removed, **kwargs):
+ if added:
+ return self.render_message(
+ 'messages/email/partners_update_applicant.html',
+ added=added,
+ **kwargs
+ )
+
+ def partners_updated_partner(self, added, removed, **kwargs):
+ for partner in added:
+ return self.render_message('messages/email/partners_update_partner.html', **kwargs)
+
def render_message(self, template, **kwargs):
return render_to_string(template, kwargs)
diff --git a/opentech/apply/activity/migrations/0022_add_versioning_to_comments.py b/opentech/apply/activity/migrations/0022_add_versioning_to_comments.py
new file mode 100644
index 0000000000000000000000000000000000000000..10034b8d281f0e15ab24d0a15c7c44ce5499551d
--- /dev/null
+++ b/opentech/apply/activity/migrations/0022_add_versioning_to_comments.py
@@ -0,0 +1,34 @@
+# Generated by Django 2.0.9 on 2019-02-24 00:03
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('activity', '0021_add_review_delete_event'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='activity',
+ name='timestamp',
+ field=models.DateTimeField(),
+ ),
+ migrations.AddField(
+ model_name='activity',
+ name='current',
+ field=models.BooleanField(default=True),
+ ),
+ migrations.AddField(
+ model_name='activity',
+ name='edited',
+ field=models.DateTimeField(default=None, null=True),
+ ),
+ migrations.AddField(
+ model_name='activity',
+ name='previous',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='activity.Activity'),
+ ),
+ ]
diff --git a/opentech/apply/activity/migrations/0023_notify_partners.py b/opentech/apply/activity/migrations/0023_notify_partners.py
new file mode 100644
index 0000000000000000000000000000000000000000..097c6f648a2cff56873bd0488fa8213e55019ad4
--- /dev/null
+++ b/opentech/apply/activity/migrations/0023_notify_partners.py
@@ -0,0 +1,18 @@
+# Generated by Django 2.0.13 on 2019-05-09 13:06
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('activity', '0022_add_versioning_to_comments'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='event',
+ name='type',
+ field=models.CharField(choices=[('UPDATE_LEAD', 'Update Lead'), ('EDIT', 'Edit'), ('APPLICANT_EDIT', 'Applicant Edit'), ('NEW_SUBMISSION', 'New Submission'), ('SCREENING', 'Screening'), ('TRANSITION', 'Transition'), ('BATCH_TRANSITION', 'Batch Transition'), ('DETERMINATION_OUTCOME', 'Determination Outcome'), ('BATCH_DETERMINATION_OUTCOME', 'Batch Determination Outcome'), ('INVITED_TO_PROPOSAL', 'Invited To Proposal'), ('REVIEWERS_UPDATED', 'Reviewers Updated'), ('BATCH_REVIEWERS_UPDATED', 'Batch Reviewers Updated'), ('PARTNERS_UPDATED', 'Partners Updated'), ('PARTNERS_UPDATED_PARTNER', 'Partners Updated Partner'), ('READY_FOR_REVIEW', 'Ready For Review'), ('BATCH_READY_FOR_REVIEW', 'Batch Ready For Review'), ('NEW_REVIEW', 'New Review'), ('COMMENT', 'Comment'), ('PROPOSAL_SUBMITTED', 'Proposal Submitted'), ('OPENED_SEALED', 'Opened Sealed Submission'), ('REVIEW_OPINION', 'Review Opinion'), ('DELETE_SUBMISSION', 'Delete Submission'), ('DELETE_REVIEW', 'Delete Review')], max_length=50),
+ ),
+ ]
diff --git a/opentech/apply/activity/models.py b/opentech/apply/activity/models.py
index 159bd219cf8270dd8e977cd087e633050363973d..089686efeeb4264c43c9e802eae6d69e720e480e 100644
--- a/opentech/apply/activity/models.py
+++ b/opentech/apply/activity/models.py
@@ -59,7 +59,10 @@ class ActivityBaseManager(models.Manager):
return super().create(**kwargs)
def get_queryset(self):
- return super().get_queryset().filter(type=self.type)
+ return super().get_queryset().filter(
+ type=self.type,
+ current=True,
+ )
class CommentQueryset(BaseActivityQuerySet):
@@ -79,13 +82,18 @@ class ActionManager(ActivityBaseManager):
class Activity(models.Model):
- timestamp = models.DateTimeField(auto_now_add=True)
+ timestamp = models.DateTimeField()
type = models.CharField(choices=ACTIVITY_TYPES.items(), max_length=30)
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT)
submission = models.ForeignKey('funds.ApplicationSubmission', related_name='activities', on_delete=models.CASCADE)
message = models.TextField()
visibility = models.CharField(choices=list(VISIBILITY.items()), default=PUBLIC, max_length=10)
+ # Fields for handling versioning of the comment activity models
+ edited = models.DateTimeField(default=None, null=True)
+ current = models.BooleanField(default=True)
+ previous = models.ForeignKey("self", on_delete=models.CASCADE, null=True)
+
# Fields for generic relations to other objects. related_object should implement `get_absolute_url`
content_type = models.ForeignKey(ContentType, blank=True, null=True, on_delete=models.CASCADE)
object_id = models.PositiveIntegerField(blank=True, null=True)
diff --git a/opentech/apply/activity/options.py b/opentech/apply/activity/options.py
index f99b2608911b4375365e7ccf12628cc5133ae058..c007308a20780b6335827fb159f4152977d3a629 100644
--- a/opentech/apply/activity/options.py
+++ b/opentech/apply/activity/options.py
@@ -15,6 +15,7 @@ class MESSAGES(Enum):
REVIEWERS_UPDATED = 'Reviewers Updated'
BATCH_REVIEWERS_UPDATED = 'Batch Reviewers Updated'
PARTNERS_UPDATED = 'Partners Updated'
+ PARTNERS_UPDATED_PARTNER = 'Partners Updated Partner'
READY_FOR_REVIEW = 'Ready For Review'
BATCH_READY_FOR_REVIEW = 'Batch Ready For Review'
NEW_REVIEW = 'New Review'
diff --git a/opentech/apply/activity/templates/activity/include/listing_base.html b/opentech/apply/activity/templates/activity/include/listing_base.html
index f999f30d48506338aea55ecea8cafb49b56a566a..95352d4d922dce15b32b2ffbb69523a802752db1 100644
--- a/opentech/apply/activity/templates/activity/include/listing_base.html
+++ b/opentech/apply/activity/templates/activity/include/listing_base.html
@@ -3,10 +3,25 @@
<div class="feed__pre-content">
<p class="feed__label feed__label--{{ activity.type }}">{{ activity.type|capfirst }}</p>
</div>
- <div class="feed__content">
- <div class="feed__meta">
+ <div class="feed__content js-feed-content">
+ <div class="feed__meta js-feed-meta">
<p class="feed__label feed__label--{{ activity.type }} feed__label--mobile">{{ activity.type|capfirst }}</p>
<p class="feed__meta-item"><span>{{ activity|display_author:request.user }}</span> – {{ activity.timestamp|date:"Y-m-d H:i" }}</p>
+
+ {% if editable %}
+ {% if activity.user == request.user %}
+ <p class="feed__meta-item feed__meta-item--edit-button">
+ <a class="link link--edit-submission is-active js-edit-comment" href="#">
+ Edit
+ <svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
+ </a>
+ </p>
+ {% endif %}
+ <p class="feed__meta-item feed__meta-item--last-edited" {% if not activity.edited %} hidden {% endif %}>
+ (Last edited: <span class="js-last-edited">{{ activity.edited|date:"Y-m-d H:i" }}</span>)
+ </p>
+ {% endif %}
+
{% if activity.private %}
<p class="feed__meta-item feed__meta-item--right">
<svg class="icon icon--eye"><use xlink:href="#eye"></use></svg>
@@ -14,12 +29,21 @@
</p>
{% endif %}
</div>
+
<p class="feed__heading">
{% if submission_title %}
updated <a href="{{ activity.submission.get_absolute_url }}">{{ activity.submission.title }}</a>
{% endif %}
- {{ activity|display_for:request.user|submission_links|markdown|bleach }}
+ {% if editable %}
+ <div class="feed__comment js-comment" data-id="{{activity.id}}" data-comment="{{activity|display_for:request.user|to_markdown}}" data-edit-url="{% url 'funds:api:comments:edit' pk=activity.pk %}">
+ {{ activity|display_for:request.user|submission_links|markdown|bleach }}
+ </div>
+
+ <div class="js-edit-block" aria-live="polite"></div>
+ {% else %}
+ {{ activity|display_for:request.user|submission_links|markdown|bleach }}
+ {% endif %}
{% if not submission_title and activity|user_can_see_related:request.user %}
{% with url=activity.related_object.get_absolute_url %}
diff --git a/opentech/apply/activity/templates/messages/email/base.html b/opentech/apply/activity/templates/messages/email/base.html
index b745bcf22b36f412ac4f05d4c464382685c8c8d9..2c634ca5a76a26bcf64740d5212db8a3b5c1e7ee 100644
--- a/opentech/apply/activity/templates/messages/email/base.html
+++ b/opentech/apply/activity/templates/messages/email/base.html
@@ -1,13 +1,10 @@
{% block salutation %}Dear {{ user }},{% endblock %}
-
{% block content %}{% endblock %}
-
{% block more_info %}{% endblock %}
-
Kind Regards,
The OTF Team
---
+--
Open Technology Fund
https://www.opentech.fund/
{% block post_signature_content %}{% endblock %}
diff --git a/opentech/apply/activity/templates/messages/email/partners_update_applicant.html b/opentech/apply/activity/templates/messages/email/partners_update_applicant.html
new file mode 100644
index 0000000000000000000000000000000000000000..aac53450a72bf1b5fa2638956be647197dafbbf8
--- /dev/null
+++ b/opentech/apply/activity/templates/messages/email/partners_update_applicant.html
@@ -0,0 +1,9 @@
+{% extends "messages/email/base.html" %}
+{% block content %}
+New partner(s) has been added to your submission.
+{% for partner in added %}
+* {{ partner }}
+{% endfor %}
+Title: {{ submission.title }}
+Link: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
+{% endblock %}
diff --git a/opentech/apply/activity/templates/messages/email/partners_update_partner.html b/opentech/apply/activity/templates/messages/email/partners_update_partner.html
new file mode 100644
index 0000000000000000000000000000000000000000..c80e90cc8b249eaef73521194c488687fa60557c
--- /dev/null
+++ b/opentech/apply/activity/templates/messages/email/partners_update_partner.html
@@ -0,0 +1,9 @@
+{% extends "messages/email/base.html" %}
+{% block salutation %}Dear Partner,{% endblock %}
+
+{% block content %}
+You have been added as a partner the following submission.
+
+Title: {{ submission.title }}
+Link: {{ request.scheme }}://{{ request.get_host }}{{ submission.get_absolute_url }}
+{% endblock %}
diff --git a/opentech/apply/activity/tests/factories.py b/opentech/apply/activity/tests/factories.py
index 30c09ab31a5971a7300269b9af699093afeca13d..fb312efc0b9cd7bb634709535b9b320b45b09adb 100644
--- a/opentech/apply/activity/tests/factories.py
+++ b/opentech/apply/activity/tests/factories.py
@@ -1,6 +1,7 @@
import uuid
import factory
+from django.utils import timezone
from opentech.apply.activity.models import Activity, Event, INTERNAL, Message, MESSAGES, REVIEWER
from opentech.apply.funds.tests.factories import ApplicationSubmissionFactory
@@ -18,6 +19,7 @@ class CommentFactory(factory.DjangoModelFactory):
submission = factory.SubFactory(ApplicationSubmissionFactory)
user = factory.SubFactory(UserFactory)
message = factory.Faker('sentence')
+ timestamp = factory.LazyFunction(timezone.now)
@classmethod
def _get_manager(cls, model_class):
diff --git a/opentech/apply/activity/tests/test_models.py b/opentech/apply/activity/tests/test_models.py
new file mode 100644
index 0000000000000000000000000000000000000000..2230036f34e6a4796565d09f05f6e7cc52515d80
--- /dev/null
+++ b/opentech/apply/activity/tests/test_models.py
@@ -0,0 +1,11 @@
+from django.test import TestCase
+
+from .factories import CommentFactory
+from ..models import Activity
+
+
+class TestActivityOnlyIncludesCurrent(TestCase):
+ def test_doesnt_include_non_current(self):
+ CommentFactory()
+ CommentFactory(current=False)
+ self.assertEqual(Activity.comments.count(), 1)
diff --git a/opentech/apply/activity/views.py b/opentech/apply/activity/views.py
index 3b6cc14462d0726caa16a5ef58c725224ab3aa90..25b216107e5528f0eaa36aaaad3f95c950b97b93 100644
--- a/opentech/apply/activity/views.py
+++ b/opentech/apply/activity/views.py
@@ -1,4 +1,5 @@
from django.views.generic import CreateView
+from django.utils import timezone
from opentech.apply.utils.views import DelegatedViewMixin
@@ -56,6 +57,7 @@ class CommentFormView(DelegatedViewMixin, CreateView):
form.instance.user = self.request.user
form.instance.submission = self.kwargs['submission']
form.instance.type = COMMENT
+ form.instance.timestamp = timezone.now()
response = super().form_valid(form)
messenger(
MESSAGES.COMMENT,
diff --git a/opentech/apply/determinations/tests/test_views.py b/opentech/apply/determinations/tests/test_views.py
index 0f7f418d9d1a1c1c4ff1336656ced8c685d4947b..f3e71f9993958c43c092ae6c0cf592eea53411fd 100644
--- a/opentech/apply/determinations/tests/test_views.py
+++ b/opentech/apply/determinations/tests/test_views.py
@@ -1,6 +1,15 @@
+import urllib
+
+from django.contrib.messages.storage.fallback import FallbackStorage
+from django.contrib.sessions.middleware import SessionMiddleware
+from django.test import RequestFactory
+from django.urls import reverse_lazy
+
from opentech.apply.activity.models import Activity
from opentech.apply.determinations.models import ACCEPTED, REJECTED
+from opentech.apply.determinations.views import BatchDeterminationCreateView
from opentech.apply.users.tests.factories import StaffFactory, UserFactory
+from opentech.apply.funds.models import ApplicationSubmission
from opentech.apply.funds.tests.factories import ApplicationSubmissionFactory
from opentech.apply.utils.testing import BaseViewTestCase
@@ -123,6 +132,15 @@ class BatchDeterminationTestCase(BaseViewTestCase):
url_name = 'funds:submissions:determinations:{}'
base_view_name = 'batch'
+ def dummy_request(self, path):
+ request = RequestFactory().get(path)
+ middleware = SessionMiddleware()
+ middleware.process_request(request)
+ request.session.save()
+ request.user = StaffFactory()
+ request._messages = FallbackStorage(request)
+ return request
+
def test_cant_access_without_submissions(self):
url = self.url(None) + '?action=rejected'
response = self.client.get(url, follow=True, secure=True)
@@ -157,6 +175,32 @@ class BatchDeterminationTestCase(BaseViewTestCase):
self.assertRedirects(response, self.url_from_pattern('apply:submissions:list'))
+ def test_sets_next_on_redirect(self):
+ test_path = '/a/path/?with=query&a=sting'
+ request = RequestFactory().get('', PATH_INFO=test_path)
+ redirect = BatchDeterminationCreateView.should_redirect(
+ request,
+ ApplicationSubmission.objects.none(),
+ ['rejected'],
+ )
+ url = urllib.parse.urlparse(redirect.url)
+ query = urllib.parse.parse_qs(url.query)
+ next_path = urllib.parse.unquote_plus(query['next'][0])
+ self.assertEqual(next_path, test_path)
+
+ def test_success_redirects_if_exists(self):
+ test_path = '/a/path/?with=query&a=sting'
+ view = BatchDeterminationCreateView()
+ view.request = self.dummy_request('?next=' + urllib.parse.quote_plus(test_path))
+ redirect_url = view.get_success_url()
+ self.assertEqual(redirect_url, test_path)
+
+ def test_success_if_no_next(self):
+ view = BatchDeterminationCreateView()
+ view.request = self.dummy_request('')
+ redirect_url = view.get_success_url()
+ self.assertEqual(redirect_url, reverse_lazy('apply:submissions:list'))
+
def test_message_created_if_determination_exists(self):
submissions = ApplicationSubmissionFactory.create_batch(2)
diff --git a/opentech/apply/determinations/views.py b/opentech/apply/determinations/views.py
index ea1e37af51ba01a29cde3fc82da498f0015dfbdf..a5e65f32d0d16335708f4c0cd52d278dfaf6280a 100644
--- a/opentech/apply/determinations/views.py
+++ b/opentech/apply/determinations/views.py
@@ -1,9 +1,12 @@
+from urllib import parse
+
from django.contrib import messages
from django.contrib.auth.decorators import login_required
from django.core.exceptions import PermissionDenied
from django.http import HttpResponseRedirect
from django.shortcuts import get_object_or_404
from django.urls import reverse_lazy
+from django.utils import timezone
from django.utils.decorators import method_decorator
from django.utils.translation import ugettext_lazy as _
from django.views.generic import DetailView, CreateView
@@ -61,6 +64,7 @@ class BatchDeterminationCreateView(CreateView):
if not self.get_action() or not self.get_submissions():
messages.warning(self.request, 'Improperly configured request, please try again.')
return HttpResponseRedirect(self.get_success_url())
+
return super().dispatch(*args, **kwargs)
def get_action(self):
@@ -132,6 +136,7 @@ class BatchDeterminationCreateView(CreateView):
# We keep a record of the message sent to the user in the comment
Activity.comments.create(
message=determination.stripped_message,
+ timestamp=timezone.now(),
user=self.request.user,
submission=submission,
related_object=determination,
@@ -162,13 +167,17 @@ class BatchDeterminationCreateView(CreateView):
return HttpResponseRedirect(
reverse_lazy('apply:submissions:determinations:batch') +
"?action=" + action +
- "&submissions=" + ','.join([str(submission.id) for submission in submissions])
+ "&submissions=" + ','.join([str(submission.id) for submission in submissions]) +
+ "&next=" + parse.quote_plus(request.get_full_path()),
)
elif set(actions) != non_determine_states:
raise ValueError('Inconsistent states provided - please talk to an admin')
def get_success_url(self):
- return reverse_lazy('apply:submissions:list')
+ try:
+ return self.request.GET['next']
+ except KeyError:
+ return reverse_lazy('apply:submissions:list')
@method_decorator(staff_required, name='dispatch')
@@ -245,6 +254,7 @@ class DeterminationCreateOrUpdateView(CreateOrUpdateView):
# We keep a record of the message sent to the user in the comment
Activity.comments.create(
message=self.object.stripped_message,
+ timestamp=timezone.now(),
user=self.request.user,
submission=self.submission,
related_object=self.object,
diff --git a/opentech/apply/funds/api_views.py b/opentech/apply/funds/api_views.py
index 9655d246423ba4778cd7541436cde673cd8329b4..55ad0c604a22f7f1ba47435dc14b2d8843c10038 100644
--- a/opentech/apply/funds/api_views.py
+++ b/opentech/apply/funds/api_views.py
@@ -1,6 +1,8 @@
from django.core.exceptions import PermissionDenied as DjangoPermissionDenied
+from django.db import transaction
from django.db.models import Q, Prefetch
-from rest_framework import generics, permissions
+from django.utils import timezone
+from rest_framework import generics, mixins, permissions
from rest_framework.response import Response
from rest_framework.exceptions import (NotFound, PermissionDenied,
ValidationError)
@@ -16,13 +18,14 @@ from .models import ApplicationSubmission, RoundsAndLabs
from .serializers import (
CommentSerializer,
CommentCreateSerializer,
+ CommentEditSerializer,
RoundLabDetailSerializer,
RoundLabSerializer,
SubmissionActionSerializer,
SubmissionListSerializer,
SubmissionDetailSerializer,
)
-from .permissions import IsApplyStaffUser
+from .permissions import IsApplyStaffUser, IsAuthor
from .workflow import PHASES
@@ -54,7 +57,7 @@ class SubmissionsFilter(filters.FilterSet):
class SubmissionList(generics.ListAPIView):
- queryset = ApplicationSubmission.objects.current()
+ queryset = ApplicationSubmission.objects.current().with_latest_update()
serializer_class = SubmissionListSerializer
permission_classes = (
permissions.IsAuthenticated, IsApplyStaffUser,
@@ -146,7 +149,12 @@ class CommentFilter(filters.FilterSet):
class Meta:
model = Activity
- fields = ['submission', 'visibility', 'since', 'before', 'newer']
+ fields = ['visibility', 'since', 'before', 'newer']
+
+
+class AllCommentFilter(CommentFilter):
+ class Meta(CommentFilter.Meta):
+ fields = CommentFilter.Meta.fields + ['submission']
class CommentList(generics.ListAPIView):
@@ -156,7 +164,7 @@ class CommentList(generics.ListAPIView):
permissions.IsAuthenticated, IsApplyStaffUser,
)
filter_backends = (filters.DjangoFilterBackend,)
- filter_class = CommentFilter
+ filter_class = AllCommentFilter
pagination_class = StandardResultsSetPagination
def get_queryset(self):
@@ -164,7 +172,7 @@ class CommentList(generics.ListAPIView):
class CommentListCreate(generics.ListCreateAPIView):
- queryset = Activity.comments.all()
+ queryset = Activity.comments.all().select_related('user')
serializer_class = CommentCreateSerializer
permission_classes = (
permissions.IsAuthenticated, IsApplyStaffUser,
@@ -180,6 +188,7 @@ class CommentListCreate(generics.ListCreateAPIView):
def perform_create(self, serializer):
obj = serializer.save(
+ timestamp=timezone.now(),
type=COMMENT,
user=self.request.user,
submission_id=self.kwargs['pk']
@@ -191,3 +200,38 @@ class CommentListCreate(generics.ListCreateAPIView):
submission=obj.submission,
related=obj,
)
+
+
+class CommentEdit(
+ mixins.RetrieveModelMixin,
+ mixins.CreateModelMixin,
+ generics.GenericAPIView,
+):
+ queryset = Activity.comments.all().select_related('user')
+ serializer_class = CommentEditSerializer
+ permission_classes = (
+ permissions.IsAuthenticated, IsAuthor
+ )
+
+ def post(self, request, *args, **kwargs):
+ return self.edit(request, *args, **kwargs)
+
+ @transaction.atomic
+ def edit(self, request, *args, **kwargs):
+ comment_to_edit = self.get_object()
+ comment_to_update = self.get_object()
+
+ comment_to_edit.previous = comment_to_update
+ comment_to_edit.pk = None
+ comment_to_edit.edited = timezone.now()
+
+ serializer = self.get_serializer(comment_to_edit, data=request.data)
+ serializer.is_valid(raise_exception=True)
+
+ if serializer.validated_data['message'] != comment_to_update.message:
+ self.perform_create(serializer)
+ comment_to_update.current = False
+ comment_to_update.save()
+ return Response(serializer.data)
+
+ return Response(self.get_serializer(comment_to_update).data)
diff --git a/opentech/apply/funds/models/mixins.py b/opentech/apply/funds/models/mixins.py
index 6ca8ac3e050ff521119c9363b663f37fdaababd7..388e238497eb6676d2de8544ecb30afc65446590 100644
--- a/opentech/apply/funds/models/mixins.py
+++ b/opentech/apply/funds/models/mixins.py
@@ -15,7 +15,13 @@ from opentech.apply.stream_forms.files import StreamFieldFile
__all__ = ['AccessFormData']
-submission_storage = get_storage_class(getattr(settings, 'PRIVATE_FILE_STORAGE', None))()
+private_file_storage = getattr(settings, 'PRIVATE_FILE_STORAGE', None)
+submission_storage_class = get_storage_class(private_file_storage)
+
+if private_file_storage:
+ submission_storage = submission_storage_class(is_submission=True)
+else:
+ submission_storage = submission_storage_class()
class UnusedFieldException(Exception):
diff --git a/opentech/apply/funds/models/submissions.py b/opentech/apply/funds/models/submissions.py
index 2906ce528132046be8dbb01b5f60500fc6bc30de..87d634b371a58f4c774f8f18ec57d755db2b6970 100644
--- a/opentech/apply/funds/models/submissions.py
+++ b/opentech/apply/funds/models/submissions.py
@@ -125,9 +125,16 @@ class ApplicationSubmissionQueryset(JSONOrderable):
# Applications which have the current stage active (have not been progressed)
return self.exclude(next__isnull=False)
- def for_table(self, user):
+ def with_latest_update(self):
activities = self.model.activities.field.model
latest_activity = activities.objects.filter(submission=OuterRef('id')).select_related('user')
+ return self.annotate(
+ last_user_update=Subquery(latest_activity[:1].values('user__full_name')),
+ last_update=Subquery(latest_activity.values('timestamp')[:1]),
+ )
+
+ def for_table(self, user):
+ activities = self.model.activities.field.model
comments = activities.comments.filter(submission=OuterRef('id')).visible_to(user)
roles_for_review = self.model.assigned.field.model.objects.with_roles().filter(
submission=OuterRef('id'), reviewer=user)
@@ -137,9 +144,7 @@ class ApplicationSubmissionQueryset(JSONOrderable):
opinions = review_model.opinions.field.model.objects.filter(review__submission=OuterRef('id'))
reviewers = self.model.assigned.field.model.objects.filter(submission=OuterRef('id'))
- return self.annotate(
- last_user_update=Subquery(latest_activity[:1].values('user__full_name')),
- last_update=Subquery(latest_activity.values('timestamp')[:1]),
+ return self.with_latest_update().annotate(
comment_count=Coalesce(
Subquery(
comments.values('submission').order_by().annotate(count=Count('pk')).values('count'),
diff --git a/opentech/apply/funds/permissions.py b/opentech/apply/funds/permissions.py
index ec6f22f83b78b3476cf267333a68149c7c32e0df..594fb0fca9ce919c6af52d570e161bee94696f99 100644
--- a/opentech/apply/funds/permissions.py
+++ b/opentech/apply/funds/permissions.py
@@ -1,6 +1,11 @@
from rest_framework import permissions
+class IsAuthor(permissions.BasePermission):
+ def has_object_permission(self, request, view, obj):
+ return obj.user == request.user
+
+
class IsApplyStaffUser(permissions.BasePermission):
"""
Custom permission to only allow OTF Staff or higher
@@ -11,3 +16,21 @@ class IsApplyStaffUser(permissions.BasePermission):
def has_object_permission(self, request, view, obj):
return request.user.is_apply_staff
+
+
+def is_user_has_access_to_view_submission(user, submission):
+ has_access = False
+
+ if not user.is_authenticated:
+ pass
+
+ elif user.is_apply_staff or submission.user == user or user.is_reviewer:
+ has_access = True
+
+ elif user.is_partner and submission.partners.filter(pk=user.pk).exists():
+ has_access = True
+
+ elif user.is_community_reviewer and submission.community_review:
+ has_access = True
+
+ return has_access
diff --git a/opentech/apply/funds/serializers.py b/opentech/apply/funds/serializers.py
index e65d40d5ef1daa0cc84dc2f6b557c176bbd8bf7b..54478823b417cab8b1a3c054b7fac2f6a3d0a0a7 100644
--- a/opentech/apply/funds/serializers.py
+++ b/opentech/apply/funds/serializers.py
@@ -106,13 +106,19 @@ class ReviewSummarySerializer(serializers.Serializer):
return response
+class TimestampField(serializers.Field):
+ def to_representation(self, value):
+ return value.timestamp() * 1000
+
+
class SubmissionListSerializer(serializers.ModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='funds:api:submissions:detail')
round = serializers.SerializerMethodField()
+ last_update = TimestampField()
class Meta:
model = ApplicationSubmission
- fields = ('id', 'title', 'status', 'url', 'round')
+ fields = ('id', 'title', 'status', 'url', 'round', 'last_update')
def get_round(self, obj):
"""
@@ -195,18 +201,37 @@ class RoundLabSerializer(serializers.ModelSerializer):
class CommentSerializer(serializers.ModelSerializer):
user = serializers.StringRelatedField()
message = serializers.SerializerMethodField()
+ edit_url = serializers.HyperlinkedIdentityField(view_name='funds:api:comments:edit')
+ editable = serializers.SerializerMethodField()
+ timestamp = TimestampField(read_only=True)
+ edited = TimestampField(read_only=True)
class Meta:
model = Activity
- fields = ('id', 'timestamp', 'user', 'submission', 'message', 'visibility')
+ fields = ('id', 'timestamp', 'user', 'submission', 'message', 'visibility', 'edited', 'edit_url', 'editable')
def get_message(self, obj):
return bleach_value(markdown(obj.message))
+ def get_editable(self, obj):
+ return self.context['request'].user == obj.user
+
class CommentCreateSerializer(serializers.ModelSerializer):
user = serializers.StringRelatedField()
+ edit_url = serializers.HyperlinkedIdentityField(view_name='funds:api:comments:edit')
+ editable = serializers.SerializerMethodField()
+ timestamp = TimestampField(read_only=True)
+ edited = TimestampField(read_only=True)
class Meta:
model = Activity
- fields = ('id', 'timestamp', 'user', 'message', 'visibility')
+ fields = ('id', 'timestamp', 'user', 'message', 'visibility', 'edited', 'edit_url', 'editable')
+
+ def get_editable(self, obj):
+ return self.context['request'].user == obj.user
+
+
+class CommentEditSerializer(CommentCreateSerializer):
+ class Meta(CommentCreateSerializer.Meta):
+ read_only_fields = ('timestamp', 'visibility', 'edited',)
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
index a81322aeaeb9fc2aba792ba3ef39b0ba8f0f6250..f11f7ecc09a5008f4fba8e037a421ea026cdb833 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_admin_detail.html
@@ -47,6 +47,7 @@
{{ comment_form.media.js }}
{{ partner_form.media.js }}
<script src="//cdnjs.cloudflare.com/ajax/libs/fancybox/3.4.1/jquery.fancybox.min.js"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-cookie/1.4.1/jquery.cookie.min.js"></script>
<script src="{% static 'js/apply/fancybox-global.js' %}"></script>
<script src="{% static 'js/apply/tabs.js' %}"></script>
<script src="{% static 'js/apply/toggle-actions-panel.js' %}"></script>
@@ -54,4 +55,5 @@
<script src="{% static 'js/apply/toggle-sidebar.js' %}"></script>
<script src="{% static 'js/apply/submission-text-cleanup.js' %}"></script>
<script src="{% static 'js/apply/toggle-related.js' %}"></script>
+ <script src="{% static 'js/apply/edit-comment.js' %}"></script>
{% endblock %}
diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
index b41916ddd77c87e053f51834173a7f16b15fe72c..0326bfbdfdcf20dceb7f9319c19c33d666d53e12 100644
--- a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
+++ b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html
@@ -141,7 +141,7 @@
<div class="tabs__content" id="tab-2">
<div class="feed">
{% include "activity/include/comment_form.html" %}
- {% include "activity/include/comment_list.html" %}
+ {% include "activity/include/comment_list.html" with editable=True %}
</div>
</div>
diff --git a/opentech/apply/funds/templates/funds/includes/activity-feed.html b/opentech/apply/funds/templates/funds/includes/activity-feed.html
index 0a3595a6d1765fd7ab028c1bc83200a646f45054..37117315ccd58c1fb4b4da12cd87404d99020698 100644
--- a/opentech/apply/funds/templates/funds/includes/activity-feed.html
+++ b/opentech/apply/funds/templates/funds/includes/activity-feed.html
@@ -15,7 +15,7 @@
<div class="wrapper wrapper--medium wrapper--activity-feed js-tabs-content">
<div class="tabs__content tabs__content--current" id="tab-1">
- {% include "activity/include/comment_list.html" with submission_title=True %}
+ {% include "activity/include/comment_list.html" with submission_title=True editable=False %}
</div>
<div class="tabs__content" id="tab-2">
diff --git a/opentech/apply/funds/templatetags/markdown_tags.py b/opentech/apply/funds/templatetags/markdown_tags.py
index 9ba5ff19dc0828092dcfab40fdcd9ab6876f7b58..bddae4d8a14e7e8c522967c64fd4eafa261e78a7 100644
--- a/opentech/apply/funds/templatetags/markdown_tags.py
+++ b/opentech/apply/funds/templatetags/markdown_tags.py
@@ -1,11 +1,21 @@
import mistune
+import tomd
from django import template
register = template.Library()
+mistune_markdown = mistune.Markdown()
+
@register.filter
def markdown(value):
- markdown = mistune.Markdown()
- return markdown(value)
+ return mistune_markdown(value)
+
+
+@register.filter
+def to_markdown(value):
+ # pass through markdown to ensure comment is a
+ # fully formed HTML block
+ value = markdown(value)
+ return tomd.convert(value)
diff --git a/opentech/apply/funds/tests/test_api_views.py b/opentech/apply/funds/tests/test_api_views.py
new file mode 100644
index 0000000000000000000000000000000000000000..4ef221274adda7686e582b076aa72fea6eb686f8
--- /dev/null
+++ b/opentech/apply/funds/tests/test_api_views.py
@@ -0,0 +1,86 @@
+from django.test import TestCase, override_settings
+from django.urls import reverse_lazy
+
+from opentech.apply.activity.models import Activity, PUBLIC, PRIVATE
+from opentech.apply.activity.tests.factories import CommentFactory
+
+from opentech.apply.users.tests.factories import UserFactory
+
+
+@override_settings(ROOT_URLCONF='opentech.apply.urls')
+class TestCommentEdit(TestCase):
+ def post_to_edit(self, comment_pk, message='my message'):
+ return self.client.post(
+ reverse_lazy('funds:api:comments:edit', kwargs={'pk': comment_pk}),
+ secure=True,
+ data={'message': message},
+ )
+
+ def test_cant_edit_if_not_author(self):
+ comment = CommentFactory()
+ response = self.post_to_edit(comment.pk)
+ self.assertEqual(response.status_code, 403)
+
+ def test_edit_updates_correctly(self):
+ user = UserFactory()
+ comment = CommentFactory(user=user)
+ self.client.force_login(user)
+
+ new_message = 'hi there'
+
+ response = self.post_to_edit(comment.pk, new_message)
+
+ self.assertEqual(response.status_code, 200, response.json())
+ self.assertEqual(Activity.objects.count(), 2)
+
+ comment.refresh_from_db()
+
+ time = comment.timestamp.timestamp() * 1000
+
+ self.assertEqual(time, response.json()['timestamp'])
+ self.assertFalse(comment.current)
+ self.assertEqual(response.json()['message'], new_message)
+
+ def test_incorrect_id_denied(self):
+ response = self.post_to_edit(10000)
+ self.assertEqual(response.status_code, 403, response.json())
+
+ def test_does_nothing_if_same_message(self):
+ user = UserFactory()
+ comment = CommentFactory(user=user)
+ self.client.force_login(user)
+
+ self.post_to_edit(comment.pk, comment.message)
+ self.assertEqual(Activity.objects.count(), 1)
+
+ def test_cant_change_visibility(self):
+ user = UserFactory()
+ comment = CommentFactory(user=user, visibility=PRIVATE)
+ self.client.force_login(user)
+
+ response = self.client.post(
+ reverse_lazy('funds:api:comments:edit', kwargs={'pk': comment.pk}),
+ secure=True,
+ data={
+ 'message': 'the new message',
+ 'visibility': PUBLIC,
+ },
+ )
+
+ self.assertEqual(response.status_code, 200, response.json())
+ self.assertEqual(response.json()['visibility'], PRIVATE)
+
+ def test_out_of_order_does_nothing(self):
+ user = UserFactory()
+ comment = CommentFactory(user=user)
+ self.client.force_login(user)
+
+ new_message = 'hi there'
+ newer_message = 'hello there'
+
+ response_one = self.post_to_edit(comment.pk, new_message)
+ response_two = self.post_to_edit(comment.pk, newer_message)
+
+ self.assertEqual(response_one.status_code, 200, response_one.json())
+ self.assertEqual(response_two.status_code, 404, response_two.json())
+ self.assertEqual(Activity.objects.count(), 2)
diff --git a/opentech/apply/funds/urls.py b/opentech/apply/funds/urls.py
index 72b29d3b792b1860a57f56c853a6e9e896f0c0dc..dd75bcd4a84bc64ab50dff8c52f85ed9ae0a0155 100644
--- a/opentech/apply/funds/urls.py
+++ b/opentech/apply/funds/urls.py
@@ -12,8 +12,10 @@ from .views import (
SubmissionOverviewView,
SubmissionSealedView,
SubmissionDeleteView,
+ SubmissionPrivateMediaRedirectView,
)
from .api_views import (
+ CommentEdit,
CommentList,
CommentListCreate,
RoundLabDetail,
@@ -35,6 +37,10 @@ app_name = 'funds'
submission_urls = ([
path('', SubmissionOverviewView.as_view(), name="overview"),
path('all/', SubmissionListView.as_view(), name="list"),
+ path(
+ 'documents/submission/<int:submission_id>/<uuid:field_id>/<str:file_name>/',
+ SubmissionPrivateMediaRedirectView.as_view(), name='private_media_redirect'
+ ),
path('<int:pk>/', include([
path('', SubmissionDetailView.as_view(), name="detail"),
path('edit/', SubmissionEditView.as_view(), name="edit"),
@@ -62,6 +68,7 @@ api_urls = ([
], 'rounds'))),
path('comments/', include(([
path('', CommentList.as_view(), name='list'),
+ path('<int:pk>/edit/', CommentEdit.as_view(), name='edit'),
], 'comments')))
], 'api')
diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py
index 5308232895c4f24bda6f10eabaac58b7397fe2e3..135988c9cc3ec3bb77221f58b9d21b016a276c01 100644
--- a/opentech/apply/funds/views.py
+++ b/opentech/apply/funds/views.py
@@ -1,8 +1,12 @@
from copy import copy
+from django.conf import settings
from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.auth.mixins import UserPassesTestMixin
+from django.contrib.auth.views import redirect_to_login
from django.contrib import messages
from django.core.exceptions import PermissionDenied
+from django.core.files.storage import get_storage_class
from django.db.models import Count, F, Q
from django.http import HttpResponseRedirect, Http404
from django.shortcuts import get_object_or_404
@@ -10,7 +14,7 @@ from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
from django.utils.text import mark_safe
from django.utils.translation import ugettext_lazy as _
-from django.views.generic import DetailView, FormView, ListView, UpdateView, DeleteView
+from django.views.generic import DetailView, FormView, ListView, UpdateView, DeleteView, RedirectView
from django_filters.views import FilterView
from django_tables2.views import SingleTableMixin
@@ -56,6 +60,9 @@ from .tables import (
SummarySubmissionsTable,
)
from .workflow import STAGE_CHANGE_ACTIONS, PHASES_MAPPING, review_statuses
+from .permissions import is_user_has_access_to_view_submission
+
+submission_storage = get_storage_class(getattr(settings, 'PRIVATE_FILE_STORAGE', None))()
class BaseAdminSubmissionsTable(SingleTableMixin, FilterView):
@@ -427,6 +434,16 @@ class UpdatePartnersView(DelegatedViewMixin, UpdateView):
added=added,
removed=removed,
)
+
+ messenger(
+ MESSAGES.PARTNERS_UPDATED_PARTNER,
+ request=self.request,
+ user=self.request.user,
+ submission=self.kwargs['submission'],
+ added=added,
+ removed=removed,
+ )
+
return response
@@ -812,3 +829,30 @@ class SubmissionDeleteView(DeleteView):
)
response = super().delete(request, *args, **kwargs)
return response
+
+
+class SubmissionPrivateMediaRedirectView(UserPassesTestMixin, RedirectView):
+
+ def get_redirect_url(self, *args, **kwargs):
+ submission_id = kwargs['submission_id']
+ field_id = kwargs['field_id']
+ file_name = kwargs['file_name']
+ file_name_with_path = f'submission/{submission_id}/{field_id}/{file_name}'
+
+ return submission_storage.url(file_name_with_path)
+
+ def test_func(self):
+ submission_id = self.kwargs['submission_id']
+ submission = get_object_or_404(ApplicationSubmission, id=submission_id)
+
+ return is_user_has_access_to_view_submission(self.request.user, submission)
+
+ def handle_no_permission(self):
+ # This method can be removed after upgrading Django to 2.1
+ # https://github.com/django/django/commit/9b1125bfc7e2dc747128e6e7e8a2259ff1a7d39f
+ # In older versions, authenticated users who lacked permissions were
+ # redirected to the login page (which resulted in a loop) instead of
+ # receiving an HTTP 403 Forbidden response.
+ if self.raise_exception or self.request.user.is_authenticated:
+ raise PermissionDenied(self.get_permission_denied_message())
+ return redirect_to_login(self.request.get_full_path(), self.get_login_url(), self.get_redirect_field_name())
diff --git a/opentech/apply/review/views.py b/opentech/apply/review/views.py
index 41714cd1ffd87797eef8e596737bcefa8187b385..c31a7b7001664ef8c2256f28ea184ff6c12972c1 100644
--- a/opentech/apply/review/views.py
+++ b/opentech/apply/review/views.py
@@ -190,6 +190,7 @@ class ReviewOpinionFormView(UserPassesTestMixin, CreateView):
template_name = 'review/review_detail.html'
form_class = ReviewOpinionForm
model = Review
+ raise_exception = True
def get_form_kwargs(self):
self.object = self.get_object()
diff --git a/opentech/apply/stream_forms/templates/stream_forms/includes/file_field.html b/opentech/apply/stream_forms/templates/stream_forms/includes/file_field.html
index 0541f087f29b4478aba5d512214bb0f9c2bb09db..79079bf273865a73c7c4068ba026420ada3a9a8e 100644
--- a/opentech/apply/stream_forms/templates/stream_forms/includes/file_field.html
+++ b/opentech/apply/stream_forms/templates/stream_forms/includes/file_field.html
@@ -1,4 +1,4 @@
-<a class="link link--download" href="{{ file.url }}">
+<a class="link link--download" href="{{ file.url }}" target="_blank">
<div>
<svg><use xlink:href="#file"></use></svg>
<span>{{ file.filename }}</span>
diff --git a/opentech/apply/urls.py b/opentech/apply/urls.py
index deb32700492d24ef9fe3db8d49680f0241fcb757..6138117fab04d25e24a59884ba270f81a3b7f2ec 100644
--- a/opentech/apply/urls.py
+++ b/opentech/apply/urls.py
@@ -1,6 +1,8 @@
from django.conf import settings
from django.urls import include, path
+from two_factor.urls import urlpatterns as tf_urls
+
from .utils import views
from .users import urls as users_urls
from .dashboard import urls as dashboard_urls
@@ -14,6 +16,7 @@ urlpatterns = [
path('', include(users_urls)),
path('dashboard/', include(dashboard_urls)),
path('hijack/', include('hijack.urls', 'hijack')),
+ path('', include(tf_urls, 'two_factor')),
]
if settings.DEBUG:
diff --git a/opentech/apply/users/templates/two_factor/_base.html b/opentech/apply/users/templates/two_factor/_base.html
new file mode 100644
index 0000000000000000000000000000000000000000..dba38b69559ddce0e130d93f37dc4717390e801d
--- /dev/null
+++ b/opentech/apply/users/templates/two_factor/_base.html
@@ -0,0 +1,7 @@
+{% extends 'base-apply.html' %}
+
+{% block content_wrapper %}
+ <div class="wrapper wrapper--small wrapper--inner-space-medium">
+ {% block content %}{% endblock %}
+ </div>
+{% endblock %}
diff --git a/opentech/apply/users/templates/two_factor/_base_focus.html b/opentech/apply/users/templates/two_factor/_base_focus.html
new file mode 100644
index 0000000000000000000000000000000000000000..86888aedb30617d625d0718f7f1f91000f438c87
--- /dev/null
+++ b/opentech/apply/users/templates/two_factor/_base_focus.html
@@ -0,0 +1,17 @@
+{% extends "two_factor/_base.html" %}
+
+{% block content_wrapper %}
+ <div class="admin-bar">
+ <div class="admin-bar__inner admin-bar__inner--with-button">
+ <h3 class="admin-bar__heading">Welcome {{ user }}</h3>
+ <a href="{% url 'dashboard:dashboard' %}" class="button button--primary button--arrow-pixels-white">
+ Go to dashboard
+ <svg><use xlink:href="#arrow-head-pixels--solid"></use></svg>
+ </a>
+ </div>
+ </div>
+
+ <div class="wrapper wrapper--small wrapper--inner-space-medium">
+ {% block content %}{% endblock %}
+ </div>
+{% endblock %}
diff --git a/opentech/apply/users/templates/two_factor/_wizard_actions.html b/opentech/apply/users/templates/two_factor/_wizard_actions.html
new file mode 100644
index 0000000000000000000000000000000000000000..cd01d7d849245b50d3f784cb8ae88ad2cb099b64
--- /dev/null
+++ b/opentech/apply/users/templates/two_factor/_wizard_actions.html
@@ -0,0 +1,17 @@
+{% load i18n %}
+
+{% if wizard.steps.prev %}
+ <button name="wizard_goto_step" type="submit"
+ value="{{ wizard.steps.prev }}"
+ class="button button--primary">{% trans "Back" %}</button>
+{% else %}
+ <button disabled name="" type="button"
+ class="button button--primary">{% trans "Back" %}</button>
+{% endif %}
+
+<button type="submit" class="button button--primary">{% trans "Next" %}</button>
+
+{% if cancel_url %}
+ <a href="{% url 'users:account' %}"
+ class="link link--bold link--left-space">{% trans "Cancel" %}</a>
+{% endif %}
diff --git a/opentech/apply/users/templates/users/account.html b/opentech/apply/users/templates/users/account.html
index 6156b72af9b21fcf4911d151201ffd5c8a16cf0b..225527bae2a77e6eedc6b275445871af74ac6403 100644
--- a/opentech/apply/users/templates/users/account.html
+++ b/opentech/apply/users/templates/users/account.html
@@ -29,7 +29,10 @@
{% if show_change_password and user.has_usable_password and not backends.associated %}
<div class="profile__column">
<h3>Change password</h3>
- <a class="button button--primary" href="{% url 'users:password_change' %}">{% trans "Update password" %}</a>
+ <p><a class="button button--primary" href="{% url 'users:password_change' %}">{% trans "Update password" %}</a></p>
+
+ <h3>Account Security</h3>
+ <p><a class="link link--button link--button--narrow" href="{% url 'two_factor:profile' %}">Two-factor authentication settings</a></p>
</div>
{% endif %}
diff --git a/opentech/apply/users/templates/users/login.html b/opentech/apply/users/templates/users/login.html
index 73d84763c32356982ca9135d8ca691e1523a701b..201f54e6dbd69dacdac9a097b83ea3308d3a91d5 100644
--- a/opentech/apply/users/templates/users/login.html
+++ b/opentech/apply/users/templates/users/login.html
@@ -1,19 +1,73 @@
{% extends 'base.html' %}
+{% load i18n two_factor %}
+
{% block header_modifier %}header--light-bg{% endblock %}
{% block page_title %}Login{% endblock %}
{% block title %}Login{% endblock %}
{% block content %}
<div class="wrapper wrapper--small">
+ {% if wizard.steps.current == 'auth' %}
+ <p>{% blocktrans %}Enter your credentials.{% endblocktrans %}</p>
+ {% elif wizard.steps.current == 'token' %}
+ {% if device.method == 'call' %}
+ <p>{% blocktrans %}We are calling your phone right now, please enter the
+ digits you hear.{% endblocktrans %}</p>
+ {% elif device.method == 'sms' %}
+ <p>{% blocktrans %}We sent you a text message, please enter the tokens we
+ sent.{% endblocktrans %}</p>
+ {% else %}
+ <p>{% blocktrans %}Please enter the tokens generated by your token
+ generator.{% endblocktrans %}</p>
+ {% endif %}
+ {% elif wizard.steps.current == 'backup' %}
+ <p>{% blocktrans %}Use this form for entering backup tokens for logging in.
+ These tokens have been generated for you to print and keep safe. Please
+ enter one of these backup tokens to login to your account.{% endblocktrans %}</p>
+ {% endif %}
+
<form class="form form--with-p-tags" method="post">
{% csrf_token %}
- {{ form.as_p }}
- <p><a class="link link--small" href="{% url 'users:password_reset' %}">Forgot your password?</a></p>
- <button class="link link--button-secondary" type="submit">Login</button>
+ {{ wizard.management_form }}
+
+ {% if wizard.steps.current == 'auth' %}
+ {{ form.as_p }}
+ <p><a class="link link--small" href="{% url 'users:password_reset' %}">Forgot your password?</a></p>
+ <button class="link link--button-secondary" type="submit">Login</button>
+ {% else %}
+ {{ wizard.form }}
+
+ {# hidden submit button to enable [enter] key #}
+ <div style="margin-left: -9999px"><input type="submit" value=""/></div>
+
+ {% if other_devices %}
+ <p>{% trans "Or, alternatively, use one of your backup phones:" %}</p>
+ <p>
+ {% for other in other_devices %}
+ <button name="challenge_device" value="{{ other.persistent_id }}"
+ class="btn btn-default btn-block" type="submit">
+ {{ other|device_action }}
+ </button>
+ {% endfor %}</p>
+ {% endif %}
+ {% if backup_tokens %}
+ <p>{% trans "As a last resort, you can use a backup token:" %}</p>
+ <p>
+ <button name="wizard_goto_step" type="submit" value="backup"
+ class="btn btn-default btn-block">{% trans "Use Backup Token" %}</button>
+ </p>
+ {% endif %}
+
+ <div class="wrapper wrapper--inner-space-large">
+ {% include "two_factor/_wizard_actions.html" %}
+ </div>
+ {% endif %}
</form>
- <div class="wrapper wrapper--inner-space-large">
- <a class="link link--button link--button-long-text" href="{% url "social:begin" "google-oauth2" %}{% if next %}?next={{ next }}{% endif %}">Log in with your OTF email</a>
- </div>
+ {% if wizard.steps.current == 'auth' %}
+ <div class="wrapper wrapper--inner-space-large">
+ <a class="link link--button link--button-long-text" href="{% url "social:begin" "google-oauth2" %}{% if next %}?next={{ next }}{% endif %}">Log in with your OTF email</a>
+ </div>
+ {% endif %}
</div>
{% endblock %}
diff --git a/opentech/apply/users/urls.py b/opentech/apply/users/urls.py
index 02e7899ca76bf89522a1b0f4d7c153033b404fcf..1d8d6f8317a337e638b4337cb320fd392e4d251e 100644
--- a/opentech/apply/users/urls.py
+++ b/opentech/apply/users/urls.py
@@ -2,7 +2,7 @@ from django.urls import path, include
from django.contrib.auth import views as auth_views
from django.urls import reverse_lazy
-from opentech.apply.users.views import AccountView, become, oauth, ActivationView, create_password
+from opentech.apply.users.views import LoginView, AccountView, become, oauth, ActivationView, create_password
app_name = 'users'
@@ -11,7 +11,7 @@ app_name = 'users'
public_urlpatterns = [
path(
'login/',
- auth_views.LoginView.as_view(
+ LoginView.as_view(
template_name='users/login.html',
redirect_authenticated_user=True
),
@@ -73,5 +73,5 @@ urlpatterns = [
),
path('activate/', create_password, name="activate_password"),
path('oauth', oauth, name='oauth'),
- ]))
+ ])),
]
diff --git a/opentech/apply/users/views.py b/opentech/apply/users/views.py
index ceca9196149ad369b92fe464834893edf2294c51..886da6469e24a8fcf6ee8209c952c2169e45dc18 100644
--- a/opentech/apply/users/views.py
+++ b/opentech/apply/users/views.py
@@ -1,19 +1,26 @@
+from django.conf import settings
from django.contrib import messages
from django.contrib.auth import get_user_model, login, update_session_auth_hash
from django.contrib.auth.decorators import login_required
from django.contrib.auth.forms import AdminPasswordChangeForm
from django.contrib.auth.tokens import PasswordResetTokenGenerator
from django.contrib.auth.models import BaseUserManager
-from django.shortcuts import redirect, render
+from django.contrib.auth.views import SuccessURLAllowedHostsMixin
+from django.http import HttpResponseRedirect
+from django.shortcuts import redirect, render, resolve_url
from django.template.response import TemplateResponse
from django.urls import reverse_lazy
from django.utils.decorators import method_decorator
from django.utils.encoding import force_text
-from django.utils.http import urlsafe_base64_decode
+from django.utils.http import is_safe_url, urlsafe_base64_decode
+from django.views.decorators.cache import never_cache
+from django.views.decorators.csrf import csrf_protect
+from django.views.decorators.debug import sensitive_post_parameters
from django.views.generic import UpdateView
from django.views.generic.base import TemplateView
from hijack.views import login_with_id
+from two_factor.views import LoginView as TwoFactorLoginView
from wagtail.admin.views.account import password_management_enabled
@@ -24,6 +31,41 @@ from .forms import BecomeUserForm, ProfileForm
User = get_user_model()
+class LoginView(SuccessURLAllowedHostsMixin, TwoFactorLoginView):
+ redirect_authenticated_user = False
+
+ @method_decorator(sensitive_post_parameters())
+ @method_decorator(csrf_protect)
+ @method_decorator(never_cache)
+ def dispatch(self, request, *args, **kwargs):
+ if self.redirect_authenticated_user and self.request.user.is_authenticated:
+ redirect_to = self.get_success_url()
+ if redirect_to == self.request.path:
+ raise ValueError(
+ "Redirection loop for authenticated user detected. Check that "
+ "your LOGIN_REDIRECT_URL doesn't point to a login page."
+ )
+ return HttpResponseRedirect(redirect_to)
+ return super().dispatch(request, *args, **kwargs)
+
+ def get_success_url(self):
+ url = self.get_redirect_url()
+ return url or resolve_url(settings.LOGIN_REDIRECT_URL)
+
+ def get_redirect_url(self):
+ """Return the user-originating redirect URL if it's safe."""
+ redirect_to = self.request.POST.get(
+ self.redirect_field_name,
+ self.request.GET.get(self.redirect_field_name, '')
+ )
+ url_is_safe = is_safe_url(
+ url=redirect_to,
+ allowed_hosts=self.get_success_url_allowed_hosts(),
+ require_https=self.request.is_secure(),
+ )
+ return redirect_to if url_is_safe else ''
+
+
@method_decorator(login_required, name='dispatch')
class AccountView(UpdateView):
form_class = ProfileForm
diff --git a/opentech/public/funds/templates/public_funds/includes/project_listing.html b/opentech/public/funds/templates/public_funds/includes/project_listing.html
index cdf06d082455691d1258a4a7ffe61fba84f1394d..f7ad0f4ee87df7fbf5654cbfca91017e2c7db997 100644
--- a/opentech/public/funds/templates/public_funds/includes/project_listing.html
+++ b/opentech/public/funds/templates/public_funds/includes/project_listing.html
@@ -1,12 +1,12 @@
{% load wagtailcore_tags wagtailimages_tags %}
<a class="media-box {{ class }}" href="{% pageurl project %}">
- {% image project.icon max-210x235 as project_icon %}
+ {% image project.icon max-210x210 as project_icon %}
{% include "utils/includes/media_box_icon.html" with page_icon=project_icon listing=True %}
<div class="media-box__content">
<h4>{{ project.title }}</h4>
{% if project.listing_summary or project.introduction %}
- <h5 class="media-box__teaser">{{ project.listing_summary|default:project.introduction|truncatechars_html:160 }}</h5>
+ <p class="media-box__teaser">{{ project.listing_summary|default:project.introduction|truncatechars_html:160 }}</p>
{% endif %}
</div>
</a>
diff --git a/opentech/public/funds/templates/public_funds/includes/reviewer_listing.html b/opentech/public/funds/templates/public_funds/includes/reviewer_listing.html
index 1d439aedafe1992f6edf647b0d0e392904bec059..2137b22e826fbf0f44690dabfe1235b8c72f945a 100644
--- a/opentech/public/funds/templates/public_funds/includes/reviewer_listing.html
+++ b/opentech/public/funds/templates/public_funds/includes/reviewer_listing.html
@@ -1,6 +1,6 @@
{% load wagtailcore_tags wagtailimages_tags %}
<a class="media-box {{ class }}" href="{% pageurl person %}">
- {% image person.photo max-210x235 as person_photo %}
+ {% image person.photo fill-210x210 as person_photo %}
{% include "utils/includes/media_box_icon.html" with page_icon=person_photo listing=True %}
<div class="media-box__content">
diff --git a/opentech/public/projects/models.py b/opentech/public/projects/models.py
index 3f4c6e998123a0d53ddf7085dc4d09c97f6e339a..38e8828d7994c281928663f6032bda8183524f7e 100644
--- a/opentech/public/projects/models.py
+++ b/opentech/public/projects/models.py
@@ -165,7 +165,7 @@ class ProjectIndexPage(BasePage):
def get_context(self, request, *args, **kwargs):
context = super().get_context(request, *args, **kwargs)
- subpages = ProjectPage.objects.descendant_of(self).live().public().select_related('icon')
+ subpages = ProjectPage.objects.descendant_of(self).live().public().select_related('icon').order_by('-first_published_at')
per_page = settings.DEFAULT_PER_PAGE
page_number = request.GET.get('page')
paginator = Paginator(subpages, per_page)
diff --git a/opentech/public/utils/templates/utils/includes/media_box_icon.html b/opentech/public/utils/templates/utils/includes/media_box_icon.html
index 535b850ceb031f619bb1d5a2cc875136215e34c6..3e5f1ba8a876203f196f3ef260e38690cca16801 100644
--- a/opentech/public/utils/templates/utils/includes/media_box_icon.html
+++ b/opentech/public/utils/templates/utils/includes/media_box_icon.html
@@ -1,15 +1,15 @@
{% load wagtailimages_tags %}
-{% image page.icon max-210x235 as page_icon %}
+{% image page.icon max-210x210 as page_icon %}
{% if page_icon %}
- <div class="media-box__image-container" style="background-image:url('{{ page_icon.url }}')">
- <img class="media-box__image media-box__image--small" src="{{ page_icon.url }}" alt="{{ page_icon.alt }}">
+ <div class="media-box__image-container">
+ <img class="media-box__image" src="{{ page_icon.url }}" alt="{{ page_icon.alt }}">
</div>
{% else %}
{% if listing %}
<div class="media-box__image-container">
{% endif %}
- <div class="media-box__default-image {% if listing %}media-box__image media-box__image--small media-box__default-image--small{% endif %}">
+ <div class="media-box__default-image {% if listing %}media-box__image{% endif %}">
<svg><use xlink:href="#logo-mobile-no-text"></use></svg>
</div>
{% if listing %}
diff --git a/opentech/settings/base.py b/opentech/settings/base.py
index bef78cd4291e5fbeb0cb6f331de95aaaaa24a279..edf98f4fbc862bef0c067a60687a080146707255 100644
--- a/opentech/settings/base.py
+++ b/opentech/settings/base.py
@@ -117,6 +117,10 @@ INSTALLED_APPS = [
'django_bleach',
'django_fsm',
'django_pwned_passwords',
+ 'django_otp',
+ 'django_otp.plugins.otp_totp',
+ 'django_otp.plugins.otp_static',
+ 'two_factor',
'rest_framework',
'wagtailcache',
@@ -147,6 +151,7 @@ MIDDLEWARE = [
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django_referrer_policy.middleware.ReferrerPolicyMiddleware',
+ 'django_otp.middleware.OTPMiddleware',
'opentech.apply.users.middleware.SocialAuthExceptionMiddleware',
diff --git a/opentech/static_src/src/app/src/api/index.js b/opentech/static_src/src/app/src/api/index.js
index 8b12cba9e524f20e74fb2c2df2f856831dd56540..d53e0261dc6225789477fa78b9499323a830018d 100644
--- a/opentech/static_src/src/app/src/api/index.js
+++ b/opentech/static_src/src/app/src/api/index.js
@@ -5,7 +5,7 @@ import {
fetchSubmissionsByStatuses
} from '@api/submissions';
import { fetchRound, fetchRounds } from '@api/rounds';
-import { createNoteForSubmission, fetchNotesForSubmission, fetchNewNotesForSubmission } from '@api/notes';
+import { createNoteForSubmission, fetchNotesForSubmission, fetchNewNotesForSubmission, editNoteForSubmission } from '@api/notes';
export default {
executeSubmissionAction,
@@ -20,4 +20,5 @@ export default {
fetchNotesForSubmission,
fetchNewNotesForSubmission,
createNoteForSubmission,
+ editNoteForSubmission,
};
diff --git a/opentech/static_src/src/app/src/api/notes.js b/opentech/static_src/src/app/src/api/notes.js
index 436c45909048736786d4c85064a16664dc0d4f4d..9e41fd1b44691a250462f6ddb4b37f542d80d829 100644
--- a/opentech/static_src/src/app/src/api/notes.js
+++ b/opentech/static_src/src/app/src/api/notes.js
@@ -30,3 +30,13 @@ export function createNoteForSubmission(submissionID, note) {
}
};
}
+
+export function editNoteForSubmission(note) {
+ return {
+ path: `/apply/api/comments/${note.id}/edit/`,
+ method: 'POST',
+ options: {
+ body: JSON.stringify({ message: note.message }),
+ }
+ }
+}
diff --git a/opentech/static_src/src/app/src/components/GroupedListing/index.js b/opentech/static_src/src/app/src/components/GroupedListing/index.js
index 88bd5dc9e075c8f18a9e4757de8136ac7190c607..43c72b22d8682ff2491d1e3f293949e65e9f6a11 100644
--- a/opentech/static_src/src/app/src/components/GroupedListing/index.js
+++ b/opentech/static_src/src/app/src/components/GroupedListing/index.js
@@ -89,6 +89,10 @@ export default class GroupedListing extends React.Component {
items: values.reduce((acc, value) => acc.concat(groupedItems[value] || []), [])
})).filter(({items}) => items.length !== 0)
+ orderedItems.map(value => {
+ value.items.sort((a,b) => a.lastUpdate > b.lastUpdate ? -1 : 1)
+ })
+
this.setState({orderedItems});
}
diff --git a/opentech/static_src/src/app/src/components/Listing/index.js b/opentech/static_src/src/app/src/components/Listing/index.js
index a743d6b746ddfedbbed1ba801ee28030a1d83fa9..5621d26fae7ff398792dbe07bbe81167e901e3fe 100644
--- a/opentech/static_src/src/app/src/components/Listing/index.js
+++ b/opentech/static_src/src/app/src/components/Listing/index.js
@@ -1,6 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
-//import { TransitionGroup } from 'react-transition-group';
import LoadingPanel from '@components/LoadingPanel';
import InlineLoading from '@components/InlineLoading'
@@ -35,12 +34,7 @@ export default class Listing extends React.Component {
return (
<>
{ isErrored && this.renderErrorItem() }
- {/* This seems to cause a bug when after updating a status
- of the only one item in the group, it does not
- dissapear from the old status*/}
- {/*<TransitionGroup component={null} >*/}
- {items.map(v => renderItem(v))}
- {/*</TransitionGroup>*/}
+ {items.map(v => renderItem(v))}
</>
);
}
@@ -96,7 +90,6 @@ export default class Listing extends React.Component {
listRef,
} = this.props;
-
if ( items.length === 0 ) {
if (isLoading) {
return (
diff --git a/opentech/static_src/src/app/src/components/Listing/style.scss b/opentech/static_src/src/app/src/components/Listing/style.scss
index a55970b210f10f581f15dc0b3fb76ba1d459eab8..f6e4bbedd665ad5725f09883ccf468f5c0e73074 100644
--- a/opentech/static_src/src/app/src/components/Listing/style.scss
+++ b/opentech/static_src/src/app/src/components/Listing/style.scss
@@ -1,15 +1,16 @@
.listing {
overflow-y: overlay;
flex-grow: 3;
+ transition: opacity $transition;
@include target-ie11 {
max-width: 390px;
width: 100%;
}
- &__header {
- height: $listing-header-height;
+ &.is-blank {
padding: 20px;
+ text-align: center;
}
// ensures the last item will be at the top of the column after navigating to it via the dropdown
@@ -29,9 +30,9 @@
box-shadow: inset 0 -20px 20px -10px $color--light-mid-grey;
}
- &.is-blank {
+ &__header {
+ height: $listing-header-height;
padding: 20px;
- text-align: center;
}
// inner <li>'s
diff --git a/opentech/static_src/src/app/src/components/LoadingPanel/styles.scss b/opentech/static_src/src/app/src/components/LoadingPanel/styles.scss
index 621045e7ffa8451da1b8c899354d635d38f7c416..e1f565e70f112a3002153473c8deef6473c85909 100644
--- a/opentech/static_src/src/app/src/components/LoadingPanel/styles.scss
+++ b/opentech/static_src/src/app/src/components/LoadingPanel/styles.scss
@@ -1,4 +1,5 @@
.loading-panel {
+ height: 100%;
text-align: center;
padding: 20px;
diff --git a/opentech/static_src/src/app/src/components/NoteListingItem/index.js b/opentech/static_src/src/app/src/components/NoteListingItem/index.js
index 6e1a7bbe274113df9edcaa0dcd95fd4fd20679ec..10dcdf5f33978c8b6ad21b1d2e2206803d9600d0 100644
--- a/opentech/static_src/src/app/src/components/NoteListingItem/index.js
+++ b/opentech/static_src/src/app/src/components/NoteListingItem/index.js
@@ -5,29 +5,45 @@ import './styles.scss';
export default class NoteListingItem extends React.Component {
static propTypes = {
- user: PropTypes.string.isRequired,
+ author: PropTypes.string.isRequired,
message: PropTypes.string.isRequired,
timestamp: PropTypes.string.isRequired,
+ handleEditNote: PropTypes.func.isRequired,
+ disabled: PropTypes.bool,
+ editable: PropTypes.bool,
+ edited: PropTypes.string,
};
parseUser() {
- const { user } = this.props;
+ const { author } = this.props;
- if (user.length > 16) {
- return `${user.substring(0, 16)}...`
+ if (author.length > 16) {
+ return `${author.substring(0, 16)}...`
} else {
- return user;
+ return author;
}
}
render() {
- const { timestamp, message } = this.props;
+ const { timestamp, message, handleEditNote, disabled, editable, edited} = this.props;
return (
- <li className="note">
+ <li className={`note ${disabled ? 'disabled' : ''}`}>
<p className="note__meta">
- <span>{this.parseUser()}</span>
- <span className="note__date">{timestamp}</span>
+ <span className="note__meta note__meta--inner">
+ <span>{this.parseUser()}</span>
+ { editable &&
+ <a onClick={(e) => handleEditNote(e.preventDefault())} className="note__edit" href="#">
+ Edit
+ <svg className="icon icon--pen"><use xlinkHref="#pen"></use></svg>
+ </a>
+ }
+ </span>
+
+ <span className="note__date">
+ <span className="note__date_created">{timestamp}</span><br/>
+ {edited && <span className="note__date_edited">(edited: {edited})</span>}
+ </span>
</p>
<div className="note__content" dangerouslySetInnerHTML={{__html: message}} />
</li>
diff --git a/opentech/static_src/src/app/src/components/NoteListingItem/styles.scss b/opentech/static_src/src/app/src/components/NoteListingItem/styles.scss
index ee7e8f87d19642189f479dbd0185d1f2e1dc1756..93c78cf4301b499c95f85710f0681a8c4f2f1dba 100644
--- a/opentech/static_src/src/app/src/components/NoteListingItem/styles.scss
+++ b/opentech/static_src/src/app/src/components/NoteListingItem/styles.scss
@@ -1,16 +1,12 @@
.note {
margin: 20px;
+ margin-top: 0px;
font-size: 14px;
- transition: opacity 200ms ease-out 200ms, transform 200ms ease-out 200ms;
+ border-top: 3px solid $color--light-grey;
- &.add-note-enter {
- opacity: 0;
- transform: translate(0, 10px);
- }
-
- &.add-note-enter-done {
- opacity: 1;
- transform: translate(0, 0);
+ &.disabled {
+ opacity: .5;
+ pointer-events: none;
}
&__meta {
@@ -25,13 +21,21 @@
}
&__date {
- color: $color--dark-blue;
margin-left: 10px;
+
+ &_created {
+ color: $color--dark-blue;
+ float: right;
+ }
+
+ &_edited {
+ font-size: 12px;
+ }
}
&__content {
margin: 0;
- word-break: break-all;
+ word-break: break-word;
hyphens: auto;
ul {
@@ -52,4 +56,16 @@
border-left: 2px solid $color--dark-blue;
}
}
+
+ &__edit {
+ color: $color--dark-blue;
+ padding-left: 10px;
+ margin-left: 10px;
+ max-height: 1.5rem;
+ border-left: 2px solid $color--mid-grey;
+
+ svg {
+ fill: $color--dark-blue;
+ }
+ }
}
diff --git a/opentech/static_src/src/app/src/components/RichTextForm/index.js b/opentech/static_src/src/app/src/components/RichTextForm/index.js
index 5f5b42857f3d78231f8f2d64cb0761ae3920c114..30633c22758dbfaeee418ce0bc45883126fcb473 100644
--- a/opentech/static_src/src/app/src/components/RichTextForm/index.js
+++ b/opentech/static_src/src/app/src/components/RichTextForm/index.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useState, useEffect} from 'react';
import PropTypes from 'prop-types';
import RichTextEditor from 'react-rte';
@@ -22,62 +22,89 @@ const toolbarConfig = {
]
};
-export default class RichTextForm extends React.Component {
- static defaultProps = {
- disabled: false,
- initialValue: '',
- };
-
- static propTypes = {
- disabled: PropTypes.bool.isRequired,
- onValueChange: PropTypes.func,
- value: PropTypes.string,
- instance: PropTypes.string,
- onSubmit: PropTypes.func,
- };
-
- state = {
- value: RichTextEditor.createEmptyValue(),
- };
-
- resetEditor = () => {
- this.setState({value: RichTextEditor.createEmptyValue()});
+
+const emptyState = RichTextEditor.createEmptyValue().toString('html')
+
+
+const RichTextForm = ({initialValue, onChange, onCancel, onSubmit, instance, disabled}) => {
+ const [value, updateValue] = useState(RichTextEditor.createValueFromString(initialValue, 'html'))
+
+ useEffect(() => {
+ updateValue(RichTextEditor.createValueFromString(initialValue, 'html'))
+ }, [initialValue])
+
+ const resetEditor = () => {
+ updateValue(RichTextEditor.createEmptyValue())
+ }
+
+ const isEmpty = () => {
+ return !value.getEditorState().getCurrentContent().hasText();
}
- render() {
- const { instance, disabled } = this.props;
-
- return (
- <div className={ instance } >
- <RichTextEditor
- disabled={ disabled }
- onChange={ this.handleValueChange }
- value={ this.state.value }
- className="add-note-form__container"
- toolbarClassName="add-note-form__toolbar"
- editorClassName="add-note-form__editor"
- toolbarConfig={toolbarConfig}
- />
+ const handleValueChange = (newValue) => {
+ const html = newValue.toString('html')
+ if ( html !== emptyState || value.toString('html') !== emptyState ) {
+ onChange && onChange(html)
+ }
+ updateValue(newValue)
+ }
+
+ const handleCancel = () => {
+ onCancel();
+ resetEditor()
+ }
+
+ const handleSubmit = () => {
+ onSubmit(value.toString('html'), resetEditor);
+ }
+
+ return (
+ <div className={ instance } >
+ <RichTextEditor
+ disabled={ disabled }
+ onChange={ handleValueChange }
+ value={ value }
+ className="add-note-form__container"
+ toolbarClassName="add-note-form__toolbar"
+ editorClassName="add-note-form__editor"
+ toolbarConfig={toolbarConfig}
+ />
+ <div>
<button
- disabled={this.isEmpty() || disabled}
- onClick={this.handleSubmit}
+ disabled={isEmpty() || disabled}
+ onClick={handleSubmit}
className={`button ${instance}__button`}
>
Submit
</button>
+ <button
+ disabled={disabled}
+ onClick={handleCancel}
+ className={`button ${instance}__button`}
+ >
+ Cancel
+ </button>
</div>
- );
- }
+ </div>
+ );
- isEmpty = () => {
- return !this.state.value.getEditorState().getCurrentContent().hasText();
- }
+}
- handleValueChange = value => {
- this.setState({value});
- }
+RichTextForm.defaultProps = {
+ disabled: false,
+ initialValue: '',
+};
- handleSubmit = () => {
- this.props.onSubmit(this.state.value.toString('html'), this.resetEditor);
- }
-}
+RichTextForm.propTypes = {
+ disabled: PropTypes.bool.isRequired,
+ onValueChange: PropTypes.func,
+ value: PropTypes.string,
+ instance: PropTypes.string,
+ onSubmit: PropTypes.func,
+ onChange: PropTypes.func,
+ onCancel: PropTypes.func,
+ initialValue: PropTypes.string,
+};
+
+
+export default RichTextForm;
diff --git a/opentech/static_src/src/app/src/containers/AddNoteForm.js b/opentech/static_src/src/app/src/containers/AddNoteForm.js
index 8daaf79b03d786317a25f0d1e86ece142a980a96..45fb64304fd630e32dd014ed10aa0eeb60f2b0ee 100644
--- a/opentech/static_src/src/app/src/containers/AddNoteForm.js
+++ b/opentech/static_src/src/app/src/containers/AddNoteForm.js
@@ -1,7 +1,12 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import { connect } from 'react-redux';
import PropTypes from 'prop-types';
+import {
+ removedStoredNote,
+ writingNote,
+} from '@actions/notes';
+import { getDraftNoteForSubmission } from '@selectors/notes';
import { createNoteForSubmission } from '@actions/notes';
import RichTextForm from '@components/RichTextForm';
@@ -12,43 +17,60 @@ import {
import './AddNoteForm.scss';
-class AddNoteForm extends React.Component {
- static propTypes = {
- submitNote: PropTypes.func,
- submissionID: PropTypes.number,
- error: PropTypes.any,
- isCreating: PropTypes.bool,
- };
-
- render() {
- const { error, isCreating } = this.props;
- return (
- <>
- {Boolean(error) && <p>{error}</p>}
- <RichTextForm
- disabled={isCreating}
- onSubmit={this.onSubmit}
- instance="add-note-form"
- />
- </>
- );
- }
- onSubmit = (message, resetEditor) => {
- this.props.submitNote(this.props.submissionID, {
+const AddNoteForm = ({error, isCreating, draftNote, submitNote, storeNote, clearNote, submissionID}) => {
+ const [initialValue, updateInitialValue] = useState()
+
+ useEffect(() => {
+ updateInitialValue(draftNote && draftNote.message || '')
+ }, [submissionID])
+
+ const onSubmit = (message, resetEditor) => {
+ submitNote(submissionID, {
message,
visibility: 'internal',
}).then(() => resetEditor());
}
+
+ return (
+ <>
+ {Boolean(error) && <p>{error}</p>}
+ <RichTextForm
+ initialValue={initialValue}
+ disabled={isCreating}
+ onCancel={() => clearNote(submissionID)}
+ onChange={(message) => storeNote(submissionID, message)}
+ onSubmit={onSubmit}
+ instance="add-note-form"
+ />
+ </>
+ );
}
+
+AddNoteForm.propTypes = {
+ submitNote: PropTypes.func,
+ storeNote: PropTypes.func,
+ clearNote: PropTypes.func,
+ submissionID: PropTypes.number,
+ error: PropTypes.any,
+ draftNote: PropTypes.object,
+ isCreating: PropTypes.bool,
+ removeEditedNote: PropTypes.func,
+};
+
+
+
const mapStateToProps = (state, ownProps) => ({
error: getNoteCreatingErrorForSubmission(ownProps.submissionID)(state),
isCreating: getNoteCreatingStateForSubmission(ownProps.submissionID)(state),
+ draftNote: getDraftNoteForSubmission(ownProps.submissionID)(state),
});
const mapDispatchToProps = dispatch => ({
submitNote: (submissionID, note) => dispatch(createNoteForSubmission(submissionID, note)),
+ storeNote: (submissionID, message) => dispatch(writingNote(submissionID, message)),
+ clearNote: (submissionID) => dispatch(removedStoredNote(submissionID)),
});
export default connect(mapStateToProps, mapDispatchToProps)(AddNoteForm);
diff --git a/opentech/static_src/src/app/src/containers/AddNoteForm.scss b/opentech/static_src/src/app/src/containers/AddNoteForm.scss
index bf20e2f0912b5d8fd4f46be12ff77b4dfeab7f7d..4d8e1bee8816412d61f1cf713819c8ff3b0b1ab5 100644
--- a/opentech/static_src/src/app/src/containers/AddNoteForm.scss
+++ b/opentech/static_src/src/app/src/containers/AddNoteForm.scss
@@ -35,11 +35,7 @@ $submit-button-height: 60px;
}
&__button {
- position: absolute;
- bottom: 0;
- left: 0;
- right: 0;
- width: 100%;
+ width: 50%;
border-top: 1px solid $color--mid-grey;
color: $color--dark-blue;
font-weight: $weight--bold;
@@ -47,6 +43,16 @@ $submit-button-height: 60px;
height: $submit-button-height;
opacity: 1;
z-index: 20;
+
+ &:first-child {
+ border-right: 1px solid $color--mid-grey;
+ background-color: $color--dark-blue;
+ color: $color--white;
+ }
+
+ &:last-child {
+ border-right: 1px solid $color--mid-grey;
+ }
}
textarea,
diff --git a/opentech/static_src/src/app/src/containers/DisplayPanel/index.js b/opentech/static_src/src/app/src/containers/DisplayPanel/index.js
index cbf976b73e705bb44cd26555a84e2bef99826f4c..bfa0d8fb7347f95e67a2377536d5dc59091955f0 100644
--- a/opentech/static_src/src/app/src/containers/DisplayPanel/index.js
+++ b/opentech/static_src/src/app/src/containers/DisplayPanel/index.js
@@ -9,11 +9,13 @@ import {
getCurrentSubmission,
getCurrentSubmissionID,
} from '@selectors/submissions'
+import { getDraftNoteForSubmission } from '@selectors/notes';
import CurrentSubmissionDisplay from '@containers/CurrentSubmissionDisplay'
import ReviewInformation from '@containers/ReviewInformation'
import ScreeningOutcome from '@containers/ScreeningOutcome'
import AddNoteForm from '@containers/AddNoteForm'
+import EditNoteForm from '@containers/EditNoteForm'
import NoteListing from '@containers/NoteListing'
import StatusActions from '@containers/StatusActions'
import Tabber, {Tab} from '@components/Tabber'
@@ -54,10 +56,9 @@ const DisplayPanel = props => {
setCurrentStatus(status)
})
- const { windowSize: {windowWidth: width} } = props;
- const { clearSubmission } = props;
-
+ const { windowSize: { windowWidth: width }, clearSubmission, draftNote } = props;
const isMobile = width < 1024;
+ const isEditing = !!draftNote && !!draftNote.id;
let tabs = [
<Tab button="Status" key="status">
@@ -68,7 +69,12 @@ const DisplayPanel = props => {
</Tab>,
<Tab button="Notes" key="note">
<NoteListing submissionID={submissionID} />
- <AddNoteForm submissionID={submissionID} />
+ {isEditing ? (
+ <EditNoteForm submissionID={submissionID}/>
+
+ ) : (
+ <AddNoteForm submissionID={submissionID} />
+ )}
</Tab>
]
@@ -111,11 +117,13 @@ DisplayPanel.propTypes = {
clearSubmission: PropTypes.func.isRequired,
windowSize: PropTypes.objectOf(PropTypes.number),
addMessage: PropTypes.func,
+ draftNote: PropTypes.object,
}
-const mapStateToProps = state => ({
+const mapStateToProps = (state, ownProps) => ({
submissionID: getCurrentSubmissionID(state),
submission: getCurrentSubmission(state),
+ draftNote: getDraftNoteForSubmission(getCurrentSubmissionID(state))(state),
})
const mapDispatchToProps = {
diff --git a/opentech/static_src/src/app/src/containers/EditNoteForm.js b/opentech/static_src/src/app/src/containers/EditNoteForm.js
new file mode 100644
index 0000000000000000000000000000000000000000..70dc20319398a8219413cd69760de823e1f6d090
--- /dev/null
+++ b/opentech/static_src/src/app/src/containers/EditNoteForm.js
@@ -0,0 +1,75 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import PropTypes from 'prop-types';
+
+import {
+ editNoteForSubmission,
+ removedStoredNote,
+ editingNote,
+} from '@actions/notes';
+import {
+ getDraftNoteForSubmission,
+ getNoteCreatingErrorForSubmission,
+ getNoteCreatingStateForSubmission,
+} from '@selectors/notes';
+import RichTextForm from '@components/RichTextForm';
+
+import './AddNoteForm.scss';
+
+class EditNoteForm extends React.Component {
+ static propTypes = {
+ submissionID: PropTypes.number,
+ error: PropTypes.any,
+ isCreating: PropTypes.bool,
+ draftNote: PropTypes.shape({
+ id: PropTypes.number,
+ message: PropTypes.string,
+ }),
+ submitNote: PropTypes.func,
+ storeNote: PropTypes.func,
+ clearNote: PropTypes.func,
+ };
+
+ render() {
+ const { error, isCreating, draftNote, clearNote, submissionID} = this.props;
+
+ return (
+ <>
+ {Boolean(error) && <p>{error}</p>}
+ <RichTextForm
+ disabled={isCreating}
+ onSubmit={this.onSubmit}
+ onCancel={() => clearNote(submissionID)}
+ onChange={this.onChange}
+ instance="add-note-form"
+ initialValue={draftNote.message}
+ />
+ </>
+ );
+ }
+
+ onChange = (message) => {
+ this.props.storeNote(this.props.draftNote.id, message, this.props.submissionID)
+ }
+
+ onSubmit = (message, resetEditor) => {
+ this.props.submitNote({
+ ...this.props.draftNote,
+ message,
+ }, this.props.submissionID);
+ }
+}
+
+const mapStateToProps = (state, ownProps) => ({
+ error: getNoteCreatingErrorForSubmission(ownProps.submissionID)(state),
+ isCreating: getNoteCreatingStateForSubmission(ownProps.submissionID)(state),
+ draftNote: getDraftNoteForSubmission(ownProps.submissionID)(state),
+});
+
+const mapDispatchToProps = (dispatch, ownProps) => ({
+ submitNote: (note, submissionID) => dispatch(editNoteForSubmission(note, submissionID)),
+ storeNote: (submissionID, message) => dispatch(editingNote(submissionID, message)),
+ clearNote: (submissionID) => dispatch(removedStoredNote(submissionID)),
+});
+
+export default connect(mapStateToProps, mapDispatchToProps)(EditNoteForm);
diff --git a/opentech/static_src/src/app/src/containers/Note.js b/opentech/static_src/src/app/src/containers/Note.js
deleted file mode 100644
index 1c25964da05781d1f7e4b1767486242fc44bf2a3..0000000000000000000000000000000000000000
--- a/opentech/static_src/src/app/src/containers/Note.js
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import PropTypes from 'prop-types';
-
-import { getNoteOfID } from '@selectors/notes';
-import NoteListingItem from '@components/NoteListingItem';
-
-class Note extends React.Component {
- static propTypes = {
- note: PropTypes.shape({
- user: PropTypes.string,
- timestamp: PropTypes.string,
- message: PropTypes.string,
- }),
- };
-
- render() {
- const { note } = this.props;
-
- const date = new Date(note.timestamp).toLocaleDateString('en-gb', {day: 'numeric', month: 'short', year:'numeric', timezone:'GMT'})
-
- return <NoteListingItem
- user={note.user}
- message={note.message}
- timestamp={date}
- />;
- }
-
-}
-
-const mapStateToProps = (state, ownProps) => ({
- note: getNoteOfID(ownProps.noteID)(state),
-});
-
-export default connect(mapStateToProps)(Note);
diff --git a/opentech/static_src/src/app/src/containers/NoteListing.js b/opentech/static_src/src/app/src/containers/NoteListing.js
index 880a020ca3763ff94b146ee2570ae70e99c9538d..f6b9771bdaa6611434e19fadf578cdc7d0766ec7 100644
--- a/opentech/static_src/src/app/src/containers/NoteListing.js
+++ b/opentech/static_src/src/app/src/containers/NoteListing.js
@@ -1,22 +1,22 @@
import React, { useEffect } from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
-import { CSSTransition } from 'react-transition-group';
import useInterval from "@rooks/use-interval"
-import { fetchNewNotesForSubmission } from '@actions/notes';
+import { fetchNewNotesForSubmission, editingNote } from '@actions/notes';
import Listing from '@components/Listing';
-import Note from '@containers/Note';
+import NoteListingItem from '@components/NoteListingItem';
import {
getNotesErrorState,
getNotesErrorMessage,
- getNoteIDsForSubmissionOfID,
+ getNotesForSubmission,
getNotesFetchState,
+ getDraftNoteForSubmission,
} from '@selectors/notes';
-const NoteListing = ({loadNotes, submissionID, noteIDs, isErrored, errorMessage, isLoading }) => {
+const NoteListing = ({ loadNotes, submissionID, notes, isErrored, errorMessage, isLoading, editing, editNote }) => {
const fetchNotes = () => loadNotes(submissionID)
const {start, stop } = useInterval(fetchNotes, 30000)
@@ -37,12 +37,29 @@ const NoteListing = ({loadNotes, submissionID, noteIDs, isErrored, errorMessage,
}
}
- const renderItem = noteID => {
- return (
- <CSSTransition key={`note-${noteID}`} timeout={200} classNames="add-note">
- <Note key={`note-${noteID}`} noteID={noteID} />
- </CSSTransition>
- );
+ /* const time = new Date(date).toLocaleTimeString([], {hour: '2-digit', minute: '2-digit'}); */
+
+ const orderedNotes = notes.sort((a,b) => new Date(b.timestamp) - new Date(a.timestamp));
+
+ const renderItem = note => {
+ const date = new Date(note.timestamp).toLocaleDateString('en-gb', {day: 'numeric', month: 'short', year:'numeric', timezone:'GMT'})
+ const edited = (
+ note.edited ?
+ new Date(note.edited).toLocaleDateString('en-gb', {day: 'numeric', month: 'short', year:'numeric', timezone:'GMT'})
+ : null
+ )
+
+ return <NoteListingItem
+ author={note.user}
+ timestamp={date}
+ key={`note-${note.id}`}
+ message={note.message}
+ submissionID={submissionID}
+ disabled={!!editing}
+ editable={note.editable}
+ edited={edited}
+ handleEditNote={() => editNote(note.id, note.message, submissionID)}
+ />;
}
return (
@@ -52,7 +69,7 @@ const NoteListing = ({loadNotes, submissionID, noteIDs, isErrored, errorMessage,
errorMessage={ errorMessage }
handleRetry={ handleRetry }
renderItem={ renderItem }
- items={ noteIDs }
+ items={ orderedNotes }
column="notes"
/>
);
@@ -60,23 +77,28 @@ const NoteListing = ({loadNotes, submissionID, noteIDs, isErrored, errorMessage,
NoteListing.propTypes = {
loadNotes: PropTypes.func,
+ editNote: PropTypes.func,
submissionID: PropTypes.number,
- noteIDs: PropTypes.array,
+ notes: PropTypes.array,
isErrored: PropTypes.bool,
errorMessage: PropTypes.string,
isLoading: PropTypes.bool,
+ editing: PropTypes.object,
};
const mapDispatchToProps = dispatch => ({
loadNotes: submissionID => dispatch(fetchNewNotesForSubmission(submissionID)),
+ editNote: (id, message, submissionID) => dispatch(editingNote(id, message, submissionID)),
});
const mapStateToProps = (state, ownProps) => ({
- noteIDs: getNoteIDsForSubmissionOfID(ownProps.submissionID)(state),
+ notes: getNotesForSubmission(ownProps.submissionID)(state),
isLoading: getNotesFetchState(state),
isErrored: getNotesErrorState(state),
errorMessage: getNotesErrorMessage(state),
+ editing: getDraftNoteForSubmission(ownProps.submissionID)(state),
+
});
export default connect(mapStateToProps, mapDispatchToProps)(NoteListing);
diff --git a/opentech/static_src/src/app/src/containers/ReviewInformation.js b/opentech/static_src/src/app/src/containers/ReviewInformation.js
index 02ddf9d854ebe090bd081ae1a99f99ef13b8b973..2f0bfad65296aae2fe16aadaf1b17641b16aa74a 100644
--- a/opentech/static_src/src/app/src/containers/ReviewInformation.js
+++ b/opentech/static_src/src/app/src/containers/ReviewInformation.js
@@ -34,6 +34,8 @@ const ReviewInformation = ({ submission }) => {
people.sort((a,b) => {
if (a.role.order === null) {
return 100;
+ } else if (b.role.order === null) {
+ return -1;
}
return a.role.order - b.role.order;
})
diff --git a/opentech/static_src/src/app/src/redux/actions/notes.js b/opentech/static_src/src/app/src/redux/actions/notes.js
index ac9b90a867324d84076b33e45e0884272ae5ef4e..6b233e39198e82a0f787d486f5481dacca74a529 100644
--- a/opentech/static_src/src/app/src/redux/actions/notes.js
+++ b/opentech/static_src/src/app/src/redux/actions/notes.js
@@ -6,11 +6,17 @@ import api from '@api';
export const FAIL_FETCHING_NOTES = 'FAIL_FETCHING_NOTES';
export const START_FETCHING_NOTES = 'START_FETCHING_NOTES';
export const UPDATE_NOTES = 'UPDATE_NOTES';
+export const CREATE_NOTE = 'CREATE_NOTE';
export const UPDATE_NOTE = 'UPDATE_NOTE';
+export const STORE_NOTE = 'UPDATE_STORE_NOTE';
export const START_CREATING_NOTE_FOR_SUBMISSION = 'START_CREATING_NOTE_FOR_SUBMISSION';
export const FAIL_CREATING_NOTE_FOR_SUBMISSION = 'FAIL_CREATING_NOTE_FOR_SUBMISSION';
+export const START_EDITING_NOTE_FOR_SUBMISSION = 'START_EDITING_NOTE_FOR_SUBMISSION';
+export const FAIL_EDITING_NOTE_FOR_SUBMISSION = 'FAIL_EDITING_NOTE_FOR_SUBMISSION';
+export const REMOVE_NOTE = 'REMOVE_NOTE';
+
export const fetchNotesForSubmission = submissionID => (dispatch, getState) => {
return dispatch(fetchNotes(submissionID))
}
@@ -30,7 +36,7 @@ export const createNoteForSubmission = (submissionID, note) => (dispatch, getSta
const createNote = (submissionID, note) => ({
[CALL_API]: {
- types: [ START_CREATING_NOTE_FOR_SUBMISSION, UPDATE_NOTE, FAIL_CREATING_NOTE_FOR_SUBMISSION],
+ types: [ START_CREATING_NOTE_FOR_SUBMISSION, CREATE_NOTE, FAIL_CREATING_NOTE_FOR_SUBMISSION],
endpoint: api.createNoteForSubmission(submissionID, note),
},
submissionID,
@@ -54,3 +60,37 @@ const fetchNewerNotes = (submissionID, latestID) => ({
},
submissionID,
})
+
+
+export const editingNote = (messageID, message, submissionID) => ({
+ type: STORE_NOTE,
+ messageID,
+ submissionID,
+ message
+})
+
+
+export const writingNote = (submissionID, message) => ({
+ type: STORE_NOTE,
+ submissionID,
+ message
+
+})
+
+
+export const editNoteForSubmission = (note, submissionID) => (dispatch) => dispatch(editNote(note, submissionID))
+
+const editNote = (note, submissionID) => ({
+ [CALL_API]: {
+ types: [ START_EDITING_NOTE_FOR_SUBMISSION, UPDATE_NOTE, FAIL_EDITING_NOTE_FOR_SUBMISSION ],
+ endpoint: api.editNoteForSubmission(note),
+ },
+ note,
+ submissionID,
+})
+
+
+export const removedStoredNote = (submissionID) => ({
+ type: REMOVE_NOTE,
+ submissionID,
+})
diff --git a/opentech/static_src/src/app/src/redux/actions/submissions.js b/opentech/static_src/src/app/src/redux/actions/submissions.js
index e5e05f18d3673b289900ec023431bb00bf2d2e1b..ac007febd92675316470069cd7ce34aaec2d5bc0 100644
--- a/opentech/static_src/src/app/src/redux/actions/submissions.js
+++ b/opentech/static_src/src/app/src/redux/actions/submissions.js
@@ -25,7 +25,6 @@ import {
addMessage,
} from '@actions/messages';
-
// Round
export const UPDATE_ROUND = 'UPDATE_ROUND';
export const START_LOADING_ROUND = 'START_LOADING_ROUND';
diff --git a/opentech/static_src/src/app/src/redux/reducers/notes.js b/opentech/static_src/src/app/src/redux/reducers/notes.js
index f27e5d351d4ad7a9a90173a4aa72fdeeda94dee6..1bed582cde626bb63e81470efeae65761601813d 100644
--- a/opentech/static_src/src/app/src/redux/reducers/notes.js
+++ b/opentech/static_src/src/app/src/redux/reducers/notes.js
@@ -1,12 +1,17 @@
import { combineReducers } from 'redux';
import {
+ CREATE_NOTE,
UPDATE_NOTE,
UPDATE_NOTES,
START_FETCHING_NOTES,
FAIL_FETCHING_NOTES,
START_CREATING_NOTE_FOR_SUBMISSION,
FAIL_CREATING_NOTE_FOR_SUBMISSION,
+ STORE_NOTE,
+ START_EDITING_NOTE_FOR_SUBMISSION,
+ FAIL_EDITING_NOTE_FOR_SUBMISSION,
+ REMOVE_NOTE,
} from '@actions/notes';
function notesFetching(state = false, action) {
@@ -43,6 +48,7 @@ function notesErrored(state = {errored: false, message: null}, action) {
function note(state, action) {
switch (action.type) {
case UPDATE_NOTE:
+ case CREATE_NOTE:
return {
...state,
...action.data,
@@ -55,12 +61,15 @@ function note(state, action) {
function notesCreating(state = [], action) {
switch (action.type) {
case START_CREATING_NOTE_FOR_SUBMISSION:
+ case START_EDITING_NOTE_FOR_SUBMISSION:
return [
...state,
action.submissionID,
];
+ case CREATE_NOTE:
case UPDATE_NOTE:
case FAIL_CREATING_NOTE_FOR_SUBMISSION:
+ case FAIL_EDITING_NOTE_FOR_SUBMISSION:
return state.filter(v => v !== action.submissionID);
default:
return state
@@ -71,13 +80,16 @@ function notesCreating(state = [], action) {
function notesFailedCreating(state = {}, action) {
switch (action.type) {
case UPDATE_NOTE:
+ case CREATE_NOTE:
case START_CREATING_NOTE_FOR_SUBMISSION:
+ case START_EDITING_NOTE_FOR_SUBMISSION:
return Object.entries(state).reduce((acc, [k, v]) => {
if (parseInt(k) !== action.submissionID) {
acc[k] = v;
}
return acc;
}, {});
+ case FAIL_EDITING_NOTE_FOR_SUBMISSION:
case FAIL_CREATING_NOTE_FOR_SUBMISSION:
return {
...state,
@@ -101,6 +113,7 @@ function notesByID(state = {}, action) {
return newNotesAccumulator;
}, {}),
};
+ case CREATE_NOTE:
case UPDATE_NOTE:
return {
...state,
@@ -114,10 +127,35 @@ function notesByID(state = {}, action) {
}
}
+function editingNote(state={}, action) {
+ switch (action.type) {
+ case STORE_NOTE:
+ return {
+ ...state,
+ [action.submissionID] : {
+ id: action.messageID,
+ message: action.message,
+ },
+ };
+ case CREATE_NOTE:
+ case UPDATE_NOTE:
+ case REMOVE_NOTE:
+ return Object.entries(state).reduce((result, [key, value]) => {
+ if (action.submissionID !== parseInt(key)) {
+ result[key] = value
+ }
+ return result;
+ },{})
+ default:
+ return state;
+ }
+}
+
export default combineReducers({
byID: notesByID,
isFetching: notesFetching,
error: notesErrored,
createError: notesFailedCreating,
isCreating: notesCreating,
+ editing: editingNote,
});
diff --git a/opentech/static_src/src/app/src/redux/reducers/submissions.js b/opentech/static_src/src/app/src/redux/reducers/submissions.js
index 529239aa11da8aea2572ba8259a315f0b3dbb63f..355edae6b0614d19a21ead27d31ba18e9bd52329 100644
--- a/opentech/static_src/src/app/src/redux/reducers/submissions.js
+++ b/opentech/static_src/src/app/src/redux/reducers/submissions.js
@@ -12,7 +12,7 @@ import {
FAIL_EXECUTING_SUBMISSION_ACTION,
} from '@actions/submissions';
-import { UPDATE_NOTES, UPDATE_NOTE } from '@actions/notes'
+import { CREATE_NOTE, UPDATE_NOTES, UPDATE_NOTE } from '@actions/notes'
function submission(state={comments: []}, action) {
@@ -61,8 +61,16 @@ function submission(state={comments: []}, action) {
isExecutingAction: false,
isExecutingActionErrored: true,
executionActionError: action.error
- }
+ };
case UPDATE_NOTE:
+ return {
+ ...state,
+ comments: [
+ action.data.id,
+ ...(state.comments.filter(comment => comment !== action.note.id) || []),
+ ]
+ };
+ case CREATE_NOTE:
return {
...state,
comments: [
@@ -81,6 +89,7 @@ function submissionsByID(state = {}, action) {
case START_LOADING_SUBMISSION:
case FAIL_LOADING_SUBMISSION:
case UPDATE_SUBMISSION:
+ case CREATE_NOTE:
case UPDATE_NOTE:
case UPDATE_NOTES:
case START_EXECUTING_SUBMISSION_ACTION:
diff --git a/opentech/static_src/src/app/src/redux/selectors/notes.js b/opentech/static_src/src/app/src/redux/selectors/notes.js
index dd91f2cc0efbe2c19b2d125c450ce2a23ab8b5d4..d7cf3121fd5b2113bbe200ec59537df1600eac93 100644
--- a/opentech/static_src/src/app/src/redux/selectors/notes.js
+++ b/opentech/static_src/src/app/src/redux/selectors/notes.js
@@ -24,6 +24,11 @@ export const getLatestNoteForSubmissionOfID = submissionID => createSelector(
notes => notes[0] || null
);
+export const getNotesForSubmission = submissionID => createSelector(
+ [getNoteIDsForSubmissionOfID(submissionID), getNotes],
+ (noteIDs, notes) => noteIDs.map(noteID => notes[noteID])
+);
+
const getNoteCreatingErrors = state => state.notes.createError;
export const getNoteCreatingErrorForSubmission = submissionID => createSelector(
@@ -35,3 +40,9 @@ const getNoteCreatingState = state => state.notes.isCreating;
export const getNoteCreatingStateForSubmission = submissionID => createSelector(
[getNoteCreatingState], creatingStates => creatingStates.includes(submissionID)
);
+
+const getNoteEditingState = state => state.notes.editing;
+
+export const getDraftNoteForSubmission = submissionID => createSelector(
+ [getNoteEditingState], editing => editing[submissionID]
+);
diff --git a/opentech/static_src/src/javascript/apply/edit-comment.js b/opentech/static_src/src/javascript/apply/edit-comment.js
new file mode 100644
index 0000000000000000000000000000000000000000..3b7c3d88d3283c98bfad623468bb89a495e61d0d
--- /dev/null
+++ b/opentech/static_src/src/javascript/apply/edit-comment.js
@@ -0,0 +1,152 @@
+(function ($) {
+
+ 'use strict';
+
+ const comment = '.js-comment';
+ const pageDown = '.js-pagedown';
+ const feedMeta = '.js-feed-meta';
+ const editBlock = '.js-edit-block';
+ const lastEdited = '.js-last-edited';
+ const editButton = '.js-edit-comment';
+ const feedContent = '.js-feed-content';
+ const commentError = '.js-comment-error';
+ const cancelEditButton = '.js-cancel-edit';
+ const submitEditButton = '.js-submit-edit';
+
+ // handle edit
+ $(editButton).click(function (e) {
+ e.preventDefault();
+
+ closeAllEditors();
+
+ const editBlockWrapper = $(this).closest(feedContent).find(editBlock);
+ const commentWrapper = $(this).closest(feedContent).find(comment);
+ const commentContents = $(commentWrapper).attr('data-comment');
+
+ // hide the edit link and original comment
+ $(this).parent().hide();
+ $(commentWrapper).hide();
+
+ const markup = `
+ <div class="js-pagedown form">
+ <div id="wmd-button-bar-edit-comment" class="wmd-button-bar"></div>
+ <textarea id="wmd-input-edit-comment" class="wmd-input" rows="10">${commentContents}</textarea>
+ <div id="wmd-preview-edit-comment" class="wmd-preview"></div>
+ <div class="wrapper--outer-space-medium">
+ <button class="button button--primary js-submit-edit" type="submit">Update</button>
+ <button class="button button--white js-cancel-edit">Cancel</button>
+ </div>
+ </div>
+ `;
+
+ // add the comment to the editor
+ $(editBlockWrapper).append(markup);
+
+ // run the editor
+ initEditor();
+ });
+
+ // handle cancel
+ $(document).on('click', cancelEditButton, function () {
+ showComment(this);
+ showEditButton(this);
+ hidePageDownEditor(this);
+ if ($(commentError).length) {
+ hideError();
+ }
+ });
+
+ // handle submit
+ $(document).on('click', submitEditButton, function () {
+ const commentContainer = $(this).closest(editBlock).siblings(comment);
+ const editedComment = $(this).closest(pageDown).find('.wmd-preview').html();
+ const commentMD = $(this).closest(editBlock).find('textarea').val();
+ const editUrl = $(commentContainer).attr('data-edit-url');
+
+ fetch(editUrl, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-CSRFToken': $.cookie('csrftoken')
+ },
+ body: JSON.stringify({
+ message: editedComment
+ })
+ }).then(response => {
+ if (!response.ok) {
+ const error = Object.assign({}, response, {
+ status: response.status,
+ statusText: response.statusText
+ });
+ return Promise.reject(error);
+ }
+ return response.json();
+ }).then(data => {
+ updateComment(commentContainer, data.id, data.message, data.edit_url, commentMD);
+ updateLastEdited(this, data.edited);
+ showComment(this);
+ showEditButton(this);
+ hidePageDownEditor(this);
+ }).catch((error) => {
+ if (error.status === 404) {
+ handleError(this, 'Update unsuccessful. This comment has been edited elsewhere. To get the latest updates please refresh the page, but note any unsaved changes will be lost by doing so.');
+ }
+ else {
+ handleError(this, 'An error has occured. Please try again later.');
+ }
+ });
+ });
+
+ const handleError = (el, message) => {
+ $(el).closest(editBlock).append(`<p class="wrapper--error js-comment-error">${message}</p>`);
+ $(el).attr('disabled', true);
+ };
+
+ const initEditor = () => {
+ const converterOne = window.Markdown.getSanitizingConverter();
+ const commentEditor = new window.Markdown.Editor(converterOne, '-edit-comment');
+ commentEditor.run();
+ };
+
+ const showEditButton = (el) => {
+ $(el).closest(editBlock).siblings(feedMeta).find(editButton).parent().show();
+ };
+
+ const hidePageDownEditor = (el) => {
+ $(el).closest(pageDown).remove();
+ };
+
+ const showComment = (el) => {
+ $(el).closest(editBlock).siblings(comment).show();
+ };
+
+ const updateLastEdited = (el, date) => {
+ const parsedDate = new Date(date).toISOString().split('T')[0];
+ const time = new Date(date).toLocaleTimeString([], {hour: '2-digit', minute: '2-digit'});
+ $(el).closest(feedContent).find(lastEdited).parent().attr('hidden', false);
+ $(el).closest(feedContent).find(lastEdited).html(`${parsedDate} ${time}`);
+ };
+
+ const updateComment = (el, id, comment, editUrl, commentMarkdown) => {
+ $(el).html(comment);
+ $(el).attr('data-id', id);
+ $(el).attr('data-edit-url', editUrl);
+ $(el).attr('data-comment', commentMarkdown);
+ };
+
+ const closeAllEditors = () => {
+ $(comment).show();
+ $(pageDown).remove();
+ $(editButton).parent().show();
+ };
+
+ const hideError = () => $(commentError).remove();
+
+ window.addEventListener('beforeunload', (e) => {
+ if ($(submitEditButton).length) {
+ e.preventDefault();
+ e.returnValue = 'It looks like you\'re still editing a comment. Are you sure you want to leave?';
+ }
+ });
+
+})(jQuery);
diff --git a/opentech/static_src/src/javascript/jquery.min.js b/opentech/static_src/src/javascript/jquery.min.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1c07fd803b5fc9c54f44e31123ae4fa11e134b0
--- /dev/null
+++ b/opentech/static_src/src/javascript/jquery.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/opentech/static_src/src/javascript/main.js b/opentech/static_src/src/javascript/main.js
index d1440f0621c2ce39851ba836e569f5fac95979d3..7bf3aa7eca63311457e88a6528571a8a774cef5f 100644
--- a/opentech/static_src/src/javascript/main.js
+++ b/opentech/static_src/src/javascript/main.js
@@ -3,9 +3,6 @@
'use strict';
- // Replace no-js with js class if js is enabled.
- document.querySelector('html').classList.replace('no-js', 'js');
-
let Search = class {
static selector() {
return '.js-search-toggle';
diff --git a/opentech/static_src/src/sass/apply/components/_button.scss b/opentech/static_src/src/sass/apply/components/_button.scss
index bec7e6d46bdeb2b9c51bc7841e5cc7262613adb7..9d7ebc20301a487cd00ae7cd13ea324a02356687 100644
--- a/opentech/static_src/src/sass/apply/components/_button.scss
+++ b/opentech/static_src/src/sass/apply/components/_button.scss
@@ -1,3 +1,4 @@
+.btn,
.button {
padding: 0;
background-color: transparent;
@@ -15,6 +16,8 @@
opacity: .5;
}
+ &-default,
+ &-primary,
&--primary {
@include button($color--light-blue, $color--dark-blue);
display: inline-block;
@@ -65,6 +68,7 @@
}
}
+ &-danger,
&--warning {
@include button($color--error, $color--error);
diff --git a/opentech/static_src/src/sass/apply/components/_feed.scss b/opentech/static_src/src/sass/apply/components/_feed.scss
index 2ab489a4bf4b1029ce4e6df43d4de6063046599f..d3afc66ee7327436224057045a9fcf735e18661c 100644
--- a/opentech/static_src/src/sass/apply/components/_feed.scss
+++ b/opentech/static_src/src/sass/apply/components/_feed.scss
@@ -101,6 +101,20 @@
margin: 0 15px 0 0;
}
+ &--edit-button {
+ border-left: 2px solid $color--mid-grey;
+ padding-left: 15px;
+ }
+
+ &--last-edited {
+ margin-right: 5px;
+ color: $color--mid-dark-grey;
+
+ span {
+ font-weight: $weight--normal;
+ }
+ }
+
&--right {
margin-left: auto;
}
diff --git a/opentech/static_src/src/sass/apply/components/_link.scss b/opentech/static_src/src/sass/apply/components/_link.scss
index 91abab5e1aa6dd3410bbc2015725b4239889dc1f..35e89799fd7bd152bf6f498ca47b9ac1b828e1aa 100644
--- a/opentech/static_src/src/sass/apply/components/_link.scss
+++ b/opentech/static_src/src/sass/apply/components/_link.scss
@@ -9,7 +9,6 @@
@include button($color--light-blue, $color--dark-blue);
display: inline-block;
-
&--narrow {
@include button--narrow;
}
@@ -27,6 +26,10 @@
font-weight: $weight--bold;
}
+ &--left-space {
+ margin-left: 20px;
+ }
+
&--download {
display: flex;
align-items: center;
@@ -91,6 +94,14 @@
}
}
+ &--button-long-text {
+ padding: 10px;
+
+ @include media-query(tablet-portrait) {
+ padding: 10px 60px;
+ }
+ }
+
&--open-feed {
position: fixed;
right: 20px;
diff --git a/opentech/static_src/src/sass/apply/components/_wrapper.scss b/opentech/static_src/src/sass/apply/components/_wrapper.scss
index b80aa2b154d104af6634779ee87cbfa784cadd25..e7165e01b4cd95706618d388763e6ce4601e6f5f 100644
--- a/opentech/static_src/src/sass/apply/components/_wrapper.scss
+++ b/opentech/static_src/src/sass/apply/components/_wrapper.scss
@@ -89,6 +89,10 @@
margin: 0 auto 2rem;
background: $color--light-pink;
border: 1px solid $color--tomato;
+
+ .feed & {
+ margin: 0 0 1rem;
+ }
}
&--bottom-space {
diff --git a/opentech/static_src/src/sass/normalize.scss b/opentech/static_src/src/sass/normalize.scss
new file mode 100644
index 0000000000000000000000000000000000000000..788872684d13fd8ecedbacb86d8b5237810546dc
--- /dev/null
+++ b/opentech/static_src/src/sass/normalize.scss
@@ -0,0 +1,350 @@
+// sass-lint:disable-all
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+ ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+html {
+ line-height: 1.15; /* 1 */
+ -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+ ========================================================================== */
+
+/**
+ * Remove the margin in all browsers.
+ */
+
+body {
+ margin: 0;
+}
+
+/**
+ * Render the `main` element consistently in IE.
+ */
+
+main {
+ display: block;
+}
+
+/**
+ * Correct the font size and margin on `h1` elements within `section` and
+ * `article` contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0;
+}
+
+/* Grouping content
+ ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+ box-sizing: content-box; /* 1 */
+ height: 0; /* 1 */
+ overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+pre {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+ ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+ background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+ border-bottom: none; /* 1 */
+ text-decoration: underline; /* 2 */
+ text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+ font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd `em` font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+ font-size: 80%;
+}
+
+/**
+ * Prevent `sub` and `sup` elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+
+sub {
+ bottom: -0.25em;
+}
+
+sup {
+ top: -0.5em;
+}
+
+/* Embedded content
+ ========================================================================== */
+
+/**
+ * Remove the border on images inside links in IE 10.
+ */
+
+img {
+ border-style: none;
+}
+
+/* Forms
+ ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+ font-family: inherit; /* 1 */
+ font-size: 100%; /* 1 */
+ line-height: 1.15; /* 1 */
+ margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+ overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+ text-transform: none;
+}
+
+/**
+ * Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+ -webkit-appearance: button;
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+ border-style: none;
+ padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+ outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+ padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 2. Correct the color inheritance from `fieldset` elements in IE.
+ * 3. Remove the padding so developers are not caught out when they zero out
+ * `fieldset` elements in all browsers.
+ */
+
+legend {
+ box-sizing: border-box; /* 1 */
+ color: inherit; /* 2 */
+ display: table; /* 1 */
+ max-width: 100%; /* 1 */
+ padding: 0; /* 3 */
+ white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+ vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
+ */
+
+textarea {
+ overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+ box-sizing: border-box; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+ height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+ -webkit-appearance: textfield; /* 1 */
+ outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to `inherit` in Safari.
+ */
+
+::-webkit-file-upload-button {
+ -webkit-appearance: button; /* 1 */
+ font: inherit; /* 2 */
+}
+
+/* Interactive
+ ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+ display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+ display: list-item;
+}
+
+/* Misc
+ ========================================================================== */
+
+/**
+ * Add the correct display in IE 10+.
+ */
+
+template {
+ display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+ display: none;
+}
diff --git a/opentech/static_src/src/sass/public/components/_button.scss b/opentech/static_src/src/sass/public/components/_button.scss
index a2962ae269586c7b310d19808157261ce7189a9a..8f93edac191f8d041dcd43ffcbc2f753dc15ef42 100644
--- a/opentech/static_src/src/sass/public/components/_button.scss
+++ b/opentech/static_src/src/sass/public/components/_button.scss
@@ -9,6 +9,23 @@
cursor: pointer;
}
+ &:disabled,
+ &.is-disabled {
+ pointer-events: none;
+ opacity: .5;
+ }
+
+ &--primary {
+ @include button($color--light-blue, $color--dark-blue);
+ display: inline-block;
+
+ .form--filters & {
+ width: 100%;
+ text-align: center;
+ height: 45px;
+ }
+ }
+
&--left-space {
margin-left: 20px;
}
@@ -111,4 +128,3 @@
}
}
}
-
diff --git a/opentech/static_src/src/sass/public/components/_link.scss b/opentech/static_src/src/sass/public/components/_link.scss
index 6bb2da46d5339c226f1507f256fdaf66dfc8792c..7d4790b203e0c1384fb609e97c9e5773a3978670 100644
--- a/opentech/static_src/src/sass/public/components/_link.scss
+++ b/opentech/static_src/src/sass/public/components/_link.scss
@@ -36,6 +36,7 @@
@include button(transparent, $color--darkest-blue);
color: $color--white;
+ &:focus,
&:hover {
border: 1px solid transparent;
}
diff --git a/opentech/static_src/src/sass/public/components/_media-box.scss b/opentech/static_src/src/sass/public/components/_media-box.scss
index fd29f1d7a1b9f7e0b5563f27149dc840760bac66..ded4c699c19a40a4dad97e4be80f3db6b2a91977 100644
--- a/opentech/static_src/src/sass/public/components/_media-box.scss
+++ b/opentech/static_src/src/sass/public/components/_media-box.scss
@@ -25,30 +25,16 @@
}
&__image-container {
- position: relative;
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 170px;
- background-repeat: no-repeat;
- background-size: cover;
@include media-query(mob-landscape) {
width: 210px;
height: 210px;
}
-
- &::before {
- position: absolute;
- top: 0;
- left: 0;
- display: block;
- width: 100%;
- height: 100%;
- background-color: rgba(27, 27, 27, .8); // sass-lint:disable-line no-color-literals
- content: '';
- }
}
&__image {
diff --git a/opentech/storage_backends.py b/opentech/storage_backends.py
index 4dba8b95e81bd05ce6dc79e6a4932e2e91d68428..3a347b4cbf1c2194e2e77dc7fbac240935eb6e62 100644
--- a/opentech/storage_backends.py
+++ b/opentech/storage_backends.py
@@ -1,6 +1,7 @@
from urllib import parse
from django.conf import settings
+from django.urls import reverse
from django.utils.encoding import filepath_to_uri
from storages.backends.s3boto3 import S3Boto3Storage
@@ -28,8 +29,21 @@ class PrivateMediaStorage(S3Boto3Storage):
file_overwrite = False
querystring_auth = True
url_protocol = 'https:'
+ is_submission = False
def url(self, name, parameters=None, expire=None):
+ if self.is_submission:
+ try:
+ name_parts = name.split('/')
+ return reverse(
+ 'apply:submissions:private_media_redirect', kwargs={
+ 'submission_id': name_parts[1], 'field_id': name_parts[2],
+ 'file_name': name_parts[3]
+ }
+ )
+ except IndexError:
+ pass
+
url = super().url(name, parameters, expire)
if hasattr(settings, 'AWS_PRIVATE_CUSTOM_DOMAIN'):
diff --git a/opentech/templates/base-apply.html b/opentech/templates/base-apply.html
index db027ef13f48542defa6ff1b260900b179cb9eec..3b304836dd251a87ca9e3ba70c56a92eeeb3537e 100644
--- a/opentech/templates/base-apply.html
+++ b/opentech/templates/base-apply.html
@@ -25,14 +25,16 @@
<meta name="theme-color" content="#ffffff">
<link rel="mask-icon" href="{% static 'images/favicons/safari-pinned-tab.svg' %}" color="#5bbad5">
- <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css">
+ <script>document.querySelector('html').classList.replace('no-js', 'js');</script>
+
+ <link rel="stylesheet" href="{% static 'css/normalize.css' %}">
<link rel="stylesheet" href="{% static 'css/apply/main.css' %}">
{# Hijack styling #}
<link rel="stylesheet" href="{% static 'hijack/hijack-styles.css' %}" />
{% block extra_css %}{% endblock %}
<link rel="stylesheet" href="{% static 'css/print.css' %}" media="print">
- <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="{% static 'js/jquery.min.js' %}"></script>
</head>
<body class="{% block body_class %}light-grey-bg template-{{ page.get_verbose_name|slugify }}{% endblock %}">
@@ -93,7 +95,9 @@
</header>
<main class="wrapper wrapper--large wrapper--main">
+ {% block content_wrapper %}
{% block content %}{% endblock %}
+ {% endblock %}
</main>
<footer class="footer"></footer>
diff --git a/opentech/templates/base.html b/opentech/templates/base.html
index 169a159d780f4063fc85d946c5d31ebb4e0bb6ee..aecbdf7b4733ad7f53ba51978041401beb56589a 100644
--- a/opentech/templates/base.html
+++ b/opentech/templates/base.html
@@ -52,12 +52,14 @@
<meta property="og:description" content="{{ page|social_text:request.site }}" />
<meta property="og:site_name" content="{{ settings.utils.SocialMediaSettings.site_name }}" />
- <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/8.0.0/normalize.min.css">
+ <script>document.querySelector('html').classList.replace('no-js', 'js');</script>
+
+ <link rel="stylesheet" href="{% static 'css/normalize.css' %}">
<link rel="stylesheet" href="{% static 'css/public/main.css' %}">
{% block extra_css %}{% endblock %}
<link rel="stylesheet" href="{% static 'css/print.css' %}" media="print">
- <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
+ <script src="{% static 'js/jquery.min.js' %}"></script>
</head>
<body class="{% block body_class %}template-{{ page.get_verbose_name|slugify }}{% endblock %}">
diff --git a/opentech/urls.py b/opentech/urls.py
index bb1184b1aae7174a39ddd6673dc03be43b638c03..2aa4a198c885865d2e0d283fcb36893c4410586c 100644
--- a/opentech/urls.py
+++ b/opentech/urls.py
@@ -12,10 +12,18 @@ from wagtail.images.views.serve import ServeView
from opentech.public import urls as public_urls
from opentech.apply.users.urls import public_urlpatterns as user_urls
-
+from opentech.apply.users.views import LoginView
urlpatterns = [
path('django-admin/', admin.site.urls),
+ path(
+ 'admin/login/',
+ LoginView.as_view(
+ template_name='users/login.html',
+ redirect_authenticated_user=True
+ ),
+ name='wagtailadmin_login'
+ ),
path('admin/', include(wagtailadmin_urls)),
path('documents/', include(wagtaildocs_urls)),
diff --git a/requirements.txt b/requirements.txt
index 192f6e09ab86362a00dc1f4f7af179e3984463c3..46114ac411cf678fc445e238b48bcc70e3d829df 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -33,6 +33,7 @@ django-referrer-policy==1.0
django-storages==1.6.6
django-tables2==1.21.1
django-tinymce4-lite==1.7.0
+django-two-factor-auth==1.8.0
django-webpack-loader==0.6.0
django_select2==6.0.1
djangorestframework==3.9.0
@@ -43,6 +44,7 @@ mistune==0.8.4
Pillow==4.3.0
psycopg2==2.7.3.1
social_auth_app_django==3.1.0
+tomd==0.1.3
wagtail~=2.2.0
wagtail-cache==0.5.1
whitenoise==4.0