From 2b810a75c8899a679d5f229b10e0b142901e7d96 Mon Sep 17 00:00:00 2001
From: Kai Kreuzer <kai@openhab.org>
Date: Wed, 30 Dec 2015 23:35:27 +0100
Subject: [PATCH] Changed dashboard feature name and added configs to UIs

Signed-off-by: Kai Kreuzer <kai@openhab.org>
---
 features/karaf/src/main/feature/feature.xml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/features/karaf/src/main/feature/feature.xml b/features/karaf/src/main/feature/feature.xml
index bfd4271cc..e365a6092 100644
--- a/features/karaf/src/main/feature/feature.xml
+++ b/features/karaf/src/main/feature/feature.xml
@@ -25,7 +25,7 @@
         <details>${project.description}</details>
         <feature>shk-esh-io-console-karaf</feature>
         <feature>openhab-runtime-base</feature>
-        <feature>openhab-ui-dashboard</feature>
+        <feature>openhab-dashboard</feature>
         <feature>openhab-misc-restdocs</feature>
         <feature>openhab-misc-certificate</feature>
     </feature>
@@ -55,7 +55,7 @@
     <feature name="openhab-misc-restdocs" description="REST Documentation" version="${project.version}">
         <feature>shk-esh-base</feature>
         <feature>shk-jax-rs-provider-swagger</feature>
-        <feature>openhab-ui-dashboard</feature>
+        <feature>openhab-dashboard</feature>
         <bundle>mvn:org.openhab.core/org.openhab.io.rest.docs/${project.version}</bundle>
     </feature>
 
@@ -65,30 +65,37 @@
 
     <!-- ui -->
 
-    <feature name="openhab-ui-dashboard" description="Dashboard" version="${project.version}">
+    <feature name="openhab-dashboard" description="Dashboard" version="${project.version}">
         <feature>shk-esh-base</feature>
         <bundle>mvn:org.openhab.core/org.openhab.ui.dashboard/${project.version}</bundle>
     </feature>
 
     <feature name="openhab-ui-basic" description="Basic UI" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <feature>openhab-ui-dashboard</feature>
+        <feature>openhab-dashboard</feature>
         <feature>shk-esh-ui-basic</feature>
         <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.basicui/${project.version}</bundle>
         <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.iconset.classic/${project.version}</bundle>
+		<config name="org.eclipse.smarthome.basicui">
+		  defaultSitemap = _default
+		  iconType = svg
+		</config>
     </feature>
 
     <feature name="openhab-ui-classic" description="Classic UI" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <feature>openhab-ui-dashboard</feature>
+        <feature>openhab-dashboard</feature>
         <feature>shk-esh-ui-classic</feature>
         <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.classicui/${project.version}</bundle>
         <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.iconset.classic/${project.version}</bundle>
+		<config name="org.eclipse.smarthome.classicui">
+		  defaultSitemap = _default
+		</config>
     </feature>
 
     <feature name="openhab-ui-paper" description="Paper UI" version="${project.version}">
         <feature>openhab-runtime-base</feature>
-        <feature>openhab-ui-dashboard</feature>
+        <feature>openhab-dashboard</feature>
         <feature>shk-esh-ui-paper</feature>
         <bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.paperui/${project.version}</bundle>
     </feature>