diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index f7d1e5788..505c6800d 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -556,6 +556,43 @@ button .usa-icon, } } +/* Sticky submit bar for Portfolio page on desktop */ +@media screen and (min-width:768px) { + .portfolio-submit-row-wrapper { + position: fixed; + bottom: 0; + right: 0; + left: 338px; /* Adjust this value according to your layout */ + background: var(--darkened-bg); /* Use a suitable background color */ + border-top-left-radius: 6px; + transition: transform .2s ease-out; + } + .portfolio-submit-row-wrapper--collapsed { + transform: translate3d(0, 88px, 0); + } + .portfolio-submit-row { + clear: both; + } + .portfolio-submit-row-toggle { + display: inline-block; + position: absolute; + top: -30px; + right: 0; + background: var(--darkened-bg); + } + #portfolioSubmitRowToggle { + color: var(--body-fg); + } + .portfolio-requested-domain-sticky { + max-width: 325px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + font-size: medium; + padding-top: 3px !important; + } +} + .visible-768 { display: none; } @@ -580,6 +617,19 @@ button .usa-icon, } } +@media screen and (min-width:935px) { + /* Analyst-only class for Portfolio page */ + .portfolio-submit-row-wrapper--analyst-view { + @include portfolio-submit-row-wrapper--collapsed-one-line(); + } +} + +@media screen and (min-width:1256px) { + .portfolio-submit-row-wrapper { + @include portfolio-submit-row-wrapper--collapsed-one-line(); + } +} + // Collapse button styles for fieldsets .module.collapse--dgfieldset { margin-top: -35px; diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html index 3b4047d39..65591dc03 100644 --- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html +++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html @@ -330,7 +330,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% endif %} {% endwith %} - {% elif field.field.name == "state_territory" %} + {% elif field.field.name == "state_territory" and original_object|model_name != 'portfolio' %}
CISA region: diff --git a/src/registrar/templates/django/admin/portfolio_change_form.html b/src/registrar/templates/django/admin/portfolio_change_form.html index 9d59aae42..4a1627907 100644 --- a/src/registrar/templates/django/admin/portfolio_change_form.html +++ b/src/registrar/templates/django/admin/portfolio_change_form.html @@ -1,11 +1,12 @@ {% extends 'django/admin/email_clipboard_change_form.html' %} +{% load custom_filters %} {% load i18n static %} {% block content %} {% comment %} Stores the json endpoint in a url for easier access {% endcomment %} {% url 'get-senior-official-from-federal-agency-json' as url %} - {{ block.super }} + {{ block.super }} {% endblock content %} {% block field_sets %} @@ -21,3 +22,21 @@ {% include "django/admin/includes/detail_table_fieldset.html" with original_object=original %} {% endfor %} {% endblock %} + +{% block submit_buttons_bottom %} +
+ + + +

+ HELLO WORLD: {{ original.requested_domain.name }} +

+ {{ block.super }} +
+ +{% endblock %} diff --git a/src/registrar/templatetags/custom_filters.py b/src/registrar/templatetags/custom_filters.py index 728478a51..b59363589 100644 --- a/src/registrar/templatetags/custom_filters.py +++ b/src/registrar/templatetags/custom_filters.py @@ -169,3 +169,8 @@ def has_contact_info(user): return False else: return bool(user.title or user.email or user.phone) + + +@register.filter +def model_name(instance): + return instance.__class__.__name__.lower()