diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2013-05-10 12:55:52 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2013-05-10 12:55:52 -0700 |
| commit | 63973c641c4be00765fa27e55c57cc5b9aa4da19 (patch) | |
| tree | 68ea71023d7116229e97fd27b38b87b5ac65228a /httemplate/elements | |
| parent | 7b5a266236857fbb4bbf8d4ac3031c3fec75cac2 (diff) | |
| parent | 0832972047a36d19ffcf7d1462abc48de7045d3d (diff) | |
merge NG auth, RT#21563
Diffstat (limited to 'httemplate/elements')
| -rw-r--r-- | httemplate/elements/header.html | 33 | ||||
| -rw-r--r-- | httemplate/elements/logout.html | 44 |
2 files changed, 13 insertions, 64 deletions
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html index c6ad3c387..7a7dc088d 100644 --- a/httemplate/elements/header.html +++ b/httemplate/elements/header.html @@ -2,18 +2,18 @@ Example: - include( '/elements/header.html', - { - 'title' => 'Title', - 'menubar' => \@menubar, - 'etc' => '', #included in <BODY> tag, for things like onLoad= - 'head' => '', #included before closing </HEAD> tag - 'nobr' => 0, #1 for no <BR><BR> after the title - } - ); - - #old-style - include( '/elements/header.html', 'Title', $menubar, $etc, $head); + <& /elements/header.html', + { + 'title' => 'Title', + 'menubar' => \@menubar, + 'etc' => '', #included in <BODY> tag, for things like onLoad= + 'head' => '', #included before closing </HEAD> tag + 'nobr' => 0, #1 for no <BR><BR> after the title + } + &> + + %#old-style + <& /elements/header.html, 'Title', $menubar, $etc, $head &> </%doc> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> @@ -41,13 +41,6 @@ Example: <% include('init_overlib.html') |n %> <% include('rs_init_object.html') |n %> - <% include('logout.html') |n %> -% my $timeout = $conf->config('logout-timeout'); -% if ( $timeout && $timeout =~ /^\s*\d+\s*$/ ) { - <script type="text/javascript"> - setTimeout('logout()', <% 60000 * $timeout %>); - </script> -% } <% $head |n %> @@ -59,7 +52,7 @@ Example: <td align=left BGCOLOR="#ffffff"> <!-- valign="top" --> <font size=6><% $company_name || 'ExampleCo' %></font> </td> - <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% getotaker %> </b> <FONT SIZE="-2"><a href="javascript:void(0);" onClick="logout();">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a> + <td align=right valign=top BGCOLOR="#ffffff"><FONT SIZE="-1">Logged in as <b><% $FS::CurrentUser::CurrentUser->username |h %> </b> <FONT SIZE="-2"><a href="<%$fsurl%>loginout/logout.html">logout</a></FONT><br></FONT><FONT SIZE="-2"><a href="<%$fsurl%>pref/pref.html" STYLE="color: #000000">Preferences</a> % if ( $conf->config("ticket_system") % && FS::TicketSystem->access_right(\%session, 'ModifySelf') ) { | <a href="<%$fsurl%>rt/Prefs/Other.html" STYLE="color: #000000">Ticketing preferences</a> diff --git a/httemplate/elements/logout.html b/httemplate/elements/logout.html deleted file mode 100644 index 313dbfaf1..000000000 --- a/httemplate/elements/logout.html +++ /dev/null @@ -1,44 +0,0 @@ -<%doc> - -Example: - - include( '/elements/logout.html'); - This is the <a href="javascript:void()" onClick="logout();">logout</a> link. - -</%doc> -<SCRIPT TYPE="text/javascript"> - - function logout() { - // count args; build URL - var url = "<% $fsurl. 'loginout/logout.html' %>"; - - var xmlhttp = rs_init_object(); - xmlhttp.open("GET", url, false, "magic", "notyet"); - xmlhttp.setRequestHeader("If-Modified-Since", "Sat, 1 Jan 2000 00:00:00 GMT"); - xmlhttp.send(null); - - if (xmlhttp.readyState != 4) { - alert("Logout failed: readyState is " + xmlhttp.readyState); - return; - } - - if (xmlhttp.status != 200) { - alert("Logout failed: status is " + xmlhttp.status); - } else { - var data = xmlhttp.responseText; - // alert('received response: ' + data); - if ( data.indexOf("<b>System error</b>") > -1 ) { - var w; - if ( w = window.open("about:blank") ) { - w.document.write(data); - } else { - // popup blocking? should use an overlib popup instead - alert("Error popup disabled; try disabling popup blocking to see"); - } - } else { - window.location = "<% $fsurl. 'loginout/logout.html' %>"; - } - } - } - -</SCRIPT> |