diff --git a/kadmos/vistoms/static/agile_logo.png b/kadmos/vistoms/static/agile_logo.png
deleted file mode 100644
index a9e2cae589446fd10b9c0524e5dc5094ad13991c..0000000000000000000000000000000000000000
Binary files a/kadmos/vistoms/static/agile_logo.png and /dev/null differ
diff --git a/kadmos/vistoms/static/pictures/AGILE_Logo.png b/kadmos/vistoms/static/pictures/AGILE_Logo.png
index d89f1b054895671cb14c52786cc0eeb794572f74..a9e2cae589446fd10b9c0524e5dc5094ad13991c 100644
Binary files a/kadmos/vistoms/static/pictures/AGILE_Logo.png and b/kadmos/vistoms/static/pictures/AGILE_Logo.png differ
diff --git a/kadmos/vistoms/static/agile.png b/kadmos/vistoms/static/pictures/agile.png
similarity index 100%
rename from kadmos/vistoms/static/agile.png
rename to kadmos/vistoms/static/pictures/agile.png
diff --git a/kadmos/vistoms/static/agile_logo_small.png b/kadmos/vistoms/static/pictures/agile_logo_small.png
similarity index 100%
rename from kadmos/vistoms/static/agile_logo_small.png
rename to kadmos/vistoms/static/pictures/agile_logo_small.png
diff --git a/kadmos/vistoms/static/agile_partners.png b/kadmos/vistoms/static/pictures/agile_partners.png
similarity index 100%
rename from kadmos/vistoms/static/agile_partners.png
rename to kadmos/vistoms/static/pictures/agile_partners.png
diff --git a/kadmos/vistoms/static/pictures/background.jpeg b/kadmos/vistoms/static/pictures/background.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..16e5512caeb16ee4567363e956c56b833141d4d1
Binary files /dev/null and b/kadmos/vistoms/static/pictures/background.jpeg differ
diff --git a/kadmos/vistoms/templates/VISTOMS.html b/kadmos/vistoms/templates/VISTOMS.html
index c5ac4467aabc5fe8bafa81dd344700345a74fabb..23fc25996fe98321d12e0e4a0327f128f2e4040f 100644
--- a/kadmos/vistoms/templates/VISTOMS.html
+++ b/kadmos/vistoms/templates/VISTOMS.html
@@ -35,23 +35,19 @@
<body>
<nav style="position:fixed" class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation">
- <span class="navbar-toggler-icon"></span>
- </button>
<div class="collapse navbar-collapse" id="navbarsExampleDefault">
<ul class="navbar-nav mr-auto">
<li style="margin-left:10pt" class="nav-item">
- <a id="mainPage" class="nav-link" style="cursor: pointer"><img title="Main page" src="static/pictures/Home.png" width="25" height="25"></img> </a>
+ <a id="mainPage" class="nav-link" style="cursor: pointer"><span style="font-size: 18pt" title="Home" class="glyphicon glyphicon-home"></span></a>
</li>
<li style="margin-left:10pt" class="nav-item">
- <a id="tutorial" class="nav-link" target="_blank" href="http://www.agile-project.eu/files/VISTOMS_Tutorial.mp4"><img title="Tutorial" src="static/pictures/Tutorial.png" width="35" height="25"></img></a>
-
+ <a id="tutorial" class="nav-link" target="_blank" href="http://www.agile-project.eu/files/VISTOMS_Tutorial.mp4"><span style="font-size: 18pt" title="Tutorial" class="glyphicon glyphicon-question-sign"></span></a>
</li>
<li style="margin-left:10pt" class="nav-item">
- <a id="email" class="nav-link" href="mailto:support@agile-project.eu"><img title="Contact support team" src="static/pictures/Contact.png" width="40" height="25"></img> </a>
+ <a id="email" class="nav-link" href="mailto:support@agile-project.eu"><span style="font-size: 18pt" title="Contact support team" class="glyphicon glyphicon-envelope"></span></a>
</li>
<li style="margin-left:10pt" class="nav-item">
- <a id="acknowledgements" class="nav-link" href="#"><img title="Acknowledgements" src="static/pictures/Acknowledgements.png" width="25" height="25"></img> </a>
+ <a id="acknowledgements" class="nav-link" href="#"><span style="font-size: 18pt" title="Acknowledgements" class="glyphicon glyphicon-thumbs-up"></span></a>
</li>
<div style="margin-left:10pt" class="dropdown">
<button style="font-size:18pt" class="btn btn-secondary dropdown-toggle" type="button" id="inspect_button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/kadmos/vistoms/templates/acknowledgements.html b/kadmos/vistoms/templates/acknowledgements.html
index 0d10fc79bfc76f7ea9453d29c1d52cb30bded3b7..a0fb3d5244e603b5eb160c76b840fd5449e1b257 100644
--- a/kadmos/vistoms/templates/acknowledgements.html
+++ b/kadmos/vistoms/templates/acknowledgements.html
@@ -6,8 +6,8 @@
<p>The development of the KADMOS/VISTOMS interface and this website have been performed in the framework of the <a href="http://agile-project.eu/">AGILE project</a> (Aircraft 3rd Generation MDO for Innovative Collaboration of Heterogeneous Teams of Experts) and has received funding from the European Union Horizon 2020 Programme (H2020-MG-2014-2015) under grant agreement no. 636202. The authors are grateful to the partners of the AGILE consortium for their contribution and feedback.</p>
<p>With special thanks to Lukas Müller and Maaike de Wit for the creation of the first version of this website interface.</p>
<p>With special thanks to Melvin van Gent for his help and advice on web development.</p>
- <img src="{{url_for('static', filename='agile_logo.png')}}" class="img-responsive" alt="AGILE logo">
- <img src="{{url_for('static', filename='agile_partners.png')}}" class="img-responsive" alt="AGILE partners">
+ <img src="static/pictures/agile_logo.png" class="img-responsive" alt="AGILE logo">
+ <img src="static/pictures/agile_partners.png" class="img-responsive" alt="AGILE partners">
<p></p>
</div>
{% endblock %}
\ No newline at end of file
diff --git a/kadmos/vistoms/templates/base.html b/kadmos/vistoms/templates/base.html
index e748f673c47f45eb454bffef37655a5dcaf31409..87d0fd7cb32b66bd7103c9d4ee0c8dc236fd2e4b 100644
--- a/kadmos/vistoms/templates/base.html
+++ b/kadmos/vistoms/templates/base.html
@@ -6,11 +6,13 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="author" content="Imco van Gent, Lukas Müller, Maaike de Wit">
{% if temp_id %}
- <title>{{ temp_id }} - KADMOS/VISTOMS Interface</title>
+ <title>{{ temp_id }} - MDO System Interface</title>
{% else %}
- <title>KADMOS/VISTOMS Interface</title>
+ <title>MDO System Interface</title>
{% endif %}
- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" >
+ <link rel="stylesheet" href="static/lib/bootstrap/bootstrap.css" rel="stylesheet">
+ <link rel="stylesheet" href="static/lib/bootstrap/bootstrap.min.css"/>
+ <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" >
<link rel=stylesheet href="{{ url_for('static', filename='style.css') }}">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans">
{% block head %}{% endblock %}
@@ -21,34 +23,30 @@
<![endif]-->
</head>
<body>
- <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
- <div class="container">
- <div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <a class="navbar-brand" href="/"><img src="{{url_for('static', filename='agile_logo_small.png')}}" alt="AGILE logo"><span class="navbar-brand-text">KADMOS/VISTOMS interface</span></a>
- </div>
- <div class="navbar-collapse collapse" id="bs-example-navbar-collapse-1">
- <ul class="nav navbar-nav navbar-right">
- <li {% if page == 'start' %}class="active"{% endif %}>
- <a href="/">Start</a>
- </li>
- <li {% if page == 'info' %}class="active"{% endif %}>
- <a href="/info">Info</a>
- </li>
- <li {% if page == 'acknowledgements' %}class="active"{% endif %}>
- <a href="/acknowledgements">Acknowledgements</a>
- </li>
- </ul>
- </div>
- </div>
- </nav>
+ <nav style="position:fixed" class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
+ <div class="collapse navbar-collapse" id="navbarsExampleDefault">
+ <ul class="navbar-nav mr-auto">
+ <li style="margin-left:10pt" {% if page == 'start' %}class="active"{% endif %}>
+ <a id="mainPage" class="nav-link" href="/" style="cursor: pointer"><span style="font-size: 18pt" title="Start" class="glyphicon glyphicon-home"></span></a>
+ </li>
+ <li style="margin-left:10pt" {% if page == 'info' %}class="active"{% endif %}>
+ <a id="info" class="nav-link" href="/info"><span style="font-size: 18pt" title="Info" class="glyphicon glyphicon-info-sign"></span></a>
+ </li>
+ <li style="margin-left:10pt" {% if page == 'acknowledgements' %}class="active"{% endif %}>
+ <a id="email" class="nav-link" href="/acknowledgements"><span style="font-size: 18pt" title="Acknowledgements" class="glyphicon glyphicon-thumbs-up"></span></a>
+ </li>
+ </ul>
+ <div style="float: none;text-align: center;" class="navbar-header">
+ <img style="margin-bottom:10pt" src="static/pictures/AGILE_Icon.png" width="40" height="40"></img>
+ <a style="color: white;font-size:24pt; float:none" class="navbar-brand">MDO System Interface</a>
+ </div>
+
+ </div>
+ </nav>y
{% block content %}{% endblock %}
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
- <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
+ <script src="static/lib/bootstrap/jquery-3.js" integrity="" crossorigin="anonymous"></script>
+ <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery-slim.min.js"><\/script>')</script>
+ <script src="static/lib/bootstrap/popper.js"></script>
+ <script src="static/lib/bootstrap/bootstrap.js"></script>
</body>
</html>
diff --git a/kadmos/vistoms/templates/index.html b/kadmos/vistoms/templates/index.html
index 844d2f5f7d9a1c920a970e438fda5855c2e4fdef..6d375924b36b8ac655a8c6c00c5bf2e9efa6a1b2 100644
--- a/kadmos/vistoms/templates/index.html
+++ b/kadmos/vistoms/templates/index.html
@@ -1,7 +1,12 @@
{% extends "base.html" %}
{% block content %}
<div class="container">
- <h1>Welcome to the KADMOS / VISTOMS interface!</h1>
+ <div style="margin-top:10pt;">
+ <div class="container">
+ <h1 class="display-3">Welcome to the MDO System Interface!</h1>
+ <p style="font-size: 18pt">This package has been created within the context of the European Horizon 2020 project <a href="http://www.agile-project.eu/" target="_blank"><img src="static/pictures/AGILE_Logo_large.png" width="100" height="20"></img></a> </p>
+ </div>
+ </div>
{% include 'message.html' %}
{% include 'error.html' %}
<div class="panel-body blue list group">
diff --git a/kadmos/vistoms/vistoms.py b/kadmos/vistoms/vistoms.py
index 886a9ec96cff4e894630c17c5bb4c1e846c5e178..4a92dd1189435c2fe505fbdd3e9540654136f346 100644
--- a/kadmos/vistoms/vistoms.py
+++ b/kadmos/vistoms/vistoms.py
@@ -2234,7 +2234,7 @@ def run_vistoms(folder=None, write_log=True, open_vistoms=True):
os.makedirs(os.path.dirname(SESSIONS_CATALOG_FOLDER))
# Run the app
app = interface()
- app.run(threaded=True, debug=False)
+ app.run(threaded=True)
# In the app.py (or vistoms.py) I would do it like this at
@@ -2254,7 +2254,9 @@ if __name__ == '__main__':
folder = os.path.join(args[args.index('-folder') + 1],'')
assert isinstance(folder, basestring), 'Folder should be a string.'
else:
- folder = None
+ #@aigner: Temporary hack. folder should be "None" again later!
+ folder = "C:/Users/aigne/Desktop/VISTOMS/vistoms_tmp"
+ #folder = None
# Check if open_vistoms is given in args
if '-open' in args:
open_vistoms = args[args.index('-open') + 1]