Skip to content

Commit 3f23172

Browse files
committed
fixed small issued prior to deployment, added members to /aboutus
1 parent d4a8fd6 commit 3f23172

File tree

10 files changed

+108
-42
lines changed

10 files changed

+108
-42
lines changed

aboutus/index.php

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,56 @@
385385
<div class="spacer">
386386
</div>
387387

388+
<div class="content flex">
389+
<div class="image-member l-4 m-6 s-12">
390+
<div>
391+
<img <?php set_source($awss3.'/img/team/member_13','jpg'); ?>></img>
392+
</div>
393+
</div>
394+
<div class="text l-8 m-6 s-12">
395+
<div class="subsection">
396+
<?php echo($lang['content']['team_member_13']['name']); ?>
397+
</div>
398+
<span><?php echo($lang['content']['team_member_13']['task'][$eng]); ?></span>
399+
<br><br>
400+
<?php echo($lang['content']['team_member_13']['info'][$eng]); ?>
401+
<br><br>
402+
<?php obfuscate_mail($lang['content']['team_member_13']['mail_prefix'], '', '<i class="far fa-lg fa-fw fa-envelope"></i>'); ?>
403+
<?php if ($lang['content']['team_member_13']['linkedin'] != '') echo('<a href="'.$lang['content']['team_member_13']['linkedin'].'"><i class="fab fa-lg fa-fw fa-linkedin-in"></i></a>'); ?>
404+
</div>
405+
</div>
406+
407+
<div class="spacer">
408+
</div>
409+
410+
<div class="spacer">
411+
</div>
412+
413+
<div class="content flex">
414+
<div class="image-member l-4 m-6 s-12">
415+
<div>
416+
<img <?php set_source($awss3.'/img/team/member_14','jpg'); ?>></img>
417+
</div>
418+
</div>
419+
<div class="text l-8 m-6 s-12">
420+
<div class="subsection">
421+
<?php echo($lang['content']['team_member_14']['name']); ?>
422+
</div>
423+
<span><?php echo($lang['content']['team_member_14']['task'][$eng]); ?></span>
424+
<br><br>
425+
<?php echo($lang['content']['team_member_14']['info'][$eng]); ?>
426+
<br><br>
427+
<?php obfuscate_mail($lang['content']['team_member_14']['mail_prefix'], '', '<i class="far fa-lg fa-fw fa-envelope"></i>'); ?>
428+
<?php if ($lang['content']['team_member_14']['linkedin'] != '') echo('<a href="'.$lang['content']['team_member_14']['linkedin'].'"><i class="fab fa-lg fa-fw fa-linkedin-in"></i></a>'); ?>
429+
</div>
430+
</div>
431+
432+
<div class="spacer">
433+
</div>
434+
435+
<div class="spacer">
436+
</div>
437+
388438
<div class="spacer" id="alumni">
389439
</div>
390440

aboutus/lang.php

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,39 +19,39 @@
1919
$lang['content']['team_member_1'] = array(
2020
'name' => 'Patrik Willi',
2121
'task' => array('Präsidium','Co-Head'),
22-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
23-
'mail_prefix' => '',
22+
'info' => array('Patrik is studying for a Master’s degree in Chemistry. In his spare time, he plays acoustic guitar and enjoys sports like squash or running. To ensure that there are always enough chemistry freshmen, he also helps organizing the Swiss Chemistry Olympiad.','Patrik is studying for a Master’s degree in Chemistry. In his spare time, he plays acoustic guitar and enjoys sports like squash or running. To ensure that there are always enough chemistry freshmen, he also helps organizing the Swiss Chemistry Olympiad.'),
23+
'mail_prefix' => 'patrik.willi',
2424
'linkedin' => ''
2525
);
2626

2727
$lang['content']['team_member_2'] = array(
2828
'name' => 'Esther Tschanen-Hammann',
2929
'task' => array('Präsidium','Co-Head'),
30-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
31-
'mail_prefix' => '',
30+
'info' => array('After completing a Master’s degree in Chemistry at ETH, Es- ther is now working in organometallic Synthesis. In her free time, she enjoys bicycling very much and has as of last year traversed all the Swiss Alps passes with a bike. ','After completing a Master’s degree in Chemistry at ETH, Es- ther is now working in organometallic Synthesis. In her free time, she enjoys bicycling very much and has as of last year traversed all the Swiss Alps passes with a bike. '),
31+
'mail_prefix' => 'esther.tschanen',
3232
'linkedin' => ''
3333
);
3434

3535
$lang['content']['team_member_3'] = array(
3636
'name' => 'Markus Böcker',
3737
'task' => array('Räume und Bewilligungen','Rooms and permits'),
38-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
38+
'info' => array('Having done social work in Berlin, he came to Zürich to study chemistry. After leaving the lab or the library Markus likes to unwind while running or watching movies. He is currently heading Industrial Relations for the chemistry students association.','Having done social work in Berlin, he came to Zürich to study chemistry. After leaving the lab or the library Markus likes to unwind while running or watching movies. He is currently heading Industrial Relations for the chemistry students association.'),
3939
'mail_prefix' => '',
4040
'linkedin' => ''
4141
);
4242

4343
$lang['content']['team_member_4'] = array(
4444
'name' => 'Andreas Bumberger',
45-
'task' => array('Test Manager','Chief Test Officer'),
46-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
45+
'task' => array('TBD','TBD'),
46+
'info' => array('As an Austrian skiing enthusiast, Andreas enjoys pursuing his chemistry studies in close proximity to the Alps. After long days in the lab, he likes to keep his stamina up by training for the yearly marathon in his hometown of Linz.','As an Austrian skiing enthusiast, Andreas enjoys pursuing his chemistry studies in close proximity to the Alps. After long days in the lab, he likes to keep his stamina up by training for the yearly marathon in his hometown of Linz.'),
4747
'mail_prefix' => '',
4848
'linkedin' => ''
4949
);
5050

5151
$lang['content']['team_member_5'] = array(
5252
'name' => 'Romain Dubey',
5353
'task' => array('Catering','Catering'),
54-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
54+
'info' => array('Romain comes from Fribourg and pursues a PhD at ETH and Empa. When he is not testing crazy new battery concepts, he strives for a better collaboration between academia and industry. In his free time he loves doing judo and running.','Romain comes from Fribourg and pursues a PhD at ETH and Empa. When he is not testing crazy new battery concepts, he strives for a better collaboration between academia and industry. In his free time he loves doing judo and running.'),
5555
'mail_prefix' => '',
5656
'linkedin' => ''
5757
);
@@ -65,50 +65,66 @@
6565
);
6666

6767
$lang['content']['team_member_7'] = array(
68+
'name' => 'David Hahn',
69+
'task' => array('TBD','TBD'),
70+
'info' => array('Besides pursuing a PhD in computational chemistry, David has a great interest in culinary art and enjoys spoiling his guests (and himself) with exquisite self-made menus. On the other hand, he also likes physical activities like running, biking and skiing across the wonderful Swiss landscape.','Besides pursuing a PhD in computational chemistry, David has a great interest in culinary art and enjoys spoiling his guests (and himself) with exquisite self-made menus. On the other hand, he also likes physical activities like running, biking and skiing across the wonderful Swiss landscape.'),
71+
'mail_prefix' => 'david.hahn',
72+
'linkedin' => ''
73+
);
74+
75+
$lang['content']['team_member_8'] = array(
6876
'name' => 'Clemens Isert',
69-
'task' => array('Test Manager','Chief Test Officer'),
70-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
77+
'task' => array('TBD','TBD'),
78+
'info' => array('Having organized a multitude of events for the chemistry students\' organization in the past, Clemens joined the team of Chemtogether to apply those skills in a different setting. Besides pursuing a degree in Chemical and Bioengineering, his time is spent improving his cooking skills or figuring out how to pull of good shot of espresso.','Having organized a multitude of events for the chemistry students\' organization in the past, Clemens joined the team of Chemtogether to apply those skills in a different setting. Besides pursuing a degree in Chemical and Bioengineering, his time is spent improving his cooking skills or figuring out how to pull of good shot of espresso.'),
7179
'mail_prefix' => '',
7280
'linkedin' => ''
7381
);
7482

75-
$lang['content']['team_member_8'] = array(
83+
$lang['content']['team_member_9'] = array(
7684
'name' => 'Ann-Christin Kerl',
77-
'task' => array('Test Manager','Chief Test Officer'),
78-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
85+
'task' => array('TBD','TBD'),
86+
'info' => array('Ann-Christin grew up near Göttingen and decided to pursue her long existing dream of becoming a Chemist in Zurich. She enjoys being active in several sports such as Swimming or Tennis. Traveling and experiencing different cultures also shape her interests strongly.','Ann-Christin grew up near Göttingen and decided to pursue her long existing dream of becoming a Chemist in Zurich. She enjoys being active in several sports such as Swimming or Tennis. Traveling and experiencing different cultures also shape her interests strongly.'),
7987
'mail_prefix' => '',
8088
'linkedin' => ''
8189
);
8290

83-
$lang['content']['team_member_9'] = array(
91+
$lang['content']['team_member_10'] = array(
8492
'name' => 'Lukas Lätsch',
8593
'task' => array('Webrbung und Design','Promotion and design'),
86-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
87-
'mail_prefix' => '',
94+
'info' => array('Coming from the Black Forest he came to Zurich to study Chemistry. In his spare time music takes a central place: He dances Latin and Standard and has been playing the guitar since 12 years.','Coming from the Black Forest he came to Zurich to study Chemistry. In his spare time music takes a central place: He dances Latin and Standard and has been playing the guitar since 12 years. '),
95+
'mail_prefix' => 'lukas.laetsch',
8896
'linkedin' => ''
8997
);
9098

91-
$lang['content']['team_member_10'] = array(
99+
$lang['content']['team_member_11'] = array(
100+
'name' => 'Josephine Scheiter',
101+
'task' => array('TBD','TBD'),
102+
'info' => array('As she likes exploring new places, Josephine decided to start studying in Zurich. Besides her studies she enjoys playing the piano and doing sports as she has been playing tennis on a competitive level for more than 10 years.', 'As she likes exploring new places, Josephine decided to start studying in Zurich. Besides her studies she enjoys playing the piano and doing sports as she has been playing tennis on a competitive level for more than 10 years.'),
103+
'mail_prefix' => 'josephine.scheiter',
104+
'linkedin' => ''
105+
);
106+
107+
$lang['content']['team_member_12'] = array(
92108
'name' => 'Paul Schnacke',
93-
'task' => array('Test Manager','Chief Test Officer'),
94-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
109+
'task' => array('TBD','TBD'),
110+
'info' => array('Coming from Cologne, Paul studies chemistry and uses his spare time mainly for his interest in modern european history, cooking and watching movies.','Coming from Cologne, Paul studies chemistry and uses his spare time mainly for his interest in modern european history, cooking and watching movies.'),
95111
'mail_prefix' => '',
96112
'linkedin' => ''
97113
);
98114

99-
$lang['content']['team_member_11'] = array(
115+
$lang['content']['team_member_13'] = array(
100116
'name' => 'Cyril Schroeder',
101117
'task' => array('Quästur','Finances'),
102-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
103-
'mail_prefix' => '',
118+
'info' => array('Coming from Luxembourg, Cyril had no great difficulties fitting in Zurich. When not studying, he can be found hitting the gym or running in the woods of the Hönggerberg. ','Coming from Luxembourg, Cyril had no great difficulties fitting in Zurich. When not studying, he can be found hitting the gym or running in the woods of the Hönggerberg. '),
119+
'mail_prefix' => 'cyril.schroeder',
104120
'linkedin' => ''
105121
);
106122

107-
$lang['content']['team_member_12'] = array(
123+
$lang['content']['team_member_14'] = array(
108124
'name' => 'Konstantin Zouboulis',
109125
'task' => array('Firmenakquise','Company acquisition'),
110-
'info' => array('Hier könnte deine Info stehen','Some info from me'),
111-
'mail_prefix' => '',
126+
'info' => array('Konstantin from Berlin is studying chemistry. Besides of his studies he is part of the student magazine’s Editorial team. Since childhood he is an avid sailor and regularly goes on sailing trips. On the mainland he likes to play tennis, going to the gym or reading news magazines. ','Konstantin from Berlin is studying chemistry. Besides of his studies he is part of the student magazine’s Editorial team. Since childhood he is an avid sailor and regularly goes on sailing trips. On the mainland he likes to play tennis, going to the gym or reading news magazines. '),
127+
'mail_prefix' => 'konstantin.zouboulis',
112128
'linkedin' => ''
113129
);
114130

companies/lang.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
'coming_soon' => array(
1717
'Noch hat kein Unternehmen seine Teilnahme endgültig bestätigt! Wir aktualisieren die Teilnehmerliste regelmässig, also folge uns auch auf Facebook und LinkedIn!',
18-
'No company has completly confirmed its attendence yet! We will update you as soon as possible, so check our Facebook or LinkedIn!')
18+
'No company has completely confirmed its attendence yet! We will update you as soon as possible, so check our Facebook or LinkedIn!')
1919
);
2020

2121
?>

exhibitors/index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,11 +109,11 @@
109109
<table class="fa-table">
110110
<tr>
111111
<td><i class="fa-fw far fa-file-alt"></i></td>
112-
<td><a href="link"><?php echo($lang['content']['documents_broschure'][$eng]); ?></a></td>
112+
<td><a href="<?php echo($awss3); ?>/files/2017brochure.pdf"><?php echo($lang['content']['documents_broschure'][$eng]); ?></a></td>
113113
</tr>
114114
<tr>
115115
<td><i class="fa-fw far fa-file-alt"></i></td>
116-
<td><a href="link"><?php echo($lang['content']['documents_guide'][$eng]); ?></a></td>
116+
<td><a href="<?php echo($awss3); ?>/files/2017expoguide.pdf"><?php echo($lang['content']['documents_guide'][$eng]); ?></a></td>
117117
</tr>
118118
</table>
119119
</div>

exhibitors/lang.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
'item1' => array('alle Leistungen des Basispakets','all perks of the base package'),
5858
'item2' => array('Veröffentlichung von Interviews vor der Messe','publishing of interviews prior to the fair'),
5959
'item3' => array('Bewerbung der Teilnahme des Unternehmens auf Sozialen Netzwerken','promotion of the company\'s participation on social media'),
60-
'item4' => array('einseitige Werbung im Messeführer','one-page advertisment in the expo guide'),
61-
'item5' => array('einseitige Werbung in der Fachvereinszeitschrift','one-page advertisment in the student magazine'),
60+
'item4' => array('einseitige Werbung im Messeführer','one-page advertisement in the expo guide'),
61+
'item5' => array('einseitige Werbung in der Fachvereinszeitschrift','one-page advertisement in the student magazine'),
6262
'item6' => array('Firmenlogo auf Studentenvereinswebsite','company logo on the student organisation\'s homepage'),
6363
),
6464

@@ -69,8 +69,8 @@
6969
'item2' => array('einseitiges Firmenprofil im Messeführer','one-page company profile in the expo guide'),
7070
'item3' => array('Veröffentlichung von Interviews vor der Messe','publishing of interviews prior to the fair'),
7171
'item4' => array('Bewerbung der Teilnahme des Unternehmens auf Sozialen Netzwerken','promotion of the company\'s participation on social media'),
72-
'item5' => array('Werbung auf Doppelseite, erster oder letzter Seite im Messeführer','first, center double or last page advertisment in expo guide'),
73-
'item6' => array('Werbung auf erster oder letzter Seite in zwei Ausgaben der Fachvereinszeitschrift','advertisment on first or last page in two editions of the student magazine'),
72+
'item5' => array('Werbung auf Doppelseite, erster oder letzter Seite im Messeführer','first, center double or last page advertisement in expo guide'),
73+
'item6' => array('Werbung auf erster oder letzter Seite in zwei Ausgaben der Fachvereinszeitschrift','advertisement on first or last page in two editions of the student magazine'),
7474
'item7' => array('kurze Firmenpräsentation während der Messe','short presentation during the fair'),
7575
'item8' => array('Raumreservierung für Bewerbungsgespräche','room reservation to conduct interviews'),
7676
'item9' => array('Nutzung der Jobwall während der Messe','use of job wall during the fair'),
@@ -81,7 +81,7 @@
8181
'name' => array('Platinpaket','Platinum package'),
8282
'desc' => array('limitiert auf ein Gold- oder Platinpaket pro Tag','limited to one gold or platinum package per day'),
8383
'item1' => array('alle Leistungen des Goldpakets','all perks of the gold package'),
84-
'item2' => array('Werbung auf der Rückseite des Messeführers','advertisment on the back side of the expo guide'),
84+
'item2' => array('Werbung auf der Rückseite des Messeführers','advertisement on the back side of the expo guide'),
8585
'item3' => array('Präsentation im Auditorium','presentation in the auditorium'),
8686
'item4' => array('Veranstaltung eines exklusiven Karrerie-Events nach Wunsch','organisation of a career event as requested'),
8787
),

fair/index.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,19 @@
9191
</div>
9292

9393
<div class="content flex">
94-
<div class="text l-4 m-12 s-12 fair-introlinks">
94+
<div class="text l-6 m-12 s-12 fair-introlinks">
9595
<a href="https://www.ethz.ch/de/campus/standorte-anreise/standorte-ZH/hoenggerberg.html">
9696
<i class="far fa-fw fa-map"></i>&nbsp;
9797
<span><?php echo($lang['content']['links_directions'][$eng]); ?></span>
9898
</a>
9999
</div>
100-
<div class="text l-4 m-12 s-12 fair-introlinks">
100+
<!-- <div class="text l-4 m-12 s-12 fair-introlinks">
101101
<a href="/files/expoguide.pdf">
102102
<i class="far fa-fw fa-file-alt"></i>&nbsp;
103103
<span><?php echo($lang['content']['links_guide'][$eng]); ?></span>
104104
</a>
105-
</div>
106-
<div class="text l-4 m-12 s-12 fair-introlinks">
105+
</div> -->
106+
<div class="text l-6 m-12 s-12 fair-introlinks">
107107
<a href="/companies/">
108108
<i class="far fa-fw fa-building"></i>&nbsp;
109109
<span><?php echo($lang['content']['links_companies'][$eng]); ?></span>

fair/lang.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
$lang['content']['main_text'] = array(
1818
'Chemtogether 2018 wird am 6. und 7. November 2018 im G-Stock des HCI-Gebäudes der ETH Hönggerberg stattfinden. An beiden Tagen werden jeweils von 9-17 Uhr neun Firmen anwesend sein. Jeder Tag beginnt mit Kaffee &amp; Croissants und endet mit einem Apéro.<br>Die Messe ist offen für jeden, es ist also keine Registrierung notwendig.',
19-
'Chemtogether 2018 will take place on 6th and 7th november, 2018, on the G-floor of the HCI building at the ETH Hönggerberg campus. On each of the days, nine different companies will be present from 9am to 5pm. Each day will begin with coffee &amp; croissants and end with an apéro.<br>The fair is open for everyone, so no registration is necessary.');
19+
'Chemtogether 2018 will take place on 6th and 7th November 2018 on the G-floor of the HCI building at the ETH Hönggerberg campus. On each of the two days, nine different companies will be present from 9am to 5pm. Each day will begin with coffee &amp; croissants and end with an apéro.<br>The fair is open for everyone, so no registration is necessary.');
2020

2121
$lang['content']['links_directions'] = array('Infos zur Anreise','Get directions');
2222
$lang['content']['links_guide'] = array('Messeführer herunterladen','Download the expo guide');

0 commit comments

Comments
 (0)