Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Updated to latest font awesome icon set

Rich Turner5430ed62abd8
diff --git a/client/src/main/java/org/openremote/app/client/admin/navigation/AdminNavigationImpl.ui.xml b/client/src/main/java/org/openremote/app/client/admin/navigation/AdminNavigationImpl.ui.xml
index cc7001201..a6c332b47 100644
--- a/client/src/main/java/org/openremote/app/client/admin/navigation/AdminNavigationImpl.ui.xml
+++ b/client/src/main/java/org/openremote/app/client/admin/navigation/AdminNavigationImpl.ui.xml
@@ -24,7 +24,7 @@
<w:Hyperlink ui:field="tenantsLink"
addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem}"
- icon="group"
+ icon="users"
text="{managerMessages.manageTenants}"/>
<w:Hyperlink ui:field="usersLink"
diff --git a/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantsImpl.ui.xml b/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantsImpl.ui.xml
index df9cad309..039c7b63a 100644
--- a/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantsImpl.ui.xml
+++ b/client/src/main/java/org/openremote/app/client/admin/tenant/AdminTenantsImpl.ui.xml
@@ -48,7 +48,7 @@
<g:HTMLPanel ui:field="mainContent"
styleName="flex {widgetStyle.MainContent}">
- <w:Headline icon="group"
+ <w:Headline icon="users"
text="{managerMessages.manageTenants}"/>
<g:Label ui:field="noTenantsLabel"
diff --git a/client/src/main/java/org/openremote/app/client/app/HeaderViewImpl.ui.xml b/client/src/main/java/org/openremote/app/client/app/HeaderViewImpl.ui.xml
index 01aad812e..7a2f959e7 100644
--- a/client/src/main/java/org/openremote/app/client/app/HeaderViewImpl.ui.xml
+++ b/client/src/main/java/org/openremote/app/client/app/HeaderViewImpl.ui.xml
@@ -26,24 +26,24 @@
<w:PushButton ui:field="rulesButton"
addStyleNames="{widgetStyle.NavItem}"
- icon="chain"
+ icon="link"
text="{managerMessages.rules}"/>
<w:PushButton ui:field="notificationsButton"
addStyleNames="{widgetStyle.NavItem}"
- icon="send"
+ icon="paper-plane"
text="{managerMessages.notifications}"/>
<w:PushButton ui:field="appsButton"
addStyleNames="{widgetStyle.NavItem}"
- icon="connectdevelop"
+ icon="mobile-alt"
text="{managerMessages.apps}"/>
<g:HTMLPanel styleName="flex"/>
<w:PushButton ui:field="adminButton"
addStyleNames="{widgetStyle.NavItem}"
- icon="gears"
+ icon="cogs"
text="{managerMessages.admin}"/>
<w:PushButton ui:field="userButton"
diff --git a/client/src/main/java/org/openremote/app/client/assets/attributes/AttributeViewImpl.java b/client/src/main/java/org/openremote/app/client/assets/attributes/AttributeViewImpl.java
index a1ed9990c..a847168ae 100644
--- a/client/src/main/java/org/openremote/app/client/assets/attributes/AttributeViewImpl.java
+++ b/client/src/main/java/org/openremote/app/client/assets/attributes/AttributeViewImpl.java
@@ -248,7 +248,7 @@ public class AttributeViewImpl extends FormGroup implements AttributeView {
if (attribute.isExecutable()) {
formLabel.setIcon("cog");
} else if (attribute.isProtocolConfiguration()) {
- formLabel.setIcon("gears");
+ formLabel.setIcon("cogs");
} else {
formLabel.setIcon(attribute.getType().map(AttributeValueType::getIcon).orElse(AttributeValueType.DEFAULT_ICON));
}
diff --git a/client/src/main/java/org/openremote/app/client/assets/tenant/AssetsTenantImpl.ui.xml b/client/src/main/java/org/openremote/app/client/assets/tenant/AssetsTenantImpl.ui.xml
index 1eef00056..2df96c684 100644
--- a/client/src/main/java/org/openremote/app/client/assets/tenant/AssetsTenantImpl.ui.xml
+++ b/client/src/main/java/org/openremote/app/client/assets/tenant/AssetsTenantImpl.ui.xml
@@ -27,7 +27,7 @@
<w:Headline ui:field="headline"
sub="{managerMessages.linkAssetUsers}"
- icon="group"/>
+ icon="users"/>
<assetBrowser:AssetSelector ui:field="assetSelector"/>
diff --git a/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.ui.xml b/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.ui.xml
index 02e3c25d1..fb234c16b 100644
--- a/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.ui.xml
+++ b/client/src/main/java/org/openremote/app/client/rules/RulesEditorImpl.ui.xml
@@ -38,7 +38,7 @@
<w:Hyperlink
addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem}"
- icon="chain"
+ icon="link"
targetHistoryToken="globalRules:"
text="{managerMessages.manageGlobalRulesets}"/>
diff --git a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListImpl.ui.xml b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListImpl.ui.xml
index f1961f675..bdf3535e2 100644
--- a/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListImpl.ui.xml
+++ b/client/src/main/java/org/openremote/app/client/rules/asset/AssetRulesListImpl.ui.xml
@@ -55,7 +55,7 @@
<w:Hyperlink
addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem}"
- icon="chain"
+ icon="link"
targetHistoryToken="globalRules:"
text="{managerMessages.manageGlobalRulesets}"/>
@@ -64,7 +64,7 @@
<g:HTMLPanel ui:field="mainContent"
styleName="flex {widgetStyle.MainContent}">
- <w:Headline ui:field="headline" icon="chain"
+ <w:Headline ui:field="headline" icon="link"
text="{managerMessages.loadingDotdotdot}"
sub="{managerMessages.manageAssetRulesets}"/>
diff --git a/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListImpl.ui.xml b/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListImpl.ui.xml
index 0e45147ca..c88461030 100644
--- a/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListImpl.ui.xml
+++ b/client/src/main/java/org/openremote/app/client/rules/global/GlobalRulesListImpl.ui.xml
@@ -59,7 +59,7 @@
<w:Hyperlink
addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem}"
- icon="chain"
+ icon="link"
targetHistoryToken="globalRules:"
text="{managerMessages.manageGlobalRulesets}"/>
@@ -68,7 +68,7 @@
<g:HTMLPanel ui:field="mainContent"
styleName="flex {widgetStyle.MainContent}">
- <w:Headline ui:field="headline" icon="chain"
+ <w:Headline ui:field="headline" icon="link"
text="{managerMessages.manageGlobalRulesets}"/>
<w:Form ui:field="engineStatusForm" visible="true">
diff --git a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListImpl.ui.xml b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListImpl.ui.xml
index 572b61aa2..1d2915f9a 100644
--- a/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListImpl.ui.xml
+++ b/client/src/main/java/org/openremote/app/client/rules/tenant/TenantRulesListImpl.ui.xml
@@ -59,7 +59,7 @@
<w:Hyperlink
addStyleNames="{style.navItem} {widgetStyle.SecondaryNavItem}"
- icon="chain"
+ icon="link"
targetHistoryToken="globalRules:"
text="{managerMessages.manageGlobalRulesets}"/>
@@ -68,7 +68,7 @@
<g:HTMLPanel ui:field="mainContent"
styleName="flex {widgetStyle.MainContent}">
- <w:Headline ui:field="headline" icon="chain"
+ <w:Headline ui:field="headline" icon="link"
sub="{managerMessages.manageTenantRulesets}"/>
<w:Form ui:field="engineStatusForm" visible="true">
diff --git a/client/src/main/java/org/openremote/app/client/widget/PushButton.java b/client/src/main/java/org/openremote/app/client/widget/PushButton.java
index ae71828ae..fd21ef2ed 100644
--- a/client/src/main/java/org/openremote/app/client/widget/PushButton.java
+++ b/client/src/main/java/org/openremote/app/client/widget/PushButton.java
@@ -37,11 +37,11 @@ public class PushButton extends com.google.gwt.user.client.ui.PushButton {
}
public void setIcon(String icon) {
- iconLabel.getElement().removeClassName("or-Icon fa");
+ iconLabel.getElement().removeClassName("or-Icon fas");
iconLabel.getElement().removeClassName("fa-" + this.icon);
this.icon = icon;
if (icon != null) {
- iconLabel.getElement().addClassName("or-Icon fa fa-" + icon);
+ iconLabel.getElement().addClassName("or-Icon fas fa-" + icon);
}
}
diff --git a/client/src/main/webapp/src/manager/or-manager-console-apps/or-manager-console-apps-view.html b/client/src/main/webapp/src/manager/or-manager-console-apps/or-manager-console-apps-view.html
index 709eea6af..15687c7b6 100644
--- a/client/src/main/webapp/src/manager/or-manager-console-apps/or-manager-console-apps-view.html
+++ b/client/src/main/webapp/src/manager/or-manager-console-apps/or-manager-console-apps-view.html
@@ -27,7 +27,7 @@
<template is="dom-repeat" id="appsList" items="[[apps]]">
<div class$="navItem [[widgetStyle.SecondaryNavItem]] [[widgetStyle.Hyperlink]] [[isActive(item)]]">
- <div class$="[[icon('connectdevelop')]]"></div>
+ <div class$="[[icon('mobile-alt')]]"></div>
<a on-click="onAppSelected">[[item]]</a>
</div>
</template>
diff --git a/client/src/main/webapp/src/or-app/or-app-security.html b/client/src/main/webapp/src/or-app/or-app-security.html
index 5213c3282..f588a5343 100644
--- a/client/src/main/webapp/src/or-app/or-app-security.html
+++ b/client/src/main/webapp/src/or-app/or-app-security.html
@@ -52,7 +52,7 @@
<div id="basicAuthMessage"
class="layout horizontal center or-FormMessages error"
style="display: none;">
- <div class="or-Icon fa fa-warning"></div>
+ <div class="or-Icon fas fa-warning"></div>
<span id="basicAuthMessageText"></span>
</div>
diff --git a/client/src/main/webapp/src/or-app/or-component.html b/client/src/main/webapp/src/or-app/or-component.html
index 22935db4d..24ce0258a 100644
--- a/client/src/main/webapp/src/or-app/or-component.html
+++ b/client/src/main/webapp/src/or-app/or-component.html
@@ -135,7 +135,7 @@
}
icon(name) {
- return "or-Icon fa fa-" + name;
+ return "or-Icon fas fa-" + name;
}
setError(e) {
diff --git a/client/src/main/webapp/src/or-app/or-error-view.html b/client/src/main/webapp/src/or-app/or-error-view.html
index 49a08fa75..89a5f1807 100644
--- a/client/src/main/webapp/src/or-app/or-error-view.html
+++ b/client/src/main/webapp/src/or-app/or-error-view.html
@@ -46,7 +46,7 @@
<div class="or-FormField layout horizontal center-center">
<button class="or-FormButtonPrimary or-PushButton"
onclick="window.location = window.location.href.split('#')[0]">
- <span class="or-Icon fa fa-refresh"></span>
+ <span class="or-Icon fas fa-refresh"></span>
<span class="html-face">Try Again</span>
</button>
</div>
diff --git a/model/src/main/java/org/openremote/model/asset/AssetType.java b/model/src/main/java/org/openremote/model/asset/AssetType.java
index 31aefa09c..f5463c2ab 100644
--- a/model/src/main/java/org/openremote/model/asset/AssetType.java
+++ b/model/src/main/java/org/openremote/model/asset/AssetType.java
@@ -75,11 +75,11 @@ public enum AssetType implements AssetTypeDescriptor {
ROOM(ASSET_NAMESPACE + ":room", "cube"),
- AGENT(ASSET_NAMESPACE + ":agent", "gears"),
+ AGENT(ASSET_NAMESPACE + ":agent", "cogs"),
- CONSOLE(ASSET_NAMESPACE + ":console", "mobile"),
+ CONSOLE(ASSET_NAMESPACE + ":console", "mobile-alt"),
- THING(ASSET_NAMESPACE + ":thing", "gear");
+ THING(ASSET_NAMESPACE + ":thing", "cog");
final protected String value;
final protected String icon;