Merge pull request #822 from CDLUC3/821-epic-ezid-site-text-and-relat…

…ed-ui-updates

Text updates

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/footer_geo-off.html

@@ -19,7 +19,7 @@
 	</div>
 
 	<div class="footer__icons">
-		<a class="footer__icon-link" href="" title="Twitter"><img class="footer__icon" src="images/iconTwitter.svg" alt="California Digital Library"></a>
+		<!-- <a class="footer__icon-link" href="" title="Twitter"><img class="footer__icon" src="images/iconTwitter.svg" alt="California Digital Library"></a> -->
 		<a class="footer__icon-link" href="" title="RSS"><img class="footer__icon" src="images/iconRSS.svg" alt="California Digital Library"></a>
  	</div>
 

dev/includes/footer_geo-on.html

@@ -25,7 +25,7 @@
 	</div>
 
 	<div class="footer__icons">
-		<a class="footer__icon-link" href="" title="Twitter"><img class="footer__icon" src="images/iconTwitter.svg" alt="California Digital Library"></a>
+		<!-- <a class="footer__icon-link" href="" title="Twitter"><img class="footer__icon" src="images/iconTwitter.svg" alt="California Digital Library"></a> -->
 		<a class="footer__icon-link" href="" title="RSS"><img class="footer__icon" src="images/iconRSS.svg" alt="California Digital Library"></a>
  	</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"),