OpenHAB
/
openhab-core
mirror of https://github.com/openhab/openhab-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

changed groupId of ui bundles and fragments and updated paper ui fragment (removed md-icons, corrected default path and enabled control ui) (#45) 

Signed-off-by: Kai Kreuzer <kai@openhab.org>
pull/47/head
Kai Kreuzer 2016-05-18 22:00:25 +02:00
parent ee40acfa5f
commit c9845400db
12 changed files with 12 additions and 4875 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bundles/org.openhab.ui.basicui/pom.xml
View File

@ -11,6 +11,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.openhab.ui</groupId>
<artifactId>org.openhab.ui.basicui</artifactId>
<name>openHAB Basic UI Dashboard Integration</name>

1
bundles/org.openhab.ui.classicui/pom.xml
View File

@ -11,6 +11,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.openhab.ui</groupId>
<artifactId>org.openhab.ui.classicui</artifactId>
<name>openHAB Classic UI Dashboard Integration</name>

1
bundles/org.openhab.ui.dashboard/pom.xml
View File

@ -7,6 +7,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.openhab.ui</groupId>
<artifactId>org.openhab.ui.dashboard</artifactId>
<name>openHAB Dashboard UI</name>

1
bundles/org.openhab.ui.iconset.classic/pom.xml
View File

@ -7,6 +7,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.openhab.ui</groupId>
<artifactId>org.openhab.ui.iconset.classic</artifactId>
<name>openHAB Classic Iconset</name>

3650
bundles/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.css
View File

File diff suppressed because one or more lines are too long

BIN
bundles/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.eot
View File

Binary file not shown.

1218
bundles/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.svg
View File

File diff suppressed because it is too large Load Diff
Side by Side

Before

Width:  |  Height:  |  Size: 561 KiB

BIN
bundles/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.ttf
View File

Binary file not shown.

BIN
bundles/org.openhab.ui.paperui/patch/web/fonts/md-icons/md-icons.woff
View File

Binary file not shown.

4
bundles/org.openhab.ui.paperui/patch/web/js/constants.js
View File

@ -2,12 +2,12 @@
angular.module('PaperUI.constants', [])
.constant('globalConfig', {
'advancedDefault': true,
'defaultRoute': '/setup/wizard'
'defaultRoute': '/inbox/search'
}).constant('restConfig', {
'restPath': '/rest',
'eventPath': $('#authentication').data('access-token') != '{{ACCESS_TOKEN}}' ? '/rest/events?access_token=' + $('#authentication').data('access-token') : '/rest/events'
}).constant('moduleConfig', {
'control': false,
'control': true,
'configuration': true,
'setup': true,
'configuration': true,

1
bundles/org.openhab.ui.paperui/pom.xml
View File

@ -11,6 +11,7 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
<groupId>org.openhab.ui</groupId>
<artifactId>org.openhab.ui.paperui</artifactId>
<name>openHAB Paper UI Theme Fragment</name>

10
features/openhab-core/src/main/feature/feature.xml
View File

@ -96,8 +96,8 @@
<feature>openhab-dashboard</feature>
<feature>esh-ui-basic</feature>
<feature>esh-ui-icon</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>
<bundle start-level="80">mvn:org.openhab.ui/org.openhab.ui.basicui/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.ui/org.openhab.ui.iconset.classic/${project.version}</bundle>
<config name="org.eclipse.smarthome.basicui">
defaultSitemap = _default
iconType = svg
@ -109,8 +109,8 @@
<feature>openhab-dashboard</feature>
<feature>esh-ui-classic</feature>
<feature>esh-ui-icon</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>
<bundle start-level="80">mvn:org.openhab.ui/org.openhab.ui.classicui/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.ui/org.openhab.ui.iconset.classic/${project.version}</bundle>
<config name="org.eclipse.smarthome.classicui">
defaultSitemap = _default
</config>
@ -120,7 +120,7 @@
<feature>openhab-runtime-base</feature>
<feature>openhab-dashboard</feature>
<feature>esh-ui-paper</feature>
<bundle start-level="80">mvn:org.openhab.core/org.openhab.ui.paperui/${project.version}</bundle>
<bundle start-level="80">mvn:org.openhab.ui/org.openhab.ui.paperui/${project.version}</bundle>
</feature>
</features>