diff --git a/rocky/assets/css/components/system-tag.scss b/rocky/assets/css/components/system-tag.scss new file mode 100644 index 00000000000..3f7caab05eb --- /dev/null +++ b/rocky/assets/css/components/system-tag.scss @@ -0,0 +1,43 @@ +.system-tag, +span.system-tag { + background-color: var(--colors-white); + border: 2px solid; + border-radius: var(--border-radius-xl); + padding: var(--spacing-grid-025) var(--spacing-grid-100); + box-sizing: border-box; + width: auto; + + &::before { + content: none; + } + + &.color-1 { + color: var(--colors-blue-600); + border-color: var(--colors-blue-600); + } + + &.color-2 { + color: var(--colors-green-600); + border-color: var(--colors-green-600); + } + + &.color-3 { + color: var(--colors-ochre-500); + border-color: var(--colors-ochre-500); + } + + &.color-4 { + color: var(--colors-orange-600); + border-color: var(--colors-orange-600); + } + + &.color-5 { + color: var(--colors-red-600); + border-color: var(--colors-red-600); + } + + &.color-6 { + color: var(--colors-purrple-600); + border-color: var(--colors-purrple-600); + } +} diff --git a/rocky/assets/css/main.scss b/rocky/assets/css/main.scss index 4fb860423c0..1dd5615f43f 100644 --- a/rocky/assets/css/main.scss +++ b/rocky/assets/css/main.scss @@ -67,6 +67,7 @@ @import "components/sticky"; @import "components/sticky-column"; @import "components/state-tags"; +@import "components/system-tag"; @import "components/table"; @import "components/toggle"; @import "components/toolbar"; diff --git a/rocky/assets/css/themes/soft/fundamentals/border-radii.scss b/rocky/assets/css/themes/soft/fundamentals/border-radii.scss index 0ac5c9d7060..547a6f6d8bb 100644 --- a/rocky/assets/css/themes/soft/fundamentals/border-radii.scss +++ b/rocky/assets/css/themes/soft/fundamentals/border-radii.scss @@ -20,6 +20,10 @@ border-radius: var(--border-radius-l); } +.border-radius-xl { + border-radius: var(--border-radius-xl); +} + .border-radius-round { border-radius: var(--border-radius-round); } diff --git a/rocky/components/modal/README.md b/rocky/components/modal/README.md index b6f996e6dc4..ec49e5030a8 100644 --- a/rocky/components/modal/README.md +++ b/rocky/components/modal/README.md @@ -10,7 +10,7 @@ This outlines the basic usages and provides a code block example below, of how t ### Instantiate -First you need to add `{% load component_tags %}` at the top of your template. Next you need to add the following code block at the bottom, to include the corresponding JS (if you haven't already you also need to add `{% load compress %}`). +First you need to add `{% load component_tags %}` at the top of your template. Next you need to add the following code block at the bottom, to include the corresponding JS (if you haven't already you also need to add `{% load compress %}` and `{% load static %}`). ``` {% block html_at_end_body %} @@ -58,7 +58,7 @@ Including `{% component_css_dependencies %}` is needed to inject the reference t {% fill "content" %}
{% csrf_token %} - {% blocktranslate %} + {% blocktranslate with context_data_variable=context_data_variable %}

You can use {{ context_data_variable }} and HTML here valid_time!

{% endblocktranslate %}
diff --git a/rocky/reports/templates/report_overview/modal_partials/enable_disable_schedule_modal.html b/rocky/reports/templates/report_overview/modal_partials/enable_disable_schedule_modal.html new file mode 100644 index 00000000000..6351601a78a --- /dev/null +++ b/rocky/reports/templates/report_overview/modal_partials/enable_disable_schedule_modal.html @@ -0,0 +1,24 @@ +{% load i18n %} + +{% component "modal" size="dialog-small" modal_id=modal_id %} +{% fill "header" %} +{% translate "Disable schedule" %} +{% endfill %} +{% fill "content" %} +
+ {% csrf_token %} +

+ {% blocktranslate with report_name=schedule.recipe.report_name_format %} + Are you sure you want to disable the schedule for {{ report_name }}? + The recipe will still exist and the schedule can be enabled later on. + {% endblocktranslate %} +

+
+{% endfill %} +{% fill "footer_buttons" %} +{% translate "Disable schedule" %} + +{% endfill %} +{% endcomponent %} +{% component_css_dependencies %} diff --git a/rocky/reports/templates/report_overview/scheduled_reports_table.html b/rocky/reports/templates/report_overview/scheduled_reports_table.html index 41ed31ae923..7a824d2c39d 100644 --- a/rocky/reports/templates/report_overview/scheduled_reports_table.html +++ b/rocky/reports/templates/report_overview/scheduled_reports_table.html @@ -1,6 +1,9 @@ {% load i18n %} +{% load static %} {% load ooi_extra %} {% load report_extra %} +{% load compress %} +{% load component_tags %} {% if scheduled_reports %}

@@ -11,10 +14,11 @@ {% translate "Scheduled reports:" %} - {% translate "Report Name" %} - {% translate "Report types" %} + {% translate "Name" %} + {% translate "Report type" %} {% translate "Scheduled for" %} {% translate "Recurrence" %} + {% translate "Schedule status" %} @@ -26,27 +30,36 @@

- {{ schedule.deadline_at }} + + {% if not schedule.enabled %} + - + {% else %} + {{ schedule.deadline_at }} + {% endif %} + {{ schedule.cron }} + + {% if schedule.enabled %} + {% translate "Enabled" %} + {% else %} + {% translate "Disabled" %} + {% endif %} +