diff --git a/ietf/ipr/views.py b/ietf/ipr/views.py index 4354262d4..fe464f8d5 100644 --- a/ietf/ipr/views.py +++ b/ietf/ipr/views.py @@ -245,23 +245,27 @@ def add_email(request, id): return render(request, 'ipr/add_email.html',dict(ipr=ipr,form=form)) @role_required('Secretariat',) -def admin(request,state): +def admin(request, state): """Administrative disclosure listing. For non-posted disclosures""" - if state == 'removed': - states = ('removed','rejected') - else: - states = [state] + states = IprDisclosureStateName.objects.filter(slug__in=[state, "rejected"] if state == "removed" else [state]) + if not states: + raise Http404 + iprs = IprDisclosureBase.objects.filter(state__in=states).order_by('-time') - - tabs = [('Pending','pending',urlreverse('ipr_admin',kwargs={'state':'pending'}),True), - ('Removed','removed',urlreverse('ipr_admin',kwargs={'state':'removed'}),True), - ('Parked','parked',urlreverse('ipr_admin',kwargs={'state':'parked'}),True)] - - template = 'ipr/admin_' + state + '.html' - return render(request, template, { + + tabs = [ + t + (t[0].lower() == state.lower(),) + for t in [ + ('Pending', urlreverse('ipr_admin', kwargs={'state':'pending'})), + ('Removed', urlreverse('ipr_admin', kwargs={'state':'removed'})), + ('Parked', urlreverse('ipr_admin', kwargs={'state':'parked'})), + ]] + + return render(request, 'ipr/admin_list.html', { 'iprs': iprs, 'tabs': tabs, - 'selected': state + 'states': states, + 'administrative_list': state, }) @role_required('Secretariat',) diff --git a/ietf/templates/ipr/admin_base.html b/ietf/templates/ipr/admin_base.html deleted file mode 100644 index b6455a6f7..000000000 --- a/ietf/templates/ipr/admin_base.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "base.html" %} -{# Copyright The IETF Trust 2007, All Rights Reserved #} - -{% block title %}IPR Admin{% endblock %} - -{% block pagehead %} - -{% endblock %} - -{% block content %} - -{% load ietf_filters %} - -

IPR Admin Page

-Back to IPR Disclosure Page

- -
- -
- -{% block tab_content %} - -{% endblock %} - - -{% endblock %} diff --git a/ietf/templates/ipr/admin_item.html b/ietf/templates/ipr/admin_item.html deleted file mode 100644 index 7516bdca4..000000000 --- a/ietf/templates/ipr/admin_item.html +++ /dev/null @@ -1,33 +0,0 @@ -{% load ietf_filters %} -{# Copyright The IETF Trust 2007, All Rights Reserved #} - - {{ ipr.time|date:"Y-m-d" }} - {{ ipr.id }} - - {{ ipr.title }} -
- {% for item in ipr.relatedipr_source_set.all %} - {% if item.target.state_id == 'posted' %} - Updates ID #{{ item.target.id }}.
- {% endif %} - {% endfor %} - {% for item in ipr.relatedipr_target_set.all %} - {% comment %}{% if item.processed == 1 and item.ipr.status != 2 %}{% endcomment %} - {% if item.source.state_id == "posted" %} - Updated by ID #{{ item.source.id }}.
- {% endif %} - {% endfor %} - - {% if selected == 'pending' %} - {{ ipr.get_latest_event_msgout.time|date:"Y-m-d" }} - - {% if ipr.get_latest_event_msgout.response_due %} - {{ ipr.get_latest_event_msgout.response_due|date:"Y-m-d" }} - {% if ipr.get_latest_event_msgout.response_past_due %} - - {% endif %} - {% endif %} - - {% endif %} - - diff --git a/ietf/templates/ipr/admin_list.html b/ietf/templates/ipr/admin_list.html new file mode 100644 index 000000000..0df342540 --- /dev/null +++ b/ietf/templates/ipr/admin_list.html @@ -0,0 +1,22 @@ +{% extends "ietf.html" %} + +{% load ietf_filters %} + +{% block title %}IPR Admin - {% for s in states %}{{ s.name }}{% if not forloop.last %}/{% endif %}{% endfor %} Disclosures{% endblock %} + +{% block content %} +

IPR Admin - {% for s in states %}{{ s.name }}{% if not forloop.last %}/{% endif %}{% endfor %} Disclosures

+ +

+ Back to IPR Disclosure Page +

+ + + + {% include "ipr/ipr_table.html" %} + +{% endblock %} diff --git a/ietf/templates/ipr/admin_parked.html b/ietf/templates/ipr/admin_parked.html deleted file mode 100644 index b0b70f58d..000000000 --- a/ietf/templates/ipr/admin_parked.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "ipr/admin_base.html" %} -{# Copyright The IETF Trust 2007, All Rights Reserved #} - -{% load ietf_filters %} - -{% block tab_content %} - -

Parked Disclosures

- - - {% for ipr in iprs %} - {% include "ipr/admin_item.html" %} - {% endfor %} -
SubmittedID #Title of IPR Disclosure
- -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/ipr/admin_pending.html b/ietf/templates/ipr/admin_pending.html deleted file mode 100644 index 5a038cb3d..000000000 --- a/ietf/templates/ipr/admin_pending.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "ipr/admin_base.html" %} -{# Copyright The IETF Trust 2007, All Rights Reserved #} - -{% load ietf_filters %} - -{% block tab_content %} - -

Pending Disclosures

- - - {% for ipr in iprs %} - {% include "ipr/admin_item.html" %} - {% endfor %} -
SubmittedID #Title of IPR DisclosureQueryResponse Due
- -{% endblock %} diff --git a/ietf/templates/ipr/admin_removed.html b/ietf/templates/ipr/admin_removed.html deleted file mode 100644 index f3d746d3e..000000000 --- a/ietf/templates/ipr/admin_removed.html +++ /dev/null @@ -1,16 +0,0 @@ -{% extends "ipr/admin_base.html" %} -{# Copyright The IETF Trust 2007, All Rights Reserved #} - -{% load ietf_filters %} - -{% block tab_content %} - -

Removed / Rejected Disclosures

- - - {% for ipr in iprs %} - {% include "ipr/admin_item.html" %} - {% endfor %} -
SubmittedID #Title of IPR Disclosure
- -{% endblock %} \ No newline at end of file diff --git a/ietf/templates/ipr/details_edit.html b/ietf/templates/ipr/details_edit.html index 7fc0ab6b4..31a39a7e3 100644 --- a/ietf/templates/ipr/details_edit.html +++ b/ietf/templates/ipr/details_edit.html @@ -7,7 +7,6 @@ {% block pagehead %} - {# #} {% endblock %} {% block content %} diff --git a/ietf/templates/ipr/ipr_table.html b/ietf/templates/ipr/ipr_table.html new file mode 100644 index 000000000..861b1f4fe --- /dev/null +++ b/ietf/templates/ipr/ipr_table.html @@ -0,0 +1,56 @@ +{% load ietf_filters %} + + + + + + + {% if administrative_list == 'pending' %} + + + {% endif %} + + + + {% for ipr in iprs %} + + + + + + {% if administrative_list == 'pending' %} + {% with ipr.get_latest_event_msgout as latest_msgout %} + + + {% endwith %} + {% endif %} + + {% endfor %} + +
DateIDTitleQueryResponse Due
{{ ipr.time|date:"Y-m-d" }}{{ ipr.id }} + {% if ipr.state_id == 'posted' or administrative_list %} +
{{ ipr.title }}
+ {% else %} +
{{ ipr.title }}
+
This IPR disclosure was removed at the request of the submitter.
+ {% endif %} + + {% for item in ipr.relatedipr_source_set.all %} + {% if item.target.state_id == 'posted' %} +
Updates ID #{{ item.target.id }}.
+ {% endif %} + {% endfor %} + + {% for item in ipr.relatedipr_target_set.all %} + {% if item.source.state_id == "posted" %} +
Updated by ID #{{ item.source.id }}.
+ {% endif %} + {% endfor %} +
{% if latest_msgout %}{{ latest_msgout.time|date:"Y-m-d" }}{% endif %} + {% if latest_msgout and latest_msgout.response_due %} + {{ latest_msgout.response_due|date:"Y-m-d" }} + {% if latest_msgout.response_past_due %} + + {% endif %} + {% endif %} +
diff --git a/ietf/templates/ipr/list.html b/ietf/templates/ipr/list.html index 1128dd464..7bb079af3 100644 --- a/ietf/templates/ipr/list.html +++ b/ietf/templates/ipr/list.html @@ -6,83 +6,53 @@ {% block bodyAttrs %}data-spy="scroll" data-target="#affix"{% endblock %} -{% block pagehead %} - -{% endblock %} - {% block content %} +
+
-
-
+

Intellectual property rights disclosures

-

Intellectual property rights disclosures

- -
+

- This page provides a mechanism for filing disclosures about intellectual property rights (IPR) and for finding out what IPR disclosures have been filed. The IETF intellectual property rights rules are defined in RFC 3979, "Intellectual Property Rights in IETF Technology." + This page provides a mechanism for filing disclosures about intellectual property rights (IPR) and for finding out what IPR disclosures have been filed. The IETF intellectual property rights rules are defined in RFC 3979, "Intellectual Property Rights in IETF Technology."

- The IETF takes no position regarding the validity or scope of any - intellectual property rights or other rights that might be claimed to - pertain to the implementation or use of the technology described in any IETF documents or the extent to - which any license under such rights might or might not be available; nor does it represent that it has made any independent effort to identify any such rights. + The IETF takes no position regarding the validity or scope of any + intellectual property rights or other rights that might be claimed to + pertain to the implementation or use of the technology described in any IETF documents or the extent to + which any license under such rights might or might not be available; nor does it represent that it has made any independent effort to identify any such rights.

-
+
-

+

Submit an IPR disclosure Search IPR disclosures {% if user|has_role:"Secretariat" %} - Administrative View + Administrative View {% endif %} -

+

-

Generic IPR disclosures

- - - - - - {% for ipr in generic_disclosures %} - {% include "ipr/list_item.html" %} - {% endfor %} - -
DateIDTitle
+

Generic IPR disclosures

-

Specific IPR disclosures

- - - - - - {% for ipr in specific_disclosures %} - {% include "ipr/list_item.html" %} - {% endfor %} - -
DateIDTitle
+ {% include "ipr/ipr_table.html" with iprs=generic_disclosures %} -

Specific third-party IPR disclosures

- - - - - - {% for ipr in thirdpty_disclosures %} - {% include "ipr/list_item.html" %} - {% endfor %} - -
DateIDTitle
+

Specific IPR disclosures

-
- -
+ {% include "ipr/ipr_table.html" with iprs=specific_disclosures %} + +

Specific third-party IPR disclosures

+ + {% include "ipr/ipr_table.html" with iprs=thirdpty_disclosures %} + +
+ +
+ +
+
{% endblock %} - - diff --git a/ietf/templates/ipr/list_item.html b/ietf/templates/ipr/list_item.html deleted file mode 100644 index be5bcd3b1..000000000 --- a/ietf/templates/ipr/list_item.html +++ /dev/null @@ -1,24 +0,0 @@ -{% load ietf_filters %} - - {{ ipr.time|date:"Y-m-d" }} - {{ ipr.id }} - - {% if ipr.state_id == 'posted' %} - {{ ipr.title }} - {% else %} - {{ ipr.title }} -
This IPR disclosure was removed at the request of the submitter. - {% endif %} - - {% for item in ipr.relatedipr_source_set.all %} - {% if item.target.state_id == 'posted' %} - Updates ID #{{ item.target.id }}.
- {% endif %} - {% endfor %} - {% for item in ipr.relatedipr_target_set.all %} - {% if item.source.state_id == "posted" %} - Updated by ID #{{ item.source.id }}.
- {% endif %} - {% endfor %} - - diff --git a/ietf/templates/ipr/search.html b/ietf/templates/ipr/search.html index 8b43433ed..c74574cbd 100644 --- a/ietf/templates/ipr/search.html +++ b/ietf/templates/ipr/search.html @@ -1,9 +1,5 @@ {% extends "ietf.html" %} -{% block pagehead %} - -{% endblock %} - {% block title %}IPR search{% endblock %} {% block content %} diff --git a/ietf/templates/ipr/search_doc_result.html b/ietf/templates/ipr/search_doc_result.html index a6706734a..e1fdfabac 100644 --- a/ietf/templates/ipr/search_doc_result.html +++ b/ietf/templates/ipr/search_doc_result.html @@ -19,7 +19,7 @@ {% for ipr in iprs %} {{ ipr.time|date:"Y-m-d" }} - {{ ipr.id }} + {{ ipr.id }} {{ ipr.title }} {% endfor %} @@ -50,7 +50,7 @@ {% if ipr.disclosure.state_id in states %} {{ ipr.disclosure.time|date:"Y-m-d" }} - {{ ipr.disclosure.id }} + {{ ipr.disclosure.id }} {{ ipr.disclosure.title }} {% endif %} diff --git a/ietf/templates/ipr/search_doctitle_result.html b/ietf/templates/ipr/search_doctitle_result.html index 6310cd777..753536955 100644 --- a/ietf/templates/ipr/search_doctitle_result.html +++ b/ietf/templates/ipr/search_doctitle_result.html @@ -24,7 +24,7 @@ {% for ipr in alias.document.ipr %} {{ ipr.disclosure.time|date:"Y-m-d" }} - {{ ipr.disclosure.id }} + {{ ipr.disclosure.id }} {% for item in ipr.disclosure.updated_by.all %} {% if item.source.state_id == "posted" %} diff --git a/ietf/templates/ipr/search_form.html b/ietf/templates/ipr/search_form.html index ab03e59ac..a40b0c80f 100644 --- a/ietf/templates/ipr/search_form.html +++ b/ietf/templates/ipr/search_form.html @@ -2,7 +2,7 @@

IPR Search

-
+ {% if user|has_role:"Secretariat" %}

State Filter

diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html index ec6c23bb4..f56e1a522 100644 --- a/ietf/templates/ipr/search_result.html +++ b/ietf/templates/ipr/search_result.html @@ -4,10 +4,6 @@ {% block title %}IPR disclosures{% endblock %} -{% block pagehead %} - -{% endblock %} - {% block content %} {% include "ipr/search_form.html" %} @@ -24,7 +20,7 @@

- + {% block iprlist %} {% for ipr in iprs %} @@ -53,7 +49,7 @@ - + @@ -61,7 +57,7 @@ {% if item != ipr %} - + - +
DateIDStatement
DateIDStatement
{{ ipr.time|date:"Y-m-d" }}{{ ipr.id }}{{ ipr.id }} {{ ipr.title }}
{{ item.target.time|date:"Y-m-d" }}#{{ item.target.id }}{{ item.target.id }} IPR disclosure #{{ ipr.id }}: {{ ipr.title }}
Updates: {{ item.target.title }} diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html index b66fbdaa1..55b6530a7 100644 --- a/ietf/templates/ipr/search_wg_result.html +++ b/ietf/templates/ipr/search_wg_result.html @@ -26,7 +26,7 @@ {% for ipr in alias.document.ipr %}
{{ ipr.disclosure.time|date:"Y-m-d" }}{{ ipr.disclosure.id }}{{ ipr.disclosure.id }} {% for item in ipr.disclosure.updates.all %} {% if item.target.state_id == "posted" %} diff --git a/static/facelift/js/ipr-search.js b/static/facelift/js/ipr-search.js index 9285f9429..d2384061e 100644 --- a/static/facelift/js/ipr-search.js +++ b/static/facelift/js/ipr-search.js @@ -1,5 +1,7 @@ $(document).ready(function() { // hack the "All States" check box + $("#id_state").addClass("list-inline"); + $("#id_state input[value!=all]").change(function(e) { if (this.checked) { $("#id_state input[value=all]").prop('checked',false);