diff --git a/ietf/templates/ipr/search_holder_result.html b/ietf/templates/ipr/search_holder_result.html index 9486aaef9..a25d464de 100644 --- a/ietf/templates/ipr/search_holder_result.html +++ b/ietf/templates/ipr/search_holder_result.html @@ -1,56 +1,4 @@ {% extends "ipr/search_result.html" %} {% load ietf_filters %} -{% block search_result %} - - - - {% if not iprs %} - - - - - {% else %} - - - {% for ipr in iprs %} - - - - - - - - - - {% for upd in ipr.updates.all %} - {% ifnotequal upd ipr %} - - - - - - {% endifnotequal %} - {% endfor %} - - {% endfor %} - - {% endif %} - -
Patent Owner/Applicant Search Result
No IPR disclosures have been submitted by {{ q }}
Total number of IPR disclosures found: {{ count }}
IPR that was submitted by {{ q }}{% if not ipr.drafts.count and not ipr.rfcs.count %}, - and is not related to a specific IETF contribution. - {% else %}, - and is related to - {% for doc in ipr.drafts.all %} - {% ifnotequal ipr.drafts.count 1 %}{% ifequal doc ipr.last_draft %} and {% endifequal %}{% endifnotequal %} - {{ doc.document }}, "{{ doc.document.title }}," - {% endfor %} - {% for doc in ipr.rfcs.all %} - {% ifnotequal ipr.rfcs.count 1 %}{% ifequal doc ipr.last_rfc %} and {% endifequal %}{% endifnotequal %} - {{ doc.document }}, "{{ doc.document.title }}," - {% endfor %} - {% endif %} -
{{ ipr.submitted_date }}
  • ID # {{ ipr.ipr_id }}
    		• "{{ ipr.title }}"
    {{ upd.updated.submitted_date }}
  • ID # {{ upd.updated.ipr_id }}
    		•  - IPR disclosure ID# {{ ipr.ipr_id }} "{{ ipr.title }}" - Updates {{ upd.updated.title }} -
    -{% endblock %} +{% block search_header %}Patent Owner/Applicant Search Result{% endblock %} +{% block item_intro %}IPR that was submitted by {{ q }},{% endblock %} diff --git a/ietf/templates/ipr/search_patent_result.html b/ietf/templates/ipr/search_patent_result.html new file mode 100644 index 000000000..8430c941d --- /dev/null +++ b/ietf/templates/ipr/search_patent_result.html @@ -0,0 +1,9 @@ +{% extends "ipr/search_result.html" %} +{% load ietf_filters %} +{% block search_header %}Patent Information Search Result{% endblock %} +{% block into_prefix %} +IPR that contains the string {{ q }} in the "Disclosure of Patent Information" +section of the form, or in the body of the text (for disclosures submitted by +e-mail), and +{% endblock %} + diff --git a/ietf/templates/ipr/search_result.html b/ietf/templates/ipr/search_result.html index 3f9a09b1b..1ebb63ba4 100644 --- a/ietf/templates/ipr/search_result.html +++ b/ietf/templates/ipr/search_result.html @@ -8,6 +8,62 @@
    {% block search_result %} + + + + {% if not iprs %} + + + + + {% else %} + + {% block iprlist %} + {% for ipr in iprs %} + + + + + + + + + + {% for item in ipr.updates.all %} + {% ifnotequal item ipr %} + + + + + + {% endifnotequal %} + {% endfor %} + + {% endfor %} + {% endblock %} + {% endif %} +
    {% block search_header %}Patent Owner/Applicant Search Result{% endblock %}
    No IPR disclosures have been submitted by {{ q }}
    Total number of IPR disclosures found: {{ count }}
    + {% block intro_prefix %}IPR that was submitted by {{ q }}, and{% endblock %} + {% block related %} + {% if not ipr.drafts.count and not ipr.rfcs.count %} + is not related to a specific IETF contribution. + {% else %} + is related to + {% for item in ipr.drafts.all %} + {% ifnotequal ipr.drafts.count 1 %}{% ifequal item ipr.last_draft %} and {% endifequal %}{% endifnotequal %} + {{ item.document }}, "{{ item.document.title }},"{% if item.document.related %}, {{ item.document.relation }} {{ item.document.related }}, "{{ item.document.related.title }}"{% endif %} + {% endfor %} + {% for item in ipr.rfcs.all %} + {% ifnotequal ipr.rfcs.count 1 %}{% ifequal item ipr.last_rfc %} and {% endifequal %}{% endifnotequal %} + {{ item.document }}, "{{ item.document.title }},"{% if item.document.related %}, {{ item.document.relation }} {{ item.document.related }}, "{{ item.document.related.title }}"{% endif %} + {% endfor %} + {% endif %} + {% endblock %} + {% block intro_suffix %}{% endblock %} +
    {{ ipr.submitted_date }}
  • ID # {{ ipr.ipr_id }}
    		• "{{ ipr.title }}"
    {{ item.updated.submitted_date }}
  • ID # {{ item.updated.ipr_id }}
    		•  + IPR disclosure ID# {{ ipr.ipr_id }} "{{ ipr.title }}" + Updates {{ item.updated.title }} +
    {% endblock %}

    diff --git a/ietf/templates/ipr/search_wg_result.html b/ietf/templates/ipr/search_wg_result.html new file mode 100644 index 000000000..9a9811010 --- /dev/null +++ b/ietf/templates/ipr/search_wg_result.html @@ -0,0 +1,54 @@ +{% extends "ipr/search_result.html" %} +{% load ietf_filters %} + {% block search_result %} + + + {% if not iprs %} + + + + + {% else %} + + + {% block iprlist %} + {% for doc in docs %} + + + + + {% if doc.iprs %} + {% for ipr in doc.iprs %} + + + + + + {% endfor %} + {% else %} + + + + + {% endif %} + + {% endfor %} + {% endblock %} + {% endif %} +
    {% block search_header %}Working Group Search Result{% endblock %}
    No IPR disclosures have been submitted by {{ q }}
    Total number of IPR disclosures found: {{ count }}
    + IPR that is related to {{ doc|rfcspace|lstrip:"0"|rfcnospace }}, "{{ doc.title }}"{% if doc.related %}, {{ doc.relation }} {{ doc.related|rfcspace|lstrip:"0"|rfcnospace }}, "{{ doc.related.title }}"{% endif %} + which is a product of Working Group {{ q }} +
    {{ ipr.submitted_date }}
  • ID # {{ ipr.ipr_id }}
    		•  + {% for item in ipr.updates.all %} + {% ifequal item.updated.status 1 %} + IPR disclosure ID# {{ item.updated.ipr_id }}, "{{ item.updated.title }}" Updated by + {% endifequal %} + {% endfor %} + "{{ ipr.title }}" + +
    No IPR disclosures related to {{ doc|rfcspace|lstrip:"0" }} have been submitted
    + {% endblock %} diff --git a/ietf/templates/utils/all.html b/ietf/templates/utils/all.html index eef68a469..b733f8246 100644 --- a/ietf/templates/utils/all.html +++ b/ietf/templates/utils/all.html @@ -6,6 +6,7 @@

    Review items

    + ( There are {{ count }} items in the list )