projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rt 4.2.13 ticket#13852
[freeside.git]
/
rt
/
share
/
html
/
Elements
/
Login
diff --git
a/rt/share/html/Elements/Login
b/rt/share/html/Elements/Login
index
eb645d4
..
6a71182
100755
(executable)
--- a/
rt/share/html/Elements/Login
+++ b/
rt/share/html/Elements/Login
@@
-2,7
+2,7
@@
%#
%# COPYRIGHT:
%#
%#
%# COPYRIGHT:
%#
-%# This software is Copyright (c) 1996-201
1
Best Practical Solutions, LLC
+%# This software is Copyright (c) 1996-201
6
Best Practical Solutions, LLC
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
%# <sales@bestpractical.com>
%#
%# (Except where explicitly superseded by other copyright notices)
@@
-46,11
+46,7
@@
%#
%# END BPS TAGGED BLOCK }}}
% $m->callback( %ARGS, CallbackName => 'Header' );
%#
%# END BPS TAGGED BLOCK }}}
% $m->callback( %ARGS, CallbackName => 'Header' );
-<& /Elements/Header, Title => loc('Login'), Focus => 'user' &>
-
-
-%# End of div#quickbar from /Elements/Header
-</div>
+<& /Elements/Header, Title => loc('Login'), Focus => '#user', RichText => 0 &>
<div id="body" class="login-body">
<div id="body" class="login-body">
@@
-65,7
+61,9
@@
<div id="login-box">
<&| /Widgets/TitleBox, title => loc('Login'), titleright => $RT::VERSION, hideable => 0 &>
<div id="login-box">
<&| /Widgets/TitleBox, title => loc('Login'), titleright => $RT::VERSION, hideable => 0 &>
-% unless (RT->Config->Get('WebExternalAuth') and !RT->Config->Get('WebFallbackToInternalAuth')) {
+<& LoginRedirectWarning, %ARGS &>
+
+% unless (RT->Config->Get('WebRemoteUserAuth') and !RT->Config->Get('WebFallbackToRTLogin')) {
<form id="login" name="login" method="post" action="<% RT->Config->Get('WebPath') %>/NoAuth/Login.html">
<div class="input-row">
<form id="login" name="login" method="post" action="<% RT->Config->Get('WebPath') %>/NoAuth/Login.html">
<div class="input-row">
@@
-75,11
+73,20
@@
<div class="input-row">
<span class="label"><&|/l&>Password</&>:</span>
<div class="input-row">
<span class="label"><&|/l&>Password</&>:</span>
- <span class="input"><input type="password" name="pass"
autocomplete="off"
/></span>
+ <span class="input"><input type="password" name="pass"
<% RT->Config->Get('AllowLoginPasswordAutoComplete') ? '' : 'autocomplete="off"' | n %>
/></span>
</div>
<input type="hidden" name="next" value="<% $next %>" />
</div>
<input type="hidden" name="next" value="<% $next %>" />
+<script type="text/javascript">
+jQuery(function(){
+ if (window.location.hash) {
+ var form = jQuery("form[name=login]");
+ form.attr('action', form.attr('action') + '#' + window.location.hash.replace(/^#/, ''));
+ }
+});
+</script>
+
<div class="button-row">
<span class="input"><input type="submit" class="button" value="<&|/l&>Login</&>" /></span>
</div>
<div class="button-row">
<span class="input"><input type="submit" class="button" value="<&|/l&>Login</&>" /></span>
</div>
@@
-90,6
+97,7
@@
</form>
% }
</&>
</form>
% }
</&>
+<& /Elements/LoginHelp &>
</div><!-- #login-box -->
% $m->callback( %ARGS, CallbackName => 'AfterForm' );
</div><!-- #login-body -->
</div><!-- #login-box -->
% $m->callback( %ARGS, CallbackName => 'AfterForm' );
</div><!-- #login-body -->