Skip to content

Commit

Permalink
Merge branch 'develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
green3g authored Feb 1, 2017
2 parents 44caebf + 46a443f commit 50cc823
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 42 deletions.
45 changes: 3 additions & 42 deletions viewer/css/cmv-theme-overrides.css
Original file line number Diff line number Diff line change
Expand Up @@ -26,48 +26,9 @@
}

/* icons for the sidebar */

.cmv .dijitTitlePane .dijitTitlePaneTextNode:before,
.cmv .dijitDialogTitleBar:before {
font-family:'FontAwesome';
margin-right: 8px;
}

.cmv #bookmarks_parent .dijitTitlePaneTextNode:before {
content: '\f02e'
}
.cmv #directions_parent .dijitTitlePaneTextNode:before {
content: '\f277'
}
.cmv #draw_parent .dijitTitlePaneTextNode:before {
content: '\f1fc'
}
.cmv #editor_parent .dijitTitlePaneTextNode:before {
content: '\f040'
}
.cmv #find_parent .dijitTitlePaneTextNode:before {
content: '\f002';
}
.cmv #help_parent .dijitTitlePaneTextNode:before {
content: '\f059'
}
.cmv #identify_parent .dijitTitlePaneTextNode:before {
content: '\f05a'
}
.cmv #layerControl_parent .dijitTitlePaneTextNode:before{
content: '\f00b';
}
.cmv #legend_parent .dijitTitlePaneTextNode:before {
content: '\f03e'
}
.cmv #measurement_parent .dijitTitlePaneTextNode:before {
content: '\f065'
}
.cmv #print_parent .dijitTitlePaneTextNode:before {
content: '\f02f';
}
.cmv #streetview_parent .dijitTitlePaneTextNode:before {
content: '\f21d';
.cmv .dijitTitlePane .dijitTitlePaneTitle .titlePaneIcon {
margin: 0 0 0 8px;
padding-top: 2px;
}
/* end custom icons */

Expand Down
11 changes: 11 additions & 0 deletions viewer/js/config/viewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Identify',
title: i18n.viewer.widgets.identify,
iconClass: 'fa-info-circle',
open: false,
position: 3,
options: 'config/identify'
Expand Down Expand Up @@ -409,6 +410,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Legend',
title: i18n.viewer.widgets.legend,
iconClass: 'fa-picture-o',
open: false,
position: 1,
options: {
Expand All @@ -422,6 +424,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/LayerControl',
title: i18n.viewer.widgets.layerControl,
iconClass: 'fa-th-list',
open: false,
position: 0,
options: {
Expand All @@ -448,6 +451,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Bookmarks',
title: i18n.viewer.widgets.bookmarks,
iconClass: 'fa-bookmark',
open: false,
position: 2,
options: 'config/bookmarks'
Expand All @@ -459,6 +463,7 @@ define([
canFloat: true,
path: 'gis/dijit/Find',
title: i18n.viewer.widgets.find,
iconClass: 'fa-search',
open: false,
position: 3,
options: 'config/find'
Expand All @@ -470,6 +475,7 @@ define([
canFloat: true,
path: 'gis/dijit/Draw',
title: i18n.viewer.widgets.draw,
iconClass: 'fa-paint-brush',
open: false,
position: 4,
options: {
Expand All @@ -484,6 +490,7 @@ define([
canFloat: true,
path: 'gis/dijit/Measurement',
title: i18n.viewer.widgets.measure,
iconClass: 'fa-expand',
open: false,
position: 5,
options: {
Expand All @@ -500,6 +507,7 @@ define([
canFloat: true,
path: 'gis/dijit/Print',
title: i18n.viewer.widgets.print,
iconClass: 'fa-print',
open: false,
position: 6,
options: {
Expand All @@ -518,6 +526,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Directions',
title: i18n.viewer.widgets.directions,
iconClass: 'fa-map-signs',
open: false,
position: 7,
options: {
Expand All @@ -539,6 +548,7 @@ define([
type: 'titlePane',
path: 'gis/dijit/Editor',
title: i18n.viewer.widgets.editor,
iconClass: 'fa-pencil',
open: false,
position: 8,
options: {
Expand Down Expand Up @@ -568,6 +578,7 @@ define([
position: 9,
path: 'gis/dijit/StreetView',
title: i18n.viewer.widgets.streetview,
iconClass: 'fa-street-view',
paneOptions: {
resizable: true,
resizeOptions: {
Expand Down
5 changes: 5 additions & 0 deletions viewer/js/gis/dijit/FloatingTitlePane.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ define([
this.createDomNodes();
this.own(on(window, 'resize', lang.hitch(this, '_endDrag')));
}
if (this.iconClass) {
this.iconNode = domConstruct.create('span', {
'class': 'titlePaneIcon fa fa-fw ' + this.iconClass
}, this.titleNode, 'before');
}
this.own(topic.subscribe('titlePane/event', lang.hitch(this, '_updateWidgetSidebarPosition')));
this.own(aspect.after(this, 'toggle', lang.hitch(this, '_afterToggle')));
this.inherited(arguments);
Expand Down
1 change: 1 addition & 0 deletions viewer/js/viewer/_WidgetsMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ define([
var tp,
options = lang.mixin({
title: widgetConfig.title || 'Widget',
iconClass: widgetConfig.iconClass,
open: widgetConfig.open || false,
canFloat: widgetConfig.canFloat || false,
resizable: widgetConfig.resizable || false
Expand Down

0 comments on commit 50cc823

Please sign in to comment.