update logo v2

HewlettPackard · Sep 20, 2023 · c1f8af4 · c1f8af4
1 parent ee1a49c
commit c1f8af4
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-    <img src="docs/images/squest_full_logo.png">
+    <img style="width: 350px; height: 350px" src="project-static/squest/img/squest_full_logo_transparent.png">
 </p>
 
 <h3 align="center">Self service portal on top of Red Hat Ansible Automation Platform(RHAAP)/AWX (formerly known as Ansible Tower)</h3>

diff --git a/docker/maintenance.html b/docker/maintenance.html
@@ -16,7 +16,7 @@
 <!-- Automatic element centering -->
 <div class="lockscreen-wrapper" style="max-width: 500px;">
     <div class="lockscreen-logo">
-        <img src="/squest_full_logo_transparent.png" alt="squest_logo">
+        <img style="width: 350px; height: 350px" src="/squest_full_logo_transparent.png" alt="squest_logo">
     </div>
 
     <h3><i class="fas fa-wrench text-olive"></i> Squest is currently under maintenance.</h3>

diff --git a/project-static/squest/img/squest_full_logo_transparent.png b/project-static/squest/img/squest_full_logo_transparent.png
diff --git a/project-static/squest/img/squest_full_logo_transparent.v1.png b/project-static/squest/img/squest_full_logo_transparent.v1.png
diff --git a/service_catalog/api/views/request_state_machine_api_view.py b/service_catalog/api/views/request_state_machine_api_view.py
@@ -149,8 +149,7 @@ def cancel(self, request, pk=None):
         if target_request.cancel():
             target_request.save()
         send_email_request_canceled(target_request,
-                                    user_applied_state=request.user,
-                                    request_owner_user=target_request.user)
+                                    user_applied_state=request.user)
         if Request.objects.filter(id=pk).exists():
             if self.request.user.has_perm("service_catalog.view_admin_survey", target_request):
                 return Response(AdminRequestSerializer(target_request).data, status=status.HTTP_200_OK)

diff --git a/service_catalog/mail_utils.py b/service_catalog/mail_utils.py
@@ -61,28 +61,28 @@ def _apply_when_filter_request(user_qs, squest_object):
 
 
 def _get_receivers_for_support_message(support_message):
-    ## Apply when filter on all users
+    # Apply when filter on all users
     receivers_raw = support_message.who_has_perm("service_catalog.view_supportmessage").exclude(
         id=support_message.sender.id)
     return _apply_when_filter_instance(receivers_raw, support_message.support.instance)
 
 
 def _get_receivers_for_request_message(request_message):
-    ## Apply when filter on all users
+    # Apply when filter on all users
     receivers_raw = request_message.who_has_perm("service_catalog.view_requestmessage").exclude(
         id=request_message.sender.id)
     return _apply_when_filter_request(receivers_raw, request_message.request)
 
 
 def _get_receivers_for_support(support):
-    ## Apply when filter on all users
+    # Apply when filter on all users
 
     receivers_raw = support.who_has_perm("service_catalog.view_support")
     return _apply_when_filter_instance(receivers_raw, support.instance)
 
 
 def _get_receivers_for_request(squest_request):
-    ## Apply when filter on all users
+    # Apply when filter on all users
     customer_raw = squest_request.who_has_perm("service_catalog.view_request")
     admin_raw = squest_request.who_can_accept()
     return _apply_when_filter_request(customer_raw | admin_raw, squest_request)
@@ -172,7 +172,7 @@ def send_mail_new_comment_on_request(message):
                            headers=_get_headers(subject))
 
 
-def send_email_request_canceled(target_request, user_applied_state=None, request_owner_user=None):
+def send_email_request_canceled(target_request, user_applied_state=None):
     """
     :param target_request: Request model
     :type target_request: service_catalog.models.request.Request

diff --git a/service_catalog/views/request.py b/service_catalog/views/request.py
@@ -103,8 +103,7 @@ def request_cancel(request, pk):
         raise PermissionDenied
     if request.method == "POST":
         send_email_request_canceled(target_request,
-                                    user_applied_state=request.user,
-                                    request_owner_user=target_request.user)
+                                    user_applied_state=request.user)
 
         if target_request.cancel():
             target_request.save()

diff --git a/templates/base.html b/templates/base.html
@@ -45,7 +45,8 @@
     </title>
 </head>
 <body class="sidebar-mini layout-fixed layout-navbar-fixed layout-footer-fixed
-        {% if request.user %}{% if request.user.profile.theme == "dark" %}dark-mode{% endif %}{% endif %}">
+        {% if request.user %}{% if request.user.profile.theme == "dark" %}dark-mode{% endif %}{% endif %}
+        {% if 'login' in request.path %} lockscreen{% endif %}">
 <div class="wrapper">
     {% if 'login' not in request.path %}
         {% include 'navbar.html' %}

diff --git a/templates/home/home.html b/templates/home/home.html
@@ -113,7 +113,7 @@ <h3 class="card-title">Service overview</h3>
                 {% if can_list_instance %}
                     <div class="col-12">
                         <!-- small card -->
-                        <div class="h-100 small-box d-flex flex-column bg-success">
+                        <div class="h-100 small-box d-flex flex-column bg-{% if total_instance > 0 %}success{%  else %}default{% endif %}">
                             <div class="inner flex-grow-1">
                                 <h3>{{ total_instance }}</h3>
                                 <p>Available instances</p>
@@ -130,7 +130,7 @@ <h3>{{ total_instance }}</h3>
                 {% endif %}
                 {% if can_list_request %}
                     <div class="col-12">
-                        <div class="h-100 small-box d-flex flex-column bg-info">
+                        <div class="h-100 small-box d-flex flex-column bg-{% if total_request > 0 %}info{%  else %}default{% endif %}">
                             <!-- small card -->
                             <div class="inner flex-grow-1">
                                 <h3>{{ total_request }}</h3>
@@ -150,7 +150,7 @@ <h3>{{ total_request }}</h3>
                 {% if can_list_support %}
                     <div class="col-12">
                         <!-- small card -->
-                        <div class="h-100 small-box d-flex flex-column bg-warning">
+                        <div class="h-100 small-box d-flex flex-column bg-{% if total_support_opened > 0 %}warning{%  else %}default{% endif %}">
                             <div class="inner flex-grow-1">
                                 <h3>{{ total_support_opened }}</h3>
                                 <p>Opened supports</p>
@@ -185,7 +185,7 @@ <h3>{{ total_user }}</h3>
                 {% if can_list_user %}
                     <div class="col-12">
                         <!-- small card -->
-                        <div class="h-100 small-box d-flex flex-column bg-pink">
+                        <div class="h-100 small-box d-flex flex-column bg-{% if user_without_organization > 0 %}pink{%  else %}default{% endif %}">
                             <div class="inner flex-grow-1">
                                 <h3>{{ user_without_organization }}</h3>
                                 <p>Users without organization</p>
@@ -201,8 +201,5 @@ <h3>{{ user_without_organization }}</h3>
                 {% endif %}
             </div>
         </div>
-
-
-
     </div>
 {% endblock %}
diff --git a/templates/maintenance.html b/templates/maintenance.html
@@ -16,7 +16,7 @@
 <!-- Automatic element centering -->
 <div class="lockscreen-wrapper" style="max-width: 500px;">
     <div class="lockscreen-logo">
-        <img src="{% static 'squest/img/squest_full_logo_transparent.png' %}" alt="squest_logo">
+        <img style="width: 350px; height: 350px" src="{% static 'squest/img/squest_full_logo_transparent.png' %}" alt="squest_logo">
     </div>
 
     <h3><i class="fas fa-wrench text-olive"></i> Squest is currently under maintenance.</h3>

diff --git a/templates/registration/login.html b/templates/registration/login.html
@@ -2,8 +2,8 @@
 {% load static %}
 {% block content %}
     <div class="container">
-        <div class="register-logo mt-5">
-            <img src="{% static '/squest/img/squest_full_logo_transparent.png' %}" alt="squest_logo">
+        <div class="register-logo">
+            <img style="width: 350px; height: 350px" src="{% static '/squest/img/squest_full_logo_transparent.png' %}" alt="squest_logo">
         </div>
         <div class="row justify-content-center align-items-center">
             <div class="col-8">
@@ -34,7 +34,7 @@
                         </div>
                         <!-- /.card-body -->
                         <div class="card-footer">
-                            <button type="submit" class="btn bg-olive">Sign in</button>
+                            <button type="submit" class="btn" style="background-color: #6ad3c2"><strong>Sign in</strong></button>
                         </div>
                         <!-- /.card-footer -->
                     </form>

diff --git a/templates/service_catalog/mails/utils/squest_logo.html b/templates/service_catalog/mails/utils/squest_logo.html
@@ -29,8 +29,7 @@
                                             <td style="padding-right: 0px;padding-left: 0px;" align="center">
 
                                                 <img align="center" border="0" src="{{ current_site }}{% static '/squest/img/squest_full_logo_transparent.png' %}" alt="Squest" title="Squest"
-                                                     style="outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;clear: both;display: inline-block !important;border: none;height: auto;float: none;width: 40%;max-width: 220px;"
-                                                     width="220" />
+                                                     style="outline: none;text-decoration: none;-ms-interpolation-mode: bicubic;clear: both;display: inline-block !important;border: none;height: auto;float: none;width: 40%;max-width: 100px;"/>
 
                                             </td>
                                         </tr>