Merge commit '546da9bac7135d7d1b02dce0c0eef2209d939fc6' into sipb Conflicts: templates/page.tmpl
Merge commit '156f70912213b6520e9056050a8827de66e80176' into sipb Conflicts: templates/page.tmpl
Merge commit 'd4a0732752e79b57509cee33001ab757132366c5' into sipb Conflicts: IkiWiki/Wrapper.pm
Merge commit 'ecdfd1b8644bc926db008054ab6192e18351afed' into sipb Conflicts: IkiWiki/Plugin/git.pm
Merge commit '1609da8f00e29c580e92fd1d3c2b093cbc41d20e' into sipb Conflicts: templates/page.tmpl
Merge commit 'c3e9215e1fcb604c3ee01119fdf7cf13724c3812' into sipb Conflicts: IkiWiki/CGI.pm
Merge commit 'f52f395437a946478da2a126015c05e3e0afdc1f' into sipb Conflicts: templates/page.tmpl
add comment subscription checkbox to editpage Reworded template, which also called the commit message a "comment".
auto-check just uploaded attachments This may make it easier to eg, Insert Links after dropping in a lot of files.
Display attachment manipulation links always, since attachments can be uploaded via javascript. Could arrange for them to be in a span that is hidden when there are no attachments and make the javascript upload unhide it; this is a quick fix.
load attachment javascript into template the clean way
WIP
WIP
remove obsolete ol class=form for editpage and editcomment The styling of labels on the form largely obsoleted the special styled ol, so just a few br's sufficed. Using an ol like that was not too semantically right (probably?) and could cause problems with customized local.css.
editpage: Rename "comments" field to avoid CSS conflict with the comments div.
style.css: Improvements to make floating sidebar fit better on pages with inlines. The key is using width: auto; overflow: auto; -- this allows the div(s) to the left of the floating sidebar to be resized to fit next to it, and prevents any clear: both from pushing the div down below the end of the sidebar. Many thanks for the Hurd wiki's developers for originally figuring this out. The edit page recently developed the same problem with its textarea, now that a sidebar can appear on that page too. In editpage.tmpl I needed to add a new div around the editcontent textarea, as the above styles cannot be applied directly to textareas. The textarea's own width is reduced to 98% because at least in chromium this avoids it getting unnecessary horizonatl scrollbars when a sidebar is displayed next to it.
fix pagediff to not display as "preview" I think originally, the page preview header was not displayed, so diff was hacked in using it.
Gave comment and page editing forms some CSS and accessability love. In particular, added <label> tags. (However, could not find a good way to add a label tag for the main page edit textarea.)
consistently drop NAME= in templates also add template syntax smoke test
Merge commit 'upstream/master' into sipb Conflicts: .gitignore IkiWiki/Plugin/git.pm IkiWiki/Wrapper.pm po/bg.po po/cs.po po/da.po po/de.po po/es.po po/fr.po po/gu.po po/ikiwiki.pot po/pl.po po/sv.po po/vi.po templates/misc.tmpl templates/page.tmpl