-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Found a bug that sometimes made paths incorrect
- Loading branch information
Showing
11 changed files
with
231 additions
and
20 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<body xmlns:diff="http://namespaces.shoobx.com/diff"> | ||
<div id="id"> | ||
<p><diff:insert>Let's see. </diff:insert>This is some simple text demonstrating the features of the <b diff:delete-formatting=""><i diff:insert-formatting="">human text differ</i></b>. This <u diff:delete-formatting="">feature</u> attempts to make changelog readable for humans. The <i diff:insert-formatting="">human text differ</i> uses sentences as its first order matching. <diff:delete>Let's see.</diff:delete><invalid><diff:insert>It should handle unknown tags just fine.</diff:insert></invalid></p> | ||
<p><diff:insert>Let's see. </diff:insert>This is some simple text demonstrating the features of the <b diff:delete-formatting=""><i diff:insert-formatting="">human text differ</i></b>. This <u diff:delete-formatting="">feature</u> attempts to make changelog readable for humans.<br diff:insert=""/> The <i diff:insert-formatting="">human text differ</i> uses sentences as its first order matching. <diff:delete>Let's see.</diff:delete><invalid><diff:insert>It should handle unknown tags just fine.</diff:insert></invalid></p> | ||
</div> | ||
</body> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
<metal:block xmlns:app="http://namespaces.shoobx.com/application" xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:diff="http://namespaces.shoobx.com/diff" tal:define=" filename string:advisor-agreement.pdf; title string:Advisor Agreement;"> | ||
<metal:block use-macro="macros/document"> | ||
<metal:block fill-slot="content"> | ||
|
||
<app:section diff:insert="" allowCustom="False" diff:add-attr="allowCustom;hidden;name;title" hidden="advisor.payment_type == 'none'" name="payment" title="Payment"><tal:if diff:insert="" condition="python: advisor.payment_type == 'stock_award'" diff:add-attr="condition"><para diff:insert=""><diff:insert>A</diff:insert><i diff:insert=""><diff:insert>whole</diff:insert></i><diff:insert>load of formatted text and</diff:insert><br diff:insert=""/><diff:insert>other stuff.</diff:insert></para></tal:if><tal:if diff:insert="" condition="python: advisor.payment_type == 'cash'" diff:add-attr="condition"><para diff:insert=""><diff:insert>More text for diffing purposes</diff:insert></para></tal:if><tal:if diff:insert="" condition="python: advisor.payment_type == 'stock_award_and_cash'" diff:add-attr="condition"><para diff:insert=""><diff:insert>Lorem hipster ipso facto</diff:insert></para></tal:if></app:section><app:section name="payment" title="Payment" hidden="advisor.stock_award == 'exclude'" allowCustom="False" diff:delete=""> | ||
<tal:if condition="python: advisor.stock_award != 'exclude'" diff:delete=""> | ||
<para diff:delete=""> | ||
We write <b diff:delete="">stuff here</b> that has nothing in common with the new text. | ||
</para> | ||
</tal:if> | ||
</app:section> | ||
|
||
<!--need to add company address and advisor address to signature block--> | ||
|
||
</metal:block> | ||
</metal:block> | ||
</metal:block> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
|
||
<!DOCTYPE document SYSTEM "rml.dtd"> | ||
<metal:block | ||
xmlns:app="http://namespaces.shoobx.com/application" | ||
xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
xmlns:preview="http://namespaces.shoobx.com/preview" | ||
tal:define=" | ||
filename string:advisor-agreement.pdf; | ||
title string:Advisor Agreement;"> | ||
<metal:block use-macro="macros/document"> | ||
<metal:block fill-slot="content"> | ||
|
||
<app:section name="payment" title="Payment" | ||
hidden="advisor.stock_award == 'exclude'" allowCustom="False"> | ||
<tal:if condition="python: advisor.stock_award != 'exclude'"> | ||
<para> | ||
We write <b>stuff here</b> that has nothing in common with the new text. | ||
</para> | ||
</tal:if> | ||
</app:section> | ||
|
||
<!--need to add company address and advisor address to signature block--> | ||
|
||
</metal:block> | ||
</metal:block> | ||
</metal:block> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
|
||
<!DOCTYPE document SYSTEM "rml.dtd"> | ||
<metal:block | ||
xmlns:app="http://namespaces.shoobx.com/application" | ||
xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
xmlns:preview="http://namespaces.shoobx.com/preview" | ||
tal:define=" | ||
filename string:advisor-agreement.pdf; | ||
title string:Advisor Agreement;"> | ||
<metal:block use-macro="macros/document"> | ||
<metal:block fill-slot="content"> | ||
|
||
<app:section name="payment" title="Payment" | ||
hidden="advisor.payment_type == 'none'" allowCustom="False"> | ||
<tal:if condition="python: advisor.payment_type == 'stock_award'"> | ||
<para> | ||
A <i>whole</i> load of formatted text and <br/> other stuff. | ||
</para> | ||
</tal:if> | ||
<tal:if condition="python: advisor.payment_type == 'cash'"> | ||
<para> | ||
More text for diffing purposes | ||
</para> | ||
</tal:if> | ||
<tal:if condition="python: advisor.payment_type == 'stock_award_and_cash'"> | ||
<para> | ||
Lorem hipster ipso facto | ||
</para> | ||
</tal:if> | ||
</app:section> | ||
|
||
<!--need to add company address and advisor address to signature block--> | ||
|
||
</metal:block> | ||
</metal:block> | ||
</metal:block> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters