diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2018-01-12 16:52:28 -0500 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2018-01-14 12:01:29 -0500 |
| commit | d153ff01787dbc84e5a6fc256ba42ee15ff0d816 (patch) | |
| tree | d70c90eed104a65432e71755672a03b3a347fe92 | |
| parent | fe8c3092f0c4210049de3a9673f70e8f4bb541be (diff) | |
RT# 78617 - updated redirect to freeside_status to show update message
Conflicts:
httemplate/pref/pref-process.html
httemplate/pref/pref.html
| -rw-r--r-- | httemplate/elements/alert.html | 4 | ||||
| -rw-r--r-- | httemplate/pref/pref-process.html | 3 | ||||
| -rw-r--r-- | httemplate/pref/pref.html | 4 |
3 files changed, 1 insertions, 10 deletions
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 cf0d8240f..122e92f7e 100644 --- a/httemplate/pref/pref-process.html +++ b/httemplate/pref/pref-process.html @@ -1,10 +1,9 @@ % 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', 'Preferences updated') %> <% include('/elements/footer.html') %> -<% $cgi->redirect(popurl(1). "pref.html?alert=Preferences updated" ) %> % } <%init> diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html index c7c7c9d60..c504b2c5e 100644 --- a/httemplate/pref/pref.html +++ b/httemplate/pref/pref.html @@ -6,10 +6,6 @@ <% include('/elements/error.html') %> -<<<<<<< HEAD -======= -<& /elements/alert.html &> - % if ( FS::Auth->auth_class->can('change_password') ) { <% mt('Change password (leave blank for no change)') |h %> |