From 1c0c19716758103381eec68100e14057cbdbd5c4 Mon Sep 17 00:00:00 2001
From: Philippe Vollenweider <pvollenweider@jahia.com>
Date: Thu, 21 Sep 2017 15:35:56 +0200
Subject: [PATCH 1/3] Add Jahia DX and Jahia Marketing Factory

---
 src/apps.json                       | 19 ++++++++++++++++++-
 src/icons/JahiaDX.svg               |  1 +
 src/icons/JahiaMarketingFactory.svg | 19 +++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 src/icons/JahiaDX.svg
 create mode 100644 src/icons/JahiaMarketingFactory.svg

diff --git a/src/apps.json b/src/apps.json
index 5435100f4..5d3c754bf 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -3956,7 +3956,24 @@
 			},
 			"website": "http://www.jalios.com"
 		},
-		"Java": {
+    "Jahia DX": {
+      "cats": [
+        "1",
+        "47"
+      ],
+      "html": "var contextJsParameters",
+      "icon": "JahiaDX.svg",
+      "website": "http://www.jahia.com/dx"
+    },
+    "Jahia Marketing Factory": {
+      "cats": [
+        "32"
+      ],
+      "html": "contextServerPublicUrl",
+      "icon": "JahiaMarketingFactory.svg",
+      "website": "http://www.jahia.com/marketingfactory"
+    },
+    "Java": {
 			"cats": [
 				"27"
 			],
diff --git a/src/icons/JahiaDX.svg b/src/icons/JahiaDX.svg
new file mode 100644
index 000000000..f6dc0356e
--- /dev/null
+++ b/src/icons/JahiaDX.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192.16 192.16"><defs><style>.cls-1{fill:#209fda;fill-rule:evenodd;}.cls-2{fill:#fff;}</style></defs><title>jahia-dx-logo</title><path class="cls-1" d="M288.62,514.12,205.91,431.4a13.37,13.37,0,0,1,0-18.91l82.71-82.71a13.37,13.37,0,0,1,18.91,0l82.71,82.71a13.37,13.37,0,0,1,0,18.91l-82.71,82.71A13.37,13.37,0,0,1,288.62,514.12Z" transform="translate(-201.99 -325.87)"/><rect class="cls-2" x="347.96" y="411.01" width="22.21" height="22.21" rx="1.34" ry="1.34" transform="translate(-395.31 51.64) rotate(-45)"/><path class="cls-2" d="M342.41,389.76,328.6,375.94a1.34,1.34,0,0,0-1.89,0l-29.52,29.53a1.34,1.34,0,0,1-1.89,0l-29.52-29.53a1.34,1.34,0,0,0-1.89,0l-13.82,13.82a1.34,1.34,0,0,0,0,1.89l76.64,76.65a1.34,1.34,0,0,0,1.89,0l13.82-13.82a1.34,1.34,0,0,0,0-1.89l-29.52-29.52a1.34,1.34,0,0,1,0-1.89l29.52-29.52A1.34,1.34,0,0,0,342.41,389.76Z" transform="translate(-201.99 -325.87)"/><path class="cls-2" d="M250.06,454.48l13.82,13.82a1.34,1.34,0,0,0,1.89,0l22.61-22.62L272.68,430l-22.62,22.61A1.34,1.34,0,0,0,250.06,454.48Z" transform="translate(-201.99 -325.87)"/></svg>
\ No newline at end of file
diff --git a/src/icons/JahiaMarketingFactory.svg b/src/icons/JahiaMarketingFactory.svg
new file mode 100644
index 000000000..057026b54
--- /dev/null
+++ b/src/icons/JahiaMarketingFactory.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 595.3 841.9" style="enable-background:new 0 0 595.3 841.9;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#D7207D;}
+	.st1{fill:#FFFFFF;}
+</style>
+<g>
+	<path class="st0" d="M230.1,414l61.9-61.9c3.9-3.9,10.2-3.9,14.1,0l61.9,61.9c3.9,3.9,3.9,10.2,0,14.1L306.1,490
+		c-3.9,3.9-10.2,3.9-14.1,0l-61.9-61.9C226.2,424.2,226.2,417.9,230.1,414z"/>
+	<g>
+		<path class="st1" d="M282.7,457.8l14.8,14.8c0.8,0.8,2,0.8,2.8,0l25.1-25.1l-17.7-17.7L282.7,455C282,455.8,282,457,282.7,457.8z"
+			/>
+		<path class="st1" d="M297.6,369.4l-14.8,14.8c-0.8,0.8-0.8,2,0,2.8l51.6,51.6l16.3-16.3c0.8-0.8,0.8-2,0-2.8l-50.2-50.2
+			C299.6,368.6,298.4,368.6,297.6,369.4z"/>
+	</g>
+</g>
+</svg>

From 11c145ceb358ed49c2a6067330707e2388eb78c0 Mon Sep 17 00:00:00 2001
From: Philippe Vollenweider <pvollenweider@jahia.com>
Date: Thu, 21 Sep 2017 16:00:12 +0200
Subject: [PATCH 2/3] Fix HTML patterns

---
 src/apps.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apps.json b/src/apps.json
index 5d3c754bf..80b2ca428 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -3961,7 +3961,7 @@
         "1",
         "47"
       ],
-      "html": "var contextJsParameters",
+      "html": "<script id=\"staticAssetAggregatedJavascrip",
       "icon": "JahiaDX.svg",
       "website": "http://www.jahia.com/dx"
     },
@@ -3969,7 +3969,7 @@
       "cats": [
         "32"
       ],
-      "html": "contextServerPublicUrl",
+      "html": "<script type=\"text\/javascript\">\svar contextJsParameters",
       "icon": "JahiaMarketingFactory.svg",
       "website": "http://www.jahia.com/marketingfactory"
     },

From f23bf6236c1c3ddded1982797c2989886d4743fd Mon Sep 17 00:00:00 2001
From: Philippe Vollenweider <pvollenweider@jahia.com>
Date: Thu, 21 Sep 2017 16:19:30 +0200
Subject: [PATCH 3/3] Remove Jahia MF

---
 src/apps.json                       |  8 --------
 src/icons/JahiaMarketingFactory.svg | 19 -------------------
 2 files changed, 27 deletions(-)
 delete mode 100644 src/icons/JahiaMarketingFactory.svg

diff --git a/src/apps.json b/src/apps.json
index 80b2ca428..e77cb636c 100755
--- a/src/apps.json
+++ b/src/apps.json
@@ -3965,14 +3965,6 @@
       "icon": "JahiaDX.svg",
       "website": "http://www.jahia.com/dx"
     },
-    "Jahia Marketing Factory": {
-      "cats": [
-        "32"
-      ],
-      "html": "<script type=\"text\/javascript\">\svar contextJsParameters",
-      "icon": "JahiaMarketingFactory.svg",
-      "website": "http://www.jahia.com/marketingfactory"
-    },
     "Java": {
 			"cats": [
 				"27"
diff --git a/src/icons/JahiaMarketingFactory.svg b/src/icons/JahiaMarketingFactory.svg
deleted file mode 100644
index 057026b54..000000000
--- a/src/icons/JahiaMarketingFactory.svg
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 21.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 595.3 841.9" style="enable-background:new 0 0 595.3 841.9;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill-rule:evenodd;clip-rule:evenodd;fill:#D7207D;}
-	.st1{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M230.1,414l61.9-61.9c3.9-3.9,10.2-3.9,14.1,0l61.9,61.9c3.9,3.9,3.9,10.2,0,14.1L306.1,490
-		c-3.9,3.9-10.2,3.9-14.1,0l-61.9-61.9C226.2,424.2,226.2,417.9,230.1,414z"/>
-	<g>
-		<path class="st1" d="M282.7,457.8l14.8,14.8c0.8,0.8,2,0.8,2.8,0l25.1-25.1l-17.7-17.7L282.7,455C282,455.8,282,457,282.7,457.8z"
-			/>
-		<path class="st1" d="M297.6,369.4l-14.8,14.8c-0.8,0.8-0.8,2,0,2.8l51.6,51.6l16.3-16.3c0.8-0.8,0.8-2,0-2.8l-50.2-50.2
-			C299.6,368.6,298.4,368.6,297.6,369.4z"/>
-	</g>
-</g>
-</svg>