From a23d07a7246cc458d8a309f65fe1ecead0f0d47d 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 a9c029ad92602b9bbc72573ed7e3b786b4fd80c1 Author: skyanth Date: Thu Sep 13 10:27:59 2018 +0200 Some Quote front page improvements commit 20c2557148f1d701ba15d354701321ec19e3cd55 Author: skyanth Date: Wed Sep 12 17:31:24 2018 +0200 put rogue pie chart percentage in its place commit e1507a28142bc2b4d07ddb50b768f219b00638c3 Author: skyanth Date: Wed Sep 12 17:27:05 2018 +0200 Updated invoice design commit 366df3a7872f1d5f63b60b7811fd754bfb44d050 Author: skyanth Date: Wed Sep 12 17:26:56 2018 +0200 better color customizability commit 6490e90e47d1da5a4c1da16a1a7669e98d806a9e Author: skyanth Date: Tue Sep 11 11:50:27 2018 +0200 More outspoken threatlevel colours commit 27f00f5786db1fa9100cb5c66bed20892910e8fa Author: skyanth Date: Mon Sep 10 15:25:48 2018 +0200 waiver snippet custom annex number addition commit a8ea948011756a8e67ad7317ac2cb3dd0735ba32 Author: skyanth Date: Mon Sep 10 13:20:15 2018 +0200 Less corporate front page graphics commit 8e0abaec9bdbf086f66248d10b413179b04f8891 Author: skyanth Date: Mon Sep 10 13:19:58 2018 +0200 Moved Finding and Non-finding sections up one level commit 6cf510ef5daf8cca6f8252afc5fccbddaa436fa4 Author: skyanth Date: Mon Sep 10 10:25:08 2018 +0200 Sorted out email element commit d968daf431ab07b6537c7b37fd8a56b7ce4f548b Author: skyanth Date: Mon Sep 10 10:24:36 2018 +0200 Configurable annex number for waivers commit dae15c01571a036c55ce29755d67f531340b5894 Author: skyanth Date: Mon Sep 10 10:04:45 2018 +0200 More colors available for generic pie chart commit 5f3fb9fa6241b56e527e2581cae656f6ac256f21 Author: skyanth Date: Fri Sep 7 09:52:50 2018 +0200 Placeholder documentation commit bc4d702076c4ca14d46728f299ecd6fff9c0f3e4 Author: skyanth Date: Fri Sep 7 09:52:40 2018 +0200 Added client reference number and rep/quo subtitles commit cadbd468dd15111e6e1f603c071fdf39b0447808 Author: skyanth Date: Wed Sep 5 14:47:29 2018 +0200 Keep finding metaboxes together & connected with title commit 293b9b45ed12c4938ada404efda0d2e5e04cb0f4 Author: skyanth Date: Wed Sep 5 14:47:04 2018 +0200 Place document classification on frontpage and in header commit 289e17ee7991f2e13c0570eb3ba221aa613eea16 Author: skyanth Date: Tue Aug 28 11:43:50 2018 +0200 better link processing for summaries commit 2f0b27311c0a378891b1ffab3c91661615f92e4b Author: skyanth Date: Tue Aug 28 11:29:49 2018 +0200 still better pie chart percentage placement commit c1027f859881e419f96c2f05134df0cea3afd373 Author: skyanth Date: Tue Aug 28 11:05:46 2018 +0200 proper link color for summary table links commit 781f8a22bf4b17abd03016ad31c0feb01d9ea590 Author: skyanth Date: Tue Aug 28 11:02:24 2018 +0200 I can do xml, really… commit 2c0ee3d55a789d58fb6a3fbeae4117163217c96d Author: skyanth Date: Tue Aug 28 11:01:11 2018 +0200 proper link now :D commit bc763607c8518c9cb4af54e23aee3be59221078f Author: skyanth Date: Tue Aug 28 10:55:49 2018 +0200 added link commit d6098c012d15ed46a85713ab04f4769a683298e4 Author: skyanth Date: Fri Aug 24 11:36:35 2018 +0200 added “todo” placeholder commit 0d45a5de8248710661f7968f9e5019953f2baadf Author: skyanth Date: Fri Aug 24 11:21:43 2018 +0200 majorly improved piechart percentage placement commit 6a4af5e574cef9b0bc5f355cad24ce5470cd8d70 Author: skyanth Date: Wed Aug 22 11:06:26 2018 +0200 finding severity metabar thickness commit 697e78fe48e007f132a67ac3141baab2cec1656a Author: skyanth Date: Wed Aug 22 10:55:13 2018 +0200 Revert "gradient bar to show severity" This reverts commit 0cc25e45d11d349c99b395ac9bd87546a162d940. commit 0cc25e45d11d349c99b395ac9bd87546a162d940 Author: skyanth Date: Fri Aug 10 10:30:42 2018 +0200 gradient bar to show severity commit c199666050588288ee13235f6aa6570f515bc626 Author: skyanth Date: Thu Aug 9 10:39:56 2018 +0200 Visual severity clue in finding metabar commit 47e6c85e02ec7d32d9f0c25ae2be0a4f35f79414 Author: skyanth Date: Thu Aug 9 10:29:23 2018 +0200 section-tocs no longer exist commit 221fd21636af483dd43a398f9e7baf534d4e4c94 Author: skyanth Date: Thu Aug 9 10:29:02 2018 +0200 Improved color customizability commit b8aa99b910e0d2ba82c86bcb031ef111b2902a1f Author: skyanth Date: Wed Aug 8 11:23:30 2018 +0200 Sections no longer force end on even page commit 3cf2a2ce2ad282782d5d1b7fcfb2f47a2836a188 Author: skyanth Date: Wed Aug 8 11:16:28 2018 +0200 Moved section marker to footer; removed sidetab commit f2db57f4617cd5470c8f77c395a0e9dea70078a5 Author: skyanth Date: Wed Aug 8 10:26:08 2018 +0200 Different graphic for quote cover commit 6917217cadbb8652e07093d8731f01d4e7a390e2 Author: skyanth Date: Tue Aug 7 10:40:36 2018 +0200 A lot of work on waivers/titles/customizability commit 3434275da82c73d71557608aaa8263715e9ba098 Author: skyanth Date: Tue Jul 24 11:03:31 2018 +0200 preventing text dropoff commit ae2385cbcd6f19dc8a201de47f316b79c2be8769 Author: skyanth Date: Tue Jul 24 10:58:34 2018 +0200 different front page graphic commit 25390e59777bb25be724637cf732983a27c67a98 Author: skyanth Date: Tue Jul 24 10:57:56 2018 +0200 Better pie chart display commit 471785e4714f3a739e116485d180819a4246d39d Author: skyanth Date: Tue Jul 24 10:57:37 2018 +0200 Better pie chart display commit f21577f1b355997c834c9422eb6edd0e68f509a2 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 ee602f8a96bce6984570575edc395eae6eecb6d3 Author: skyanth Date: Mon Jul 9 14:14:10 2018 +0200 accept floats commit a653ae60ef38e04242ed7d5868093c7c61b8d59f Author: skyanth Date: Mon Jul 9 14:14:02 2018 +0200 accept floats commit 270758f95c2417887bdb2ab16e45b484c18d6a64 Author: Patricia Piolon Date: Mon May 7 14:51:02 2018 +0200 new generic document style commit 24f3c0ce0f814a3ceb2d7ace61e2a7797593a08f Author: Patricia Piolon Date: Fri May 4 14:38:09 2018 +0200 fix email; updated exampe offerte commit 866afd015254ecf3bfd1f19bfa8951f206629ac9 Author: skyanth Date: Fri May 4 14:03:54 2018 +0200 faulty common commit 53455555d7473427a9cc686d894e447ca6874b77 Author: skyanth Date: Fri May 4 13:27:50 2018 +0200 set default root properties on root element commit d3a109494e0a245fdc8a3de20e8abab8b07dec7f Author: skyanth Date: Tue Apr 17 15:34:55 2018 +0200 Improved ratecard design commit 759764d1f9ec0b5f7087aed71d1e37a64051fdcf Author: skyanth Date: Thu Apr 12 12:45:59 2018 +0200 somewhat improved ratecard design… not complete yet commit 4f1ef5b5139de2ca5c8f8d954047a72c11de61d3 Author: skyanth Date: Wed Apr 11 15:24:37 2018 +0200 Invoice & ratecard new design commit aeba58ae0cfddd13376b7b06a52117617b7187e0 Author: skyanth Date: Fri Apr 6 16:01:12 2018 +0200 better list design (default+finding/rec tables) commit 975afadbbd01395d1777dd758808d9430827b898 Author: skyanth Date: Fri Apr 6 14:56:54 2018 +0200 general var/param/function refactoring - small fixes commit dbfe29238eb56857a6b6de8601ed0c6b1943ab31 Author: skyanth Date: Fri Apr 6 14:48:04 2018 +0200 refactoring to isolate keys/vars/params/functions commit c3b94fec4bfb9f5d2189f5866ab5876385444538 Author: skyanth Date: Wed Apr 4 09:51:03 2018 +0200 made toc colwidth dynamic to stop fop from whining commit 58df1d1434db767e76f19df814d871493f6e94b5 Author: skyanth Date: Wed Apr 4 09:50:38 2018 +0200 added waivers back to quotes (oops) commit 5279b2534d4c4435c46b2932863aaba46851070f Author: skyanth Date: Wed Apr 4 09:50:21 2018 +0200 Added waivers back to quotes (oops) commit f9374400513c9af303b06f896609184d2a9e5fed Author: skyanth Date: Wed Apr 4 09:49:45 2018 +0200 Migrated exec summary to new design commit 6bf792e92783db2aefb5e6944a382640de880092 Author: skyanth Date: Wed Apr 4 09:48:08 2018 +0200 merge fix commit 61e821ea18fca498cabce6a859300834d2f02df0 Author: skyanth Date: Wed Apr 4 09:47:55 2018 +0200 moving TitleCase function to top level sheet commit 4d4d1be9167217c6b4bc6b8e976842d04dc4403a Author: skyanth Date: Wed Apr 4 09:46:34 2018 +0200 adding client reference commit 81df9ce41b7b627723266cd4c552565c03339a96 Author: skyanth Date: Thu Mar 29 16:52:39 2018 +0200 fixing exec summary variable name commit f8bf71ed627e61a1f6b04c4a92b1fa0f8a4ebcac Author: skyanth Date: Thu Mar 29 16:51:43 2018 +0200 proper styling and counting for waiver title commit 91d83bc05711c198ad8f283e4ec534d673f23a2c 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 b02d5d1b0cceaa3d1c01eef10ac3d5f2a9ff774a Author: skyanth Date: Wed Mar 28 16:20:29 2018 +0200 new quote layout commit e3fad41e562a38ce2d04efa167fdd0285cfcd9d1 Author: skyanth Date: Tue Mar 27 15:29:42 2018 +0200 renamed prependNumber to prependId commit 20754df335f40b3c8dbb3bf424e811a8de771adb Author: skyanth Date: Tue Mar 27 15:29:24 2018 +0200 Better finding meta box styling commit 2caa84f449b26394df2e048eb580e1aa109b851f Author: skyanth Date: Tue Mar 27 15:28:54 2018 +0200 Better number-title separation commit 2d9cc06ac89a496247e2aad93ee75fb3af770bfd Author: skyanth Date: Tue Mar 27 15:27:55 2018 +0200 Better pie chart colors for @threatLevel commit c28b8a6028260b132959812ce1741371e32ad809 Author: skyanth Date: Tue Mar 27 15:27:38 2018 +0200 add a class; set proper accepted values for @includepage commit 4dd60886f89bbe9152fde5c513090a976270e48c Author: skyanth Date: Wed Nov 15 14:32:48 2017 +0100 finalizing report style commit 19f093eca0588505171a0002ca6b7737836da9ae Author: skyanth Date: Fri Oct 27 14:37:15 2017 +0200 adapting to new layout commit 02fe3ec374017e9f191603672fbb7aae4846e918 Author: skyanth Date: Wed Oct 25 13:58:48 2017 +0200 Fixes after bringing up to date with master commit 87514c44361d0d976c1ddfdc3022cfd07fb36afc Author: skyanth Date: Tue Oct 24 15:16:22 2017 +0200 Squashed commit of the following: commit ed989f339b1284efa1b4c57cfbc5f6b374b54067 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 57942940f8bea64e0d8f6b824bd9c083103b2a19 Author: skyanth Date: Tue Oct 24 14:12:04 2017 +0200 no more large whitespace after ol in recommendation table commit 81a107f3465bdbf3345cee6d5848b1401c0961a1 Author: skyanth Date: Tue Oct 24 14:10:35 2017 +0200 no more large whitespace after ul in recommendation table commit 788795e8f416ac665bc024a75b63f1353d78f667 Author: Peter Mosmans Date: Mon Oct 16 13:16:41 2017 +1000 Display unique finding code as well commit 39cca0c5bf387e0af12510b029c8220653759d19 Author: skyanth Date: Wed Oct 11 11:07:34 2017 +0200 minor xml fixes commit 773f1554020bdf710ba9c0e483bbed194dec2853 Author: Marcus Bointon Date: Tue Oct 10 11:32:02 2017 +0200 Code audit tweaks commit 1cd43543e0b2887e2d5cbd21e8ea886f9485fe33 Author: Marcus Bointon Date: Thu Oct 5 15:37:37 2017 +0200 Scheduling commit 26f4883c376c50c3f2d4b15ba423ba8feb2c19b2 Author: Marcus Bointon Date: Thu Oct 5 14:18:13 2017 +0200 Planning tweaks commit 094199370ebc55d06c2f634afe6c465d7ce73070 Author: Marcus Bointon Date: Thu Oct 5 14:18:00 2017 +0200 Grey box tweaks commit 04de7a90f8a811cf056c9e96509582c9a0f151cf Author: Marcus Bointon Date: Mon Feb 27 17:20:12 2017 +0100 Formatting cleanup (cherry picked from commit 53ff916) commit e73ed1be1944a2738136bc15fd46661d17d4d368 Author: skyanth Date: Wed Aug 30 10:45:10 2017 +0200 still better p&p snippets commit c64e536a7090dda6610138e216795e083c36a132 Author: skyanth Date: Wed Aug 30 10:25:00 2017 +0200 Updated p&p snippet to use new planning placeholders commit 660de9902993fff98c7d318ffb70b1c773405e37 Author: Peter Mosmans Date: Sun Aug 20 19:37:37 2017 -0700 Clean up code somewhat Some spelling / imperative fixes. commit b981f99dad4923e9ef8bd1cce0325853218f403f Author: Peter Mosmans Date: Sun Aug 20 19:27:20 2017 -0700 Ignore local file structure when querying projects commit e6d6f082e4c3fd9f0419c9a8f39cd16130f0d4dc Author: Peter Mosmans Date: Sun Aug 20 19:26:46 2017 -0700 Re-include helper function to capitalize sentences commit 60ff680e3c80e7aa80d09f9edf13c30f61d36aea Author: Peter Mosmans Date: Sun Aug 20 19:08:09 2017 -0700 Add content of all includes for spell checking commit f3f1c2729e6c3a9057d98bd1a757253bb11200b3 Author: Patricia Piolon Date: Fri Aug 18 11:29:19 2017 +0200 Added new planning element info to release notes commit 1ff5806edde549db6fe6350849f6f8e87a5510d3 Author: skyanth Date: Tue Aug 15 11:30:57 2017 +0200 offerte ‘fee’ element now deals gracefully with non-numbers commit e0c6f0d25b0fc41454514d779232dbc6c88234fd Author: skyanth Date: Tue Aug 1 11:32:21 2017 +0200 Added client_postal_code placeholder commit 63ff61a942fadff76d082b27e70070887ba11a1b 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 a5a14f7413abe9de271e8ee9ce16d05a520668da Author: skyanth Date: Tue Jul 25 15:43:12 2017 +0200 placeholders can now be used in summary tables commit 802ce0a9786a681b6e3e031e0384f02ac2d18d6d 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 449e5b5be809c89d11883671fd841677081721c7 Author: skyanth Date: Tue Jul 25 11:10:24 2017 +0200 Updated phone number commit d5de88582136eae26d259064a117da624e0f6017 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 418408a922d13d62ec9965be262224944979c422 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 d1a44bda5a05c4b15968be13775ce9e469fa4495 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 04ee23b791ae6d18349d8d0ebe60db599f56146d Author: skyanth Date: Mon Jul 24 14:44:08 2017 +0200 Fixed date formatting commit ff94346e3f52db136c0c5079913f91004958bbb2 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 fc6d84463227e33c58276e30e24875797fd50c92 Author: skyanth Date: Wed Jul 5 14:21:00 2017 +0200 removing some files that shouldn’t have been pushed commit e9565b849cde8917dac37519e69154bb6a45d628 Author: skyanth Date: Wed Jul 5 14:17:03 2017 +0200 improved planning data in documents commit 161199c1e2616e9ccfd2a293a5d9ae37e55b9f7d Author: skyanth Date: Wed Jul 5 13:54:04 2017 +0200 merged activity_info and activityinfo, added planning dates commit f1817e4227adc1bb0c93ce778c52f16bfef02337 Author: skyanth Date: Wed Jul 5 13:52:10 2017 +0200 Removed ‘disregard-shifts’ from Pie chart font commit 5982f9fffb7fa3e7684189ffeab379b596313dc6 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 @@ - + - + - + - + - + - + - + - +