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

diff --git a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn b/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
index f9f086793ff11592c304f1be02e394d67c400ec6..9bd8938c5d44cb8ac61e3cd475bc0570a831e9e4 100644 (file)
--- a/doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
+++ b/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]] 

diff --git a/doc/style.css b/doc/style.css
index 6832194b2bf3045eb72a59facca81d658ae239a9..4ea77573ac63f10357687827841cdb064f7888f2 100644 (file)
--- a/doc/style.css
+++ b/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;

diff --git a/gitremotes b/gitremotes
index 6c03011a8cb5ac73a90edb1e74dab102c55eb9d5..5cafad1b8dcb550c694567b7815978a7861fc6fe 100755 (executable)
--- a/gitremotes
+++ b/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);
                }
        }
 }

diff --git a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js b/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
index 4eaa613d978e39dda431c20088629c5be3dc9420..f22f5776a17713b7a5d05b93a2040b6eb393ef49 100644 (file)
--- a/underlays/openid-selector/ikiwiki/openid/openid-jquery.js
+++ b/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="";