Merge branch 'master' into cvs
[ikiwiki.git] / templates / openid-selector.tmpl
index 76c4051ed8312bb9f502a96a1c4a9f96cb677b7d..b6be2720c99e4593d8fede439675916817b37aa5 100644 (file)
@@ -1,30 +1,43 @@
-<script type="text/javascript" src="ikiwiki/openid-selector/jquery.js"></script>
-<script type="text/javascript" src="ikiwiki/openid-selector/openid-jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/jquery.min.js"></script>
+<script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-       openid.init('openid_url');
+       openid.init('openid_identifier','<TMPL_IF NONOPENIDFORM>nonopenidform</TMPL_IF>');
 });
 </script>
-       
-<TMPL_IF OPENID_ERROR>
-<div class="error"><TMPL_VAR OPENID_ERROR></span>
-</TMPL_IF>
-</div>
+
+<noscript>
+<h2>OpenID:</h2>
+</noscript>
 
 <form action="<TMPL_VAR CGIURL>" method="get" id="openid_form">
-       <input type="hidden" name="do" value="signin" />
-       <input type="hidden" name="action" value="verify" />
-       <div id="openid_choice">
-               <p><TMPL_VAR LOGINLABEL>:</p>
-               <div id="openid_btns">
+       <fieldset>
+               <script>
+               $('fieldset').append("<legend>Select your account provider</legend>");
+               </script>
+               
+               <input type="hidden" name="do" value="signin" />
+               <input type="hidden" name="action" value="verify" />
+               <div id="openid_choice">
+                       <div id="openid_btns"></div>
+               </div>
+               <div id="openid_input_area">
+                       <label for="openid_identifier" class="block">Enter your OpenID:</label>
+                       <input id="openid_identifier" name="openid_identifier" type="text" value="<TMPL_VAR OPENID_URL>"/>
+                       <input id="openid_submit" type="submit" value="Login"/>
                </div>
-               <TMPL_IF NONOPENIDURL>
-               <a href="<TMPL_VAR NONOPENIDURL>">local account</a>
+               <TMPL_IF OPENID_ERROR>
+               <div class="error"><TMPL_VAR OPENID_ERROR></div>
                </TMPL_IF>
-       </div>
-       
-       <span id="openid_input_area">
-               <input id="openid_url" name="openid_url" type="text" value="<TMPL_VAR OPENID_URL>"/>
-               <input id="openid_submit" type="submit" value="Login"/>
-       </span>
+       </fieldset>
 </form>
+
+<div id="nonopenidform">
+<TMPL_IF NONOPENIDFORM>
+<br />
+<noscript>
+<h2>Other:</h2>
+</noscript>
+</TMPL_IF>
+<TMPL_VAR NONOPENIDFORM>
+</div>