Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Item14248: Simplified openid templates. Also corrected a protocol err…
…or (requesting scopes that aren't supported)
- Loading branch information
Pascal Schuppli
committed
Dec 9, 2016
1 parent
fae3d52
commit fa59d14
Showing
7 changed files
with
117 additions
and
38 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
%TMPL:INCLUDE{"page"}%<!-- template: openidlogin.nat.tmpl --> | ||
%TMPL:INCLUDE{"openidloginbase.tmpl"}% | ||
%TMPL:INCLUDE{"login"}% | ||
|
||
%TMPL:DEF{"LOG_IN_BANNER"}%%MAKETEXT{"Welcome, please login"}%.%TMPL:END% | ||
|
||
%TMPL:DEF{"message"}%<!-- --> | ||
<div class="foswikiFormSteps"> | ||
%NOTE%<!-- --> | ||
%TMPL:P{"openidstep"}%<div class="native_credentials"> | ||
%TMPL:P{"login"}%<!-- --> | ||
%TMPL:P{"seealso"}%<!-- --> | ||
</div></div> | ||
%TMPL:P{"poweredby"}%<!-- --> | ||
%TMPL:P{"openid_javascript"}% | ||
<!-- -->%TMPL:END% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
%TMPL:INCLUDE{"login"}% | ||
%TMPL:DEF{"bodyclassname"}%patternNoViewPage patternLoginPage%TMPL:END% | ||
|
||
%TMPL:DEF{"title"}%<h2 class="openid_accounts">%MAKETEXT{"Log on to [_1] with these accounts" args="%WIKITOOLNAME%"}%</h2><h2 class="native_credentials">%MAKETEXT{"Log on to [_1]" args="%WIKITOOLNAME%"}%</h2>%TMPL:END% | ||
|
||
%TMPL:DEF{"bottombarcontents"}%%TMPL:END% | ||
%TMPL:DEF{"webaction"}%%TMPL:END% | ||
|
||
%TMPL:DEF{"usernamefieldhelplink"}%%TMPL:END% | ||
%TMPL:DEF{"usernamefieldhelpcontents"}%%TMPL:END% | ||
%TMPL:DEF{"passwordnote"}%%TMPL:END% | ||
|
||
%TMPL:DEF{"rememberbox"}%<p><label class='foswikiLabel'> | ||
<input tabindex='3' id='remember' name='remember' type='checkbox' value='1' /> | ||
<span>%MAKETEXT{"Remember me"}%</span> | ||
</label></p>%TMPL:END% | ||
|
||
%TMPL:DEF{"passwordstep"}%<div class="foswikiFormStep"> | ||
<h3>%MAKETEXT{"Password"}%</h3> | ||
<p>%TMPL:P{"passwordfield"}% %TMPL:P{"passwordnote"}%</p> | ||
%TMPL:P{context="can_remember_login" then="rememberbox"}%</div>%TMPL:END% | ||
|
||
%TMPL:DEF{"seealsostep"}%<span class='foswikiUnvisited'>[[%SCRIPTURLPATH{view}%/%SYSTEMWEB%/ResetPassword?username=%URLPARAM{username}%][%MAKETEXT{"Having problems logging in?"}%]]</span><br /><span class='foswikiUnvisited'>[[%SYSTEMWEB%.UserRegistration][%MAKETEXT{"Create account"}%]]</span>%TMPL:END% | ||
|
||
%TMPL:DEF{"openidbutton"}% | ||
<a class="openidbutton provider_%PROVIDERNAME%" href="%SCRIPTURLPATH{"login"}%?provider=%PROVIDER%"> | ||
<img src="%PUBURLPATH%/%SYSTEMWEB%/OpenIDLoginContrib/%LOGOIMAGE%"> | ||
<span>%PROVIDERNAME%</span> | ||
</a> | ||
%TMPL:END% | ||
|
||
%TMPL:DEF{"openidstep"}% | ||
<div class="openid_accounts"><hr/> | ||
%TMPL:P{"openidbutton" PROVIDER="MSAzure" PROVIDERNAME="Microsoft" LOGOIMAGE="windows_logo.png"}% | ||
%TMPL:P{"openidbutton" PROVIDER="Google" PROVIDERNAME="Google" LOGOIMAGE="google_g_logo.png"}% | ||
</div> | ||
%TMPL:END% | ||
|
||
%TMPL:DEF{"form"}%<div id="foswikiLogin"> | ||
%TMPL:P{"formstart"}%<div class="foswikiFormSteps">%TMPL:P{"titlestep"}% | ||
%TMPL:P{"openidstep"}%<p class="clear"><a class='foswikiUnvisited native_toggle' href="#?provider=native">%MAKETEXT{"I don't use any of those."}%</a></p> | ||
<div class="native_credentials"> | ||
<hr /> | ||
%TMPL:P{"usernamestep"}%%TMPL:P{"passwordstep"}%%TMPL:P{"submitstep"}% | ||
<hr />%TMPL:P{"seealsostep"}% | ||
</div> | ||
</div>%TMPL:P{"loginasadministratorstep"}%%TMPL:P{"formend"}% | ||
</div><script src="%PUBURLPATH%/%SYSTEMWEB%/OpenIDLoginContrib/openidlogin.js"></script> | ||
%TMPL:END% |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
%TMPL:DEF{"openidbutton"}% | ||
<a class="openidbutton provider_%PROVIDERNAME%" href="%SCRIPTURLPATH{"login"}%?provider=%PROVIDER%"> | ||
<img src="%PUBURLPATH%/%SYSTEMWEB%/OpenIDLoginContrib/%LOGOIMAGE%"> | ||
<span>%PROVIDERNAME%</span> | ||
</a> | ||
%TMPL:END% | ||
|
||
%TMPL:DEF{"openidstep"}% | ||
<div class="openid_accounts foswikiFormStep">%TMPL:P{"openid_providers"}%</div> | ||
%TMPL:P{"openid_toggle"}% | ||
%TMPL:END% | ||
|
||
%TMPL:DEF{"openid_toggle"}% | ||
<p class="foswikiFormStep clear openid_accounts"><a class='foswikiUnvisited native_toggle' href="?provider=native">%MAKETEXT{"I don't use any of those."}%</a></p> | ||
%TMPL:END% | ||
|
||
%TMPL:DEF{"openid_javascript"}% | ||
<script src="%PUBURLPATH%/%SYSTEMWEB%/OpenIDLoginContrib/openidlogin.js"></script> | ||
%TMPL:END% | ||
|
||
%{################################################################################# }% | ||
%TMPL:DEF{"openid_providers"}% | ||
%TMPL:P{"openidbutton" PROVIDER="Default" PROVIDERNAME="Microsoft" LOGOIMAGE="windows_logo.png"}% | ||
%TMPL:P{"openidbutton" PROVIDER="Google" PROVIDERNAME="Google" LOGOIMAGE="google_g_logo.png"}% | ||
%TMPL:END% |