Skip to content

Commit

Permalink
Merge branch 'gh-pages'
Browse files Browse the repository at this point in the history
  • Loading branch information
driskull committed Feb 29, 2016
2 parents 5d849b2 + fcdf93d commit 268b856
Show file tree
Hide file tree
Showing 51 changed files with 293 additions and 2,018 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The GeoForm template can be accessed via the ArcGIS template gallery or item det
3. Change the sharing host, found in defaults.js inside the config folder for the application, to the sharing URL for ArcGIS Online or Portal. For ArcGIS Online users, keep the default value of www.arcgis.com or specify the name of your organization.
- ArcGIS Online Example: `"sharinghost": location.protocol + "//" + “<your organization name>.maps.arcgis.com`
- Portal Example where `arcgis` is the name of the Web Adaptor: `"sharinghost": location.protocol + "//" + "webadaptor.domain.com/arcgis"`
4. If you are using Portal or a local install of the ArcGIS API for JavaScript, change all references to the ArcGIS API for JavaScript in index.html to refer to your local copy of the API. Search for the references containing `"//js.arcgis.com/3.15"` and replace this portion of the reference with the url to your local install.
4. If you are using Portal or a local install of the ArcGIS API for JavaScript, change all references to the ArcGIS API for JavaScript in index.html to refer to your local copy of the API. Search for the references containing `"//js.arcgis.com/3.16"` and replace this portion of the reference with the url to your local install.
- For example: `"//webadaptor.domain.com/arcgis/jsapi/jsapi"` where `arcgis` is the name of your Web Adaptor.
5. Copy a map or group ID from Portal/ArcGIS Online and replace the default web map ID in the application’s defaults.js file. You can now run the application on your web server or customize the application further.

Expand Down
237 changes: 0 additions & 237 deletions __viewer.html

This file was deleted.

2 changes: 2 additions & 0 deletions config/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ define({
}],
"attachmentInfo":{
},
"submitButtonText": "",
"viewSubmissionsText": "",
"helperServices": {
"geometry": {
"url": null
Expand Down
2 changes: 1 addition & 1 deletion config/templateConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ define({
"latlon"
],
// For esri hosted envoronments only. Will automatically create a sharingurl and proxyurl for the application.
esriEnvironment: false
esriEnvironment: true
});
13 changes: 0 additions & 13 deletions css/__viewer.css

This file was deleted.

5 changes: 0 additions & 5 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,6 @@ body.modal-open,
.fullscreen .app-content {
display: none;
}
/* fix for darkly datepicker in dropdown */

.geoform-darkly .bootstrap-datetimepicker-widget {
color: #333;
}

#geoform .select2-container {
color: #000;
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
<!-- Latest compiled and minified CSS -->
<link rel="stylesheet" type="text/css" href="js/vendor/bootstrap/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="js/vendor/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css">
<link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.15/esri/css/esri.css">
<link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.15/dijit/themes/claro/claro.css">
<link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.16/esri/css/esri.css">
<link rel="stylesheet" type="text/css" href="//js.arcgis.com/3.16/dijit/themes/claro/claro.css">
<link rel="stylesheet" type="text/css" href="js/vendor/font-awesome/css/font-awesome.min.css">
<link rel="stylesheet" type="text/css" href="css/style.css">
<link id="rtlCSS" rel="stylesheet" />
Expand Down Expand Up @@ -72,7 +72,7 @@
dojoConfig.locale = RegExp.$1;
}
</script>
<script type="text/javascript" src="//js.arcgis.com/3.15"></script>
<script type="text/javascript" src="//js.arcgis.com/3.16"></script>
<script type="text/javascript" src="js/vendor/offline/offline.min.js"></script>
<script type="text/javascript" src="js/vendor/IndexedDBShim.min.js"></script>
<script type="text/javascript">
Expand Down
Loading

0 comments on commit 268b856

Please sign in to comment.