Skip to content

Commit 346f64e

Browse files
committed
4.3 updates
1 parent 704b017 commit 346f64e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+2758
-2229
lines changed

config/defaults.js

+36-34
Original file line numberDiff line numberDiff line change
@@ -31,70 +31,72 @@ define({
3131
"sharinghost": location.protocol + "//" + "www.arcgis.com",
3232
"customProfileUrl": null,
3333
// Define the profile widget location. Valid values are bottom-center
34-
// and top-center.
35-
"panelLocation": "bottom-center",
36-
// Define the profile units if no units are specified
34+
// and top-center.
35+
"panelLocation": "bottom-center",
36+
// Define the profile units if no units are specified
3737
// arcgis online org units will be used
3838
"units": null,
3939
// Define the title and description text that appears on the panel
4040
"title": null,
4141
"description": null,
4242
// Set splashModal to display a splash screen when the app loads
43-
// Define the splash content using splashTitle and splashContent.
43+
// Define the splash content using splashTitle and splashContent.
4444
"splashModal": false,
4545
"splashTitle": null,
4646
"splashContent": null,
47-
"splashButtonText":null,
47+
"splashButtonText": null,
4848
"markerSymbol": "./images/EsriBluePinCircle26.png",
4949
"markerSymbolWidth": 26,
5050
"markerSymbolHeight": 26,
5151
//If your applcation needs to edit feature layer fields set this value to true. When false the map will
52-
//be dreated with layers that are not set to editable which allows the FeatureLayer to load features optimally.
52+
//be dreated with layers that are not set to editable which allows the FeatureLayer to load features optimally.
5353
"editable": false,
54-
// Define background and text colors for the app.
54+
// Define background and text colors for the app.
5555
"background": "#666", // #009ACD
5656
"backgroundOpacity": "0.9",
57-
"color": "#fff",
57+
"color": "#fff",
5858
// Enable/disable tools
59-
"mapZoom": true, // set to false to disable map zoom slider
59+
"mapZoom": true, // set to false to disable map zoom slider
6060
"search": false, // Search Tool
6161
"searchExtent": true,
62-
"searchLayers":[{
63-
"id": "",
64-
"fields": []
62+
"searchLayers": [{
63+
"id": "",
64+
"fields": []
6565
}],
6666
// Enter custom start location to find (POI, location etc). Note
67-
// this uses the esri default locator
67+
// this uses the esri default locator
6868
"find": null,
6969
//Setup the app to support a custom url parameter. Use this if you want users
7070
//to be able to search for a string field in a layer. For example if the web map
7171
//has parcel data and you'd like to be able to zoom to a feature using its parcel id
72-
//you could add a custom url param named parcel then users could enter
72+
//you could add a custom url param named parcel then users could enter
7373
//a value for that param in the url. index.html?parcel=3203
74-
"customUrlLayer":{
75-
"id": null,//id of the search layer as defined in the web map
76-
"fields": []//Name of the string field to search
74+
"customUrlLayer": {
75+
"id": null, //id of the search layer as defined in the web map
76+
"fields": [] //Name of the string field to search
7777
},
78-
"customUrlParam": null,//Name of url param. For example parcels
79-
"basemaps": false, // Basemap Gallery
80-
"legend": false, // Legend and Layer List
81-
"includesublayers":true,// Include ability to toggle sub layers
82-
"includelayerlegend": true, // Show Legend
78+
"customUrlParam": null, //Name of url param. For example parcels
79+
"basemaps": false, // Basemap Gallery
80+
"basemapToggle": false, // Basemap Toggle instead of gallery
81+
"alt_basemap": "satellite",
82+
"legend": false, // Legend and Layer List
83+
"includesublayers": true, // Include ability to toggle sub layers
84+
"includelayerlegend": true, // Show Legend
8385
"includelayeropacity": false, // Show opacity slider in legend
84-
"share": false, // Share Dialog
86+
"share": false, // Share Dialog
8587
//Replace these with your own bitly key
8688
"bitlyLogin": "arcgis",
8789
"bitlyKey": "R_b8a169f3a8b978b9697f64613bf1db6d",
8890
"elevationDraw": true, // include draw tool
89-
// Profile Chart Colors
90-
"axisFontColor": "#fff", // white
91-
"titleFontColor": "#fff", // white
92-
"axisMajorTickColor": "#fff", // white
93-
"elevationLineColor": "#f2f2f2", // white
94-
"elevationBottomColor":"#696969", //gray
95-
"elevationTopColor": "#8C8C8C", //gray
96-
"skyBottomColor": "#00B2EE", // robin blue
97-
"skyTopColor":"#009ACD", // baby blue
91+
// Profile Chart Colors
92+
"axisFontColor": "#fff", // white
93+
"titleFontColor": "#fff", // white
94+
"axisMajorTickColor": "#fff", // white
95+
"elevationLineColor": "#f2f2f2", // white
96+
"elevationBottomColor": "#696969", //gray
97+
"elevationTopColor": "#8C8C8C", //gray
98+
"skyBottomColor": "#00B2EE", // robin blue
99+
"skyTopColor": "#009ACD", // baby blue
98100
"helperServices": {
99101
"geometry": {
100102
"url": null
@@ -109,8 +111,8 @@ define({
109111
"url": null
110112
}]
111113
},
112-
// This is an option added so that developers working with the
114+
// This is an option added so that developers working with the
113115
// hosted version of the application can apply custom styles
114-
// not used in the download version.
116+
// not used in the download version.
115117
"customstyle": null
116118
});

config/templateConfig.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ define({
5151
"extent",
5252
"level",
5353
"marker",
54-
"find" // example param. ?theme=<my theme>
54+
"find", "sharedTheme", "sharedThemeItem"
5555
],
5656
// Most users will not need to modify this value. For esri hosting environments only. Will automatically create a "sharinghost" and "proxyurl" for the application. Only set this is to true if the app is going to be stored on Esri's hosting servers. If you are using your own custom hosted portal, set the "sharinghost" in defaults.js instead of setting this to true.
57-
esriEnvironment: true
57+
esriEnvironment: false
5858
});

css/main.css

+108-9
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,79 @@ body {
1313
width: 100%;
1414
height: 100%;
1515
}
16+
g#mapDiv_graphics_layer path {
17+
fill-opacity: 0;
18+
}
19+
#elevInfo{
20+
padding:5px 5px 5px 10px;
21+
font-size: .8em;
22+
}
23+
#toggle{
24+
position: absolute;
25+
top: 20px;
26+
right: 20px;
27+
}
28+
#toggle.bottom{
29+
bottom:20px;
30+
left:20px;
31+
top:auto;
32+
right:auto;
33+
}
34+
35+
.BasemapToggle .toggleButton {
36+
background: rgba(255,255,255,0.7);
37+
-moz-user-select: -moz-none;
38+
-ms-user-select: none;
39+
-webkit-user-select: none;
40+
user-select: none;
41+
-moz-box-shadow: 0px 1px 1px rgba(0,0,0,0.5);
42+
-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,0.5);
43+
box-shadow: 0px 1px 1px rgba(0,0,0,0.5);
44+
cursor: pointer;
45+
border:none;
46+
border-radius:0 !important;
47+
padding:0;
48+
}
49+
.BasemapToggle .basemapImageContainer {
50+
position: relative;
51+
}
52+
.BasemapToggle .basemapImage {
53+
width: 65px;
54+
height: 65px;
55+
overflow: hidden;
56+
}
57+
.BasemapToggle .basemapImage .basemapBG {
58+
width: 100%;
59+
height: 100%;
60+
margin: 0;
61+
padding: 0;
62+
background-repeat: no-repeat;
63+
background-position: center center;
64+
border-radius: 0 !important;
65+
padding:0;
66+
}
67+
.BasemapToggle .basemapTitle {
68+
display: block;
69+
width: 100%;
70+
color: #4c4c4c;
71+
margin: 0;
72+
font-size: 10px;
73+
line-height: 1.2;
74+
padding: 4px;
75+
background: #fff;
76+
background: rgba(255,255,255,0.7);
77+
text-align: center;
78+
position: absolute;
79+
bottom: 0;
80+
z-index: 2;
81+
-moz-box-sizing: border-box;
82+
-webkit-box-sizing: border-box;
83+
box-sizing: border-box;
84+
border-radius: 0;
85+
}
86+
.BasemapToggle .basemapTitle {
87+
font-family: "Times New Roman", Georgia, "Book Antiqua", serif;
88+
}
1689
.loading-indicator {
1790
/* Loading status */
1891
display: none;
@@ -62,11 +135,11 @@ body {
62135
/*Icon Fonts*/
63136
@font-face {
64137
font-family: 'elevfonts';
65-
src:url('../fonts/icomoon.eot?-dk7kju');
66-
src:url('../fonts/icomoon.eot?#iefix-dk7kju') format('embedded-opentype'),
67-
url('../fonts/icomoon.ttf?-dk7kju') format('truetype'),
68-
url('../fonts/icomoon.woff?-dk7kju') format('woff'),
69-
url('../fonts/icomoon.svg?-dk7kju#icomoon') format('svg');
138+
src:url('../fonts/tool-icons.eot?o2bzxw');
139+
src:url('../fonts/tool-icons.eot?o2bzxw#iefix') format('embedded-opentype'),
140+
url('../fonts/tool-icons.ttf?o2bzxw') format('truetype'),
141+
url('../fonts/tool-icons.woff?o2bzxw') format('woff'),
142+
url('../fonts/tool-icons.svg?o2bzxw#tool-icons') format('svg');
70143
font-weight: normal;
71144
font-style: normal;
72145
}
@@ -180,9 +253,34 @@ elevation profile widget */
180253
height:100%;
181254
width:98%;
182255
}
256+
.esriElevationProfile .esriElevationProfileInfoNode{
257+
display:none;
258+
}
183259
.esriElevationProfile .esriElevationProfileSourceLabel{
184260
display: none;
185261
}
262+
.esriElevationProfile .esriElevationProfileDirectionButton{
263+
margin:0 !important;
264+
position: absolute !important;
265+
bottom:-2px !important;
266+
right: 5px;
267+
width:35px !important;
268+
}
269+
.esriElevationProfile .esriElevationProfileDirectionButton:before{
270+
content:"\e900";
271+
font-family: "elevfonts"
272+
}
273+
.esriElevationProfile .esriElevationProfileDirectionForward,.esriElevationProfile .esriElevationProfileDirectionForward:hover, .esriElevationProfile .esriElevationProfileDirectionReverse, .esriElevationProfile .esriElevationProfileDirectionReverse:hover{
274+
background:none !important;
275+
}
276+
.esriElevationProfile .esriElevationProfileDirectionButton:hover {
277+
color: rgba(59,60,64,0.4) !important;
278+
font-weight: bold !important;
279+
}
280+
/*standby widget updates*/
281+
#dojox_widget_Standby_0 > div:nth-child(1){
282+
background-color:rgba(0,0,0,0) !important;
283+
}
186284
#desc{
187285
display:none;
188286
width:98%;
@@ -359,9 +457,10 @@ that appear below the zoom slider */
359457
}
360458
.closeBtn{
361459
font-size: 14px;
460+
font-weight: bold;
362461
position: absolute;
363-
top:2px;
364-
right:2px;
462+
top:4px;
463+
right:5px;
365464
cursor:pointer;
366465
padding:4px;
367466
z-index: 30;
@@ -371,7 +470,7 @@ that appear below the zoom slider */
371470
}
372471
.dialog-header{
373472
width:100%;
374-
height:20px;
473+
margin-bottom:4px;
375474
}
376475

377476
#legendContainer, #basemapContainer, #shareContainer{
@@ -386,7 +485,7 @@ that appear below the zoom slider */
386485
#legendDiv, #basemapDiv, #shareDiv{
387486
overflow: auto;
388487
height: auto;
389-
width:255px;
488+
width:240px;
390489
max-height: 300px;
391490
padding:1em;
392491
}

fonts/tool-icons.eot

4.63 KB
Binary file not shown.

0 commit comments

Comments
 (0)