diff --git a/xml/doc/examples/exampleofferte.xml b/xml/doc/examples/exampleofferte.xml index 051f205..900a7b2 100644 --- a/xml/doc/examples/exampleofferte.xml +++ b/xml/doc/examples/exampleofferte.xml @@ -6,6 +6,7 @@ xsi:noNamespaceSchemaLocation="../dtd/offerte.xsd" xml:lang="en"> + quote penetration testing services penetration test @@ -23,6 +24,7 @@ Hotshot Dev Lawyer
Silicon Valley St. 50
+ 10000 San Francisco US @@ -30,15 +32,17 @@ 10 - August 1st, 2016, lasting until August 13th, 2016 + 20 + + 2018-01-01 + 2018-02-02 + - August 26th, 2016 - - August 26th, 2016 + 2018-03-03 time-boxed crystal-box - 1000000 + 1000000 FishInABarrel @@ -62,7 +66,6 @@ - diff --git a/xml/doc/examples/examplereport.xml b/xml/doc/examples/examplereport.xml index 9c53336..ace05cc 100644 --- a/xml/doc/examples/examplereport.xml +++ b/xml/doc/examples/examplereport.xml @@ -10,7 +10,10 @@ 4 4 - bla + + TBD + TBD + bla something black-box @@ -230,111 +233,104 @@ Raw packets sent: 1681 (73.962KB) | Rcvd: 1681 (77.322KB) -
- Pentest Technical Summary -
- Findings -

We have identified the following issues:

+
+ Findings - - PHPInfo Disclosure - -

The phpinfo() function of the PHP language is readable, - resulting in a listing of all the runtime - information of the environment, thus disclosing - potentially valuable information to attackers.

- - -

This is where the good stuff goes. We give a detailed - technical description of the problem.

-

Illustrative picture of an evil hacker pondering dark - deeds:

- - - -

This is where we explain how the sh*t is hitting the fan, - exactly.

- - -

Here is where we write some tips to solve the - problem.

- - +

We have identified the following issues:

- - A terrible XSS issue - -

A general description of the problem.

- - -

This is we go into great detail about the - vulnerability.

- - -

This is where we explain why this vulnerability is a - problem.

- - -

This is where we solve everything and the sun starts - shining again.

- - + + PHPInfo Disclosure + +

The phpinfo() function of the PHP language is readable, resulting + in a listing of all the runtime information of the + environment, thus disclosing potentially valuable + information to attackers.

+ + +

This is where the good stuff goes. We give a detailed technical + description of the problem.

+

Illustrative picture of an evil hacker pondering dark deeds:

+ + + +

This is where we explain how the sh*t is hitting the fan, + exactly.

+ + +

Here is where we write some tips to solve the problem.

+ + - - A not quite so terrible XSS issue - -

A description of the problem.

- - -

Vulnerability described in detail.

- - -

Impact on security.

- - -

A ready solution.

- - -
+ + A terrible XSS issue + +

A general description of the problem.

+ + +

This is we go into great detail about the vulnerability.

+ + +

This is where we explain why this vulnerability is a problem.

+ + +

This is where we solve everything and the sun starts shining + again.

+ + -
- Non-Findings -

In this section we list some of the things that were tried but turned out - to be dead ends.

+ + A not quite so terrible XSS issue + +

A description of the problem.

+ + +

Vulnerability described in detail.

+ + +

Impact on security.

+ + +

A ready solution.

+ + +
- - FTP -

The server was running FTPserver ABC, the most recent version of - this particular piece of software. Anonymous login was - turned off and no relevant vulnerabilities or exploits were - found.

- - - Mail Server -

The server was running Mailserver XYZ, the most recent version of - this particular piece of software. No relevant - vulnerabilities or exploits were found.

- - - SQL Code Injection -

The following parameters are not vulnerable to SQL injection.

-

All parameters have been checked manually.

- 
-file1.php
+        

+                Non-Findings
+                
In this section we list some of the things that were tried but turned out to be
+                        dead ends.

+
+                
+                        FTP
+                        
The server was running FTPserver ABC, the most recent version of this
+                                particular piece of software. Anonymous login was turned off and no
+                                relevant vulnerabilities or exploits were found.

+                
+                
+                        Mail Server
+                        
The server was running Mailserver XYZ, the most recent version of this
+                                particular piece of software. No relevant vulnerabilities or
+                                exploits were found. 

+                
+                
+                        SQL Code Injection
+                        
The following parameters are not vulnerable to SQL injection. 

+                        
All parameters have been checked manually.

+                        
-file1.php
 -file2.php
 -file3.php
 

-                        
-                        
-                                Heartbleed
-                                
System was not vulnerable to heartbleed.

-                        
-                        
-                                Windows XP
-                                
The host is running Windows XP. As we all know, Windows XP is
-                                        bulletproof.

-                        
-                

+                
+                
+                        Heartbleed
+                        
System was not vulnerable to heartbleed.

+                
+                
+                        Windows XP
+                        
The host is running Windows XP. As we all know, Windows XP is
+                                bulletproof.

+
Conclusion diff --git a/xml/doc/placeholders.md b/xml/doc/placeholders.md new file mode 100644 index 0000000..032efc3 --- /dev/null +++ b/xml/doc/placeholders.md @@ -0,0 +1,189 @@ +PenText 2.0 Placeholders + +###client_long +*Refers to:* /*/meta//client/full_name +Client's full name (e.g. Sitting Duck B.V.) + +###client_short +*Refers to:* /*/meta//client/short_name +Client's shorter name (e.g. Sitting Duck) + +###client_street +*Refers to:* /*/meta//client/address +Client's street + number + +###client_city +*Refers to:* /*/meta//client/city +Client's city + +###client_country +*Refers to:* /*/meta//client/country +Client's country + +###client_postal_code +*Refers to:* /*/meta//client/postal_code +Client's postal code + +###client_legal_rep +*Refers to:* /*/meta//client/legal_rep +Name of client's legal representative (to sign quotes) + +###client_waiver_rep +*Refers to:* /*/meta//client/waiver_rep +Name of client's waiver-signing representative (to sign waiver) + +###client_poc1 +*Refers to:* /*/meta//client/poc1 +Name of client's first point of contact when the pentest is underway + +###client_coc +*Refers to:* /*/meta//client/coc +Client's chamber of commerce number + +###client_ref +*Refers to:* /*/meta/client_reference +Client's reference number for the project (sometimes they want this to be shown in the quote/report/invoice) + +###client_rate +*Refers to:* /*/meta//client/rates/rate[@title = $roleTitle] (rate per role category) + +###company_long +*Refers to:* /*/meta/company/full_name +Company's full name (e.g. Radically Open Security B.V.) + +###company_short +*Refers to:* /*/meta/company/short_name +Company's short name (e.g. ROS) + +###company_address +*Refers to:* /*/meta/company/address +Company's street name & number + +###company_city +*Refers to:* /*/meta/company/city +Company's city + +###company_postalcode +*Refers to:* /*/meta/company/postal_code +Company's postal code + +###company_country +*Refers to:* /*/meta/company/country +Company's country + +###company_svc_long +*Refers to:* /*/meta/offered_service_long +Long name of service offered (e.g. Pentesting Services) + +###company_svc_short +*Refers to:* /*/meta/offered_service_short +Short name of service offered (e.g. Pentest) + +###company_legal_rep +*Refers to:* /*/meta/company/legal_rep +Company's legal representative + +###company_poc1 +*Refers to:* /*/meta/company/poc1 +Company's first point of contact during the pentest + +###company_email +*Refers to:* /*/meta/company/email +Company's email address + +###t_app +*Refers to:* /*/meta/activityinfo/target_application +Name of the tested application (if any) + +###t_app_producer +*Refers to:* /*/meta/activityinfo/target_application_producer +Name of the company producing the tested application + +###p_duration +*Refers to:* /*/meta/activityinfo/duration +Test duration + +###p_persondays +*Refers to:* /*/meta/activityinfo/persondays +Persondays allotted to test + +###p_boxtype +*Refers to:* /*/meta/activityinfo/type +Pentest boxtype (crystal, black, ...) + +###p_fee* +Refers to:* /offerte/meta/activityinfo/fee" +Agreed fee (can be used in QUOTES only!) + +###p_startdate +*Refers to:* /*/meta/activityinfo/planning/start +Start date of test + +###p_enddate +*Refers to:* /*/meta/activityinfo/planning/end +End date of test + +###p_reportdue +*Refers to:* /*/meta/activityinfo/report_due +Due date of pentest report + +###finding_count +*Refers to:* total finding count. Use @threatLevel or @status in this placeholder to filter by threatlevel or status. Can be used only in reports! + +###todo +Inserts a highly visible 'todo' reminder in snippets (or elsewhere) as a reminder to the editor that info is missing at that point. + + +## Contract-specific placeholders +###engagement_description +*Refers to:* /contract/meta/scope/engagement_description +###secondpartyrole +*Refers to:* /contract/meta/scope/secondpartyrole +###contract_start_date +*Refers to:* /contract/meta/work/start_date +###contract_end_date +*Refers to:* /contract/meta/work/end_date +###contract_period +*Refers to:* difference between /contract/meta/work/start_date and /contract/meta/work/end_date (i.e. a period of time) +###contract_total_fee +*Refers to:* calculated total fee +###contract_planned_hours +*Refers to:* /contract/meta/work/planning/hours +###contract_period_unit +*Refers to:* /contract/meta/work/planning/per +###contract_activities +*Refers to:* /contract/meta/work/activities/activity (multiple activities possible) +###contractor_name_company +*Refers to:* /contract/meta/contractor/name (and /contract/meta/contractor/ctcompany, if present) +###contractor_name +*Refers to:* /contract/meta/contractor/name +###contractor_company +*Refers to:* /contract/meta/contractor/ctcompany +###contractor_address +*Refers to:* /contract/meta/contractor/address +###contractor_city +*Refers to:* /contract/meta/contractor/city +###contractor_postalcode +*Refers to:* /contract/meta/contractor/postal_code +###contractor_country +*Refers to:* /contract/meta/contractor/country +###contractor_hourly_fee +*Refers to:* /contract/meta/contractor/hourly_fee +###contractor_email +*Refers to:* /contract/meta/contractor/email +###contractor_possessive_pronoun +*Refers to:* /contract/meta/contractor/@sex (will show as his/her/their depending on sex) +###contractor_subject_pronoun +*Refers to:* /contract/meta/contractor/@sex (will show as he/she/xe depending on sex) +###contractor_object_pronoun +*Refers to:* /contract/meta/contractor/@sex (will show as him/her/them depending on sex) +###generate_raterevisiondate +*Refers to:* //meta//client/rates/@lastrevisiondate + +## Incident Response Quote Specific Placeholders +###ir_ora_rate +*Refers to:* /*/meta/activityinfo/organizational_readiness_assessment/rate +###ir_sim_rate +*Refers to:* /*/meta/activityinfo/security_incident_management/rate +###ir_taa_rate +*Refers to:* /*/meta/activityinfo/technical_artefact_analysis/rate \ No newline at end of file diff --git a/xml/dtd/common.xsd b/xml/dtd/common.xsd index 379c2bc..b00fc22 100644 --- a/xml/dtd/common.xsd +++ b/xml/dtd/common.xsd @@ -2,20 +2,21 @@ - - - - - - - - - + + + + + + + + + @@ -37,10 +38,13 @@ - - - - + + + + + + + @@ -63,11 +67,15 @@ - - - + + + + + + + + - @@ -151,11 +159,11 @@ - + - - + + @@ -191,8 +199,8 @@ - - + + @@ -206,6 +214,14 @@ + + + + + + + + @@ -216,6 +232,7 @@ + @@ -299,6 +316,8 @@ + + @@ -361,12 +380,12 @@ + - - - + + diff --git a/xml/dtd/invoice.xsd b/xml/dtd/invoice.xsd index d080f44..ab1797a 100644 --- a/xml/dtd/invoice.xsd +++ b/xml/dtd/invoice.xsd @@ -25,6 +25,7 @@ + diff --git a/xml/dtd/offerte.xsd b/xml/dtd/offerte.xsd index bb176df..033bf81 100644 --- a/xml/dtd/offerte.xsd +++ b/xml/dtd/offerte.xsd @@ -26,6 +26,8 @@ + + @@ -145,6 +147,7 @@ + @@ -236,11 +239,17 @@ + + + + + + @@ -250,6 +259,8 @@ + + @@ -261,6 +272,7 @@ + diff --git a/xml/dtd/pentestreport.xsd b/xml/dtd/pentestreport.xsd index 9efae9b..870ad8e 100644 --- a/xml/dtd/pentestreport.xsd +++ b/xml/dtd/pentestreport.xsd @@ -32,7 +32,9 @@ - + + + @@ -377,9 +379,15 @@ + + + + + + @@ -394,6 +402,7 @@ + diff --git a/xml/graphics/frontpage_quote.jpg b/xml/graphics/frontpage_quote.jpg new file mode 100644 index 0000000..7f4a2e4 Binary files /dev/null and b/xml/graphics/frontpage_quote.jpg differ diff --git a/xml/graphics/frontpage_report.jpg b/xml/graphics/frontpage_report.jpg new file mode 100644 index 0000000..2de0f8b Binary files /dev/null and b/xml/graphics/frontpage_report.jpg differ diff --git a/xml/graphics/logo_alt.png b/xml/graphics/logo_alt.png index f4af81b..4964d5c 100644 Binary files a/xml/graphics/logo_alt.png and b/xml/graphics/logo_alt.png differ diff --git a/xml/graphics/logo_alt_cutout.png b/xml/graphics/logo_alt_cutout.png deleted file mode 100644 index 7dddb9c..0000000 Binary files a/xml/graphics/logo_alt_cutout.png and /dev/null differ diff --git a/xml/graphics/logo_alt_cutout.svg b/xml/graphics/logo_alt_cutout.svg deleted file mode 100644 index fc4195f..0000000 --- a/xml/graphics/logo_alt_cutout.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/xml/graphics/logo_footer.png b/xml/graphics/logo_footer.png new file mode 100644 index 0000000..c9685d7 Binary files /dev/null and b/xml/graphics/logo_footer.png differ diff --git a/xml/graphics/logo_large_whitecaps.png b/xml/graphics/logo_large_whitecaps.png new file mode 100644 index 0000000..7075ce4 Binary files /dev/null and b/xml/graphics/logo_large_whitecaps.png differ diff --git a/xml/graphics/omemog1.png b/xml/graphics/omemog1.png deleted file mode 100644 index e317ccd..0000000 Binary files a/xml/graphics/omemog1.png and /dev/null differ diff --git a/xml/graphics/omemog2.png b/xml/graphics/omemog2.png deleted file mode 100644 index 1ed48a7..0000000 Binary files a/xml/graphics/omemog2.png and /dev/null differ diff --git a/xml/graphics/omemog3.png b/xml/graphics/omemog3.png deleted file mode 100644 index 7bcd588..0000000 Binary files a/xml/graphics/omemog3.png and /dev/null differ diff --git a/xml/rosbot/OpenSans-Bold.ttf b/xml/rosbot/OpenSans-Bold.ttf new file mode 100755 index 0000000..fd79d43 Binary files /dev/null and b/xml/rosbot/OpenSans-Bold.ttf differ diff --git a/xml/rosbot/fop.conf b/xml/rosbot/fop.conf index 15376aa..82a8bb6 100644 --- a/xml/rosbot/fop.conf +++ b/xml/rosbot/fop.conf @@ -103,7 +103,9 @@ the location of this file. - + + + diff --git a/xml/source/snippets/localisationstrings.xml b/xml/source/snippets/localisationstrings.xml index 4e7db8c..3edb202 100644 --- a/xml/source/snippets/localisationstrings.xml +++ b/xml/source/snippets/localisationstrings.xml @@ -8,8 +8,8 @@ - OFFERTE - QUOTE + Offerte + Quote penetratietestdiensten @@ -75,6 +75,10 @@ Kamer van Koophandel Chamber of Commerce + + van + of + Factuur nr. @@ -142,11 +146,15 @@ Spaar papier — niet afdrukken tenzij absoluut noodzakelijk. Lees onze (unieke) voorwaarden op: - https://radicallyopensecurity.com/TermsandConditions.pdf Please keep digital unless absolutely required. Read the (unique) terms and conditions of Radically Open Security at: - https://radicallyopensecurity.com/TermsandConditions.pdf + + + + https://radicallyopensecurity.com/TermsandConditions.pdf + + https://radicallyopensecurity.com/TermsandConditions.pdf diff --git a/xml/source/snippets/offerte/en/generaltermsandconditions.xml b/xml/source/snippets/offerte/en/generaltermsandconditions.xml index 7040d51..1aec1b1 100644 --- a/xml/source/snippets/offerte/en/generaltermsandconditions.xml +++ b/xml/source/snippets/offerte/en/generaltermsandconditions.xml @@ -1,6 +1,6 @@ - Annex 1<br/>General Terms and Conditions + Annex 1 - General Terms and Conditions

What is this document?

diff --git a/xml/source/snippets/offerte/en/waiver.xml b/xml/source/snippets/offerte/en/waiver.xml index 5f8de7a..d2a54b8 100644 --- a/xml/source/snippets/offerte/en/waiver.xml +++ b/xml/source/snippets/offerte/en/waiver.xml @@ -1,9 +1,9 @@ - + <company_svc_short/> - - WAIVER + waiver

diff --git a/xml/source/snippets/offerte/nl/waiver.xml b/xml/source/snippets/offerte/nl/waiver.xml index e9fe585..0aafcdd 100644 --- a/xml/source/snippets/offerte/nl/waiver.xml +++ b/xml/source/snippets/offerte/nl/waiver.xml @@ -1,4 +1,4 @@ - + <company_svc_short/> - VRIJWARINGSVERKLARING diff --git a/xml/source/snippets/ratecard/ratecard.xml b/xml/source/snippets/ratecard/ratecard.xml index 41fd87b..fad72fc 100644 --- a/xml/source/snippets/ratecard/ratecard.xml +++ b/xml/source/snippets/ratecard/ratecard.xml @@ -19,23 +19,24 @@ - <company_long/><br/> <br/>SERVICES RATE CARD FOR <client_long/> + Service Rate Card for <client_long/>

-

For we have the following hourly rates:

- - - - +

offers the following hourly rates:

+
•Junior pentester:
•Medior pentester:
•Senior pentester:
+ + + + + approval of, - + conclusions, communication with team, etc. +
 RoleRate
•Junior pentester
•Medior pentester
•Senior pentester
•Expert pentesterOnly on special requests by, and after discussion with and - approval of, :
•Junior project and account managerTasks of a project and account manager include support in client contact, writing pentest reports, presenting findings and - conclusions, communication with team, etc.:
•Senior project and account manager:
•Senior project and account manager
-

's hourly rates are excluding VAT and out-of-pocket expenses and depend upon +

All hourly rates are excluding VAT and out-of-pocket expenses and depend upon the exact service or area of expertise.

Typically, a pentesting team is composed of two pentesters and one project/account manager. The actual team composition and price naturally depends on the length of the pentest and the complexity of the tasks, and will be determined in close consultation with on a per-assignment basis.

diff --git a/xml/source/snippets/report/methodology.xml b/xml/source/snippets/report/methodology.xml index 3480bca..15032e0 100644 --- a/xml/source/snippets/report/methodology.xml +++ b/xml/source/snippets/report/methodology.xml @@ -44,6 +44,6 @@

Please note that this risk rating system was taken from the Penetration Testing Execution Standard (PTES). For more information, see: - http://www.pentest-standard.org/index.php/Reporting.

+ http://www.pentest-standard.org/index.php/Reporting.

diff --git a/xml/xslt/auto.xslt b/xml/xslt/auto.xslt index 5ceb03e..85e3d7f 100644 --- a/xml/xslt/auto.xslt +++ b/xml/xslt/auto.xslt @@ -1,9 +1,7 @@ + xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0"> @@ -11,11 +9,10 @@ - + - + @@ -25,7 +22,7 @@ - + @@ -152,7 +149,7 @@ - + @@ -163,17 +160,17 @@ - - + + ID - + Type - + Description - + Threat level @@ -211,7 +208,10 @@ - + + + #ededed + @@ -219,7 +219,7 @@ - + @@ -255,7 +255,7 @@ - + @@ -264,14 +264,14 @@ - - + + ID - + Type - + Recommendation @@ -309,10 +309,13 @@ - + + + #ededed + - + @@ -329,7 +332,7 @@ - + @@ -343,7 +346,7 @@ - + - + - - - - - - - - - - - - - Pie chart can only be generated when - there are findings in the report. Get to work! ;) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ( - - - - - summaryTableThreatLevel - - - - - - - - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - % - - - - - - - - +10 - -10 - - - - - - - - - - - - - - - none - - - - - - - - - - - - - - % - - - - - - - - - - - - - - - - - - - - - - - - #CC4900 - #FF5C00 - #FE9920 - #ffbf7f - #ffed7f - #FFFFFF - #CCCCCC - - #CC4900 - #FF5C00 - #FE9920 - #e5d572 - - - - - #D9D375 - #B9A44C - #BEC5AD - #7CA982 - #566E3D - #5B5F97 - #C200FB - #A9E5BB - #98C1D9 - #5B5F97 - burlywood - cornflowerblue - cornsilk - black - - - - - - - - - - - - - - - - - - - - diff --git a/xml/xslt/block.xslt b/xml/xslt/block.xslt index 8bd79a6..dffbbfd 100644 --- a/xml/xslt/block.xslt +++ b/xml/xslt/block.xslt @@ -32,7 +32,7 @@ - + diff --git a/xml/xslt/findings.xslt b/xml/xslt/findings.xslt index 512c6b7..18c27bc 100644 --- a/xml/xslt/findings.xslt +++ b/xml/xslt/findings.xslt @@ -1,7 +1,7 @@ + xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:my="http://www.radical.sexy" + exclude-result-prefixes="xs my" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0"> @@ -13,8 +13,10 @@ my:titleCase($x), ' ')" /> - + + 4px solid + @@ -84,8 +86,8 @@ - Description: - + Description: + @@ -100,22 +102,22 @@ - Technical description: - + Technical description: + - Impact: - + Impact: + - Recommendation: - + Recommendation: + @@ -128,5 +130,12 @@ + + + + + + + diff --git a/xml/xslt/functions_params_vars.xslt b/xml/xslt/functions_params_vars.xslt new file mode 100644 index 0000000..250f1a3 --- /dev/null +++ b/xml/xslt/functions_params_vars.xslt @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + #000000 + #922D00 + #E2632A + #FFA67E + #F7D4C4 + silver + #EDD382 + + #CC4900 + #FF5C00 + #FE9920 + #e5d572 + + + #D9D375 + #B9A44C + #BEC5AD + #7CA982 + #566E3D + #5B5F97 + #C200FB + #A9E5BB + #98C1D9 + #5B5F97 + burlywood + cornflowerblue + + darksalmon + goldenrod + lightslategray + mediumpurple + teal + yellow + sienna + mediumturquoise + navy + black + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/xslt/generate_contract.xsl b/xml/xslt/generate_contract.xsl index 0426b98..d321b91 100644 --- a/xml/xslt/generate_contract.xsl +++ b/xml/xslt/generate_contract.xsl @@ -24,53 +24,22 @@ - - - - - - - - - - - - - - - - - - - € - £ - $ - - - - - - + - - - - - + + - - + - @@ -106,13 +75,13 @@ - + + - + + @@ -128,19 +97,25 @@ - + + + - + + + - + + + - + + @@ -149,39 +124,56 @@ - + - - - - - - - - - - -   - - - - - - - - - - - Chamber of Commerce - VAT number - - - - - - + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + Chamber of Commerce + VAT number + + + + + + diff --git a/xml/xslt/generate_document.xsl b/xml/xslt/generate_document.xsl index e2cbe88..cfd5900 100644 --- a/xml/xslt/generate_document.xsl +++ b/xml/xslt/generate_document.xsl @@ -1,7 +1,8 @@ + xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:my="http://www.radical.sexy" + exclude-result-prefixes="my xs" version="2.0"> @@ -10,7 +11,6 @@ - @@ -19,46 +19,29 @@ - - - + + + + - - - - - - - - - - - - - - - - - - - + - + - - - + + - - - + + + + @@ -69,48 +52,62 @@ - - - - - - 7cm - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - V - - - Amsterdam - - - - - - - - + + + + + + + + + + + - - - + + + + + + + + + + + @@ -122,7 +119,8 @@ - + Document Properties @@ -152,8 +150,7 @@ - Authors + Authors @@ -161,7 +158,9 @@ , - + + + @@ -195,4 +194,7 @@ + + + diff --git a/xml/xslt/generate_invoice.xsl b/xml/xslt/generate_invoice.xsl index b2f8dc0..581fc9e 100644 --- a/xml/xslt/generate_invoice.xsl +++ b/xml/xslt/generate_invoice.xsl @@ -1,20 +1,18 @@ + xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:my="http://radical.sexy" + exclude-result-prefixes="xs my" version="2.0"> - + + - - - - @@ -33,56 +31,73 @@ + + + + + + + + + + + + + + + + + + - - + + - - + + - - - - - € - £ - $ - - + + - -   + + - + + + + + + + + () - - + + - + + + -  .-- + + + @@ -92,9 +107,7 @@ 21% -  .-- + @@ -107,15 +120,14 @@  .-- + select="$denomination"/> - + @@ -124,7 +136,7 @@ - + @@ -138,13 +150,6 @@ - - - $ - € - £ - - - - + + - + + +  .-- @@ -205,7 +212,8 @@ - + @@ -241,7 +249,7 @@ + test="/*/meta//client/client_reference and normalize-space(/*/meta//client/client_reference) != ''"> @@ -250,7 +258,7 @@ - + @@ -266,7 +274,7 @@ - + @@ -278,7 +286,8 @@ - + @@ -349,10 +358,9 @@ - - + - + @@ -364,96 +372,13 @@ + + + + - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xml/xslt/generate_offerte.xsl b/xml/xslt/generate_offerte.xsl index b273bc4..6201679 100644 --- a/xml/xslt/generate_offerte.xsl +++ b/xml/xslt/generate_offerte.xsl @@ -1,16 +1,16 @@ + xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:my="http://www.radical.sexy" + exclude-result-prefixes="xs my" version="2.0" extension-element-prefixes="my"> - + - @@ -18,111 +18,94 @@ + - - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - title- - + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + - + + + @@ -130,16 +113,18 @@ - - - - + + + + - - + + + + - - + + + + diff --git a/xml/xslt/generate_ratecard.xsl b/xml/xslt/generate_ratecard.xsl index 22ab0c3..7e24240 100644 --- a/xml/xslt/generate_ratecard.xsl +++ b/xml/xslt/generate_ratecard.xsl @@ -4,7 +4,7 @@ xmlns:fo="http://www.w3.org/1999/XSL/Format" exclude-result-prefixes="xs" version="2.0"> - + @@ -14,159 +14,50 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - € - £ - $ - - - + + - - + + - - + + - - - + + - + - + + + + + + + + - - - - - - - - - - - - - - - - - - -   - - - - - - - - - - - - - - - - - - - - - - -   - - - - - - -   - - - - - - - - - - - - + + + - - - - - - - - - - - - - - - - - - - - diff --git a/xml/xslt/generate_report.xsl b/xml/xslt/generate_report.xsl index beebdc6..594f780 100644 --- a/xml/xslt/generate_report.xsl +++ b/xml/xslt/generate_report.xsl @@ -8,10 +8,10 @@ - + @@ -20,67 +20,43 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - + + - + + + + + + + + + + + - - - - + + + + - + \ No newline at end of file diff --git a/xml/xslt/graphics.xslt b/xml/xslt/graphics.xslt index 5143b81..bffca24 100644 --- a/xml/xslt/graphics.xslt +++ b/xml/xslt/graphics.xslt @@ -7,7 +7,8 @@ - + + @@ -37,14 +38,15 @@ - 17cm - + 15.5cm + scale-to-fit scale-to-fit - + + diff --git a/xml/xslt/inline.xslt b/xml/xslt/inline.xslt index 353b9cd..6125497 100644 --- a/xml/xslt/inline.xslt +++ b/xml/xslt/inline.xslt @@ -26,7 +26,7 @@ HIDDEN - + @@ -78,7 +78,7 @@ - + diff --git a/xml/xslt/lists.xslt b/xml/xslt/lists.xslt index c23e35f..7ed364f 100644 --- a/xml/xslt/lists.xslt +++ b/xml/xslt/lists.xslt @@ -5,23 +5,36 @@ version="2.0"> - + - + - - + + + + + + + + + + + + + + + + + @@ -32,141 +45,140 @@ + + + - 1 + 0.2 - - - - • - - - - - - + + + + + + + + + + • + + + + + + + + - + - + - - + + - - - - - 0pt - - - 12pt - - - - - - - - - - - 1 - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + - - + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/xml/xslt/meta.xslt b/xml/xslt/meta.xslt index ec114bd..47941ca 100644 --- a/xml/xslt/meta.xslt +++ b/xml/xslt/meta.xslt @@ -1,11 +1,10 @@ - - - + xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs my" + xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:my="http://www.radical.sexy" version="2.0"> + + + @@ -16,51 +15,90 @@ - - - - - - - PENETRATION TEST MANAGEMENT SUMMARY - - - - - - for - - - - - - - - - - - - - - - V - - - Amsterdam - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Management Summary + + + + + + + + V + + , + + + + + + + + + + + @@ -73,16 +111,16 @@ - + Document Properties - + - + Client @@ -92,22 +130,31 @@ - + Title - - - - PENETRATION TEST MANAGEMENT SUMMARY - - - - + + + Penetration Test Report Management Summary + + + + + + + - + Targets @@ -116,11 +163,11 @@ - - - - - + + + + + @@ -132,7 +179,7 @@ - + Version @@ -142,7 +189,7 @@ - + Pentesters @@ -160,9 +207,8 @@ - - Authors + + Authors @@ -170,13 +216,15 @@ , - + + + - + Reviewed by @@ -190,7 +238,7 @@ - + Approved by @@ -218,24 +266,27 @@ - - + + Version - + Date - + Author - + Description - + + + #ededed + @@ -253,7 +304,9 @@ - + + + , @@ -276,8 +329,8 @@ - 0. + 0. @@ -290,17 +343,17 @@ Contact - For more information about this Document and its - contents please contact - . - + For more information about this + document and its contents please contact + . + - + - + Name @@ -310,7 +363,7 @@ - + Address @@ -318,7 +371,8 @@ -   +   @@ -326,7 +380,7 @@ - + Phone @@ -336,7 +390,7 @@ - + Email @@ -348,6 +402,15 @@ + + is registered at the trade register of the + Dutch chamber of commerce under number . - + + + + + + + diff --git a/xml/xslt/numbering.xslt b/xml/xslt/numbering.xslt index 934b863..58afbd3 100644 --- a/xml/xslt/numbering.xslt +++ b/xml/xslt/numbering.xslt @@ -95,9 +95,9 @@ - + - + — diff --git a/xml/xslt/off2inv.xsl b/xml/xslt/off2inv.xsl index 68e757c..42e465c 100644 --- a/xml/xslt/off2inv.xsl +++ b/xml/xslt/off2inv.xsl @@ -48,6 +48,8 @@ />-   + () diff --git a/xml/xslt/off2rep.xsl b/xml/xslt/off2rep.xsl index 1b21b09..05e7274 100644 --- a/xml/xslt/off2rep.xsl +++ b/xml/xslt/off2rep.xsl @@ -82,7 +82,8 @@ Executive Summary
Introduction -

Between and , carried out a penetration test for

+

Between and , carried out a + penetration test for

This report contains our findings as well as detailed explanations of exactly how performed the penetration test.

@@ -152,32 +153,28 @@ -
- Pentest Technical Summary -
- Findings +
+ Findings -

We have identified the following issues:

- Listing of Findings (written by pentesters) - Extreme - - High - - Elevated - - Moderate - - - Low -
- -
- Non-Findings -

In this section we list some of the things that were tried but turned out to - be dead ends.

- Listing of Non-Findings (written by pentesters) -
+

We have identified the following issues:

+ Listing of Findings (written by pentesters) + Extreme + + High + + Elevated + + Moderate + + Low +
+ +
+ Non-Findings +

In this section we list some of the things that were tried but turned out to be + dead ends.

+ Listing of Non-Findings (written by pentesters)
diff --git a/xml/xslt/pages.xslt b/xml/xslt/pages.xslt index 7874cfe..4c2eed8 100644 --- a/xml/xslt/pages.xslt +++ b/xml/xslt/pages.xslt @@ -7,101 +7,175 @@ - - - - - + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - + - - + + + + + + + + + - - - - - - - - - - - - - - - - + - - - / + + + - - - - - -   - + + + - - - / + + + + + - - - - - -   - + - - - + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/xslt/pages_flimsy.xslt b/xml/xslt/pages_flimsy.xslt new file mode 100644 index 0000000..8db77c3 --- /dev/null +++ b/xml/xslt/pages_flimsy.xslt @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + +   + + + + + + +   + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/xslt/piecharts.xslt b/xml/xslt/piecharts.xslt new file mode 100644 index 0000000..3692056 --- /dev/null +++ b/xml/xslt/piecharts.xslt @@ -0,0 +1,686 @@ + + + + + + + + + + + + + + + Pie chart can only be generated when + there are findings in the report. Get to work! ;) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ( + + + + + summaryTableThreatLevel + + + + + + + + ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + middle + start + end + middle + + + + % + + + + + + + + +10 + -10 + + + + + + + + + + + + + + + none + + + + + + + + + + + + + + % + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/xslt/placeholders.xslt b/xml/xslt/placeholders.xslt index 6f8929b..5adf987 100644 --- a/xml/xslt/placeholders.xslt +++ b/xml/xslt/placeholders.xslt @@ -2,22 +2,23 @@ - + - € - $ - £ - - WARNING: NO DENOMINATION FOUND + € + $ + £ + + WARNING: NO DENOMINATION + FOUND + - + @@ -79,6 +80,12 @@ + + + + + + - + - + @@ -390,7 +398,8 @@ - + @@ -400,7 +409,8 @@ - + @@ -423,14 +433,16 @@ - + - - + + $threatLevel])"/> @@ -439,6 +451,10 @@ + + ###TODO### + + @@ -448,13 +464,14 @@ - - + +   - + @@ -466,6 +483,11 @@ select="format-date($placeholderElement, '[MNn] [D1], [Y]', 'en', (), ())" /> + + + TBD + @@ -553,30 +575,38 @@ - [ WARNING: Cannot resolve placeholder in - ] + [ WARNING: Cannot resolve + placeholder in - + ] - + - - element "" () is empty - - - referenced element not found - + element "" + () is empty + referenced element not found - + - + - - + + diff --git a/xml/xslt/structure.xslt b/xml/xslt/structure.xslt index c9e451e..3935f0b 100644 --- a/xml/xslt/structure.xslt +++ b/xml/xslt/structure.xslt @@ -1,7 +1,11 @@ + xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:my="http://www.radical.sexy" + exclude-result-prefixes="xs my" xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0"> + + #e2632a + #ededed + #414241 @@ -31,76 +35,226 @@ - - - - title- - - - - - - - + - - - - Appendix  - - - - App . - - - - - - - - - + + 1 - - - Appendix  - - - - App . - - - - - - - - + -     - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3.5cm + 1.5cm + + + + + + + + + + + + + + Appendix  + + + + App . + + + + + + + + + + + + + + + + Appendix  + + + + App . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Annex + - + + + + + + + + + + + + + + + + + + diff --git a/xml/xslt/styles.xslt b/xml/xslt/styles.xslt index 3d38c57..a4c11c7 100644 --- a/xml/xslt/styles.xslt +++ b/xml/xslt/styles.xslt @@ -1,43 +1,54 @@ + xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs" + xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0"> + + + + #e2632a + #ededed + #e4e4e4 + #999999 + #444444 + white + + #444444 + 1pt solid - black 20mm 5pt + 4mm 8mm - 1.5cm - + 1.3cm + always - + disregard-shifts + + LiberationSansNarrow - 12pt - black - disregard-shifts + 11pt - 10pt + 11pt LiberationSansNarrow - 10pt + 11pt black @@ -46,56 +57,81 @@ LiberationMono 10pt - - - orange - black + black + OpenSans + + + 3mm + 2mm - center 16pt - 1cm - orange + + 0.4cm + 0.4cm + 16pt - 1cm - orange + 0.6cm - italic - 14pt - 0.8cm - silver + + 13pt + 0.5cm + 0.4cm - 14pt - 0.8cm - silver + + 13pt + 0.5cm - 5pt + 12pt + 0.5cm - - silver - 6cm - capitalize + + 16pt + normal - - center + + + 13pt + 0.5cm + 0.4cm + + + + 18pt + 0.7cm + OpenSans + + + + 16pt 1cm - - - 0cm + capitalize italic center + always + always + 1cm + 1cm + 0.5cm + @@ -112,21 +148,27 @@ LiberationMono - 90% + 85% #eeeeee LiberationMono - 90% + inherit + normal + 85% - 60% - super + 60% + super - 60% - sub + 60% + sub + + + + @@ -135,29 +177,31 @@ + - + + + + + + 6mm + + - - - - - - - - double - 2pt - - - + + + + solid + 1pt + false preserve preserve @@ -167,114 +211,237 @@ - + + + + - 2cm - 1.8cm - 2cm - 2cm + 0cm + 0cm + 0cm + 0cm 29.7cm 21.0cm - - 1cm - 1cm - - - true - 0.6cm - - - true - 0.6cm - 0 - + + + + + + + + + + + - 1cm - 1cm + 2.5cm + 2.5cm + + 2cm + 2cm + + + 2cm + 2cm + true - 0.6cm + 4.6cm + + - true - 0.6cm - 0 + 2.1cm - - right - bold + + 2cm + + + 2cm + + + 0.7cm + 1px + solid justify - - - - orange + + + + 1cm + 1px + solid + right + + 0cm + 2cm - + + + 0cm + 2cm + + + + 0cm + 2cm + + + 23.3cm + 0.2cm + + + 2cm + 3cm + + + + LiberationSansNarrow + 10pt + black + normal + left + + + 2cm + 9cm + + + + 0cm + 0cm + + + + center + + + + 0.5cm + 0.7cm + 0.4cm + + + + 0.5cm + 0.5cm + 1.2cm + + + + page + center - - + + - - - - - - 2pt + + + - + + 4pt + 4pt + 3pt + 3pt + + + fixed + 100% + + + retain + retain - - #eeeeee + + always - + + + 0.7cm + 2mm + 2mm + + 5.5mm + always - + page - + + 1.5mm + + + 8cm + white + 1cm + 0.7cm + 2cm + + + LiberationSansNarrow + 10pt + black + normal + left + + always 18pt - + + 9pt + center + 15px + + + - - - - #FF5C00 - - + + + right 8mm + + center + 16pt + 1cm + 1cm + bold + + + 0 + 0 + diff --git a/xml/xslt/styles_inv.xslt b/xml/xslt/styles_inv.xslt index 6add5ae..cd35322 100644 --- a/xml/xslt/styles_inv.xslt +++ b/xml/xslt/styles_inv.xslt @@ -1,69 +1,44 @@ - + xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs" version="2.0"> + - - - - 10pt - - - always - center - white - bold - - - - - + 0.5cm - 1.5cm - 1.5cm - 1.5cm + 2cm + 2cm 29.7cm 21.0cm + 5.5mm + right - - 3.6cm - 1cm + + 3.7cm + 2.1cm - + true - 2.7cm + 3.6cm - + true - 0.6cm + 2cm 0 - + 2cm 1cm - + true - 0.6cm + 1cm - + true - 0.6cm + 2cm 0 - - right - normal - - - center - 0cm 0cm @@ -73,14 +48,11 @@ scale-to-fit uniform - - 18pt - #FF5C00 - 1cm - - - normal - 18pt + + right + + 1cm + 1cm @@ -90,9 +62,12 @@ - + + + + separate 5mm @@ -102,6 +77,28 @@ 5pt - #EEEEEE + + + + -8pt + solid + 1px + fixed + 100% + + center + + + + + 1cm + 1px + solid + right + + 0cm + 2cm + + diff --git a/xml/xslt/styles_off.xslt b/xml/xslt/styles_off.xslt index cbdc6a1..7119b2a 100644 --- a/xml/xslt/styles_off.xslt +++ b/xml/xslt/styles_off.xslt @@ -8,184 +8,19 @@ - 10pt - - + 8pt - - - always - center - white - bold - uppercase - - - - - - 18pt - 1cm - #FF5C00 - uppercase - - - 18pt - 1cm - #FF5C00 - uppercase - - - italic - 14pt - 0.8cm - #999999 - uppercase - - - 14pt - 0.8cm - #999999 - - - 5pt - - - #999999 - uppercase - - - 16pt - center - bold - 1cm - - + - 18pt - - - - - - - - - double - 2pt - - - - false - preserve - preserve - - - - - 2cm - 1.8cm - 2cm - 2cm - 29.7cm - 21.0cm - - 1cm - 1cm - - - true - 0.6cm - - - true - 0.6cm - 0 - - - 1cm - 1cm - - - true - 0.6cm - - - true - 0.6cm - 0 - - - right - bold - - - justify + url(../graphics/frontpage_quote.jpg) - - - #FF5C00 - - - - - center - - - - 2cm - 3cm - url(../graphics/logo.png) - 70mm - scale-to-fit - scale-to-fit - uniform - - - - - - - - - - - - - - - - - 2pt - - - - - - - - - - - - - - - - page - - - page - \ No newline at end of file diff --git a/xml/xslt/styles_rat.xslt b/xml/xslt/styles_rat.xslt index 3719e77..26b22cb 100644 --- a/xml/xslt/styles_rat.xslt +++ b/xml/xslt/styles_rat.xslt @@ -1,70 +1,44 @@ - + xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs" version="2.0"> + - - - - 12pt - - - always - center - white - bold - uppercase - - - - - + 0.5cm - 1.5cm - 1.5cm - 1.5cm + 2cm + 2cm 29.7cm 21.0cm + 5.5mm + right - - 3.6cm - 1cm + + 3.7cm + 2.8cm - + true - 2.7cm + 3.6cm - + true - 0.6cm + 2cm 0 - + 2cm 1cm - + true - 0.6cm + 1cm - + true - 0.6cm + 2cm 0 - - right - normal - - - center - 0cm 0cm @@ -74,14 +48,18 @@ scale-to-fit uniform - + 18pt - #FF5C00 1cm + 0cm + 0.3cm + center normal 18pt + 0cm + 0.3cm @@ -97,23 +75,21 @@ separate 5mm - + 2pt 5pt - - #EEEEEE + + 1px solid #e4e4e4 - - center - 16pt - 1cm - 1cm - bold + + center - - - - + + + + + + diff --git a/xml/xslt/styles_rep.xslt b/xml/xslt/styles_rep.xslt index cc10dde..18e2aac 100644 --- a/xml/xslt/styles_rep.xslt +++ b/xml/xslt/styles_rep.xslt @@ -6,79 +6,7 @@ - - - 8pt - - - - - - - - always - bold - - - center - 16pt - 1cm - orange - - - 16pt - 1cm - orange - - - italic - 14pt - 0.8cm - silver - - - 14pt - 0.8cm - silver - - - 5pt - - - silver - 6cm - capitalize - - - center - 1cm - - - - - - - - orange - - - 2cm - 3cm - url(../graphics/logo.png) - 70mm - scale-to-fit - scale-to-fit - uniform - - - - - - - orange - - - + #CC4900 @@ -88,7 +16,45 @@ #FE9920 + + + + + + + + + + + url(../graphics/frontpage_report.jpg) + + + + + + + -8pt + solid + 1px + 1px + 1px + fixed + 100% + always + + + + fixed + + + + + + + 4pt + - \ No newline at end of file + diff --git a/xml/xslt/table.xslt b/xml/xslt/table.xslt index 72a28b2..fcb240b 100644 --- a/xml/xslt/table.xslt +++ b/xml/xslt/table.xslt @@ -1,32 +1,79 @@ - + xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-result-prefixes="xs" + xmlns:fo="http://www.w3.org/1999/XSL/Format" version="2.0"> + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 100% + + + + + + solid + + + black + + + 1pt + + + + + + + + + + + - + - - + + @@ -34,23 +81,23 @@ - + - + - + - + - + @@ -64,17 +111,19 @@ - + test=" + (@border = '1' or + ancestor::tr[@border = '1'] or + ancestor::thead[@border = '1'] or + ancestor::table[@border = '1']) and + following-sibling::*"> + solid - - black + + #e4e4e4 - + 1pt @@ -82,13 +131,13 @@ - + center - + right - + justify @@ -98,13 +147,13 @@ - + center - + right - + justify @@ -117,13 +166,13 @@ - + center - + right - + justify @@ -137,15 +186,15 @@ - + - + - + @@ -158,43 +207,33 @@ - - - solid - - - black - - - 1pt - - - + - + - + + - + - + + #ededed + + - - \ No newline at end of file + + diff --git a/xml/xslt/toc.xslt b/xml/xslt/toc.xslt index 243eb64..3a4d261 100644 --- a/xml/xslt/toc.xslt +++ b/xml/xslt/toc.xslt @@ -7,9 +7,10 @@ Table of Contents - - - + + + + @@ -42,21 +43,41 @@ - + + + + + - + -   - - + + + + + + + + + + + + + + + + + + + @@ -79,19 +100,18 @@ - - - -    - + + bold + 4mm + - + diff --git a/xml/xslt/waiver.xslt b/xml/xslt/waiver.xslt index dcd2e6e..d79cab8 100644 --- a/xml/xslt/waiver.xslt +++ b/xml/xslt/waiver.xslt @@ -5,33 +5,46 @@ - - - - - - page - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -44,7 +57,7 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86,38 +117,25 @@ - - - - + + - - - + - + - - - - ANNEX 2 - - - - + - - - @@ -146,8 +164,8 @@ -     +     @@ -184,42 +202,42 @@ - + - + - + - + - + - + - + - +