Differences

This shows you the differences between two versions of the page.

--- reseda:index [2020/07/16 14:55] – Johanna Jochum
+++ reseda:index [2020/07/17 09:11] – Johanna Jochum
@@ Line 1: / Line 1: @@
-====== RESEDA ======
+====== Welcome @ RESEDA ======
-Hi and welcome at RESEDA!
+{{:reseda:reseda_test.jpg?nolink&1200 |}} \\
-RESEDA team - Johanna, Jon, Christian, Peter, Lukas
+**RESEDA team** - Johanna, Jon, Christian, Andreas, Peter, Lukas
 ----
@@ Line 11: / Line 12: @@
 <WRAP half column round box>
 ===== News =====
-{{ :panda:news_1_.svg?nolink&120}}
-  * Christian Franz left RESEDA, we wish him all the best at PANDA
+{{ :reseda:reseda_logo_small.png?nolink&120|}}
-  *
+  * Christian Franz left RESEDA, we wish him all the best at PANDA/TOPAS
+  * The new sample table from JJ-Xray is being installed
   *
   *
@@ Line 43: / Line 45: @@
 ===== Newcomer guide =====
 {{ :panda:question.svg?nolink&120}}
-Are you new to PANDA? You should read our short introduction guide, where you will learn:
+Are you new to RESEDA? If so, you should watch this [[https://www.youtube.com/watch?v=GuRw1zfD6Mo|short introductory talk]] and check out our introduction guide, where you will learn:
   * about our accessible energy-moment space
@@ Line 75: / Line 77: @@
 <WRAP half column round box>
 ===== What's happening at RESEDA? =====
-{{ :panda:calculator.svg?nolink&120}}
+<html>
+<a class="twitter-timeline" data-width="500" data-height="500" href="https://twitter.com/RESEDA_MLZ?ref_src=twsrc%5Etfw">Tweets by RESEDA_MLZ</a> <script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
-{{rss>https://twitter.com/RESEDA_MLZ 5}}
+</html>
 </WRAP>
@@ Line 94: / Line 96: @@
-[[:reseda:analysis|data analysis section]]
+[[:reseda:analysis|Data Analysis Section]]
 </WRAP>
@@ Line 107: / Line 109: @@
   * Christian Franz - https://mlz-garching.de/topas/de
-  * Thorsten Schröder -
+  * Steffen Säubert - http://www.rosslabcsu.com/people/
-  * Jonas Kindervater -
+  * Thorsten Schröder - Osram
-  * ...
+  * Jonas Kindervater - Carl Zeiss SMT GmbH
-  *
+  * Maximilian Krautloher - Max Planck Institut Stuttgart
-  *
-  *
-  *
 </WRAP>

MLZ - Wiki

User Tools

Site Tools

Differences

Page Tools