add OpenID documentation

darcs-hash:20080701172429-84dde-94b70a726459e7309f179c18788f2a7de8d233f1.gz

3 files changed, 22 insertions, 3 deletions

diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index f00c17181..5ec17ec46 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -40,15 +40,22 @@ class OpenidloginAction extends Action {
 		}
 	}
 
+	function get_instructions() {
+		return _t('Login with an [OpenID](%%doc.openid%%) account.');
+	}
+
 	function show_top($error=NULL) {
 		if ($error) {
 			common_element('div', array('class' => 'error'), $error);
 		} else {
-			common_element('div', 'instructions',
-						   _t('Login with an OpenID account.'));
+			$instr = $this->get_instructions();
+			$output = common_markup_to_html($instr);
+			common_element_start('div', 'instructions');
+			common_raw($output);
+			common_element_end('div');
 		}
 	}
-	
+
 	function show_form($error=NULL, $openid_url) {
 		common_show_header(_t('OpenID Login'), NULL, $error, array($this, 'show_top'));
 		$formaction = common_local_url('openidlogin');
diff --git a/doc/openid b/doc/openid
new file mode 100644
index 000000000..1200bdedd
--- /dev/null
+++ b/doc/openid
@@ -0,0 +1,11 @@
+%%site.name%% supports the [OpenID](http://openid.net/) standard for single signon between Web sites. OpenID lets you log into many different Web sites without using a different password for each. (See [Wikipedia\'s OpenID article](http://en.wikipedia.org/wiki/OpenID) for more information.)
+
+If you already have an account on %%site.name%%, you can [login](%%action.login%%) with your username and password as usual.
+To use OpenID in the future, you can [add an OpenID to your account)(%%action.openidsettings%%) after you have logged in normally.
+
+There are many [Public OpenID providers](http://wiki.openid.net/Public_OpenID_providers), and you may already have an OpenID-enabled account on another service.
+
+* On wikis: If you have an account on an OpenID-enabled wiki, like [Wikitravel](http://wikitravel.org/), [wikiHow](http://www.wikihow.com/), [Vinismo](http://vinismo.com/), [AboutUs](http://aboutus.org/) or [Keiki](http://kei.ki/), you can log in to %%site.name%% by entering the **full URL** of your user page on that other wiki in the box above. For example, **http://kei.ki/en/User:Evan**.
+* [Yahoo!](http://openid.yahoo.com/) : If you have an account with Yahoo!, you can log in to this site by entering your Yahoo!-provided OpenID in the box above. Yahoo! OpenID URLs have the form https://me.yahoo.com/yourusername.
+* [AOL](http://dev.aol.com/aol-and-63-million-openids) : If you have an account with [AOL](http://www.aol.com/), like an [AIM](http://www.aim.com/) account, you can log in to %%site.name%% by entering your AOL-provided OpenID in the box above. AOL OpenID URLs have the form http://openid.aol.com/yourusername. Your username should be all lowercase, no spaces.
+* [Blogger](http://bloggerindraft.blogspot.com/2008/01/new-feature-blogger-as-openid-provider.html), [Wordpress.com](http://faq.wordpress.com/2007/03/06/what-is-openid/), [LiveJournal](http://www.livejournal.com/openid/about.bml), [Vox](http://bradfitz.vox.com/library/post/openid-for-vox.html) : If you have a blog on any of these services, enter your blog URL in the box above. For example, http://yourusername.blogspot.com/, http://yourusername.wordpress.com/, http://yourusername.livejournal.com/, or http://yourusername.vox.com/.
diff --git a/htaccess.sample b/htaccess.sample
index d57761709..985a97eed 100644
--- a/htaccess.sample
+++ b/htaccess.sample
@@ -8,6 +8,7 @@ RewriteRule ^doc/about$ index.php?action=doc&title=about [L,QSA]
 RewriteRule ^doc/faq$ index.php?action=doc&title=faq [L,QSA]
 RewriteRule ^doc/help$ index.php?action=doc&title=help [L,QSA]
 RewriteRule ^doc/im$ index.php?action=doc&title=im [L,QSA]
+RewriteRule ^doc/openid$ index.php?action=doc&title=openid [L,QSA]
 RewriteRule ^doc/openmublog$ index.php?action=doc&title=openmublog [L,QSA]
 RewriteRule ^doc/privacy$ index.php?action=doc&title=privacy [L,QSA]
 RewriteRule ^doc/source$ index.php?action=doc&title=source [L,QSA]