dani/lemonldap-ng
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Google form, automatic now

Browse Source
This commit is contained in:
Xavier Guimard 2013-09-29 18:08:21 +00:00
parent 106de86477
commit ba6e7667da
7 changed files with 0 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lemonldap-ng-portal/example/skins/dark/google.tpl
View File

@ -1 +0,0 @@
../pastel/google.tpl

1
lemonldap-ng-portal/example/skins/dark/googleform.tpl
View File

@ -1 +0,0 @@
../pastel/googleform.tpl

1
lemonldap-ng-portal/example/skins/impact/google.tpl
View File

@ -1 +0,0 @@
<TMPL_INCLUDE NAME="openid.tpl">

19
lemonldap-ng-portal/example/skins/impact/googleform.tpl
View File

@ -1,19 +0,0 @@
<TMPL_IF NAME="CHECK_LOGINS">
<p>
<label for="checkLogins">
<input type="checkbox" id="checkLogins" name="checkLogins" <TMPL_IF NAME="ASK_LOGINS">checked</TMPL_IF>/>
<lang en="Check my last logins" fr="Voir mes dernières connexions"/>
</label>
</p>
</TMPL_IF>
<hr class="solid" />
<div class="panel-buttons">
<button type="reset" class="negative" tabindex="4">
<lang en="Cancel" fr="Annuler" />
</button>
<button type="submit" class="positive" tabindex="3">
<lang en="Connect" fr="Se connecter" />
</button>
</div>

1
lemonldap-ng-portal/example/skins/pastel/google.tpl
View File

@ -1 +0,0 @@
<TMPL_INCLUDE NAME="openid.tpl">

27
lemonldap-ng-portal/example/skins/pastel/googleform.tpl
View File

@ -1,27 +0,0 @@
<h3><lang en="Log in with your Google Account" fr="Connectez-vous avec votre compte Google"/></h3>
<table>
<TMPL_IF NAME="CHECK_LOGINS">
<tr><td colspan="2"><div class="buttons">
<label for="checkLogins">
<input type="checkbox" id="checkLogins" name="checkLogins" <TMPL_IF NAME="ASK_LOGINS">checked</TMPL_IF>/>
<lang en="Check my last logins" fr="Voir mes dernières connexions"/>
</label>
</div></td></tr>
</TMPL_IF>
<tr><td>
<div class="buttons">
<button type="reset" class="negative" tabindex="4">
<img src="<TMPL_VAR NAME="SKIN_PATH">/common/cancel.png" alt="" />
<lang en="Cancel" fr="Annuler" />
</button>
<button type="submit" class="positive" tabindex="3" name="google_go" value="1">
<img src="<TMPL_VAR NAME="SKIN_PATH">/common/accept.png" alt="" />
<lang en="Connect" fr="Se connecter" />
</button>
</div></td></tr>
</table>

6
lemonldap-ng-portal/lib/Lemonldap/NG/Portal/Display.pm
View File

@ -189,8 +189,6 @@ sub display {
);
}
# TODO: Manage Google errors
# 2.5 Authentication has been refused OR this is the first access
else {
$skinfile = 'login.tpl';
@ -237,7 +235,6 @@ sub display {
REQUIRE_OLDPASSWORD =>
1, # Old password is required to check user credentials
DISPLAY_FORM => 0,
DISPLAY_GOOGLE_FORM => 0,
DISPLAY_OPENID_FORM => 0,
DISPLAY_YUBIKEY_FORM => 0,
DISPLAY_PASSWORD => 1,
@ -263,7 +260,6 @@ sub display {
%templateParams,
DISPLAY_RESETPASSWORD => 0,
DISPLAY_FORM => 0,
DISPLAY_GOOGLE_FORM => 0,
DISPLAY_OPENID_FORM => 0,
DISPLAY_YUBIKEY_FORM => 0,
AUTH_LOOP => [],
@ -284,7 +280,6 @@ sub display {
CHOICE_PARAM => $self->{authChoiceParam},
CHOICE_VALUE => $self->{_authChoice},
DISPLAY_FORM => 0,
DISPLAY_GOOGLE_FORM => 0,
DISPLAY_OPENID_FORM => 0,
DISPLAY_YUBIKEY_FORM => 0,
);
@ -300,7 +295,6 @@ sub display {
%templateParams = (
%templateParams,
DISPLAY_FORM => $displayType eq "standardform" ? 1 : 0,
DISPLAY_GOOGLE_FORM => $displayType eq "googleform" ? 1 : 0,
DISPLAY_OPENID_FORM => $displayType eq "openidform" ? 1 : 0,
DISPLAY_YUBIKEY_FORM => $displayType eq "yubikeyform"
? 1