servala/website
1
0
Fork 0
Code Issues 12 Pull requests Projects 1 Packages 1 Activity Actions

Compare commits

base: servala:f2c867b52106889fd13466828d4831d8732117d6
Branches Tags
servala:main
servala:plan-pricing2
servala:plan-pricing
servala:service-addons
..
compare: servala:f0f5b627c3ef02e3378cbf78b8203b065b8ea5b5
Branches Tags
servala:main
servala:plan-pricing2
servala:plan-pricing
servala:service-addons

No commits in common. "f2c867b52106889fd13466828d4831d8732117d6" and "f0f5b627c3ef02e3378cbf78b8203b065b8ea5b5" have entirely different histories.
f2c867b521 ... f0f5b627c3

6 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hub/services/admin.py
View file

@ -69,7 +69,7 @@ class CategoryAdmin(admin.ModelAdmin):
@admin.register(CloudProvider) @admin.register(CloudProvider)
class CloudProviderAdmin(admin.ModelAdmin): class CloudProviderAdmin(admin.ModelAdmin):
list_display = ("name", "slug", "logo_preview", "disable_listing", "is_featured") list_display = ("name", "slug", "logo_preview")
search_fields = ("name", "description") search_fields = ("name", "description")
prepopulated_fields = {"slug": ("name",)} prepopulated_fields = {"slug": ("name",)}
inlines = [OfferingInline] inlines = [OfferingInline]
@ -130,7 +130,7 @@ class ServiceOfferingAdmin(admin.ModelAdmin):
@admin.register(ConsultingPartner) @admin.register(ConsultingPartner)
class ConsultingPartnerAdmin(admin.ModelAdmin): class ConsultingPartnerAdmin(admin.ModelAdmin):
list_display = ("name", "website", "logo_preview", "disable_listing", "is_featured") list_display = ("name", "website", "logo_preview")
search_fields = ("name", "description") search_fields = ("name", "description")
prepopulated_fields = {"slug": ("name",)} prepopulated_fields = {"slug": ("name",)}
filter_horizontal = ("services", "cloud_providers") filter_horizontal = ("services", "cloud_providers")

4
hub/services/templates/services/base.html
View file

@ -167,7 +167,7 @@
</a> </a>
</li> </li>
<li> <li>
<a class="d-flex align-items-center" href="mailto:hi@servala.com"> <a class="d-flex align-items-center" href="mailto:hi@serva.la">
<span class="pr-10"> <span class="pr-10">
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"> <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<mask id="mask0_3315_428" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" <mask id="mask0_3315_428" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0"
@ -181,7 +181,7 @@
</g> </g>
</svg> </svg>
</span> </span>
<span>hi@servala.com</span> <span>hi@serva.la</span>
</a> </a>
</li> </li>
<li> <li>

2
hub/services/templates/services/partner_list.html
View file

@ -155,7 +155,7 @@
<div class="row"> <div class="row">
<div class="col-12 col-lg-4 mb-30 mb-lg-0"> <div class="col-12 col-lg-4 mb-30 mb-lg-0">
<div class="section-logo mx-auto"> <div class="section-logo mx-auto">
<img class="img-fluid" src="{% static "img/section-logo.png" %}" alt="Servala logo"> <img class="img-fluid" src="{% static "img/section-logo.png" %}" alt="Sir Vala mascot">
</div> </div>
</div> </div>
<div class="col-12 col-lg-8"> <div class="col-12 col-lg-8">

8
hub/services/templates/services/provider_list.html
View file

@ -99,14 +99,14 @@
<a href="{{ provider.get_absolute_url }}"> <a href="{{ provider.get_absolute_url }}">
<img src="{{ provider.logo.url }}" <img src="{{ provider.logo.url }}"
alt="{{ provider.name }}" alt="{{ provider.name }}"
style="max-height: 100px; max-width: 250px; object-fit: contain;"> style="max-height: 180px; max-width: 250px; object-fit: contain;">
</a> </a>
</div> </div>
</div> </div>
</div> </div>
<div class="card__desc flex-grow-1 rich-text-content"> <div class="card__desc rich-text-content" style="align-self: flex-start;">
{{ provider.description|safe|truncatewords_html:30 }} {{ provider.description|safe|truncatewords_html:50 }}
</div> </div>
<div class="card__footer mt-3"> <div class="card__footer mt-3">
@ -138,7 +138,7 @@
<div class="row"> <div class="row">
<div class="col-12 col-lg-4 mb-30 mb-lg-0"> <div class="col-12 col-lg-4 mb-30 mb-lg-0">
<div class="section-logo mx-auto"> <div class="section-logo mx-auto">
<img class="img-fluid" src="{% static "img/section-logo.png" %}" alt="Servala logo"> <img class="img-fluid" src="{% static "img/section-logo.png" %}" alt="Sir Vala mascot">
</div> </div>
</div> </div>
<div class="col-12 col-lg-8"> <div class="col-12 col-lg-8">

1
hub/services/templates/services/service_detail.html
View file

@ -52,7 +52,6 @@
{% if service.consulting_partners.exists %} {% if service.consulting_partners.exists %}
<div class="mb-40"> <div class="mb-40">
<h3 class="fw-semibold mb-12">Consulting Partners</h3> <h3 class="fw-semibold mb-12">Consulting Partners</h3>
<p>If you want to get the most out of your {{ service.name }}, our consulting partners can help you optimize your setup and application:</p>
<ul class="list-unstyled space-y-12 fs-19 ps-0"> <ul class="list-unstyled space-y-12 fs-19 ps-0">
{% for partner in service.consulting_partners.all %} {% for partner in service.consulting_partners.all %}
<li> <li>

19
hub/settings.py
View file

@ -207,22 +207,3 @@ SCHEMA_VIEWER = {
"auth": ["User"], "auth": ["User"],
}, },
} }
JAZZMIN_SETTINGS = {
"site_title": "Servala Admin",
"site_header": "Servala",
"site_brand": "Servala",
"site_logo": "img/section-logo.png",
"welcome_sign": "Welcome to Servala Admin",
"copyright": "VSHN AG",
"topmenu_links": [
{"name": "Home", "url": "admin:index"},
{
"name": "Website",
"url": "https://servala.com",
"new_window": True,
},
],
"show_sidebar": True,
"navigation_expanded": True,
}