Skip to content

Commit

Permalink
Merge pull request #30 from llamafilm/fix-s3-images
Browse files Browse the repository at this point in the history
Use correct image URL for S3
  • Loading branch information
minitriga authored Nov 26, 2024
2 parents 34dcde5 + 01f9bb2 commit 564e5d9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
data-item-face="{{ face }}">
{% if device.device.device_type.front_image and images %}
<div class="grid-stack-item-content"
style="background-image: url('{{ base_url }}{{ device.device.device_type.front_image.url }}');
style="background-image: url('{{ device.device.device_type.front_image.url }}');
background-size: {{ unit_width }}px;
color: #{% if device.device.role.color %}{{ device.device.role.color|text_color }}{% else %}000000{% endif %}">
{% if labels %}{{ device.device | device_name }}{% endif %}
Expand Down Expand Up @@ -63,7 +63,7 @@
gs-no-move="{% if not request.user|can_change:device.device %}true{% else %}{% endif %}">
{% if device.device.device_type.rear_image and images %}
<div class="grid-stack-item-content device_rear"
style="background-image: url('{{ base_url }}{{ device.device.device_type.rear_image.url }}');
style="background-image: url('{{ device.device.device_type.rear_image.url }}');
background-size: {{ unit_width }}px;
color: #{% if device.device.role.color %}{{ device.device.role.color|text_color }}{% else %}000000{% endif %}">
{% if labels %}{{ device.device | device_name }}{% endif %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ <h4>Non-Racked Devices</h4>
gs-locked="{% if not request.user|can_change:device %}true{% else %}{% endif %}"
gs-no-move="{% if not request.user|can_change:device %}true{% else %}{% endif %}">
<div class="grid-stack-item-content"
style="{% if device.device_type.front_image and images %}background-image: url('{{ base_url }}{{ device.device_type.front_image.url }}');
style="{% if device.device_type.front_image and images %}background-image: url('{{ device.device_type.front_image.url }}');
background-size: {{ unit_width }}px;
{% else %}background-color: #{{ device.role.color }};
{% endif %} color: #{% if device.role.color %}{{ device.role.color|text_color }}{% else %}000000{% endif %}">
Expand Down

0 comments on commit 564e5d9

Please sign in to comment.