Update Support Messaging (#12495)

* Update Support Messaging

* Revert CSS change

* Update wording

* Silly type :face_palm:

Author: Maffooch

docker/entrypoint-initializer.sh

@@ -26,7 +26,7 @@ echo "Creating Announcement Banner"
 cat <<EOD | python3 manage.py shell
 from dojo.models import Announcement, UserAnnouncement, Dojo_User
 announcement, created = Announcement.objects.get_or_create(id=1)
-announcement.message = '<a href="https://defectdojo.com/contact" target="_blank">Cloud and On-Premise Subscriptions Now Available! Click here for more details</a>'
+announcement.message = '<a href="https://cloud.defectdojo.com/accounts/onboarding/plg_step_1" target="_blank">DefectDojo Pro Cloud and On-Premise Subscriptions Now Available! Create an account to try Pro for free!</a>'
 announcement.dismissable = True
 announcement.save()
 for dojo_user in Dojo_User.objects.all():

dojo/announcement/signals.py

@@ -12,7 +12,7 @@ def add_announcement_to_new_user(sender, instance, **kwargs):
         dojo_user = Dojo_User.objects.get(id=instance.id)
         announcement = announcements.first()
         cloud_announcement = (
-            "Cloud and On-Premise Subscriptions Now Available!"
+            "DefectDojo Pro Cloud and On-Premise Subscriptions Now Available!"
             in announcement.message
         )
         if not cloud_announcement or settings.CREATE_CLOUD_BANNER:

dojo/context_processors.py

@@ -29,6 +29,7 @@ def globalize_vars(request):
         "DOCUMENTATION_URL": settings.DOCUMENTATION_URL,
         "API_TOKENS_ENABLED": settings.API_TOKENS_ENABLED,
         "API_TOKEN_AUTH_ENDPOINT_ENABLED": settings.API_TOKEN_AUTH_ENDPOINT_ENABLED,
+        "CREATE_CLOUD_BANNER": settings.CREATE_CLOUD_BANNER,
     }
 
 

dojo/tasks.py

@@ -204,7 +204,7 @@ def evaluate_pro_proposition(*args, **kwargs):
         entry in announcement.message
         for entry in [
             "",
-            "Cloud and On-Premise Subscriptions Now Available!",
+            "DefectDojo Pro Cloud and On-Premise Subscriptions Now Available!",
             "Findings/Endpoints in their systems",
         ]
     ):

dojo/templates/base.html

@@ -194,6 +194,14 @@
                                             </a>
                                         </li>
                                     {% endif %}
+                                    {% if CREATE_CLOUD_BANNER %}
+                                        <li>
+                                            <a href="https://cloud.defectdojo.com/accounts/onboarding/plg_step_1">
+                                                <i class="fa-solid fa-level-up fa-fw"></i>
+                                                {% trans "Try Pro for Free!" %}
+                                            </a>
+                                        </li>
+                                    {% endif %}
                                     <li>
                                         <a href="{% url 'logout' %}">
                                             <i class="fa-solid fa-right-from-bracket fa-fw"></i>

dojo/templates/dojo/support.html

@@ -75,7 +75,7 @@ <h2 style="text-align: center;">Go Pro!</h2>
                     <p><i class="fa-solid fa-lg fa-circle-check"></i> Support directly from the DefectDojo Team</p>
                     <p><i class="fa-solid fa-lg fa-circle-check"></i> Assistance with best practice and implementation</p>
                 </div>
-                <a href="https://www.defectdojo.com/contact" target="_blank" class="btn btn-primary support commercial light">Go Pro Now</a>
+                <a href="https://cloud.defectdojo.com/accounts/onboarding/plg_step_1" target="_blank" class="btn btn-primary support commercial light">Try Pro for Free!</a>
             </div>
         </div>
     </div>