avoid AAP references in default theme (superdesk#526)

NHUB-12

assets/styles/custom.scss

@@ -1,4 +1,4 @@
-// Bootstrap overrides - AAP Newsroom
+// Bootstrap overrides - Newshub
 
 @import './custom-variables.scss'; // custom variables, Bootstrap overrides
 @import './custom-utilities.scss'; // custom utilities for RTL support

newsroom/templates/base_layout.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
     {% block title_wrapper %}
-    <title>{{ config.SITE_NAME }} - {% block title %}{% endblock %}</title>
+    <title>{{ config.SITE_NAME }}{% if self.title() %} - {% endif %}{% block title %}{% endblock %}</title>
     {% endblock %}
 
     {% block fonts %}

newsroom/templates/company_expiry_alert_user.html

@@ -1,3 +1,3 @@
 <h3>Your company's account is expiring on {{expiry_date | datetime_short}}</h3></br>
-<h3>Please contact AAP for further details.</h3>
+<h3>Please contact us for further details.</h3>
 

newsroom/templates/company_expiry_alert_user.txt

@@ -1,2 +1,2 @@
 Your company's account is expiring on {{expiry_date | datetime_short}}
-Please contact AAP for further details.
+Please contact us for further details.

newsroom/templates/page-copyright.html

@@ -9,16 +9,16 @@
 
             <h1 class="mb-5">Copyright</h1>
 
-            <p>Note: The copyright in the information provided through AAP Newsroom is either owned by
-                or licensed to Australian Associated Press Pty Ltd.</p>
+            <p>Note: The copyright in the information provided through {{ config.SITE_NAME }} is either owned by
+                or licensed to {{ config.COPYRIGHT_HOLDER }}.</p>
 
             <p>You may not use this information for any purpose or in any medium or format unless you or your
-                organisation have an appropriate agreement in place with Australian Associated Press Pty Ltd and
+                organisation have an appropriate agreement in place with {{ config.COPYRIGHT_HOLDER }} and
                 strictly adhere to the terms of such agreement.</p>
 
             <p>For the avoidance of doubt, this information (including edited, abridged or rewritten versions of
                 this information) is not to be republished, redistributed or redisseminated via the Internet or
-                the World Wide Web without AAP's written permission. The above prohibitions include framing,
+                the World Wide Web without written permission. The above prohibitions include framing,
                 linking, posting to newsgroups and any other form of copying.</p>
 
         </div>

newsroom/web/default_settings.py

@@ -176,8 +176,8 @@
     "newsroom.notifications.send_scheduled_notifications",
 ]
 
-SITE_NAME = "AAP Newsroom"
-COPYRIGHT_HOLDER = "AAP"
+SITE_NAME = "Newshub"
+COPYRIGHT_HOLDER = "Sourcefabric"
 COPYRIGHT_NOTICE = ""
 USAGE_TERMS = ""
 CONTACT_ADDRESS = "#"

tests/core/test_agenda.py

@@ -236,7 +236,7 @@ def test_share_items(client, app, mocker):
         assert resp.status_code == 201, resp.get_data().decode("utf-8")
         assert len(outbox) == 1
         assert outbox[0].recipients == ["[email protected]"]
-        assert outbox[0].subject == "From AAP Newsroom: test headline"
+        assert outbox[0].subject == "From Newshub: test headline"
         assert "Hi Foo Bar" in outbox[0].body
         assert "admin admin ([email protected]) shared " in outbox[0].body
         assert "Conference Planning" in outbox[0].body

tests/core/test_topics.py

@@ -153,7 +153,7 @@ def test_share_wire_topics(client, app):
         assert len(outbox) == 1
         assert outbox[0].recipients == ["[email protected]"]
         assert outbox[0].sender == "newsroom@localhost"
-        assert outbox[0].subject == "From AAP Newsroom: %s" % topic["label"]
+        assert outbox[0].subject == "From Newshub: %s" % topic["label"]
         assert "Hi Test Bar" in outbox[0].body
         assert "Foo Bar ([email protected]) shared " in outbox[0].body
         assert topic["query"] in outbox[0].body
@@ -183,7 +183,7 @@ def test_share_agenda_topics(client, app):
         assert len(outbox) == 1
         assert outbox[0].recipients == ["[email protected]"]
         assert outbox[0].sender == "newsroom@localhost"
-        assert outbox[0].subject == "From AAP Newsroom: %s" % agenda_topic["label"]
+        assert outbox[0].subject == "From Newshub: %s" % agenda_topic["label"]
         assert "Hi Test Bar" in outbox[0].body
         assert "Foo Bar ([email protected]) shared " in outbox[0].body
         assert agenda_topic["query"] in outbox[0].body

tests/core/test_wire.py

@@ -68,7 +68,7 @@ def test_share_items(client, app):
         assert len(outbox) == 1
         assert outbox[0].recipients == ["[email protected]"]
         assert outbox[0].sender == "newsroom@localhost"
-        assert outbox[0].subject == "From AAP Newsroom: %s" % items[0]["headline"]
+        assert outbox[0].subject == "From Newshub: %s" % items[0]["headline"]
         assert "Hi Foo Bar" in outbox[0].body
         assert "admin admin ([email protected]) shared " in outbox[0].body
         assert items[0]["headline"] in outbox[0].body