Canonical SSO provider

Merge lp:~canonical-isd-hackers/canonical-identity-provider/disable-unsupported-devices into lp:canonical-identity-provider/release

  1. disable-unsupported-devices
  2. Merge into trunk
Proposed by Michael Foord
Status: Merged
Approved by: Simon Davy
Approved revision: no longer in the source branch.
Merged at revision: 298
Proposed branch: lp:~canonical-isd-hackers/canonical-identity-provider/disable-unsupported-devices
Merge into: lp:canonical-identity-provider/release
Diff against target: 29 lines (+3/-3)
1 file modified
identityprovider/templates/device/types.html (+3/-3)
To merge this branch: bzr merge lp:~canonical-isd-hackers/canonical-identity-provider/disable-unsupported-devices
Reviewer Review Type Date Requested Status
Canonical ISD hackers Pending
Review via email: mp+89742@code.launchpad.net

Commit message

Disable unsupported devices in the add authentication device type view.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'identityprovider/templates/device/types.html'
--- identityprovider/templates/device/types.html 2012-01-12 21:50:25 +0000
+++ identityprovider/templates/device/types.html 2012-01-23 17:23:24 +0000
@@ -24,14 +24,14 @@
24 <dl>24 <dl>
2525
26 <dt style="font-weight: bold"><label>26 <dt style="font-weight: bold"><label>
27 <input type="radio" name="type" value="yubi" id="type_yubi"> YubiKey27 <input type="radio" name="type" value="yubi" id="type_yubi" disabled="disabled"> YubiKey
28 </label></dt>28 </label></dt>
29 <dd style="margin-left: 2em">29 <dd style="margin-left: 2em">
30 <p><label for="type_yubi">blah blah blah</label></p>30 <p><label for="type_yubi">blah blah blah</label></p>
31 </dd>31 </dd>
3232
33 <dt style="font-weight: bold"><label>33 <dt style="font-weight: bold"><label>
34 <input type="radio" name="type" value="google" id="type_google"> Google Authenticator34 <input type="radio" name="type" value="google" id="type_google" disabled="disabled"> Google Authenticator
35 </label></dt>35 </label></dt>
36 <dd style="margin-left: 2em">36 <dd style="margin-left: 2em">
37 <p><label for="type_google">blah blah blah</label></p>37 <p><label for="type_google">blah blah blah</label></p>
@@ -45,7 +45,7 @@
45 </dd>45 </dd>
4646
47 <dt style="font-weight: bold"><label>47 <dt style="font-weight: bold"><label>
48 <input type="radio" name="type" value="paper" id="type_paper"> One-time pad48 <input type="radio" name="type" value="paper" id="type_paper" disabled="disabled"> One-time pad
49 </label></dt>49 </label></dt>
50 <dd style="margin-left: 2em">50 <dd style="margin-left: 2em">
51 <p><label for="type_paper">A paper with a list of one-time51 <p><label for="type_paper">A paper with a list of one-time