Website build SUMO website/master-12
diff --git a/about/index.html b/about/index.html
index 810be21..c777e0d 100644
--- a/about/index.html
+++ b/about/index.html
@@ -207,82 +207,82 @@
<div class="row text-center" id="components">
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/SUMO.html">
- <h6>SUMO</h6><p class="text-muted">command line simulation</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/sumo.html">
+ <h6>sumo</h6><p class="text-muted">command line simulation</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/SUMO-GUI.html">
- <h6>SUMO-GUI</h6><p class="text-muted">simulation with a graphical user interface</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/sumo-gui.html">
+ <h6>sumo-gui</h6><p class="text-muted">simulation with a graphical user interface</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/NETCONVERT.html">
- <h6>NETCONVERT</h6><p class="text-muted">network importer</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/netconvert.html">
+ <h6>netconvert</h6><p class="text-muted">network importer</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/NETEDIT.html">
- <h6>NETEDIT</h6><p class="text-muted">visual editor for network elements</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/netedit.html">
+ <h6>netedit</h6><p class="text-muted">visual editor for network elements</p>
</a></div>
</div>
</div>
<div class="row text-center">
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/NETGENERATE.html">
- <h6>NETGENERATE</h6><p class="text-muted">abstract networks generator</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/netgenerate.html">
+ <h6>netgenerate</h6><p class="text-muted">abstract networks generator</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/OD2TRIPS.html">
- <h6>OD2TRIPS</h6><p class="text-muted">converter from O/D matrices to trips</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/od2trips.html">
+ <h6>od2trips</h6><p class="text-muted">converter from O/D matrices to trips</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/DUAROUTER.html">
- <h6>DUAROUTER</h6><p class="text-muted">routes generator based on a dynamic user assignment</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/duarouter.html">
+ <h6>duarouter</h6><p class="text-muted">routes generator based on a dynamic user assignment</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/JTRROUTER.html">
- <h6>JTRROUTER</h6><p class="text-muted">routes generator based on turning ratios at intersections</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/jtrrouter.html">
+ <h6>jtrrouter</h6><p class="text-muted">routes generator based on turning ratios at intersections</p>
</a></div>
</div>
</div>
<div class="row text-center">
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/DFROUTER.html">
- <h6>DFROUTER</h6><p class="text-muted">route generator with use of detector data</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/dfrouter.html">
+ <h6>dfrouter</h6><p class="text-muted">route generator with use of detector data</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/MAROUTER.html">
- <h6>MAROUTER</h6><p class="text-muted">macroscopic user assignment based on capacity functions</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/marouter.html">
+ <h6>marouter</h6><p class="text-muted">macroscopic user assignment based on capacity functions</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/POLYCONVERT.html">
- <h6>POLYCONVERT</h6><p class="text-muted">imports geometrical shapes and convert them to be visualized using SUMO-GUI</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/polyconvert.html">
+ <h6>polyconvert</h6><p class="text-muted">imports geometrical shapes and convert them to be visualized using SUMO-GUI</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/ACTIVITYGEN.html">
- <h6>ACTIVITYGEN</h6><p class="text-muted">compute mobility wishes based on population</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/activitygen.html">
+ <h6>activitygen</h6><p class="text-muted">compute mobility wishes based on population</p>
</a></div>
</div>
</div>
<div class="row text-center">
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/Tools/Emissions.html">
- <h6>EMISSIONSMAP</h6><p class="text-muted">emission map generator</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/Tools/Emissions.html#emissionsmap">
+ <h6>emissionsMap</h6><p class="text-muted">emission map generator</p>
</a></div>
</div>
<div class="col-sm-3">
- <div class="application-box"><a href="https://sumo.dlr.de/docs/Tools/Emissions.html">
- <h6>EMISSIONSDRIVINGCYCLE</h6><p class="text-muted">calculates emission values based on a given driving cycle</p>
+ <div class="application-box"><a href="https://sumo.dlr.de/docs/Tools/Emissions.html#emissionsdrivingcycle">
+ <h6>emissionsDrivingCycle</h6><p class="text-muted">calculates emission values based on a given driving cycle</p>
</a></div>
</div>
<div class="col-sm-3">
diff --git a/conference/index.html b/conference/index.html
index 614fb39..b5ccd31 100644
--- a/conference/index.html
+++ b/conference/index.html
@@ -183,128 +183,53 @@
<li>E-Mobility</li>
</ul>
+<h4 id="paper-submission">Paper Submission</h4>
+
+<p>Please submit your final paper using EasyChair <a href="https://easychair.org/">https://easychair.org/</a> until <strong>14.09.2020</strong> using a template from <a href="https://easychair.org/publications/for_authors">https://easychair.org/publications/for_authors</a>. We will try to give feedback shortly after.</p>
+
<h3 id="agenda">Agenda</h3>
-<p>Unfortunately, due to the current corona situation we decided to postpone the SUMO user conference. We are very interested in networking with all conference participants therefore we did not want to cancel the conference. Please save the new date for the SUMO conference: <strong>26.-28. October 2020</strong></p>
+<p>The new Agenda is coming soon…</p>
-<p>At the moment we see no other option and we are very sorry for any inconveniences.</p>
+<!-- Unfortunately, due to the current corona situation we decided to postpone the SUMO user conference. We are very interested in networking with all conference participants therefore we did not want to cancel the conference. Please save the new date for the SUMO conference: **26.-28. October 2020**
-<table>
-<thead>
-<tr>
-<th>Monday</th>
-<th>October 26, 2020</th>
-</tr>
-</thead>
+At the moment we see no other option and we are very sorry for any inconveniences.
-<tbody>
-<tr>
-<td>13:00 - 14:00</td>
-<td>Eclipse Present / Open ADX</td>
-</tr>
+| Monday |October 26, 2020|
+|----------------|---|
+| 13:00 - 14:00 | Eclipse Present / Open ADX |
+| 14:00 - 15:45 | SUMO Tutorial |
+| 16:00 - 17:45 | Ask us Anything |
-<tr>
-<td>14:00 - 15:45</td>
-<td>SUMO Tutorial</td>
-</tr>
+<br>
-<tr>
-<td>16:00 - 17:45</td>
-<td>Ask us Anything</td>
-</tr>
-</tbody>
-</table>
+| Tuesday | October 27, 2020 |
+|----------------|---|
+| 09:30 - 10:15 | Welcome |
+| 10:15 - 11:45 | Scientific Session |
+| 12:30 - 13:30 | Keynote Jordi Casas (AIMSUN) |
+| 13:30 - 15:00 | Scientific Session |
+| 15:30 - 16:30 | Technical Session |
+| 16:30 - 17:30 | Poster Session |
+| 18:00 | Evening Program |
-<p><br></p>
+<br>
-<table>
-<thead>
-<tr>
-<th>Tuesday</th>
-<th>October 27, 2020</th>
-</tr>
-</thead>
+| Wednesday | October 28, 2020 |
+|----------------|---|
+| 09:00 - 10:30 | Scientific Session |
+| 10:45 - 11:45 | Technical Session |
+| 12:30 - 13:30 | Poster Session |
+| 13:30 - 15:00 | Scientific Session |
+| 15:00 - 15:15 | Closing |
+| 15:15 | openMobility Meeting | -->
-<tbody>
-<tr>
-<td>09:30 - 10:15</td>
-<td>Welcome</td>
-</tr>
+<!-- ### Social Event -->
-<tr>
-<td>10:15 - 11:45</td>
-<td>Scientific Session</td>
-</tr>
+<!-- ### Registration
-<tr>
-<td>12:30 - 13:30</td>
-<td>Keynote Jordi Casas (AIMSUN)</td>
-</tr>
-
-<tr>
-<td>13:30 - 15:00</td>
-<td>Scientific Session</td>
-</tr>
-
-<tr>
-<td>15:30 - 16:30</td>
-<td>Technical Session</td>
-</tr>
-
-<tr>
-<td>16:30 - 17:30</td>
-<td>Poster Session</td>
-</tr>
-
-<tr>
-<td>18:00</td>
-<td>Evening Program</td>
-</tr>
-</tbody>
-</table>
-
-<p><br></p>
-
-<table>
-<thead>
-<tr>
-<th>Wednesday</th>
-<th>October 28, 2020</th>
-</tr>
-</thead>
-
-<tbody>
-<tr>
-<td>09:00 - 10:30</td>
-<td>Scientific Session</td>
-</tr>
-
-<tr>
-<td>10:45 - 11:45</td>
-<td>Technical Session</td>
-</tr>
-
-<tr>
-<td>12:30 - 13:30</td>
-<td>Poster Session</td>
-</tr>
-
-<tr>
-<td>13:30 - 15:00</td>
-<td>Scientific Session</td>
-</tr>
-
-<tr>
-<td>15:00 - 15:15</td>
-<td>Closing</td>
-</tr>
-
-<tr>
-<td>15:15</td>
-<td>openMobility Meeting</td>
-</tr>
-</tbody>
-</table>
+The registration fee includes a two and a half day conference program with refreshments, lunch, proceedings and social events in the evening. Accommodation is not included within the registration fee and must be pre-booked separately.
+Register here. -->
<h3 id="language">Language</h3>
diff --git a/images/screenshots/screenshot6.png b/images/screenshots/screenshot6.png
index 0e5ee2d..05d590f 100644
--- a/images/screenshots/screenshot6.png
+++ b/images/screenshots/screenshot6.png
Binary files differ
