{} - {}x{} - {}
' - "{} - {}x{} - {}
' - "
+ 
{% endif %}
',
- css_class,
- )
-
-
-@register.simple_tag
-def image_library_url(slug_or_id):
- """
- Get the URL of an image from the image library.
-
- Usage:
- {% image_library_url "my-image-slug" %}
- {% image_library_url image_id %}
- """
- try:
- if isinstance(slug_or_id, str):
- image = ImageLibrary.objects.get(slug=slug_or_id)
- else:
- image = ImageLibrary.objects.get(pk=slug_or_id)
-
- return image.image.url
-
- except ImageLibrary.DoesNotExist:
- return "/static/images/placeholder.png"
-
-
-@register.simple_tag
-def image_library_info(slug_or_id):
- """
- Get information about an image from the image library.
-
- Usage:
- {% image_library_info "my-image-slug" as img_info %}
- {{ img_info.name }} - {{ img_info.width }}x{{ img_info.height }}
- """
- try:
- if isinstance(slug_or_id, str):
- image = ImageLibrary.objects.get(slug=slug_or_id)
- else:
- image = ImageLibrary.objects.get(pk=slug_or_id)
-
- return {
- "name": image.name,
- "alt_text": image.alt_text,
- "width": image.width,
- "height": image.height,
- "file_size": image.get_file_size_display(),
- "category": image.get_category_display(),
- "tags": image.get_tags_list(),
- "url": image.image.url,
- }
-
- except ImageLibrary.DoesNotExist:
- return {
- "name": "Image not found",
- "alt_text": "Image not found",
- "width": None,
- "height": None,
- "file_size": "Unknown",
- "category": "Unknown",
- "tags": [],
- "url": "/static/images/placeholder.png",
- }
diff --git a/hub/services/templatetags/json_ld_tags.py b/hub/services/templatetags/json_ld_tags.py
index c9225d5..eb18007 100644
--- a/hub/services/templatetags/json_ld_tags.py
+++ b/hub/services/templatetags/json_ld_tags.py
@@ -119,8 +119,8 @@ def json_ld_structured_data(context):
}
# Add image if available
- if hasattr(service, "get_logo") and service.get_logo:
- data["image"] = request.build_absolute_uri(service.get_logo.url)
+ if hasattr(service, "logo") and service.logo:
+ data["image"] = request.build_absolute_uri(service.logo.url)
# Add offerings if available
if hasattr(service, "offerings") and service.offerings.exists():
@@ -143,8 +143,8 @@ def json_ld_structured_data(context):
}
# Add image if available
- if hasattr(provider, "get_logo") and provider.get_logo:
- data["logo"] = request.build_absolute_uri(provider.get_logo.url)
+ if hasattr(provider, "logo") and provider.logo:
+ data["logo"] = request.build_absolute_uri(provider.logo.url)
# Add contact information if available
contact_point = {"@type": "ContactPoint", "contactType": "Customer Support"}
@@ -179,8 +179,8 @@ def json_ld_structured_data(context):
}
# Add image if available
- if hasattr(partner, "get_logo") and partner.get_logo:
- data["logo"] = request.build_absolute_uri(partner.get_logo.url)
+ if hasattr(partner, "logo") and partner.logo:
+ data["logo"] = request.build_absolute_uri(partner.logo.url)
# Add contact information if available
contact_point = {"@type": "ContactPoint", "contactType": "Customer Support"}
@@ -219,8 +219,8 @@ def json_ld_structured_data(context):
data["brand"] = {"@type": "Brand", "name": offering.service.name}
# Add image if available
- if hasattr(offering.service, "get_logo") and offering.service.get_logo:
- data["image"] = request.build_absolute_uri(offering.service.get_logo.url)
+ if hasattr(offering.service, "logo") and offering.service.logo:
+ data["image"] = request.build_absolute_uri(offering.service.logo.url)
# Add offers if available
if hasattr(offering, "plans") and offering.plans.exists():
diff --git a/hub/services/utils/image_library.py b/hub/services/utils/image_library.py
deleted file mode 100644
index c0b72b2..0000000
--- a/hub/services/utils/image_library.py
+++ /dev/null
@@ -1,243 +0,0 @@
-from django.core.files.base import ContentFile
-from django.utils.text import slugify
-from ..models.images import ImageLibrary
-import os
-
-try:
- import requests
-except ImportError:
- requests = None
-from PIL import Image as PILImage
-
-
-def create_image_from_file(
- file_path, name, description="", alt_text="", category="other", tags=""
-):
- """
- Create an ImageLibrary entry from a local file.
-
- Args:
- file_path: Path to the image file
- name: Name for the image
- description: Optional description
- alt_text: Alternative text for accessibility
- category: Image category
- tags: Comma-separated tags
-
- Returns:
- ImageLibrary instance or None if failed
- """
- try:
- if not os.path.exists(file_path):
- print(f"File not found: {file_path}")
- return None
-
- # Generate slug
- slug = slugify(name)
-
- # Check if image already exists
- if ImageLibrary.objects.filter(slug=slug).exists():
- print(f"Image with slug '{slug}' already exists")
- return ImageLibrary.objects.get(slug=slug)
-
- # Create image library entry
- image_lib = ImageLibrary(
- name=name,
- slug=slug,
- description=description,
- alt_text=alt_text or name,
- category=category,
- tags=tags,
- )
-
- # Read and save the image file
- with open(file_path, "rb") as f:
- image_lib.image.save(
- os.path.basename(file_path), ContentFile(f.read()), save=True
- )
-
- print(f"Created image library entry: {name}")
- return image_lib
-
- except Exception as e:
- print(f"Error creating image library entry: {e}")
- return None
-
-
-def create_image_from_url(
- url, name, description="", alt_text="", category="other", tags=""
-):
- """
- Create an ImageLibrary entry from a URL.
-
- Args:
- url: URL to the image
- name: Name for the image
- description: Optional description
- alt_text: Alternative text for accessibility
- category: Image category
- tags: Comma-separated tags
-
- Returns:
- ImageLibrary instance or None if failed
- """
- if requests is None:
- print("requests library is not installed. Cannot download from URL.")
- return None
-
- try:
- # Generate slug
- slug = slugify(name)
-
- # Check if image already exists
- if ImageLibrary.objects.filter(slug=slug).exists():
- print(f"Image with slug '{slug}' already exists")
- return ImageLibrary.objects.get(slug=slug)
-
- # Download the image
- response = requests.get(url)
- response.raise_for_status()
-
- # Create image library entry
- image_lib = ImageLibrary(
- name=name,
- slug=slug,
- description=description,
- alt_text=alt_text or name,
- category=category,
- tags=tags,
- )
-
- # Save the image
- filename = url.split("/")[-1]
- if "?" in filename:
- filename = filename.split("?")[0]
-
- image_lib.image.save(filename, ContentFile(response.content), save=True)
-
- print(f"Created image library entry from URL: {name}")
- return image_lib
-
- except Exception as e:
- print(f"Error creating image library entry from URL: {e}")
- return None
-
-
-def get_image_by_slug(slug):
- """
- Get an image from the library by slug.
-
- Args:
- slug: Slug of the image
-
- Returns:
- ImageLibrary instance or None if not found
- """
- try:
- return ImageLibrary.objects.get(slug=slug)
- except ImageLibrary.DoesNotExist:
- return None
-
-
-def get_images_by_category(category):
- """
- Get all images from a specific category.
-
- Args:
- category: Category name
-
- Returns:
- QuerySet of ImageLibrary instances
- """
- return ImageLibrary.objects.filter(category=category)
-
-
-def get_images_by_tags(tags):
- """
- Get images that contain any of the specified tags.
-
- Args:
- tags: List of tags or comma-separated string
-
- Returns:
- QuerySet of ImageLibrary instances
- """
- if isinstance(tags, str):
- tags = [tag.strip() for tag in tags.split(",")]
-
- from django.db.models import Q
-
- query = Q()
- for tag in tags:
- query |= Q(tags__icontains=tag)
-
- return ImageLibrary.objects.filter(query).distinct()
-
-
-def cleanup_unused_images():
- """
- Find and optionally clean up unused images from the library.
-
- Returns:
- List of ImageLibrary instances with usage_count = 0
- """
- unused_images = ImageLibrary.objects.filter(usage_count=0)
-
- print(f"Found {unused_images.count()} unused images:")
- for image in unused_images:
- print(f" - {image.name} ({image.slug})")
-
- return unused_images
-
-
-def optimize_image(image_library_instance, max_width=1920, max_height=1080, quality=85):
- """
- Optimize an image in the library by resizing and compressing.
-
- Args:
- image_library_instance: ImageLibrary instance
- max_width: Maximum width in pixels
- max_height: Maximum height in pixels
- quality: JPEG quality (1-100)
-
- Returns:
- bool: True if optimization was successful
- """
- try:
- if not image_library_instance.image:
- return False
-
- # Open the image
- with PILImage.open(image_library_instance.image.path) as img:
- # Calculate new dimensions while maintaining aspect ratio
- ratio = min(max_width / img.width, max_height / img.height)
-
- if ratio < 1: # Only resize if image is larger than max dimensions
- new_width = int(img.width * ratio)
- new_height = int(img.height * ratio)
-
- # Resize the image
- img_resized = img.resize(
- (new_width, new_height), PILImage.Resampling.LANCZOS
- )
-
- # Save the optimized image
- img_resized.save(
- image_library_instance.image.path,
- format="JPEG",
- quality=quality,
- optimize=True,
- )
-
- # Update the image properties
- image_library_instance._update_image_properties()
-
- print(f"Optimized image: {image_library_instance.name}")
- return True
- else:
- print(f"Image already optimal: {image_library_instance.name}")
- return True
-
- except Exception as e:
- print(f"Error optimizing image {image_library_instance.name}: {e}")
- return False
diff --git a/hub/services/views/articles.py b/hub/services/views/articles.py
index 4b8117f..6589d6f 100644
--- a/hub/services/views/articles.py
+++ b/hub/services/views/articles.py
@@ -23,7 +23,7 @@ def article_list(request):
# Apply filters based on request parameters
if search_query:
articles = articles.filter(
- Q(title__icontains=search_query)
+ Q(title__icontains=search_query)
| Q(excerpt__icontains=search_query)
| Q(content__icontains=search_query)
| Q(meta_keywords__icontains=search_query)
@@ -41,7 +41,7 @@ def article_list(request):
# Order articles: featured first, then by creation date (newest first)
articles = articles.order_by(
"-is_featured", # Featured first (True before False)
- "-article_date", # Newest first
+ "-created_at", # Newest first
)
# Create base querysets for each filter type that apply all OTHER current filters
@@ -51,7 +51,7 @@ def article_list(request):
service_filter_base = all_articles
if search_query:
service_filter_base = service_filter_base.filter(
- Q(title__icontains=search_query)
+ Q(title__icontains=search_query)
| Q(excerpt__icontains=search_query)
| Q(content__icontains=search_query)
| Q(meta_keywords__icontains=search_query)
@@ -69,7 +69,7 @@ def article_list(request):
cp_filter_base = all_articles
if search_query:
cp_filter_base = cp_filter_base.filter(
- Q(title__icontains=search_query)
+ Q(title__icontains=search_query)
| Q(excerpt__icontains=search_query)
| Q(content__icontains=search_query)
| Q(meta_keywords__icontains=search_query)
@@ -85,7 +85,7 @@ def article_list(request):
cloud_filter_base = all_articles
if search_query:
cloud_filter_base = cloud_filter_base.filter(
- Q(title__icontains=search_query)
+ Q(title__icontains=search_query)
| Q(excerpt__icontains=search_query)
| Q(content__icontains=search_query)
| Q(meta_keywords__icontains=search_query)
@@ -136,14 +136,16 @@ def article_detail(request, slug):
Article.objects.select_related(
"author",
"related_service",
- "related_consulting_partner",
- "related_cloud_provider",
+ "related_consulting_partner",
+ "related_cloud_provider"
).filter(is_published=True),
slug=slug,
)
# Get related articles (same service, partner, or provider)
- related_articles = Article.objects.filter(is_published=True).exclude(id=article.id)
+ related_articles = Article.objects.filter(
+ is_published=True
+ ).exclude(id=article.id)
if article.related_service:
related_articles = related_articles.filter(
@@ -162,13 +164,13 @@ def article_detail(request, slug):
related_articles = related_articles.filter(
related_service__isnull=True,
related_consulting_partner__isnull=True,
- related_cloud_provider__isnull=True,
+ related_cloud_provider__isnull=True
)
- related_articles = related_articles.order_by("-article_date")[:3]
+ related_articles = related_articles.order_by("-created_at")[:3]
context = {
"article": article,
"related_articles": related_articles,
}
- return render(request, "services/article_detail.html", context)
+ return render(request, "services/article_detail.html", context)
\ No newline at end of file
diff --git a/hub/services/views/offerings.py b/hub/services/views/offerings.py
index 4016857..e135aec 100644
--- a/hub/services/views/offerings.py
+++ b/hub/services/views/offerings.py
@@ -173,28 +173,15 @@ def generate_exoscale_marketplace_yaml(offering):
).strip()
# Build YAML structure
- service_name = offering.service.name
-
- # List of service names that should have "Enterprise" appended
- # This concerns all services which are already available on Exoscale Marketplace or DBaaS for differentiation
- # A workaround because we don't particularly have "Enterprise" services yet
- enterprise_services = ["GitLab", "PostgreSQL"]
-
- if any(
- enterprise_service in service_name for enterprise_service in enterprise_services
- ):
- service_name += " Enterprise"
-
- title = f"{service_name} by Servala"
yaml_structure = {
yaml_key: {
"page_class": "tmpl-marketplace-product",
- "html_title": title,
- "meta_desc": f"Managed {offering.service.name} by Servala - a product by VSHN. Servala is the Open Cloud Native Service Hub. It connects businesses, developers, and cloud service providers on one unique hub with secure, scalable, and easy-to-use cloud-native services.",
- "page_header_title": title,
+ "html_title": f"Managed {offering.service.name} by VSHN via Servala",
+ "meta_desc": "Servala is the Open Cloud Native Service Hub. It connects businesses, developers, and cloud service providers on one unique hub with secure, scalable, and easy-to-use cloud-native services.",
+ "page_header_title": f"Managed {offering.service.name} by VSHN via Servala",
"provider_key": "vshn",
- "slug": f"{offering.service.slug}-by-servala",
- "title": title,
+ "slug": f"servala-managed-{offering.service.slug}",
+ "title": f"Managed {offering.service.name} by VSHN via Servala",
"logo": f"img/servala-{offering.service.slug}.svg",
"list_display": [],
"meta": [
diff --git a/hub/settings.py b/hub/settings.py
index 120d9cb..8e6f3e6 100644
--- a/hub/settings.py
+++ b/hub/settings.py
@@ -245,7 +245,6 @@ JAZZMIN_SETTINGS = {
"new_window": True,
},
{"name": "Articles", "url": "/admin/services/article/"},
- {"name": "Image Library", "url": "/admin/services/imagelibrary/"},
{"name": "FAQs", "url": "/admin/services/websitefaq/"},
],
"show_sidebar": True,
@@ -258,7 +257,6 @@ JAZZMIN_SETTINGS = {
"services.VSHNAppCatAddon": "single",
"services.ServiceOffering": "single",
"services.Plan": "single",
- "services.ImageLibrary": "single",
},
"related_modal_active": True,
}