From eced4c36f5e393acd5e95733d96891a66ffd2338 Mon Sep 17 00:00:00 2001 From: Benjamin Bertrand <benjamin.bertrand@esss.se> Date: Fri, 21 Sep 2018 22:38:56 +0200 Subject: [PATCH] Implement alert flashing from javascript JIRA INFRA-545 --- app/static/js/csentry.js | 13 +++++++++++++ app/templates/base-fluid.html | 2 +- app/templates/base.html | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/app/static/js/csentry.js b/app/static/js/csentry.js index e2721ae..5727400 100644 --- a/app/static/js/csentry.js +++ b/app/static/js/csentry.js @@ -1,3 +1,16 @@ +function flash_alert(message, category) { + var htmlString = '<div class="alert alert-' + category + ' alert-dismissible" role="alert">' + htmlString += '<button type="button" class="close" data-dismiss="alert" aria-label="Close">' + htmlString += '<span aria-hidden="true">×</span></button>' + message + '</div>' + $(htmlString).prependTo("#mainContent").hide().slideDown(); +} + +function remove_alerts() { + $(".alert").slideUp("normal", function() { + $(this).remove(); + }); +} + // Function to dynamically update a select field function update_selectfield(field_id, data, selected_value) { var $field = $(field_id); diff --git a/app/templates/base-fluid.html b/app/templates/base-fluid.html index c3f1400..394b91b 100644 --- a/app/templates/base-fluid.html +++ b/app/templates/base-fluid.html @@ -34,7 +34,7 @@ </div> </div> - <div class="col-12 col-md-10 col-xl-10"> + <div class="col-12 col-md-10 col-xl-10" id="mainContent"> {{flashed_messages(messages, container=False, dismissible=True)}} {% block main %}{% endblock %} </div> diff --git a/app/templates/base.html b/app/templates/base.html index 9f4c97d..9e7533c 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -54,7 +54,7 @@ {% endblock %} {% block content %} - <div class="container"> + <div class="container" id="mainContent"> {{flashed_messages(messages, container=False, dismissible=True)}} {% block main %}{% endblock %} </div> -- GitLab