From f5f4bb12dd685abc4b5b5b2228206c7712376e5e Mon Sep 17 00:00:00 2001 From: skyanth Date: Thu, 13 Sep 2018 10:34:35 +0200 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 70b75a7b7b6e796cbcaba348088644612d48f283 Author: skyanth Date: Thu Sep 13 10:27:59 2018 +0200 Some Quote front page improvements commit 212cc80b473906c412e38acda81d4c5202420daa Author: skyanth Date: Wed Sep 12 17:31:24 2018 +0200 put rogue pie chart percentage in its place commit 2b07ff6067ddf1b479203496a54dabfb7291853b Author: skyanth Date: Wed Sep 12 17:27:05 2018 +0200 Updated invoice design commit 929ae6dfad7c0802dd1aff72a85984e7a5d86fae Author: skyanth Date: Wed Sep 12 17:26:56 2018 +0200 better color customizability commit 317c68800d0e1b85a539f75caeb2da778106cc05 Author: skyanth Date: Tue Sep 11 11:50:27 2018 +0200 More outspoken threatlevel colours commit dd92fbf02d3aa8075d42197c7297bba6f1e37a87 Author: skyanth Date: Mon Sep 10 15:25:48 2018 +0200 waiver snippet custom annex number addition commit d1ceb73316992394704702d2063b118e2fda1d9f Author: skyanth Date: Mon Sep 10 13:20:15 2018 +0200 Less corporate front page graphics commit c72ee7835b949820336537929e30f8dae22a383b Author: skyanth Date: Mon Sep 10 13:19:58 2018 +0200 Moved Finding and Non-finding sections up one level commit 70ff593dc80490b30330b1da01fdf91536c7e50e Author: skyanth Date: Mon Sep 10 10:25:08 2018 +0200 Sorted out email element commit 8eaaac83e19ebac8b82da162a4541ed3adf160a7 Author: skyanth Date: Mon Sep 10 10:24:36 2018 +0200 Configurable annex number for waivers commit 5599f83aa4b74254abc76ccd976e54360fb90d27 Author: skyanth Date: Mon Sep 10 10:04:45 2018 +0200 More colors available for generic pie chart commit 462055de5e40927eb9dc892df8f71df6b698ed23 Author: skyanth Date: Fri Sep 7 09:52:50 2018 +0200 Placeholder documentation commit b2e6dafe1fe784003d66c8d43c850e9293e07f24 Author: skyanth Date: Fri Sep 7 09:52:40 2018 +0200 Added client reference number and rep/quo subtitles commit ac67cc8d224f3b7b71f21e9062a1cf80b683c932 Author: skyanth Date: Wed Sep 5 14:47:29 2018 +0200 Keep finding metaboxes together & connected with title commit 57fe712ebdc5725f0ae1e063375076f0367a5842 Author: skyanth Date: Wed Sep 5 14:47:04 2018 +0200 Place document classification on frontpage and in header commit 336fb8d0ecdac8379a47de17a84a9c5fe270bde7 Author: skyanth Date: Tue Aug 28 11:43:50 2018 +0200 better link processing for summaries commit d2ab1ad389c8d6827afba80ca55ce58af2679377 Author: skyanth Date: Tue Aug 28 11:29:49 2018 +0200 still better pie chart percentage placement commit 762079ec92079708d385c5de5183acce014ff71b Author: skyanth Date: Tue Aug 28 11:05:46 2018 +0200 proper link color for summary table links commit 6d7a27022a924341f98f412e73a9728212934a05 Author: skyanth Date: Tue Aug 28 11:02:24 2018 +0200 I can do xml, really… commit 019f7f7e4a34a6bc3a3ccb79dbdec2ae38a9d35f Author: skyanth Date: Tue Aug 28 11:01:11 2018 +0200 proper link now :D commit d0d536c27d8f168a823e42cc4383070fdfe735fc Author: skyanth Date: Tue Aug 28 10:55:49 2018 +0200 added link commit 73f3b2fec13f1f507538414106a75a4becdaf562 Author: skyanth Date: Fri Aug 24 11:36:35 2018 +0200 added “todo” placeholder commit 5fe7638ea1a9d83e4e5173695cd4b682e8857f66 Author: skyanth Date: Fri Aug 24 11:21:43 2018 +0200 majorly improved piechart percentage placement commit 284b28ba04a81ad578108e99f6453a6020056a8f Author: skyanth Date: Wed Aug 22 11:06:26 2018 +0200 finding severity metabar thickness commit 95b1fe03028c12aee6884a6bcb6a649a9194c93d Author: skyanth Date: Wed Aug 22 10:55:13 2018 +0200 Revert "gradient bar to show severity" This reverts commit 46dd55133f7b4ba0d39513609ec1e50ebf725e45. commit 46dd55133f7b4ba0d39513609ec1e50ebf725e45 Author: skyanth Date: Fri Aug 10 10:30:42 2018 +0200 gradient bar to show severity commit b122fe4a45864a7afdb86a644231f5d161b72361 Author: skyanth Date: Thu Aug 9 10:39:56 2018 +0200 Visual severity clue in finding metabar commit e8bd4c9e8a021aa79b5a45363421a71c1be7dbbe Author: skyanth Date: Thu Aug 9 10:29:23 2018 +0200 section-tocs no longer exist commit 53856c29911064b4de60dbc752a321b9e10cf5d4 Author: skyanth Date: Thu Aug 9 10:29:02 2018 +0200 Improved color customizability commit b9b2dab7777ec9c9ec24d6d94e92676812ae3b54 Author: skyanth Date: Wed Aug 8 11:23:30 2018 +0200 Sections no longer force end on even page commit d816d58ad18766bcea75cbe01348a517dbbe957b Author: skyanth Date: Wed Aug 8 11:16:28 2018 +0200 Moved section marker to footer; removed sidetab commit ec84c4d56f08b2413a296d7e2a4ccadbe9f7919f Author: skyanth Date: Wed Aug 8 10:26:08 2018 +0200 Different graphic for quote cover commit 549e01585fb3cd8e595f67b5cb7a7682506eb55a Author: skyanth Date: Tue Aug 7 10:40:36 2018 +0200 A lot of work on waivers/titles/customizability commit cbffd5ce6ae69833caef9f5061106bf66ce2ed09 Author: skyanth Date: Tue Jul 24 11:03:31 2018 +0200 preventing text dropoff commit 84604bde8296ff138307d690743207a3f63a0a51 Author: skyanth Date: Tue Jul 24 10:58:34 2018 +0200 different front page graphic commit 3ce82d958c9f7f2b1432bb62a940c2c45859c8c1 Author: skyanth Date: Tue Jul 24 10:57:56 2018 +0200 Better pie chart display commit efa50c1119c3ded3bc57460b37dbac0d5702b877 Author: skyanth Date: Tue Jul 24 10:57:37 2018 +0200 Better pie chart display commit 91e7b1451a6ed74824da71d61c2260ec7f3337b2 Merge: 832b884 8c0d4fa Author: skyanth Date: Mon Jul 9 14:16:35 2018 +0200 Merge branch 'xslt-new-layout' of https://github.com/radicallyopensecurity/pentext into xslt-new-layout # Conflicts: # xml/dtd/common.xsd commit 832b884299f9cb39ef422a7cefd3ce0fa21f89d9 Author: skyanth Date: Mon Jul 9 14:14:10 2018 +0200 accept floats commit 986fe0b0c8d4ccc9fd944556bf8c4f306c15489b Author: skyanth Date: Mon Jul 9 14:14:02 2018 +0200 accept floats commit 8c0d4fa0e7d1486e1bb32fb94e57724124be7ef0 Author: Patricia Piolon Date: Mon May 7 14:51:02 2018 +0200 new generic document style commit 0cff3c8e7539a25146e7a5299870d2b65c5fa53d Author: Patricia Piolon Date: Fri May 4 14:38:09 2018 +0200 fix email; updated exampe offerte commit 8b9348f3d4d8ce3e9d964f2d81a0735907697392 Author: skyanth Date: Fri May 4 14:03:54 2018 +0200 faulty common commit b16a52607a280486cfd992213247f8df85cc0932 Author: skyanth Date: Fri May 4 13:27:50 2018 +0200 set default root properties on root element commit 63106a72152f6b52f42650afd377eb76edf97089 Author: skyanth Date: Tue Apr 17 15:34:55 2018 +0200 Improved ratecard design commit d62322ab21c19d4b673af916c3fde80ae37fc4d5 Author: skyanth Date: Thu Apr 12 12:45:59 2018 +0200 somewhat improved ratecard design… not complete yet commit fb43e55df2b4fd8bb1f95f32803200a9660bd781 Author: skyanth Date: Wed Apr 11 15:24:37 2018 +0200 Invoice & ratecard new design commit 72a006e31fd36bbf4ff3043d58a27b11a7874ae1 Author: skyanth Date: Fri Apr 6 16:01:12 2018 +0200 better list design (default+finding/rec tables) commit 07e8273a1d1361f3a458b2dff3aa76834b2bb267 Author: skyanth Date: Fri Apr 6 14:56:54 2018 +0200 general var/param/function refactoring - small fixes commit bb519e45d14d6435bb504f877048abb33c7c6f1e Author: skyanth Date: Fri Apr 6 14:48:04 2018 +0200 refactoring to isolate keys/vars/params/functions commit ac2d33394d0cc39c286c04c4382b82c213e87cbe Author: skyanth Date: Wed Apr 4 09:51:03 2018 +0200 made toc colwidth dynamic to stop fop from whining commit aba135423920c3560126456103f206b86f12ebcf Author: skyanth Date: Wed Apr 4 09:50:38 2018 +0200 added waivers back to quotes (oops) commit ad8ede077491def1e2b6a9664f4ff9ba1d222592 Author: skyanth Date: Wed Apr 4 09:50:21 2018 +0200 Added waivers back to quotes (oops) commit 472564402ec9b16e82b22f12689f833d31c24f33 Author: skyanth Date: Wed Apr 4 09:49:45 2018 +0200 Migrated exec summary to new design commit 0d40ecc8ee2206afbf64355fd45029e224500408 Author: skyanth Date: Wed Apr 4 09:48:08 2018 +0200 merge fix commit d9694d343dcef09f94629585e1d73e3be20d7fae Author: skyanth Date: Wed Apr 4 09:47:55 2018 +0200 moving TitleCase function to top level sheet commit f6bec101c92b933402c4af0471eb92b05462d119 Author: skyanth Date: Wed Apr 4 09:46:34 2018 +0200 adding client reference commit d698f802276f5a8763a14bb24e6ab3dde7ffc582 Author: skyanth Date: Thu Mar 29 16:52:39 2018 +0200 fixing exec summary variable name commit e82b42603223fbc0002d99f6b5e083cea977840c Author: skyanth Date: Thu Mar 29 16:51:43 2018 +0200 proper styling and counting for waiver title commit bd935ea47e2b83a8caa8770a6e0fa674aaf8204d Merge: 4a668bf 6788dc9 Author: skyanth Date: Wed Mar 28 16:46:55 2018 +0200 Merge branch 'master' into xslt-new-layout # Conflicts: # chatops/python/gitlab-to-pentext.py # chatops/python/pentext_id.py # chatops/python/validate_report.py # xml/xslt/auto.xslt # xml/xslt/findings.xslt # xml/xslt/generate_offerte.xsl # xml/xslt/generate_report.xsl # xml/xslt/meta.xslt # xml/xslt/numbering.xslt # xml/xslt/placeholders.xslt # xml/xslt/structure.xslt # xml/xslt/styles.xslt # xml/xslt/styles_rep.xslt # xml/xslt/toc.xslt commit 4a668bf923600665422645b558eed39b9ecccb30 Author: skyanth Date: Wed Mar 28 16:20:29 2018 +0200 new quote layout commit 086e39f07cf139fb8911efef0ed76ca19caa57ab Author: skyanth Date: Tue Mar 27 15:29:42 2018 +0200 renamed prependNumber to prependId commit 1c82a53e0ed45cdd2d27fbf8a5f2580822cc1ac9 Author: skyanth Date: Tue Mar 27 15:29:24 2018 +0200 Better finding meta box styling commit dcdc3a3331514b3f9a6428394f0affe72fbe035a Author: skyanth Date: Tue Mar 27 15:28:54 2018 +0200 Better number-title separation commit 07b3268651ef445c24a9500efaed301b211d7fd4 Author: skyanth Date: Tue Mar 27 15:27:55 2018 +0200 Better pie chart colors for @threatLevel commit 07f14ed9ea8fc207dc0cc879fc09ece2ba16eeec Author: skyanth Date: Tue Mar 27 15:27:38 2018 +0200 add a class; set proper accepted values for @includepage commit a71d53a13a688623217646091ab966c514ed9802 Author: skyanth Date: Wed Nov 15 14:32:48 2017 +0100 finalizing report style commit 4e90c7f316421c707d65248ace47c70276ffc178 Author: skyanth Date: Fri Oct 27 14:37:15 2017 +0200 adapting to new layout commit 85e308a608eabe746d12c20592e45174cbfd0eb7 Author: skyanth Date: Wed Oct 25 13:58:48 2017 +0200 Fixes after bringing up to date with master commit bc52a9f8ef744d2e8fbce1558963c802fd009b02 Author: skyanth Date: Tue Oct 24 15:16:22 2017 +0200 Squashed commit of the following: commit 060bac5f672a6777578ed01f4b58fb72c655990e Merge: 56b6c3b 6ff1465 Author: Patricia Piolon Date: Tue Oct 24 14:13:48 2017 +0200 Merge pull request #51 from radicallyopensecurity/no-whitespace-after-recomm-table-list No whitespace after recomm table list commit 6ff14656e3baca9ad6de4aa27541991dc1a931e3 Author: skyanth Date: Tue Oct 24 14:12:04 2017 +0200 no more large whitespace after ol in recommendation table commit d66215b978d2cc5480039ab6ad69833a481957d0 Author: skyanth Date: Tue Oct 24 14:10:35 2017 +0200 no more large whitespace after ul in recommendation table commit 56b6c3b24d0378791c7444f03f1858919a5f07cf Author: Peter Mosmans Date: Mon Oct 16 13:16:41 2017 +1000 Display unique finding code as well commit 2051d7556371b8242fc11cb3f079e004b9331015 Author: skyanth Date: Wed Oct 11 11:07:34 2017 +0200 minor xml fixes commit da3d6ca1091fc462b42cc075f119830e02d87b89 Author: Marcus Bointon Date: Tue Oct 10 11:32:02 2017 +0200 Code audit tweaks commit 7d02e7275f7fe83c826a8afda5a9397e2ce55b0a Author: Marcus Bointon Date: Thu Oct 5 15:37:37 2017 +0200 Scheduling commit 5e46aa28f754f15428b3ce0f07986bc9732be6a0 Author: Marcus Bointon Date: Thu Oct 5 14:18:13 2017 +0200 Planning tweaks commit 9180b282ba1848fc5b8fb352a73bf5bb5310a784 Author: Marcus Bointon Date: Thu Oct 5 14:18:00 2017 +0200 Grey box tweaks commit c628b3b0d160aea28878e8c03ecf9972cd50c9b1 Author: Marcus Bointon Date: Mon Feb 27 17:20:12 2017 +0100 Formatting cleanup (cherry picked from commit 53ff916) commit 1fcbb8aa503c44a731081e33312a68d300cc9137 Author: skyanth Date: Wed Aug 30 10:45:10 2017 +0200 still better p&p snippets commit d1686904f9c06e52d421ed7dde01bbb57438dbf0 Author: skyanth Date: Wed Aug 30 10:25:00 2017 +0200 Updated p&p snippet to use new planning placeholders commit 6b1d11ad5db242a0462233c72d56842d8e010cfd Author: Peter Mosmans Date: Sun Aug 20 19:37:37 2017 -0700 Clean up code somewhat Some spelling / imperative fixes. commit 6a2559793ba416b06b20a09e7f7c10d9017faf08 Author: Peter Mosmans Date: Sun Aug 20 19:27:20 2017 -0700 Ignore local file structure when querying projects commit ce8a0cdfca2b03ee562fdefdde897510a12a5dcc Author: Peter Mosmans Date: Sun Aug 20 19:26:46 2017 -0700 Re-include helper function to capitalize sentences commit 072c24659ffc9a071a80e5406687da1973d8da53 Author: Peter Mosmans Date: Sun Aug 20 19:08:09 2017 -0700 Add content of all includes for spell checking commit 28198158bbd78c02b4661eee0513d7d864113896 Author: Patricia Piolon Date: Fri Aug 18 11:29:19 2017 +0200 Added new planning element info to release notes commit d0d5d3e986bf9628102a3d2db91b17a8a8442f31 Author: skyanth Date: Tue Aug 15 11:30:57 2017 +0200 offerte ‘fee’ element now deals gracefully with non-numbers commit 5a8ccbdfadd5bfc97258e3cfc0186dacdf62991e Author: skyanth Date: Tue Aug 1 11:32:21 2017 +0200 Added client_postal_code placeholder commit 4d6bd7bc324811871db16a8b7ab604a4c549bd39 Merge: 951cd74 184269f Author: Patricia Piolon Date: Tue Jul 25 15:45:10 2017 +0200 Merge pull request #45 from radicallyopensecurity/placeholders-in-summarytables placeholders can now be used in summary tables commit 184269f80257c5375d2b1b104f130e7f98bd69d0 Author: skyanth Date: Tue Jul 25 15:43:12 2017 +0200 placeholders can now be used in summary tables commit 951cd74801e9e92b70affa7c73f236164f8d3907 Merge: f649847 645ef7e Author: Patricia Piolon Date: Tue Jul 25 11:23:56 2017 +0200 Merge pull request #41 from DeforaNetworks/khorben/findings2csv Import findings2csv.xsl commit f6498477aae18b85057b3e05a34dc8fe791cbf2b Author: skyanth Date: Tue Jul 25 11:10:24 2017 +0200 Updated phone number commit 029faaf00dcecd2caed14da4a6899755e02f4d9a Merge: 6529219 e0ea42f Author: Patricia Piolon Date: Tue Jul 25 11:06:49 2017 +0200 Merge pull request #44 from radicallyopensecurity/contact-info-update updated contact info commit e0ea42f6f4cda1cd8d17c921bdae186b6b11738c Author: skyanth Date: Tue Jul 25 11:01:05 2017 +0200 updated contact info, switched to single point of truth for company contact info commit 6529219b07518d7bd9b8b41046e53224b62e4125 Merge: 4f9fe9c 6412935 Author: Patricia Piolon Date: Mon Jul 24 14:44:57 2017 +0200 Merge pull request #43 from radicallyopensecurity/date-formatting Fixed date formatting commit 641293575241328b83ac2a8b8d1a0f4678664f24 Author: skyanth Date: Mon Jul 24 14:44:08 2017 +0200 Fixed date formatting commit 4f9fe9c1ec7d3114cd54585d7869c1491cc1f7df Merge: d1785ff b1f85bf Author: Patricia Piolon Date: Wed Jul 5 14:23:41 2017 +0200 Merge pull request #42 from radicallyopensecurity/better-planning-data Better planning data commit b1f85bf2852c0ab5b1d1d2dc9ca8147cfb54dfbf Author: skyanth Date: Wed Jul 5 14:21:00 2017 +0200 removing some files that shouldn’t have been pushed commit 3988bc36606b3dfaabeb86f2fd526b897e697728 Author: skyanth Date: Wed Jul 5 14:17:03 2017 +0200 improved planning data in documents commit 51e9f7981511a3336ba31a7c5d3f912373605d4d Author: skyanth Date: Wed Jul 5 13:54:04 2017 +0200 merged activity_info and activityinfo, added planning dates commit 94e8b9b753cd8196d283a79cc2e30756f2670869 Author: skyanth Date: Wed Jul 5 13:52:10 2017 +0200 Removed ‘disregard-shifts’ from Pie chart font commit 645ef7ed0b43977d8628a11b67ba72f6f1b890c9 Author: Pierre Pronchery Date: Tue Jul 4 18:22:47 2017 +0200 Import findings2csv.xsl This stylesheet outputs the findings from a report as CSV data. It should be useful already but: - it assumes the finding IDs are in sequential order; - the description is currently expected as a single paragraph (

) - recommendations are expected as a single paragraph, an unordered list (

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 @@ - + - + - + - + - + - + - + - +