Use different forms for each auth choice (fix #214)

This commit is contained in:
Clément Oudot 2010-10-25 16:21:15 +00:00
parent a00ba782c7
commit 11bebe87d1
5 changed files with 34 additions and 27 deletions

View File

@ -40,10 +40,6 @@ $(document).ready(function(){
$("#authMenu").tabs({
fx: {opacity: 'toggle'},
cookie: {name: 'lemonldapauthchoice'},
show:function(event,ui) {
$('#authKey').val($('#authMenu li.ui-tabs-selected').attr('title'));
return true;
},
});
$("#authMenu").tabs("select",choicetab);

View File

@ -94,11 +94,11 @@ color:#000;
}
#logincontent form {
height:330px;
height:230px;
}
#mailcontent form {
height:300px;
height:200px;
}
#mailcontent div.link {
@ -114,8 +114,10 @@ float:left;
}
#authMenu {
background:#E4E4E4;
opacity:0.9;
margin: 20px -100px 20px 250px;
text-align:center;
background:#FFF;
padding:5px;
font-size:9pt;
-moz-border-radius:10px 10px 10px 10px;

View File

@ -23,14 +23,6 @@
<hr class="solid" />
<p><span class="text-error"><TMPL_VAR NAME="AUTH_ERROR"></span></p>
<form action="#" method="post" class="login">
<!-- Hidden fields -->
<TMPL_VAR NAME="HIDDEN_INPUTS">
<input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
<input type="hidden" name="timezone" />
<input type="hidden" id="authKey" name="<TMPL_VAR NAME="CHOICE_PARAM">" value="" />
<!-- tabs -->
<div id="authMenu">
<ul>
@ -45,6 +37,14 @@
<div id="<TMPL_VAR NAME="key">">
<form action="#" method="post" class="login">
<!-- Hidden fields -->
<TMPL_VAR NAME="HIDDEN_INPUTS">
<input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
<input type="hidden" name="timezone" />
<input type="hidden" id="authKey" name="<TMPL_VAR NAME="CHOICE_PARAM">" value="<TMPL_VAR NAME="key">" />
<TMPL_IF NAME="standardform">
<TMPL_INCLUDE NAME="standardform.tpl">
@ -77,12 +77,12 @@
</TMPL_IF>
</form>
</div>
</TMPL_LOOP>
</form>
</div>
</TMPL_IF>

View File

@ -126,6 +126,14 @@ background-image:url("../../common/ok.png");
background-image:url("../../common/warning_triangle.png");
}
#authMenu ul {
margin:0px 200px -20px 200px;
-moz-box-shadow:0 3px 6px rgba(0, 0, 0, 0.25);
-webkit-box-shadow:0 3px 6px rgba(0, 0, 0, 0.25);
-moz-border-radius:10px 10px 10px 10px;
-webkit-border-radius:10px 10px 10px 10px;
}
form {
display:block;
overflow:visible;

View File

@ -9,15 +9,8 @@
<TMPL_IF AUTH_LOOP>
<!-- Authentication loop -->
<form action="#" method="post" class="login">
<!-- Hidden fields -->
<TMPL_VAR NAME="HIDDEN_INPUTS">
<input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
<input type="hidden" name="timezone" />
<input type="hidden" id="authKey" name="<TMPL_VAR NAME="CHOICE_PARAM">" value="" />
<!-- tabs -->
<!-- Choice tabs -->
<div id="authMenu">
<ul>
<TMPL_LOOP NAME="AUTH_LOOP">
@ -31,6 +24,14 @@
<div id="<TMPL_VAR NAME="key">">
<form action="#" method="post" class="login">
<!-- Hidden fields -->
<TMPL_VAR NAME="HIDDEN_INPUTS">
<input type="hidden" name="url" value="<TMPL_VAR NAME="AUTH_URL">" />
<input type="hidden" name="timezone" />
<input type="hidden" id="authKey" name="<TMPL_VAR NAME="CHOICE_PARAM">" value="<TMPL_VAR NAME="key">" />
<TMPL_IF NAME="standardform">
<TMPL_INCLUDE NAME="standardform.tpl">
@ -69,12 +70,12 @@
</TMPL_IF>
</form>
</div>
</TMPL_LOOP>
</form>
</TMPL_IF>
<TMPL_IF NAME="DISPLAY_FORM">