fixed people lists to avoid weird floats
svn path=/trunk/; revision=26884
This commit is contained in:
parent
4844c024b8
commit
e421f065d5
@ -201,9 +201,8 @@
|
||||
<employee>freelancer/m</employee>
|
||||
</person>
|
||||
|
||||
<person id="jean" avatar="yes" teams="fr, de, core">
|
||||
<person id="jean" avatar="yes" teams="fr, core">
|
||||
<name>Nicolas Jean</name>
|
||||
<country>DE</country>
|
||||
<country>FR</country>
|
||||
<function volunteers="web">coordinator/m</function>
|
||||
<email>nicoulas (at) fsfe (dot) org</email>
|
||||
@ -341,7 +340,7 @@
|
||||
<person id="piana" avatar="yes" teams="it, ftf">
|
||||
<name>Carlo Piana</name>
|
||||
<country>IT</country>
|
||||
<function country="IT"></function>
|
||||
<function country="IT">seniorcounsel/m</function>
|
||||
<email></email>
|
||||
<link>http://piana.eu/</link>
|
||||
<avatar>/about/piana/piana-avatar.jpg</avatar>
|
||||
|
||||
@ -14,42 +14,43 @@
|
||||
certain areas. Some of them are <a href="members.html">members</a> of the
|
||||
<a href="legal/legal.html">association</a>, some are not.
|
||||
</p>
|
||||
|
||||
<h2>Council</h2>
|
||||
<p>The Executive Council of the FSFE consists of the Executive Director
|
||||
(currently vacant), the President and Vice-President. The Council is
|
||||
responsible for larger budgeting questions, implementation of strategic
|
||||
guidelines, and rights of the national associations.</p>
|
||||
|
||||
<council-members />
|
||||
|
||||
<h2>General Assembly</h2>
|
||||
<p>The General Assembly consists of the <a
|
||||
href="/about/members.html">FSFE's legal body's members</a>. It is
|
||||
responsible for strategic planing, budgeting, agenda-setting, exoneration,
|
||||
and choice and recall of the Executive Council and the Financial
|
||||
Officer.</p>
|
||||
<div id="show-people">
|
||||
<h2>Council</h2>
|
||||
<p>The Executive Council of the FSFE consists of the Executive Director
|
||||
(currently vacant), the President and Vice-President. The Council is
|
||||
responsible for larger budgeting questions, implementation of strategic
|
||||
guidelines, and rights of the national associations.</p>
|
||||
|
||||
<council-members />
|
||||
|
||||
<ga-members />
|
||||
|
||||
<h2>European Core Team</h2>
|
||||
<p>Here you can find people working on the day to day tasks of the
|
||||
organisation on a voluntary or paid basis on core issues: Country team
|
||||
coordinators and their deputies, staff, coordinators of special teams,
|
||||
or system administrators. Not included are a huge number of altering
|
||||
volunteers from our working team, contributors to our campaigns, or to
|
||||
specific topics.</p>
|
||||
|
||||
<core-members />
|
||||
|
||||
<h2>Interns</h2>
|
||||
<p><a href="/contribute/internship.html">Our interns</a> are working on
|
||||
various topics inside FSFE's teams: Supporting ongoing projects and
|
||||
campaigns, coordinating volunteers and communicating with the community,
|
||||
public administrations and other organisations.</p>
|
||||
<h2>General Assembly</h2>
|
||||
<p>The General Assembly consists of the <a
|
||||
href="/about/members.html">FSFE's legal body's members</a>. It is
|
||||
responsible for strategic planing, budgeting, agenda-setting, exoneration,
|
||||
and choice and recall of the Executive Council and the Financial
|
||||
Officer.</p>
|
||||
|
||||
<intern-members />
|
||||
<ga-members />
|
||||
|
||||
<h2>European Core Team</h2>
|
||||
<p>Here you can find people working on the day to day tasks of the
|
||||
organisation on a voluntary or paid basis on core issues: Country team
|
||||
coordinators and their deputies, staff, coordinators of special teams,
|
||||
or system administrators. Not included are a huge number of altering
|
||||
volunteers from our working team, contributors to our campaigns, or to
|
||||
specific topics.</p>
|
||||
|
||||
<core-members />
|
||||
|
||||
<h2>Interns</h2>
|
||||
<p><a href="/contribute/internship.html">Our interns</a> are working on
|
||||
various topics inside FSFE's teams: Supporting ongoing projects and
|
||||
campaigns, coordinating volunteers and communicating with the community,
|
||||
public administrations and other organisations.</p>
|
||||
|
||||
<intern-members />
|
||||
</div>
|
||||
</body>
|
||||
<timestamp>$Date$ $Author$</timestamp>
|
||||
</html>
|
||||
|
||||
@ -16,40 +16,43 @@
|
||||
href="legal/legal.html">l'association</a>, et d'autres ne le sont pas.
|
||||
</p>
|
||||
|
||||
<h2>Conseil</h2>
|
||||
<p>Le conseil exécutif de la FSFE comprend un directeur exécutif (poste
|
||||
pour le moment vacant), le président et le vice-président. Le conseil est
|
||||
responsable des questions budgétaires, de la mise en place des stratégies,
|
||||
et des droits des associations nationales.</p>
|
||||
<div id="show-people">
|
||||
|
||||
<h2>Conseil</h2>
|
||||
<p>Le conseil exécutif de la FSFE comprend un directeur exécutif (poste
|
||||
pour le moment vacant), le président et le vice-président. Le conseil est
|
||||
responsable des questions budgétaires, de la mise en place des stratégies,
|
||||
et des droits des associations nationales.</p>
|
||||
|
||||
<council-members />
|
||||
|
||||
<h2>Assemblée générale</h2>
|
||||
<p>L’assemblée générale comprend <a href="/about/members.html">les membres
|
||||
de la structure juridique de la FSFE</a>. Elle est responsable de
|
||||
l’élaboration des stratégies, du budget, de l’agenda, d’exonérer, choisir
|
||||
et rappeler le conseil exécutif et le trésorier.</p>
|
||||
|
||||
<ga-members />
|
||||
|
||||
<council-members />
|
||||
|
||||
<h2>Assemblée générale</h2>
|
||||
<p>L’assemblée générale comprend <a href="/about/members.html">les membres
|
||||
de la structure juridique de la FSFE</a>. Elle est responsable de
|
||||
l’élaboration des stratégies, du budget, de l’agenda, d’exonérer, choisir
|
||||
et rappeler le conseil exécutif et le trésorier.</p>
|
||||
<h2>Comité central européen</h2>
|
||||
<p>Ce sont les personnes qui œuvrent au jour le jour dans l’organisation
|
||||
comme bénévoles ou employés sur les enjeux centraux : coordinateurs
|
||||
des équipes nationales et leur adjoint, permanents, coordinateurs d’équipes
|
||||
dédiées. Ce comité n’inclut pas une grande partie des bénévoles des
|
||||
équipes, contributeurs aux campagnes ou à des sujets dédiés.</p>
|
||||
|
||||
<core-members />
|
||||
|
||||
<h2>Stagiaires</h2>
|
||||
<p><a href="/contribute/internship.html">Nos stagiaires</a> travaillent sur
|
||||
de nombreux sujets dans les équipes de la FSFE : soutenir les projets
|
||||
en cours et les campagnes, coordonner l’action de bénévoles, communiquer
|
||||
avec la communauté, les administrations publiques ou d’autres
|
||||
organisations.</p>
|
||||
|
||||
<ga-members />
|
||||
|
||||
<h2>Comité central européen</h2>
|
||||
<p>Ce sont les personnes qui œuvrent au jour le jour dans l’organisation
|
||||
comme bénévoles ou employés sur les enjeux centraux : coordinateurs
|
||||
des équipes nationales et leur adjoint, permanents, coordinateurs d’équipes
|
||||
dédiées. Ce comité n’inclut pas une grande partie des bénévoles des
|
||||
équipes, contributeurs aux campagnes ou à des sujets dédiés.</p>
|
||||
|
||||
<core-members />
|
||||
|
||||
<h2>Stagiaires</h2>
|
||||
<p><a href="/contribute/internship.html">Nos stagiaires</a> travaillent sur
|
||||
de nombreux sujets dans les équipes de la FSFE : soutenir les projets
|
||||
en cours et les campagnes, coordonner l’action de bénévoles, communiquer
|
||||
avec la communauté, les administrations publiques ou d’autres
|
||||
organisations.</p>
|
||||
|
||||
<intern-members />
|
||||
<intern-members />
|
||||
|
||||
</div>
|
||||
</body>
|
||||
|
||||
<timestamp>$Date: 2011-01-17 15:20:24 +0100 (Mo, 17. Jan 2011) $ $Author: maelle $</timestamp>
|
||||
|
||||
@ -1821,6 +1821,10 @@ table#patrons td img {
|
||||
|
||||
/* People pages */
|
||||
|
||||
#show-people h2 {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.people img, img.author-avatar {
|
||||
float: left;
|
||||
margin: 5px 10px 10px 0px;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user