Skip to content

Use correct image URL for S3 #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
minitriga merged 2 commits into from
Nov 26, 2024
Merged

Use correct image URL for S3 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5795059
Update rack.html
llamafilm Oct 28, 2024
01f9bb2
Update rack_elevation.html
llamafilm Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions netbox_reorder_rack/templates/netbox_reorder_rack/inc/rack_elevation.html
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion netbox_reorder_rack/templates/netbox_reorder_rack/rack.html
View file
Open in desktop
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