${i18n.optionsLabel}
diff --git a/viewer/js/gis/dijit/FloatingTitlePane.js b/viewer/js/gis/dijit/FloatingTitlePane.js
index 6c9e05c16..189a220e0 100644
--- a/viewer/js/gis/dijit/FloatingTitlePane.js
+++ b/viewer/js/gis/dijit/FloatingTitlePane.js
@@ -38,7 +38,7 @@ define([
}
if (this.iconClass) {
this.iconNode = domConstruct.create('span', {
- 'class': 'titlePaneIcon fa fa-fw ' + this.iconClass
+ 'class': 'titlePaneIcon ' + this.iconClass
}, this.titleNode, 'before');
}
this.own(topic.subscribe('titlePane/event', lang.hitch(this, '_updateWidgetSidebarPosition')));
diff --git a/viewer/js/gis/dijit/FloatingTitlePane/css/FloatingTitlePane.css b/viewer/js/gis/dijit/FloatingTitlePane/css/FloatingTitlePane.css
index ed17fc8d1..4b842ca71 100644
--- a/viewer/js/gis/dijit/FloatingTitlePane/css/FloatingTitlePane.css
+++ b/viewer/js/gis/dijit/FloatingTitlePane/css/FloatingTitlePane.css
@@ -2,15 +2,18 @@
margin: 0 0 0 8px;
padding-top: 2px;
}
-
-.dijitTitlePane .dijitTitlePaneTitle .floatingWidgetDock:before {
- content: "\f112";
- float: right;
- font-family: FontAwesome;
-}
-
+.dijitTitlePane .dijitTitlePaneTitle .floatingWidgetDock:before,
.dijitTitlePane .dijitTitlePaneTitle .floatingWidgetPopout:before {
content: "\f064";
float: right;
- font-family: FontAwesome;
+ font-family: 'Font Awesome 5 Free';
+ font-weight: 900;
+}
+
+.dijitTitlePane .dijitTitlePaneTitle .floatingWidgetDock:before {
+ -moz-transform: scaleX(-1);
+ -ms-transform: scaleX(-1);
+ -o-transform: scaleX(-1);
+ -webkit-transform: scaleX(-1);
+ transform: scaleX(-1);
}
\ No newline at end of file
diff --git a/viewer/js/gis/dijit/FloatingWidgetDialog.js b/viewer/js/gis/dijit/FloatingWidgetDialog.js
index 02c7bfdfc..0be031b01 100644
--- a/viewer/js/gis/dijit/FloatingWidgetDialog.js
+++ b/viewer/js/gis/dijit/FloatingWidgetDialog.js
@@ -15,7 +15,7 @@ define([
postCreate: function () {
if (this.iconClass) {
this.iconNode = domConstruct.create('span', {
- 'class': 'titlePaneIcon fa fa-fw ' + this.iconClass
+ 'class': 'titlePaneIcon ' + this.iconClass
}, this.titleNode, 'before');
}
if (this.html && this.domTarget) {
diff --git a/viewer/js/gis/dijit/Geocoder/css/Geocoder.css b/viewer/js/gis/dijit/Geocoder/css/Geocoder.css
index 2ff4c4c6c..0803ebcc2 100644
--- a/viewer/js/gis/dijit/Geocoder/css/Geocoder.css
+++ b/viewer/js/gis/dijit/Geocoder/css/Geocoder.css
@@ -19,7 +19,8 @@
.gis_GeocoderDijit .zoomSearchButton:after {
color: #444444;
content: '\f002';
- font-family: FontAwesome;
+ font-family: 'Font Awesome 5 Free';
+ font-weight: 900;
font-size: 16px;
}
diff --git a/viewer/js/gis/dijit/LayerControl.js b/viewer/js/gis/dijit/LayerControl.js
index 583f04996..add574875 100644
--- a/viewer/js/gis/dijit/LayerControl.js
+++ b/viewer/js/gis/dijit/LayerControl.js
@@ -33,15 +33,15 @@ define([
map: null,
layerInfos: [],
icons: {
- expand: 'fa-caret-right fa-fw layerControlIcon-Expand',
- collapse: 'fa-caret-down fa-fw layerControlIcon-Collapse',
- checked: 'fa-check fa-fw fa-border layerControlIcon-Checked',
- unchecked: 'fa-square fa-fw fa-border layerControlIcon-Unchecked',
- indeterminate: 'fa-minus fa-fw fa-border layerControlIcon-Indeterminate',
- update: 'fa-refresh layerControlIcon-Update',
- menu: 'fa-bars layerControlIcon-Menu',
- folder: 'fa-folder fa-fw layerControlIcon-Folder',
- folderOpen: 'fa-folder-open fa-fw layerControlIcon-Folder layerControlIcon-FolderOpen'
+ expand: 'fas fa-caret-right fa-fw layerControlIcon-Expand',
+ collapse: 'fas fa-caret-down fa-fw layerControlIcon-Collapse',
+ checked: 'fas fa-check fa-fw fa-border layerControlIcon-Checked',
+ unchecked: 'fas fa-square fa-fw fa-border layerControlIcon-Unchecked',
+ indeterminate: 'fas fa-minus fa-fw fa-border layerControlIcon-Indeterminate',
+ update: 'fas fa-refresh layerControlIcon-Update',
+ menu: 'fas fa-bars layerControlIcon-Menu',
+ folder: 'fas fa-folder fa-fw layerControlIcon-Folder',
+ folderOpen: 'fas fa-folder-open fa-fw layerControlIcon-Folder layerControlIcon-FolderOpen'
},
separated: false,
overlayReorder: false,
diff --git a/viewer/js/gis/dijit/LayerControl/controls/Dynamic.js b/viewer/js/gis/dijit/LayerControl/controls/Dynamic.js
index 6793f320e..c2c1c5820 100644
--- a/viewer/js/gis/dijit/LayerControl/controls/Dynamic.js
+++ b/viewer/js/gis/dijit/LayerControl/controls/Dynamic.js
@@ -81,10 +81,12 @@ define([
if (this._hasSublayers && this.controlOptions.allSublayerToggles !== false) {
menu.addChild(new MenuItem({
label: i18n.dynamicSublayersOn,
+ iconClass: 'far fa-fw fa-check-square',
onClick: lang.hitch(this, '_toggleAllSublayers', true)
}));
menu.addChild(new MenuItem({
label: i18n.dynamicSublayersOff,
+ iconClass: 'far fa-fw fa-square',
onClick: lang.hitch(this, '_toggleAllSublayers', false)
}));
menu.addChild(new MenuSeparator());
diff --git a/viewer/js/gis/dijit/LayerControl/controls/templates/Control.html b/viewer/js/gis/dijit/LayerControl/controls/templates/Control.html
index e7e224030..f429f9405 100644
--- a/viewer/js/gis/dijit/LayerControl/controls/templates/Control.html
+++ b/viewer/js/gis/dijit/LayerControl/controls/templates/Control.html
@@ -2,19 +2,19 @@
diff --git a/viewer/js/gis/dijit/LayerControl/controls/templates/Folder.html b/viewer/js/gis/dijit/LayerControl/controls/templates/Folder.html
index c62a97f34..20f38b471 100644
--- a/viewer/js/gis/dijit/LayerControl/controls/templates/Folder.html
+++ b/viewer/js/gis/dijit/LayerControl/controls/templates/Folder.html
@@ -2,10 +2,10 @@
|
-
+
|
-
+
|
diff --git a/viewer/js/gis/dijit/LayerControl/controls/templates/Sublayer.html b/viewer/js/gis/dijit/LayerControl/controls/templates/Sublayer.html
index 6d2a2b464..89b4f731d 100644
--- a/viewer/js/gis/dijit/LayerControl/controls/templates/Sublayer.html
+++ b/viewer/js/gis/dijit/LayerControl/controls/templates/Sublayer.html
@@ -2,19 +2,19 @@
diff --git a/viewer/js/gis/dijit/LayerControl/plugins/LayerMenu.js b/viewer/js/gis/dijit/LayerControl/plugins/LayerMenu.js
index 1908610bb..67f5cf099 100644
--- a/viewer/js/gis/dijit/LayerControl/plugins/LayerMenu.js
+++ b/viewer/js/gis/dijit/LayerControl/plugins/LayerMenu.js
@@ -30,6 +30,7 @@ define([
if ((layerType === 'vector' && controller.vectorReorder) || (layerType === 'overlay' && controller.overlayReorder)) {
control._reorderUp = new MenuItem({
label: i18n.moveUp,
+ iconClass: 'fas fa-fw fa-sort-up',
onClick: function () {
controller._moveUp(control);
}
@@ -37,6 +38,7 @@ define([
self.addChild(control._reorderUp);
control._reorderDown = new MenuItem({
label: i18n.moveDown,
+ iconClass: 'fas fa-fw fa-sort-down',
onClick: function () {
controller._moveDown(control);
}
@@ -52,6 +54,7 @@ define([
if ((controlOptions.noZoom !== true && controller.noZoom !== true) || (controller.noZoom === true && controlOptions.noZoom === false)) {
self.addChild(new MenuItem({
label: i18n.zoomTo,
+ iconClass: 'fas fa-fw fa-search',
onClick: function () {
controller._zoomToLayer(layer);
}
@@ -61,6 +64,7 @@ define([
if ((controlOptions.noTransparency !== true && controller.noTransparency !== true) || (controller.noTransparency === true && controlOptions.noTransparency === false)) {
self.addChild(new Transparency({
label: i18n.transparency,
+ iconClass: 'fas fa-fw fa-adjust',
layer: layer
}));
}
@@ -69,12 +73,14 @@ define([
var swipeMenu = new Menu();
swipeMenu.addChild(new MenuItem({
label: i18n.layerSwipeVertical,
+ iconClass: 'fas fa-fw fa-sort fa-rotate-90',
onClick: function () {
controller._swipeLayer(layer, 'vertical');
}
}));
swipeMenu.addChild(new MenuItem({
label: i18n.layerSwipeHorizontal,
+ iconClass: 'fas fa-fw fa-sort',
onClick: function () {
controller._swipeLayer(layer, 'horizontal');
}
@@ -82,6 +88,7 @@ define([
if (controlOptions.swipeScope === true) {
swipeMenu.addChild(new MenuItem({
label: i18n.layerSwipeScope,
+ iconClass: 'fas fa-fw fa-circle',
onClick: function () {
controller._swipeLayer(layer, 'scope');
}
@@ -89,6 +96,7 @@ define([
}
self.addChild(new PopupMenuItem({
label: i18n.layerSwipe,
+ iconClass: 'fas fa-fw fa-sort',
popup: swipeMenu
}));
}
@@ -98,6 +106,7 @@ define([
self.addChild(new MenuSeparator());
self.addChild(new MenuItem({
label: i18n.metadata,
+ iconClass: 'fas fa-fw fa-info-circle',
onClick: function () {
window.open(layer.url, '_blank');
}
@@ -108,6 +117,7 @@ define([
self.addChild(new MenuSeparator());
self.addChild(new MenuItem({
label: i18n.metadata,
+ iconClass: 'fas fa-fw fa-info-circle',
onClick: function () {
window.open(controlOptions.metadataUrl, '_blank');
}
diff --git a/viewer/js/gis/dijit/Print/templates/Print.html b/viewer/js/gis/dijit/Print/templates/Print.html
index 453c6c9a1..9ccc2713d 100644
--- a/viewer/js/gis/dijit/Print/templates/Print.html
+++ b/viewer/js/gis/dijit/Print/templates/Print.html
@@ -30,7 +30,7 @@
-
+
${i18n.printButton.label}
|