wiki-cafe/wiki-security-passportjs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tidy up done dialog

Browse Source
This commit is contained in:
Paul Rodwell
2016-07-26 12:17:22 +01:00
parent 59f7932272
commit 59c25de098
2 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
server/social.coffee
View File

@ -350,16 +350,28 @@ module.exports = exports = (log, loga, argv) ->
res.render(path.join(__dirname, '..', 'views', 'personaDialog.html'), info) res.render(path.join(__dirname, '..', 'views', 'personaDialog.html'), info)
app.get '/auth/loginDone', (req, res) -> app.get '/auth/loginDone', (req, res) ->
referer = req.headers.referer
info = { info = {
wikiName: if useHttps
url.parse(referer).hostname
else
url.parse(referer).host
wikiHostName: if wikiHost
"part of " + req.hostname + " wiki farm"
else
"a federated wiki site"
title: if owner title: if owner
"Wiki Site Owner Sign-on" "Wiki Site Owner Sign-on"
else else
"Sign-on to claim Wiki site" "Sign-on to claim Wiki site"
owner: getOwner owner: getOwner
authMessage: "You are now logged in..." authMessage: "You are now logged in<br>If this window hasn't closed, you can close it."
} }
res.render(path.join(__dirname, '..', 'views', 'done.html'), info) res.render(path.join(__dirname, '..', 'views', 'done.html'), info)
app.get '/auth/addAuthDialog', (req, res) ->
app.get '/auth/claim-wiki', (req, res) -> app.get '/auth/claim-wiki', (req, res) ->
if owner if owner
console.log 'Claim Request Ignored: Wiki already has owner' console.log 'Claim Request Ignored: Wiki already has owner'

41
views/done.html
View File

@ -1,19 +1,44 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title>Federated Wiki: Sign-on</title> <link href='https://fonts.googleapis.com/css?family=Open+Sans:400,300,700' rel='stylesheet' type='text/css'>
<title>{{title}}</title>
<link id='favicon' href='/favicon.png' rel='icon' type='image/png'> <link id='favicon' href='/favicon.png' rel='icon' type='image/png'>
<link rel="stylesheet" href="/security/style.css"> <link rel="stylesheet" href="/security/dialog.css">
</head> </head>
<body> <body>
<header> <div id="content">
<img src="/favicon.png"> <div class="wikiinfo">
{{title}} <div class="table">
</header> <div class="vertical">
<div> <img id="wiki_logo" src="//{{wikiName}}/favicon.png" width="32px" height="32px"></img>
{{{authMessage}}} <h2 id=wiki_name>{{wikiName}}</h2>
<h3 id="wiki_hostname">{{wikiHostName}}</h3>
</div>
</div>
</div>
<div id="signIn">
<div class="table">
<div class="vertical">
<div class="contents">
<div class="scheme_section vcenter" style="width: 249px;">
<div id="message">
<p>{{authMessage}}</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div> </div>
<footer>
<span id="footerText">
<strong>Federated Wiki.</strong>
Sharing ideas through federation.
<a href="http://fed.wiki/view/welcome-visitors/view/federated-wiki" target="_blank">Learn more→</a>
</span>
</footer>
</body> </body>
<script src="/security/winchan.js"></script> <script src="/security/winchan.js"></script>
<script> <script>