Merge branch '821-epic-ezid-site-text-and-related-ui-updates' into ac…

…cessibility-rollup01

dev/includes/accordion.html

@@ -15,32 +15,11 @@
 
 	</details>
 
-	<details id="accordion__section-3" class="accordion__section">
-		<summary class="accordion__title">Pricing</summary>
-
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Laudantium cumque ex, pariatur autem, numquam veniam, ipsam accusantium hic officia qui doloremque soluta, minus cupiditate obcaecati est temporibus expedita at eligendi.</p>
-
-	</details>
-
 	<details id="accordion__section-4" class="accordion__section">
 		<summary class="accordion__title">Documentation</summary>
 
 		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptate reprehenderit, eius ipsam nulla inventore, tempore eveniet dicta dolores eaque illo provident officiis perspiciatis ut tenetur voluptatum sapiente? Molestiae, aliquid quia.</p>
 
 	</details>
 
-	<details id="accordion__section-5" class="accordion__section">
-		<summary class="accordion__title"><abbr title="Frequently Asked Questions">FAQ</abbr></summary>
-
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Voluptas molestias quidem quae reprehenderit eveniet fuga sapiente, temporibus aspernatur obcaecati quia illum similique, impedit soluta reiciendis non architecto expedita nesciunt optio!</p>
-
-	</details>
-
-	<details id="accordion__section-6" class="accordion__section">
-		<summary class="accordion__title">Media</summary>
-
-		<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Asperiores quam deleniti obcaecati perferendis earum itaque necessitatibus accusantium consequuntur labore in blanditiis illo, corrupti amet maiores! Consequuntur et maxime quia ratione.</p>
-
-	</details>
-
 </div>

dev/includes/header.html

@@ -25,10 +25,8 @@
       <div class="header__subnav-panel">
         <a class="header__nav-subitem" href="/learn#01">What Is EZID?</a>
         <a class="header__nav-subitem" href="/learn#02">Current Users</a>
-        <a class="header__nav-subitem" href="/learn#03">Pricing</a>
         <a class="header__nav-subitem" href="/learn#04">Documentation</a>
-        <a class="header__nav-subitem" href="/learn#05">FAQ</a>
-        <a class="header__nav-subitem" href="/learn#06">Media</a>
+        <a class="header__nav-subitem" href="/learn/doi_services_faq">FAQ</a>
         <a class="header__nav-subitem" href="/doc/apidoc.html">API Guide</a>
         <a class="header__nav-subitem" href="/demo">EZID Demo</a>
       </div>

dev/layout_contact.html

@@ -33,7 +33,6 @@ <h1 class="heading__primary-text">Contact Us</h1>
         <select name="url-here" id="fcontrol__example-label14" class="fcontrol__select--fullwidth">
           <option value="account_new">I would like to inquire about getting a new account</option>
           <option value="account_existing">I have a problem or question about existing account</option>
-          <option value="newsletter">I'd like to sign up for the EZID email newsletter</option>
           <option value="other">Other</option>
         </select>
       </div>

impl/form_objects.py

@@ -1703,8 +1703,8 @@ def __init__(self, *args, **kwargs):
         CONTACT_REASONS = (
             ("None Entered", _("Choose One")),
             (
-                "I would like to inquire about getting a new account for ARKs",
-                _("I would like to inquire about getting a new account for ARKs *"),
+                "I would like to inquire about getting a new account",
+                _("I would like to inquire about getting a new account *"),
             ),
             (
                 "I have a problem or question about existing account",
@@ -1754,11 +1754,6 @@ def __init__(self, *args, **kwargs):
             choices=REFERRAL_SOURCES,
             label=_("How did you hear about us?"),
         )
-        # noinspection PySimplifyBooleanCheck
-        if self.localized == False:
-            self.fields["newsletter"] = django.forms.BooleanField(
-                required=False, label=_("Subscribe to the EZID newsletter")
-            )
         self.fields["question"] = django.forms.CharField(
             max_length=200,
             label=_("Human test: How many drop down menus are in this form?"),

impl/ui.py

@@ -84,11 +84,6 @@ def contact(request):
                 + P['hear_about']
                 + "\r\n\r\n"
             )
-            if 'newsletter' in P:
-                if P['newsletter'] == 'on':
-                    message += "YES, I'd like to subscribe to the EZID newsletter."
-                else:
-                    message += "Newsletter option NOT checked."
             try:
                 email = EmailMessage(
                     subject=title,

impl/ui_home.py

@@ -62,14 +62,6 @@ def learn(request):
     return impl.ui_common.render(request, 'learn', d)
 
 
-def ark_open_faq(request):
-    if request.method != "GET":
-        return impl.ui_common.methodNotAllowed(request)
-    d = {'menu_item': 'ui_home.learn'}
-    # noinspection PyUnresolvedReferences
-    return impl.ui_common.render(request, 'info/ark_open_faq', d)
-
-
 def crossref_faq(request):
     if request.method != "GET":
         return impl.ui_common.methodNotAllowed(request)

settings/urls.py

@@ -35,7 +35,6 @@
     django.urls.re_path("^$",                              impl.ui_home.index,                 name="ui_home.index"),
     django.urls.re_path("^home/ajax_index_form$",          impl.ui_home.ajax_index_form,       name="ui_home.ajax_index_form"),
     django.urls.re_path("^learn/$",                        impl.ui_home.learn,                 name="ui_home.learn"),
-    django.urls.re_path("^learn/ark_open_faq$",            impl.ui_home.ark_open_faq,          name="ui_home.ark_open_faq"),
     django.urls.re_path("^learn/crossref_faq$",            impl.ui_home.crossref_faq,          name="ui_home.crossref_faq"),
     django.urls.re_path("^learn/doi_services_faq$",        impl.ui_home.doi_services_faq,      name="ui_home.doi_services_faq",),
     django.urls.re_path("^learn/id_basics$",               impl.ui_home.id_basics,             name="ui_home.id_basics"),

static_src/info/doi_services_faq.html

@@ -3,49 +3,63 @@
 {% load menus %}
 {% load i18n %}
 
-{% block title %}{% block title-twitter %}{% trans "DOI Services FAQ" %}{% endblock %}{% endblock %}
-{% block heading %}{% content_heading _("DOI Services: Frequently Asked Questions") %}{% endblock %}
+{% block title %}{% block title-twitter %}{% trans "Registration Services FAQ" %}{% endblock %}{% endblock %}
+{% block heading %}{% content_heading _("Frequently Asked Questions") %}{% endblock %}
 {% block content %}
 
 {% comment %}Don't need to translate this{% endcomment %}
-{% learn_breadcrumb 'DOI Services FAQ' 'FAQ' '#05' %}
+{% learn_breadcrumb 'Registration Services FAQ' 'FAQ' '#05' %}
 <div class="container api">
 {% comment %}Translators: Copy HTML tags over and only translate words outside of these tags 
 i.e.: <p>TRANSLATE TEXT WRAPPED BY HTML TAGS</p> 
 i.e.: <a href="don't_translate_urls">PLEASE PRESERVE HTML TAGS</a> 
 {% endcomment %}
 {% blocktrans trimmed %}
-<p><strong>Can I get a new DOI account?</strong></p>
-
-<p>We are no longer able to issue new DOI service accounts to non-University of California entities. 
-
-<p><strong>Can I get a new ARK account?</strong></p>
-
-<p>Yes.
-
-<p><strong>Why are you changing EZID's service offering in this way?</strong></p>
-
-<p>DOI service providers have evolved considerably over the last 5-10 years, and after careful consideration, we have adopted the following new strategy direction: to endorse and support DataCite's long-term sustainability, while maintaining our own distinct role in the persistent identifier (PID) space. 
-
-<p><strong>What alternatives do I have for DOI services?</strong></p>
-
-<p>Option 1: Direct membership in <a href="http://www.datacite.org/" class="ext-link">DataCite</a>. This is an especially good option if you seek a participatory role in the data citation and data curation community. In addition, we are working closely with DataCite to make sure popular EZID features (such as link checking and the usage dashboard) make their way into DataCite's feature set. If you'd like to know more, visit <a href="http://www.datacite.org/contact.html" class="ext-link">https://www.datacite.org/contact.html</a>.
-
-<p>Option 2: Become a client of another DataCite member. Here is a list of current members:  <a href="http://www.datacite.org/members.html" class="ext-link">https://www.datacite.org/members.html</a>.
-
-<p>Option 3: Use the services of a repository that provides DOIs, such as  <a href="http://www.datadryad.org/" class="ext-link">Dryad</a>,  <a href="http://dataverse.harvard.edu/" class="ext-link">Dataverse</a> or  <a href="http://www.figshare.com/" class="ext-link">figshare</a>. This is a good option if you need only a very small number of DOIs. 
-
-<p>Option 4: Become a client of  <a href="http://www.crossref.org/" class="ext-link">Crossref</a>. Crossref's annual member fee is based on the publishing revenue of the organization. For those organizations with less than $1M in publishing revenue the annual fee is $275. Crossref accepts data, text and preprints. You can explore Crossref's website for more information and when you are ready to apply for membership, complete this form:  <a href="http://www.crossref.org/membership/join" class="ext-link">http://www.crossref.org/membership/join</a>.
-
-<p>If you would like help assessing the differences between Crossref and DataCite services, please <a href="/contact" class="link__primary">contact us</a>
-
-<p><strong>If I already have an EZID account, can I upgrade or change it?</strong></p>
-
-<p>You can certainly add new ARK services. If you have other questions, please <a href="/contact" class="link__primary">contact us</a>.</p>
-
-<p><strong>How does all of this affect University of California EZID account holders?</strong></p>
-
-<p>University of California clients and prospective clients are <strong>not</strong> affected by this change. If you have any questions, please <a href="/contact" class="link__primary">contact us</a>.</p>
+  <h2 class="heading_2">How do I obtain a new account?</h2>
+
+<p>
+  New accounts for ARK and DOI services are available to University of California users only, with access being
+  managed at the campus-level through the library. Please reach out to your campus library directly to obtain an account.
+</p>
+<br/>
+<h2 class="heading_2">What alternatives do I have for DOI and ARK registration services?</h2>
+
+<h3 class="heading_3">For DOI services:</h3>
+
+<p>Option 1: Use the services of a repository that provides DOIs, such as
+  <a href="https://datadryad.org" class="ext-link">Dryad</a>,
+  <a href="https://dataverse.harvard.edu/" class="ext-link">Dataverse</a> or
+  <a href="https://figshare.com/" class="ext-link">figshare</a>.
+  This is a good option if you need only a very small number of DOIs.
+</p>
+
+<p>
+  Option 2: Direct membership in <a href="https://www.datacite.org" class="ext-link">DataCite</a>.
+  See <a href="https://www.datacite.org" class="ext-link">https://www.datacite.org</a> for additional details.
+</p>
+
+<p>
+  Option 3: Direct membership in <a href="https://www.crossref.org" class="ext-link">Crossref</a>.
+  See <a href="https://www.crossref.org" class="ext-link">https://www.crossref.org</a> for additional details.
+</p>
+
+<h3 class="heading_3">For ARK services:</h3>
+
+<p>
+  The <a href="https://arks.org" class="ext-link">ARK Alliance</a> offers many
+  resources to help users get started with ARKs, including
+  setting up your own infrastructure. See
+  <a href="https://arks.org" class="ext-link">https://arks.org</a> for additional details.
+</p>
+
+  <br/>
+<h2 class="heading_2">
+  If I already have an EZID account, can I upgrade or change it?
+</h2>
+
+<p>
+  For assistance with changes to existing accounts, please contact us.
+</p>
 
 {% endblocktrans %}
 </div>