[freeside-commits] branch master updated. 234cbf5b650cfd5616a81b55d86b8bbd0b23c558

[Christopher Burger]

The branch, master has been updated
       via  234cbf5b650cfd5616a81b55d86b8bbd0b23c558 (commit)
      from  354d94625f6bd4a484c52c89774ad53b3b1c50ea (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 234cbf5b650cfd5616a81b55d86b8bbd0b23c558
Author: Christopher Burger <burgerc at freeside.biz>
Date:   Fri Jan 12 16:52:28 2018 -0500

    RT# 78617 - updated redirect to freeside_status to show update message

diff --git a/httemplate/elements/alert.html b/httemplate/elements/alert.html
deleted file mode 100644
index 620588b0c..000000000
--- a/httemplate/elements/alert.html
+++ /dev/null
@@ -1,4 +0,0 @@
-% if ( $cgi->param('alert') ) { 
-  <FONT SIZE="+1" COLOR="#008000"><% mt($cgi->param('alert')) |h %></FONT>
-  <BR><BR>
-% } 
\ No newline at end of file
diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 96d301815..1b18d2ec8 100644
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -1,10 +1,15 @@
 % if ( $error ) {
 %   $cgi->param('error', $error);
-<% $cgi->redirect(popurl(1). "pref.html?". $cgi->query_string ) %>
+    <% $cgi->redirect(popurl(1). "pref.html?". $cgi->query_string ) %>
 % } else {
-<% include('/elements/header.html', mt('Preferences updated')) %>
-<% include('/elements/footer.html') %>
-<% $cgi->redirect(popurl(1). "pref.html?alert=Preferences updated" ) %>
+    <% $cgi->redirect( -uri    => popurl(1). "pref.html",
+                   -cookie => CGI::Cookie->new(
+                     -name    => 'freeside_status',
+                     -value   => mt('Preferences updated'),
+                     -expires => '+5m',
+                   ),
+       )
+    %>
 % }
 <%init>
 
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index ceafa9850..56fde6d44 100644
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -6,8 +6,6 @@
 
 <& /elements/error.html &>
 
-<& /elements/alert.html &>
-
 % if ( FS::Auth->auth_class->can('change_password') ) {
 
     <FONT CLASS="fsinnerbox-title"><% emt('Change password (leave blank for no change)') %></FONT>

-----------------------------------------------------------------------

Summary of changes:
 httemplate/elements/alert.html    |  4 ----
 httemplate/pref/pref-process.html | 13 +++++++++----
 httemplate/pref/pref.html         |  2 --
 3 files changed, 9 insertions(+), 10 deletions(-)
 delete mode 100644 httemplate/elements/alert.html