Differences

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

--- reseda:index [2020/07/16 15:42] – Johanna Jochum
+++ reseda:index [2020/07/17 09:36] – rearrange Joerg Pulz
@@ 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}}
+{{ :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 24: / Line 26: @@
-<WRAP half column round box>
+<WRAP third column round box>
 ===== Publications =====
 {{ :panda:attach_1_.svg?nolink&120}}
@@ Line 55: / Line 57: @@
-<WRAP half column round box>
+<WRAP third column round box>
 ===== Sample Environment =====
 {{ :panda:temperature.svg?nolink&120}}
@@ Line 75: / Line 77: @@
 <WRAP half column round box>
 ===== What's happening at RESEDA? =====
+<html>
-{{rss>https://twitter.com/RESEDA_MLZ 5}}
+<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>
+</html>
 </WRAP>
+<WRAP third column round box>
-<WRAP half column round box>
 ===== Data analysis =====
 {{ :reseda:site-logo-2.png?nolink&120|}}
@@ Line 96: / Line 98: @@
 </WRAP>
+<WRAP third column round box>
-<WRAP group>
-<WRAP half column round box>
 ===== Former members =====
 {{ :panda:welcome.svg?nolink&120}}
@@ Line 106: / Line 104: @@
   * 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>
+</WRAP>

MLZ - Wiki

User Tools

Site Tools

Differences

Page Tools