You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/10/08 21:40:42 UTC
[airavata-django-portal] branch simccs updated (862e549 -> 15474e2)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git.
from 862e549 Removing CDNs
add 968588e Adding additional components to the map
new 15474e2 Merge pull request #13 from gowtham06/simccs
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
django_airavata/apps/admin/package-lock.json | 8546 ++++++++++----------
django_airavata/apps/api/package-lock.json | 806 +-
django_airavata/apps/groups/package-lock.json | 7772 +++++++++---------
.../{static => }/Data/Alberta_BaseNetwork.json | 0
.../{static => }/Data/Illinois_BaseNetwork.json | 0
.../apps/maptool/{static => }/Data/NE_Network.json | 0
.../apps/maptool/{static => }/Data/NE_Sink.json | 0
.../apps/maptool/{static => }/Data/NE_Source.json | 0
.../Ordos Basin_Network.json} | 0
.../{static => }/Data/Ordos Basin_Sink.json | 0
.../{static => }/Data/Ordos Basin_Source.json | 0
.../{static => }/Data/Ordos_Basin_Network.json | 0
.../apps/maptool/Data/Ordos_Basin_Sink.json | 338 +
.../Ordos_Basin_Source.json} | 0
.../Data/Sinks_NATCARB_Coal_For_Gateway.json | 0
.../Sinks_NATCARB_OG_For_Gateway_OnePerGrid.json | 0
.../Data/Sinks_NATCARB_SALINE_For_Gateway.json | 0
.../{static => }/Data/Source_Chemicals.json | 0
.../Data/Source_Coal-based_Liquid_Fuel_Supply.json | 0
...t_of_Equipment_Containing_Fluorintaed_GHGs.json | 0
.../Data/Source_Industrial_Gas_Suppliers.json | 0
.../{static => }/Data/Source_Injection_of_CO2.json | 0
.../maptool/{static => }/Data/Source_Metals.json | 0
.../maptool/{static => }/Data/Source_Minerals.json | 0
...ural_Gas_and_Natural_Gas_Liquids_Suppliers.json | 0
.../maptool/{static => }/Data/Source_Other.json | 0
.../Data/Source_Petroleum_Product_Suppliers.json | 0
.../Source_Petroleum_and_Natural_Gas_Systems.json | 0
.../{static => }/Data/Source_Power_Plants.json | 0
.../{static => }/Data/Source_Pulp_and_Paper.json | 0
.../{static => }/Data/Source_Refineries.json | 0
.../{static => }/Data/Source_Suppliers_of_CO2.json | 0
.../maptool/{static => }/Data/Source_Waste.json | 0
.../{static => }/Data/SoutheastUS_Network.json | 0
.../{static => }/Data/SoutheastUS_Sink.json | 0
.../{static => }/Data/SoutheastUS_Source.json | 0
.../apps/maptool/{static => }/Data/UT_Network.json | 0
.../apps/maptool/{static => }/Data/UT_Sink.json | 0
.../apps/maptool/{static => }/Data/UT_Source.json | 0
.../maptool/{static => }/css/MarkerCluster.css | 0
.../{static => }/css/MarkerCluster_Default.css | 0
.../maptool/{static => }/css/bootstrap.min.css | 0
.../maptool/{static => }/css/images/layers-2x.png | Bin
.../maptool/{static => }/css/images/layers.png | Bin
.../{static => }/css/images/marker-icon-2x.png | Bin
.../{static => }/css/images/marker-icon.png | Bin
.../{static => }/css/images/marker-shadow.png | Bin
.../apps/maptool/{static => }/css/leaflet.css | 1270 +--
.../apps/maptool/{static => }/css/mapTool.css | 0
.../apps/maptool/{static => }/css/temp.css | 0
.../apps/maptool/{templates => }/index.html | 96 +-
.../apps/maptool/{static => }/js/bootstrap.min.js | 0
.../apps/maptool/{static => }/js/jquery.min.js | 0
.../apps/maptool/{static => }/js/leaflet.js | 0
.../{static => }/js/leaflet.markercluster-src.js | 5318 ++++++------
.../apps/maptool/{static => }/js/leafletMap.js | 88 +-
...Basin_Network.json => Ordos Basin_Network.json} | 0
.../apps/maptool/static/Data/Ordos_Basin_Sink.json | 338 +
...s Basin_Source.json => Ordos_Basin_Source.json} | 0
.../apps/maptool/static/css/leaflet.css | 1270 +--
.../maptool/static/js/leaflet.markercluster-src.js | 5318 ++++++------
.../apps/maptool/static/js/leafletMap.js | 88 +-
django_airavata/apps/maptool/temp.html | 127 +
django_airavata/apps/maptool/templates/index.html | 96 +-
django_airavata/apps/maptool/templates/temp.html | 127 +
.../package-lock.json | 2122 ++---
django_airavata/apps/workspace/package-lock.json | 7774 +++++++++---------
django_airavata/static/common/package-lock.json | 3234 ++++----
68 files changed, 22869 insertions(+), 21859 deletions(-)
copy django_airavata/apps/maptool/{static => }/Data/Alberta_BaseNetwork.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Illinois_BaseNetwork.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/NE_Network.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/NE_Sink.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/NE_Source.json (100%)
copy django_airavata/apps/maptool/{static/Data/Ordos_Basin_Network.json => Data/Ordos Basin_Network.json} (100%)
copy django_airavata/apps/maptool/{static => }/Data/Ordos Basin_Sink.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Ordos Basin_Source.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Ordos_Basin_Network.json (100%)
create mode 100644 django_airavata/apps/maptool/Data/Ordos_Basin_Sink.json
copy django_airavata/apps/maptool/{static/Data/Ordos Basin_Source.json => Data/Ordos_Basin_Source.json} (100%)
copy django_airavata/apps/maptool/{static => }/Data/Sinks_NATCARB_Coal_For_Gateway.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Sinks_NATCARB_OG_For_Gateway_OnePerGrid.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Sinks_NATCARB_SALINE_For_Gateway.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Chemicals.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Coal-based_Liquid_Fuel_Supply.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Import_and_Export_of_Equipment_Containing_Fluorintaed_GHGs.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Industrial_Gas_Suppliers.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Injection_of_CO2.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Metals.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Minerals.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Natural_Gas_and_Natural_Gas_Liquids_Suppliers.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Other.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Petroleum_Product_Suppliers.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Petroleum_and_Natural_Gas_Systems.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Power_Plants.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Pulp_and_Paper.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Refineries.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Suppliers_of_CO2.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/Source_Waste.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/SoutheastUS_Network.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/SoutheastUS_Sink.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/SoutheastUS_Source.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/UT_Network.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/UT_Sink.json (100%)
copy django_airavata/apps/maptool/{static => }/Data/UT_Source.json (100%)
copy django_airavata/apps/maptool/{static => }/css/MarkerCluster.css (100%)
copy django_airavata/apps/maptool/{static => }/css/MarkerCluster_Default.css (100%)
copy django_airavata/apps/maptool/{static => }/css/bootstrap.min.css (100%)
copy django_airavata/apps/maptool/{static => }/css/images/layers-2x.png (100%)
copy django_airavata/apps/maptool/{static => }/css/images/layers.png (100%)
copy django_airavata/apps/maptool/{static => }/css/images/marker-icon-2x.png (100%)
copy django_airavata/apps/maptool/{static => }/css/images/marker-icon.png (100%)
copy django_airavata/apps/maptool/{static => }/css/images/marker-shadow.png (100%)
copy django_airavata/apps/maptool/{static => }/css/leaflet.css (95%)
copy django_airavata/apps/maptool/{static => }/css/mapTool.css (100%)
copy django_airavata/apps/maptool/{static => }/css/temp.css (100%)
copy django_airavata/apps/maptool/{templates => }/index.html (84%)
copy django_airavata/apps/maptool/{static => }/js/bootstrap.min.js (100%)
copy django_airavata/apps/maptool/{static => }/js/jquery.min.js (100%)
copy django_airavata/apps/maptool/{static => }/js/leaflet.js (100%)
copy django_airavata/apps/maptool/{static => }/js/leaflet.markercluster-src.js (96%)
copy django_airavata/apps/maptool/{static => }/js/leafletMap.js (91%)
copy django_airavata/apps/maptool/static/Data/{Ordos_Basin_Network.json => Ordos Basin_Network.json} (100%)
create mode 100644 django_airavata/apps/maptool/static/Data/Ordos_Basin_Sink.json
copy django_airavata/apps/maptool/static/Data/{Ordos Basin_Source.json => Ordos_Basin_Source.json} (100%)
create mode 100644 django_airavata/apps/maptool/temp.html
create mode 100644 django_airavata/apps/maptool/templates/temp.html
[airavata-django-portal] 01/01: Merge pull request #13 from
gowtham06/simccs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git
commit 15474e2d3d231a004a35bbe5a2e3c4472a9e238b
Merge: 862e549 968588e
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Oct 8 17:40:38 2018 -0400
Merge pull request #13 from gowtham06/simccs
Adding additional components to the map
django_airavata/apps/admin/package-lock.json | 8546 ++++++++++----------
django_airavata/apps/api/package-lock.json | 806 +-
django_airavata/apps/groups/package-lock.json | 7772 +++++++++---------
.../apps/maptool/Data/Alberta_BaseNetwork.json | 1 +
.../apps/maptool/Data/Illinois_BaseNetwork.json | 1 +
django_airavata/apps/maptool/Data/NE_Network.json | 1 +
django_airavata/apps/maptool/Data/NE_Sink.json | 1 +
django_airavata/apps/maptool/Data/NE_Source.json | 1 +
.../apps/maptool/Data/Ordos Basin_Network.json | 1 +
.../apps/maptool/Data/Ordos Basin_Sink.json | 1 +
.../apps/maptool/Data/Ordos Basin_Source.json | 1 +
.../apps/maptool/Data/Ordos_Basin_Network.json | 1 +
.../apps/maptool/Data/Ordos_Basin_Sink.json | 338 +
.../apps/maptool/Data/Ordos_Basin_Source.json | 1 +
.../Data/Sinks_NATCARB_Coal_For_Gateway.json | 1 +
.../Sinks_NATCARB_OG_For_Gateway_OnePerGrid.json | 1 +
.../Data/Sinks_NATCARB_SALINE_For_Gateway.json | 1 +
.../apps/maptool/Data/Source_Chemicals.json | 1 +
.../Data/Source_Coal-based_Liquid_Fuel_Supply.json | 1 +
...t_of_Equipment_Containing_Fluorintaed_GHGs.json | 1 +
.../Data/Source_Industrial_Gas_Suppliers.json | 1 +
.../apps/maptool/Data/Source_Injection_of_CO2.json | 1 +
.../apps/maptool/Data/Source_Metals.json | 1 +
.../apps/maptool/Data/Source_Minerals.json | 1 +
...ural_Gas_and_Natural_Gas_Liquids_Suppliers.json | 1 +
.../apps/maptool/Data/Source_Other.json | 1 +
.../Data/Source_Petroleum_Product_Suppliers.json | 1 +
.../Source_Petroleum_and_Natural_Gas_Systems.json | 1 +
.../apps/maptool/Data/Source_Power_Plants.json | 1 +
.../apps/maptool/Data/Source_Pulp_and_Paper.json | 1 +
.../apps/maptool/Data/Source_Refineries.json | 1 +
.../apps/maptool/Data/Source_Suppliers_of_CO2.json | 1 +
.../apps/maptool/Data/Source_Waste.json | 1 +
.../apps/maptool/Data/SoutheastUS_Network.json | 1 +
.../apps/maptool/Data/SoutheastUS_Sink.json | 1 +
.../apps/maptool/Data/SoutheastUS_Source.json | 1 +
django_airavata/apps/maptool/Data/UT_Network.json | 1 +
django_airavata/apps/maptool/Data/UT_Sink.json | 1 +
django_airavata/apps/maptool/Data/UT_Source.json | 1 +
django_airavata/apps/maptool/css/MarkerCluster.css | 6 +
.../apps/maptool/css/MarkerCluster_Default.css | 60 +
django_airavata/apps/maptool/css/bootstrap.min.css | 7 +
.../apps/maptool/css/images/layers-2x.png | Bin 0 -> 1259 bytes
django_airavata/apps/maptool/css/images/layers.png | Bin 0 -> 696 bytes
.../apps/maptool/css/images/marker-icon-2x.png | Bin 0 -> 2464 bytes
.../apps/maptool/css/images/marker-icon.png | Bin 0 -> 1466 bytes
.../apps/maptool/css/images/marker-shadow.png | Bin 0 -> 618 bytes
.../apps/maptool/{static => }/css/leaflet.css | 1270 +--
django_airavata/apps/maptool/css/mapTool.css | 147 +
django_airavata/apps/maptool/css/temp.css | 105 +
.../apps/maptool/{templates => }/index.html | 96 +-
django_airavata/apps/maptool/js/bootstrap.min.js | 7 +
django_airavata/apps/maptool/js/jquery.min.js | 2 +
django_airavata/apps/maptool/js/leaflet.js | 5 +
.../{static => }/js/leaflet.markercluster-src.js | 5318 ++++++------
.../apps/maptool/{static => }/js/leafletMap.js | 88 +-
.../maptool/static/Data/Ordos Basin_Network.json | 1 +
.../apps/maptool/static/Data/Ordos_Basin_Sink.json | 338 +
.../maptool/static/Data/Ordos_Basin_Source.json | 1 +
.../apps/maptool/static/css/leaflet.css | 1270 +--
.../maptool/static/js/leaflet.markercluster-src.js | 5318 ++++++------
.../apps/maptool/static/js/leafletMap.js | 88 +-
django_airavata/apps/maptool/temp.html | 127 +
django_airavata/apps/maptool/templates/index.html | 96 +-
django_airavata/apps/maptool/templates/temp.html | 127 +
.../package-lock.json | 2122 ++---
django_airavata/apps/workspace/package-lock.json | 7774 +++++++++---------
django_airavata/static/common/package-lock.json | 3234 ++++----
68 files changed, 23245 insertions(+), 21859 deletions(-)