urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
Joey Hess 2010-05-11 21:52:39 +00:00
parent 4ceae1761b 378cae14bb
commit 688c58ac90
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/bugs/gitremotes_script_picks_up_tags_from_anywhere.mdwn
View File

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

7
doc/style.css
View File

@ -332,6 +332,13 @@ ol.form {
li.form { li.form {
padding-bottom: 1em; 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 { input#searchbox {
background: url(wikiicons/search-bg.gif) no-repeat; background: url(wikiicons/search-bg.gif) no-repeat;
background-color: #fff; background-color: #fff;

3
gitremotes
View File

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

3
underlays/openid-selector/ikiwiki/openid/openid-jquery.js
View File

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