Merge branch 'master' of file:///srv/git/ikiwiki.info

doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn

@@ -18,3 +18,5 @@ see <http://git.pseudorandom.co.uk/smcv/ikiwiki.git?a=shortlog;h=refs/heads/read
 > --[[Joey]] 
 
 >> Oh, I see why. Try the same branch again... --[[smcv]]
+
+>>> [[done]] --[[Joey]] 

doc/style.css

@@ -332,6 +332,13 @@ ol.form {
 li.form {
 	padding-bottom: 1em;
 }
+input#openid_identifier {
+	background: url(wikiicons/openidlogin-bg.gif) no-repeat;
+	background-color: #fff;
+	background-position: 0 50%;
+	color: #000;
+	padding-left: 18px;
+}
 input#searchbox {
 	background: url(wikiicons/search-bg.gif) no-repeat;
 	background-color: #fff;

gitremotes

@@ -16,9 +16,10 @@ while (<IN>) {
 		my ($oldurl)=$info=~/URL: (.*)/m;
 		if ($oldurl ne $url) {
 			system("git remote rm $remote 2>/dev/null");
-			system("git", "remote", "add", "-f", $remote, $url);
+			system("git", "remote", "add", $remote, $url);
 			system("git", "config", "remote.$remote.tagopt",
 				"--no-tags");
+			system("git", "fetch", $remote);
 		}
 	}
 }

underlays/openid-selector/ikiwiki/openid/openid-jquery.js

@@ -116,6 +116,7 @@ var openid = {
 			' other' +
 			'</a>'
 		);
+		$('#'+this.localsignin_id).hide();
 	}
         
         $('#openid_form').submit(this.submit);
@@ -123,7 +124,7 @@ var openid = {
         var box_id = this.readCookie();
         if (box_id) {
         	this.signin(box_id, true);
-        }  
+        }
     },
     getBoxHTML: function(provider, box_size) {
 	var label="";