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/10 14:59:58 UTC

[airavata-django-portal] branch simccs updated (f4f0c6b -> ff22e57)

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 f4f0c6b  Merge branch 'master' into simccs
     add 411fa5f  Changes in UI
     new ff22e57  Merge pull request #15 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:
 .../maptool/static/Data/France_FranceSource.json   |    1 +
 .../apps/maptool/static/js/leafletMap.js           |    8 +-
 .../static/static/Data/Alberta_BaseNetwork.json    |    1 -
 .../static/static/Data/Illinois_BaseNetwork.json   |    1 -
 .../maptool/static/static/Data/NE_Network.json     |    1 -
 .../apps/maptool/static/static/Data/NE_Sink.json   |    1 -
 .../apps/maptool/static/static/Data/NE_Source.json |    1 -
 .../static/static/Data/Ordos Basin_Network.json    |    1 -
 .../static/static/Data/Ordos Basin_Sink.json       |    1 -
 .../static/static/Data/Ordos Basin_Source.json     |    1 -
 .../static/static/Data/Ordos_Basin_Network.json    |    1 -
 .../static/static/Data/Ordos_Basin_Sink.json       |  338 ---
 .../static/static/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 -
 .../static/static/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 -
 .../static/Data/Source_Injection_of_CO2.json       |    1 -
 .../maptool/static/static/Data/Source_Metals.json  |    1 -
 .../static/static/Data/Source_Minerals.json        |    1 -
 ...ural_Gas_and_Natural_Gas_Liquids_Suppliers.json |    1 -
 .../maptool/static/static/Data/Source_Other.json   |    1 -
 .../Data/Source_Petroleum_Product_Suppliers.json   |    1 -
 .../Source_Petroleum_and_Natural_Gas_Systems.json  |    1 -
 .../static/static/Data/Source_Power_Plants.json    |    1 -
 .../static/static/Data/Source_Pulp_and_Paper.json  |    1 -
 .../static/static/Data/Source_Refineries.json      |    1 -
 .../static/Data/Source_Suppliers_of_CO2.json       |    1 -
 .../maptool/static/static/Data/Source_Waste.json   |    1 -
 .../static/static/Data/SoutheastUS_Network.json    |    1 -
 .../static/static/Data/SoutheastUS_Sink.json       |    1 -
 .../static/static/Data/SoutheastUS_Source.json     |    1 -
 .../maptool/static/static/Data/UT_Network.json     |    1 -
 .../apps/maptool/static/static/Data/UT_Sink.json   |    1 -
 .../apps/maptool/static/static/Data/UT_Source.json |    1 -
 .../maptool/static/static/css/MarkerCluster.css    |    6 -
 .../static/static/css/MarkerCluster_Default.css    |   60 -
 .../maptool/static/static/css/bootstrap.min.css    |    7 -
 .../maptool/static/static/css/images/layers-2x.png |  Bin 1259 -> 0 bytes
 .../maptool/static/static/css/images/layers.png    |  Bin 696 -> 0 bytes
 .../static/static/css/images/marker-icon-2x.png    |  Bin 2464 -> 0 bytes
 .../static/static/css/images/marker-icon.png       |  Bin 1466 -> 0 bytes
 .../static/static/css/images/marker-shadow.png     |  Bin 618 -> 0 bytes
 .../apps/maptool/static/static/css/leaflet.css     |  635 -----
 .../apps/maptool/static/static/css/mapTool.css     |  147 --
 .../apps/maptool/static/static/css/temp.css        |  105 -
 .../apps/maptool/static/static/js/bootstrap.min.js |    7 -
 .../apps/maptool/static/static/js/jquery.min.js    |    2 -
 .../apps/maptool/static/static/js/leaflet.js       |    5 -
 .../static/static/js/leaflet.markercluster-src.js  | 2690 --------------------
 .../apps/maptool/static/static/js/leafletMap.js    |  506 ----
 django_airavata/apps/maptool/templates/index.html  |  267 +-
 django_airavata/apps/maptool/templates/temp.html   |    3 +-
 56 files changed, 167 insertions(+), 4655 deletions(-)
 create mode 100644 django_airavata/apps/maptool/static/Data/France_FranceSource.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Alberta_BaseNetwork.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Illinois_BaseNetwork.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/NE_Network.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/NE_Sink.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/NE_Source.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Ordos Basin_Network.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Ordos Basin_Sink.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Ordos Basin_Source.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Ordos_Basin_Network.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Ordos_Basin_Sink.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Ordos_Basin_Source.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Sinks_NATCARB_Coal_For_Gateway.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Sinks_NATCARB_OG_For_Gateway_OnePerGrid.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Sinks_NATCARB_SALINE_For_Gateway.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Chemicals.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Coal-based_Liquid_Fuel_Supply.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Import_and_Export_of_Equipment_Containing_Fluorintaed_GHGs.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Industrial_Gas_Suppliers.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Injection_of_CO2.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Metals.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Minerals.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Natural_Gas_and_Natural_Gas_Liquids_Suppliers.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Other.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Petroleum_Product_Suppliers.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Petroleum_and_Natural_Gas_Systems.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Power_Plants.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Pulp_and_Paper.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Refineries.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Suppliers_of_CO2.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/Source_Waste.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/SoutheastUS_Network.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/SoutheastUS_Sink.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/SoutheastUS_Source.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/UT_Network.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/UT_Sink.json
 delete mode 100644 django_airavata/apps/maptool/static/static/Data/UT_Source.json
 delete mode 100644 django_airavata/apps/maptool/static/static/css/MarkerCluster.css
 delete mode 100644 django_airavata/apps/maptool/static/static/css/MarkerCluster_Default.css
 delete mode 100644 django_airavata/apps/maptool/static/static/css/bootstrap.min.css
 delete mode 100644 django_airavata/apps/maptool/static/static/css/images/layers-2x.png
 delete mode 100644 django_airavata/apps/maptool/static/static/css/images/layers.png
 delete mode 100644 django_airavata/apps/maptool/static/static/css/images/marker-icon-2x.png
 delete mode 100644 django_airavata/apps/maptool/static/static/css/images/marker-icon.png
 delete mode 100644 django_airavata/apps/maptool/static/static/css/images/marker-shadow.png
 delete mode 100644 django_airavata/apps/maptool/static/static/css/leaflet.css
 delete mode 100644 django_airavata/apps/maptool/static/static/css/mapTool.css
 delete mode 100644 django_airavata/apps/maptool/static/static/css/temp.css
 delete mode 100644 django_airavata/apps/maptool/static/static/js/bootstrap.min.js
 delete mode 100644 django_airavata/apps/maptool/static/static/js/jquery.min.js
 delete mode 100644 django_airavata/apps/maptool/static/static/js/leaflet.js
 delete mode 100644 django_airavata/apps/maptool/static/static/js/leaflet.markercluster-src.js
 delete mode 100644 django_airavata/apps/maptool/static/static/js/leafletMap.js

[airavata-django-portal] 01/01: Merge pull request #15 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 ff22e572e0a678dd444ffbefdcfd83a63219bc92
Merge: f4f0c6b 411fa5f
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 10 10:59:54 2018 -0400

    Merge pull request #15 from gowtham06/simccs
    
    Changes in UI

 .../maptool/static/Data/France_FranceSource.json   |    1 +
 .../apps/maptool/static/js/leafletMap.js           |    8 +-
 .../static/static/Data/Alberta_BaseNetwork.json    |    1 -
 .../static/static/Data/Illinois_BaseNetwork.json   |    1 -
 .../maptool/static/static/Data/NE_Network.json     |    1 -
 .../apps/maptool/static/static/Data/NE_Sink.json   |    1 -
 .../apps/maptool/static/static/Data/NE_Source.json |    1 -
 .../static/static/Data/Ordos Basin_Network.json    |    1 -
 .../static/static/Data/Ordos Basin_Sink.json       |    1 -
 .../static/static/Data/Ordos Basin_Source.json     |    1 -
 .../static/static/Data/Ordos_Basin_Network.json    |    1 -
 .../static/static/Data/Ordos_Basin_Sink.json       |  338 ---
 .../static/static/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 -
 .../static/static/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 -
 .../static/Data/Source_Injection_of_CO2.json       |    1 -
 .../maptool/static/static/Data/Source_Metals.json  |    1 -
 .../static/static/Data/Source_Minerals.json        |    1 -
 ...ural_Gas_and_Natural_Gas_Liquids_Suppliers.json |    1 -
 .../maptool/static/static/Data/Source_Other.json   |    1 -
 .../Data/Source_Petroleum_Product_Suppliers.json   |    1 -
 .../Source_Petroleum_and_Natural_Gas_Systems.json  |    1 -
 .../static/static/Data/Source_Power_Plants.json    |    1 -
 .../static/static/Data/Source_Pulp_and_Paper.json  |    1 -
 .../static/static/Data/Source_Refineries.json      |    1 -
 .../static/Data/Source_Suppliers_of_CO2.json       |    1 -
 .../maptool/static/static/Data/Source_Waste.json   |    1 -
 .../static/static/Data/SoutheastUS_Network.json    |    1 -
 .../static/static/Data/SoutheastUS_Sink.json       |    1 -
 .../static/static/Data/SoutheastUS_Source.json     |    1 -
 .../maptool/static/static/Data/UT_Network.json     |    1 -
 .../apps/maptool/static/static/Data/UT_Sink.json   |    1 -
 .../apps/maptool/static/static/Data/UT_Source.json |    1 -
 .../maptool/static/static/css/MarkerCluster.css    |    6 -
 .../static/static/css/MarkerCluster_Default.css    |   60 -
 .../maptool/static/static/css/bootstrap.min.css    |    7 -
 .../maptool/static/static/css/images/layers-2x.png |  Bin 1259 -> 0 bytes
 .../maptool/static/static/css/images/layers.png    |  Bin 696 -> 0 bytes
 .../static/static/css/images/marker-icon-2x.png    |  Bin 2464 -> 0 bytes
 .../static/static/css/images/marker-icon.png       |  Bin 1466 -> 0 bytes
 .../static/static/css/images/marker-shadow.png     |  Bin 618 -> 0 bytes
 .../apps/maptool/static/static/css/leaflet.css     |  635 -----
 .../apps/maptool/static/static/css/mapTool.css     |  147 --
 .../apps/maptool/static/static/css/temp.css        |  105 -
 .../apps/maptool/static/static/js/bootstrap.min.js |    7 -
 .../apps/maptool/static/static/js/jquery.min.js    |    2 -
 .../apps/maptool/static/static/js/leaflet.js       |    5 -
 .../static/static/js/leaflet.markercluster-src.js  | 2690 --------------------
 .../apps/maptool/static/static/js/leafletMap.js    |  506 ----
 django_airavata/apps/maptool/templates/index.html  |  267 +-
 django_airavata/apps/maptool/templates/temp.html   |    3 +-
 56 files changed, 167 insertions(+), 4655 deletions(-)