Tails

#3 Updated by BitingBird 2014-04-07 15:06:10

• Assignee deleted (None)

#4 Updated by Anonymous 2014-07-08 16:49:33

• Assignee deleted ()

#7 Updated by naar 2015-03-03 03:22:33

• File 0001-Rebase-ikiwiki-templates-on-top-of-upstream.patch added
• File 0002-Improve-ikiwiki-s-page-tmpl-indentation.patch added
• File 0003-Compact-HTML5-conditional-markup.patch added
• Status changed from Confirmed to In Progress
• % Done changed from 0 to 50
• QA Check set to Ready for QA

1. 0001-Rebase-ikiwiki-templates-on-top-of-upstream.patch is the mere rebasing patch (in which I’ve also replaced these <TMPL_VAR NAME="PERCENTTRANSLATED"> with <TMPL_VAR PERCENTTRANSLATED> since it doesn’t seem needed.
2. 0002-Improve-ikiwiki-s-page.tmpl-indentation.patch is self-explanatory.
3. 0003-Compact-HTML5-conditional-markup.patch, which is based on the previous one, follow on from what has been started upstream, that is compacting those <TMPL_IF HTML5> conditional variables like so:

<TMPL_IF HTML5><nav<TMPL_ELSE><div</TMPL_IF> id="otherlanguages">

Furthermore, just to leave a note about it for the next iteration, here is a convenient snippet for an interactive merging (hitting <Return> when the sdiff prompt ‘%’ is waiting for an input will display the list of available commands):

<code>
$ tmpdiff="$(mktemp)"
$ [[ -w "tmpdiff" ]] && wget --quiet --output-document=- 'http://source.ikiwiki.branchable.com/?p=source.git;a=blob_plain;f=templates/page.tmpl;hb=HEAD' > "$tmpdiff" && sdiff --output=wiki/src/templates/page.tmpl.new --ignore-blank-lines --expand-tabs --ignore-tab-expansion --width=$(tput cols) wiki/src/templates/page.tmpl "$tmpdiff"
$ srm "$tmpdiff" && unset tmpdiff
</code>

#8 Updated by intrigeri 2015-03-03 08:48:39

• Assignee set to sajolida
• Target version set to Tails_1.3.2

sajolida, do you want to take it?

#10 Updated by sajolida 2015-03-18 11:19:06

• Status changed from In Progress to Resolved
• Assignee deleted (sajolida)
• QA Check changed from Ready for QA to Pass

Thanks, I applied 0001-Rebase-ikiwiki-templates-on-top-of-upstream.patch but not the other ones. As the idea of rebasing was to make the diff between upstream and our version smaller, your other two patches actually were going into the opposite direction.

I also did some more rebasing with 38f504f.

#13 Updated by BitingBird 2015-03-19 14:21:47

• Assignee set to naar

Assigning this closed ticket back to naar, otherwise he might not see this discussion.

Maybe a new ticket should be opened to track the not-merged patches?

#16 Updated by BitingBird 2015-03-22 12:12:32

• Target version changed from Tails_1.3.2 to Tails_1.3.1