Skip to content

Commit

Permalink
Version 2.0
Browse files Browse the repository at this point in the history
Updates to template for css changes, bug fixes and more responsive
design
  • Loading branch information
mdgio committed Jul 6, 2015
1 parent c851f60 commit c15408d
Show file tree
Hide file tree
Showing 105 changed files with 30,629 additions and 3,228 deletions.
4 changes: 2 additions & 2 deletions AGStoJSON/ArcGISservicestoJSON.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def main(argv=None):

# Get the location and the name of the file to be created
#resultFile = raw_input("Output File: ")
resultFile = "C:\Temp\ArcGISservicesJSONtest.txt"
resultFile = "C:\Temp\ArcGISservicesJSON.txt"

# Specify JSON output format, set pretty = TRUE for pretty Format. Otherwise output will be one long string.
pretty = True
Expand Down Expand Up @@ -246,7 +246,7 @@ def main(argv=None):
# Close the children array [] and the JSON object for the folder.
if folder != "" and folder != "/":
ln = "] } "
if f != (len(folders) - 1):
if f < (len(folders) - 2):
ln = ln + ","
print ln
serviceResultFile.write(ln)
Expand Down
168 changes: 84 additions & 84 deletions basicviewer/AddLayers.js

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions basicviewer/Changes.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
MD iMap Template Changes

7/1/2015
*Update to ArcGIS JS API 3.13.
*Many updates to the styling of the template.
** Button bar now vertical between map and left pane (if no buttons on map, this bar will not be shown).
** Removed gradient.
** Style changes to tabs in left pane.
** Some font changes.
** Styles of drop downs simplified.
** Query results now in bottom pane.
** Basemap gallery in pane at bottom of map.
** Location is no longer a tool on the button bar, rather it's a button on the map below the home button.
*Addition of Search Features tool in upper right. If layers in the map on load, will be able to search for features by their default name (only searches this field).
*Updates to print tool to popup with more choices and not just ESRI's out of the box print tool.
*Update to Query Result grid and tool.
** Removed extra columns at far right of data table.
** Added support for Zoom to Feature functionality.
** When layers are added through Add Data, they are now available to query off of.
** Reset button available during more steps of refining query for ability to start over.
*Updates to Contents tab
**By default, Layer List pane is turned on and called Legend (to match old configuration).
**Ability to turn on only Simplified Legend pane (only shows legend for layers in the map, no on/off or transparency settings).
**Ability to turn on both Simplified and Layer List (in this case simplified will be called Legend and Layer List will be titled just that).
*Removed trailing \ in AddLayers.js service URLs for better coordination with query tool.
*Updated draw tool with color options and more asthetic inferface.
*Updated MD iMap Basemap group to include MD-GIO specific basemaps in web Mercator projection allowing all public users access to MD GIO basemaps. Facilitated in the AGO and hosted template by including the �basemap group name� and �owner� in the app.js parameter basemapGroup{}
*Added a configuration option to disable the Left Pane at application load. Available in AGO configuration mode and also in hosted template (look for the disableLeftPane parameter in app.js)
*Fixed the display and position of the Zoom to County and Address Search widgets in Internet Explorer.
*D3 and C3 libraries added into main file for development uses


10/29/2014
* Added means to show progress when using print tool. "Spinning gif" added to map container--hides when print task is complete or found in error.
* Current issue with MD iMap 2.0 print service. Changed print service from MD Geodata to one of the default ESRI ones.
Expand Down
Binary file added basicviewer/assets/arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw.psd
Binary file not shown.
Binary file added basicviewer/assets/draw/i_draw_anno.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_arrow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_ellipse.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_freeline.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_freepoly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_line.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_point.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_poly.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_rect.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/draw/i_draw_triangle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/popup-sprite.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified basicviewer/assets/toolbar/Basemaps.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified basicviewer/assets/toolbar/location.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added basicviewer/assets/toolbar/toolbar_icons.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 29 additions & 13 deletions basicviewer/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,20 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=7,IE=9" />
<meta name="viewport" content="initial-scale=1, maximum-scale=1,user-scalable=no">
<title>MD iMap</title>
<title>MD iMAP</title>
<link rel="shortcut icon" href="assets/favicon.ico">
<!--<link rel="stylesheet" href="src/libs/jquery/css/ui-lightness/jquery-ui-1.9.2.custom.css" /> -->


<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dijit/themes/claro/claro.css">
<!-- <link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dijit/themes/claro/claro.css">
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dijit/themes/claro/document.css">
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dojox/layout/resources/FloatingPane.css">
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dojox/layout/resources/ResizeHandle.css">
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dojox/widget/TitleGroup/TitleGroup.css">
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dojox/grid/enhanced/resources/EnhancedGrid_rtl.css">
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dojox/grid/enhanced/resources/EnhancedGrid.css">
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/esri/css/esri.css">
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.10/js/dojo/dojox/grid/enhanced/resources/EnhancedGrid.css">-->
<link rel="stylesheet" href="http://js.arcgis.com/3.13/dijit/themes/claro/claro.css">
<link rel="stylesheet" href="http://js.arcgis.com/3.13/esri/css/esri.css">
<link rel="stylesheet" type="text/css" href="src/css/main.css">
<!--
<link rel="stylesheet" type="text/css" href="http://js.arcgis.com/3.11/dijit/themes/claro/claro.css">
Expand All @@ -36,7 +37,7 @@
<link rel="stylesheet" type="text/css" href="src/css/ie.css" />
<![endif]-->

<script src="http://js.arcgis.com/3.10/"></script>
<script type="text/javascript" src="http://js.arcgis.com/3.13/"></script>
<script type="text/javascript" src="src/main.js"></script>
</head>
<body class="claro">
Expand All @@ -57,25 +58,27 @@
</div>
<!--End Header-->
<!-- Main Content Section (map, toolbars, left panel)-->
<div data-dojo-type="dijit/layout/TabContainer" id="leftPane" data-dojo-props="region:'left', splitter:true">
<div data-dojo-type="dijit/layout/TabContainer" id="leftPane" data-dojo-props="region:'left', splitter:'true'">
</div>
<!--End Left Panel-->
<div data-dojo-type="dijit/layout/ContentPane" id="tools" data-dojo-props="region:'left'">
</div>
<!-- Map Section -->

<div id="map" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"center", gutters:"false"'>
<!-- The zoom to Home or initial extent button -->
<div id="HomeButton" > </div>

<div id="LocateButton" > </div>
<!-- Toolbar (Search and Tool Buttons)-->
<!--<div id="toolbarContainer" data-dojo-type="dijit/layout/ContentPane" data-dojo-props='region:"top", gutters:"false", region:"left"'>-->
<div id="toolbarDij" data-dojo-type="dijit/Toolbar">
<div id="webmap-toolbar-right">
<!--create the search tool-->


<div id="tools"> </div>

<div id="gotoPlaces">
<div id="search" > </div><br/>
<div id="search" > </div>
<div id="layerSearch" > </div><br/>

</div>
</div>
Expand All @@ -91,8 +94,21 @@
</div>
<!--Floating window contains the time slider-->
<div id="timeFloater" style='display:none;'> </div>
<div id="btnLpaneToggle" class="PaneToggle"> </div>

<div id="btnLpaneToggle" class="PaneToggle" style='display:none;'> </div>
<div id="attributeDiv">
<div id="btnBpaneToggle"></div>
<div id="attributeFooter">
<div id="attributeHeader">
<div id="attributeTitle" class="attributeTitle">Query Results:</div>
<div id="attributeClose" class="headerButtons"></div>
<div id="attributeMaximize" class="headerButtons"></div>
<div id="attributeMinimize" class="headerButtons"></div>
<div id="exportResults" class="generalButtonStyle">Export To Excel</div>
</div>
<div id="attributeGridContainer"><div id="attributeGrid"></div></div>
</div>
</div>

</div>
<!--end Map section-->

Expand All @@ -101,7 +117,7 @@
</div>-->
<!--End Right Panel-->

<div id="bottomPane" dojotype="dijit/layout/ContentPane" region="bottom" gutters="false" style="color:white;font-size:75%;">Template 10/29/2014
<div id="bottomPane" dojotype="dijit/layout/ContentPane" region="bottom" gutters="false" style="color:white;font-size:75%;">Template 7/6/2015
</div>
<!-- End Main Content section-->
</div>
Expand Down
Loading

0 comments on commit c15408d

Please sign in to comment.