Merge remote-tracking branch 'remotes/smcv/ready/openid'

master
Joey Hess 2014-02-23 14:24:15 -04:00
commit c4cb6e3c34
12 changed files with 373 additions and 19 deletions

45
debian/copyright vendored
View File

@ -211,6 +211,34 @@ Comment:
From http://code.google.com/p/openid-selector/
License: BSD-2-clause
Files: underlays/openid-selector/ikiwiki/openid/goa-*
Copyright:
© 2011 Red Hat, Inc.
License: LGPL-2.1+
Comment:
taken from data/icons/16x16/ in gnome-online-accounts git
Files: underlays/openid-selector/ikiwiki/openid/wordpress.png
Copyright:
© 2003-2013 "the contributors"
License: GPL-2+
Comment:
taken from wp-admin/images/w-logo-blue.png in wordpress/3.8.1+dfsg1-1
and trivially modified (resized to 16x16, placed on a white background)
Files:
icons/aol.svg
icons/livejournal.svg
icons/verisign.svg
underlays/openid-selector/ikiwiki/openid/aol.png
underlays/openid-selector/ikiwiki/openid/livejournal.png
underlays/openid-selector/ikiwiki/openid/verisign.png
Copyright:
© 2014 Simon McVittie
License: other
Redistribution and use in source and compiled forms, with or without
modification, are permitted under any circumstances. No warranty.
Files: underlays/jquery/*
Copyright: © 2005-2011 by John Resig, Branden Aaron & Jörn Zaefferer
© 2011 The Dojo Foundation
@ -301,3 +329,20 @@ License: Expat
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.

101
icons/aol.svg 100644
View File

@ -0,0 +1,101 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
id="svg2985"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="aol.svg"
inkscape:export-filename="/home/smcv/src/ikiwiki/icons/aol.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<title
id="title3812">approximately the AOL logo</title>
<defs
id="defs2987">
<linearGradient
inkscape:collect="always"
id="linearGradient3781">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3783" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3785" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3781"
id="linearGradient3787" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="19.271071"
inkscape:cy="3.271264"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1366"
inkscape:window-height="717"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>approximately the AOL logo</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Simon McVittie</dc:title>
</cc:Agent>
</dc:creator>
<dc:date>2014</dc:date>
<dc:rights>
<cc:Agent>
<dc:title>ikiwiki basewiki license</dc:title>
</cc:Agent>
</dc:rights>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<text
xml:space="preserve"
style="font-size:8.92135143px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Liberation Sans;-inkscape-font-specification:Liberation Sans Bold"
x="-0.16655508"
y="11.176648"
id="text3841"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan3843"
x="-0.16655508"
y="11.176648">Aol.</tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.1 KiB

View File

@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
id="svg2985"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="New document 2">
<title
id="title3825">A pencil resembling the Livejournal logo</title>
<defs
id="defs2987" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="-26.375015"
inkscape:cy="3.6372964"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
showguides="true"
inkscape:guide-bbox="true"
inkscape:window-width="1366"
inkscape:window-height="717"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>A pencil resembling the Livejournal logo</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Simon McVittie</dc:title>
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title>ikiwiki basewiki license</dc:title>
</cc:Agent>
</dc:rights>
<dc:date>2014</dc:date>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<rect
style="color:#000000;fill:#729fcf;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none"
id="rect3015"
width="16.103926"
height="3.75"
x="-3.1922383"
y="-4.2015886"
transform="matrix(0.68662998,0.72700707,-0.72700707,0.68662997,0,0)" />
<rect
style="color:#000000;fill:#3465a4;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none"
id="rect3017"
width="16.103926"
height="3.5"
x="-3.1922383"
y="-0.45158866"
transform="matrix(0.68662998,0.72700707,-0.72700707,0.68662997,0,0)" />
<path
style="color:#000000;fill:#e9b96e;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:0.50000000000000000;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none;stroke-linejoin:bevel"
d="M 11.90625 6.53125 L 11.8125 6.59375 L 10.125 7.28125 L 8.34375 7.96875 L 7.53125 9.75 L 6.8125 11.28125 L 6.65625 11.4375 L 6.71875 11.46875 L 6.71875 11.5 L 6.75 11.46875 L 10.90625 13.3125 L 15.15625 15.1875 L 13.53125 10.84375 L 11.9375 6.5625 L 11.90625 6.5625 L 11.90625 6.53125 z "
id="path3019" />
<path
transform="matrix(0.11470637,0.12145165,-0.088438,0.08352626,11.92361,11.142815)"
inkscape:transform-center-x="-0.65303443"
d="m 30.903804,3.625 -7.334103,4.2343464 -7.334103,4.2343466 0,-8.4686932 0,-8.4686923 7.334103,4.23434635 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.0471976"
sodipodi:arg1="0"
sodipodi:r2="4.8894019"
sodipodi:r1="9.7788038"
sodipodi:cy="3.625"
sodipodi:cx="21.125"
sodipodi:sides="3"
id="path3023"
style="color:#000000;fill:#2e3436;fill-opacity:1;fill-rule:nonzero;stroke:#2e3436;stroke-width:3.50741758;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;stroke-miterlimit:4;stroke-dasharray:none"
sodipodi:type="star" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

112
icons/verisign.svg 100644
View File

@ -0,0 +1,112 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16px"
height="16px"
id="svg2985"
version="1.1"
inkscape:version="0.48.4 r9939"
sodipodi:docname="verisign.svg"
inkscape:export-filename="/home/smcv/src/ikiwiki/icons/verisign.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<title
id="title3812">approximately the Verisign logo</title>
<defs
id="defs2987">
<linearGradient
inkscape:collect="always"
id="linearGradient3781">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3783" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop3785" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3781"
id="linearGradient3787" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1"
inkscape:cx="19.271071"
inkscape:cy="3.271264"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:grid-bbox="true"
inkscape:document-units="px"
inkscape:window-width="1366"
inkscape:window-height="717"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata2990">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title>approximately the Verisign logo</dc:title>
<dc:creator>
<cc:Agent>
<dc:title>Simon McVittie</dc:title>
</cc:Agent>
</dc:creator>
<dc:date>2014</dc:date>
<dc:rights>
<cc:Agent>
<dc:title>ikiwiki basewiki license</dc:title>
</cc:Agent>
</dc:rights>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
sodipodi:type="arc"
style="color:#000000;fill:none;stroke:#edd400;stroke-width:2.56285746999999997;stroke-linecap:butt;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3001"
sodipodi:cx="7.906188"
sodipodi:cy="8.22896"
sodipodi:rx="6.734901"
sodipodi:ry="6.734901"
d="m 14.641089,8.22896 a 6.734901,6.734901 0 1 1 -13.4698019,0 6.734901,6.734901 0 1 1 13.4698019,0 z"
transform="matrix(0.77034953,0,0,0.79053893,0.64096934,1.9303724)" />
<text
xml:space="preserve"
style="font-size:21.52570534px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;text-align:start;line-height:125%;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Inconsolata;-inkscape-font-specification:Inconsolata Medium"
x="2.9831085"
y="12.96045"
id="text3789"
sodipodi:linespacing="125%"
transform="scale(1.0045059,0.99551431)"><tspan
sodipodi:role="line"
id="tspan3791"
x="2.9831085"
y="12.96045">✔</tspan></text>
</g>
</svg>

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 460 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 592 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 825 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 741 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 772 B

View File

@ -8,12 +8,12 @@ This code is licenced under the New BSD License.
var providers_large = {
google: {
name: 'Google',
icon: 'http://google.com/favicon.ico',
icon: 'ikiwiki/openid/goa-account-google.png',
url: 'https://www.google.com/accounts/o8/id'
},
yahoo: {
name: 'Yahoo',
icon: 'http://yahoo.com/favicon.ico',
icon: 'ikiwiki/openid/goa-account-yahoo.png',
url: 'http://me.yahoo.com/'
},
openid: {
@ -26,43 +26,31 @@ var providers_large = {
var providers_small = {
livejournal: {
name: 'LiveJournal',
icon: 'http://livejournal.com/favicon.ico',
icon: 'ikiwiki/openid/livejournal.png',
label: 'Enter your Livejournal username:',
url: 'http://{username}.livejournal.com/'
},
flickr: {
name: 'Flickr',
icon: 'http://flickr.com/favicon.ico',
icon: 'ikiwiki/openid/goa-account-flickr.png',
label: 'Enter your Flickr username:',
url: 'http://flickr.com/photos/{username}/'
},
wordpress: {
name: 'Wordpress',
icon: 'https://s2.wp.com/i/favicon.ico',
icon: 'ikiwiki/openid/wordpress.png',
label: 'Enter your Wordpress.com username:',
url: 'http://{username}.wordpress.com/'
},
myopenid: {
name: 'MyOpenID',
icon: 'http://myopenid.com/favicon.ico',
label: 'Enter your MyOpenID username:',
url: 'http://{username}.myopenid.com/'
},
claimid: {
name: 'ClaimID',
icon: 'http://claimid.com/favicon.ico',
label: 'Enter your ClaimID username:',
url: 'http://claimid.com/{username}'
},
aol: {
name: 'AOL',
icon: 'http://aol.com/favicon.ico',
icon: 'ikiwiki/openid/aol.png',
label: 'Enter your AOL username:',
url: 'http://openid.aol.com/{username}'
},
verisign: {
name: 'Verisign',
icon: 'http://verisign.com/favicon.ico',
icon: 'ikiwiki/openid/verisign.png',
label: 'Enter your Verisign username:',
url: 'http://{username}.pip.verisignlabs.com/'
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 886 B