From bfddbff90c1568259fa21db600e35e7d1d98bdc4 Mon Sep 17 00:00:00 2001
From: istasm <mathieu.istas@outlook.com>
Date: Mon, 7 Mar 2022 11:58:41 +0100
Subject: [PATCH] add cdfilb and astropy as dependencies
---
setup.py | 2 +-
webgeodyn/server/__init__.py | 0
webgeodyn/server/datahandlers.py | 0
webgeodyn/server/server.py | 0
webgeodyn/www/controller/homePageController.js | 12 ++++++++++++
webgeodyn/www/index.js | 5 +++++
6 files changed, 18 insertions(+), 1 deletion(-)
mode change 100644 => 100755 webgeodyn/server/__init__.py
mode change 100644 => 100755 webgeodyn/server/datahandlers.py
mode change 100644 => 100755 webgeodyn/server/server.py
diff --git a/setup.py b/setup.py
index 4c11329..7ba94ba 100644
--- a/setup.py
+++ b/setup.py
@@ -25,7 +25,7 @@ setup(
description="A web-based plot tool to visualize Earth core flows",
long_description=open('README.rst').read(),
long_description_content_type='text/x-rst',
- install_requires=["tornado", "numpy", "scipy>1.1", "h5py"],
+ install_requires=["tornado", "numpy", "scipy>1.1", "h5py", "cdflib", "astropy"],
test_suite="webgeodyn.tests",
include_package_data=True,
classifiers=[
diff --git a/webgeodyn/server/__init__.py b/webgeodyn/server/__init__.py
old mode 100644
new mode 100755
diff --git a/webgeodyn/server/datahandlers.py b/webgeodyn/server/datahandlers.py
old mode 100644
new mode 100755
diff --git a/webgeodyn/server/server.py b/webgeodyn/server/server.py
old mode 100644
new mode 100755
diff --git a/webgeodyn/www/controller/homePageController.js b/webgeodyn/www/controller/homePageController.js
index b14b2fb..0261831 100644
--- a/webgeodyn/www/controller/homePageController.js
+++ b/webgeodyn/www/controller/homePageController.js
@@ -12,6 +12,18 @@ class HomePageController{
}
documentReady(){
+ //Add banner
+ let banner = new Banner(
+ '#maincontentdiv',
+ '<h3 class="ui" style="text-align: center"><a href="https://gricad-gitlab.univ-grenoble-alpes.fr/Geodynamo/pygeodyn">pygeodyn</a> (Python geomagnetic data assimilation package) and <a href="https://gricad-gitlab.univ-grenoble-alpes.fr/Geodynamo/webgeodyn">webgeodyn</a> (visualisation tool deployed on this website) are now available for download !</h3>',
+ 'info');
+ //Add long description
+ $('#longDesc').load("view/longDesc.html");
+
+ //Add core flow descriptions
+ $.get("view/coreflowDesc.html", function(data){
+ $('#maincontentdiv .segment').append(data);
+ });
}
}
\ No newline at end of file
diff --git a/webgeodyn/www/index.js b/webgeodyn/www/index.js
index cc0a677..4b75452 100644
--- a/webgeodyn/www/index.js
+++ b/webgeodyn/www/index.js
@@ -28,5 +28,10 @@ $(document).ready(function() {
}
};
+ //Add downloadTab
+ $.get("view/downloadTab.html", function(data){
+ $('#tabMenu').append(data);
+ });
+
window.mc = new MainController();
});
--
GitLab