complete refactoring for donors and members

ot_templating/Resources/Private/Layouts/Classic/Home.html

@@ -33,7 +33,8 @@
     <f:comment><!-- Right column --></f:comment>
     <div class="rightcol">
         <f:comment><!-- Render the donors section defined in partial/Donors.html--></f:comment>
-        <f:render partial="Classic/Donors" />
+        <f:render partial="Classic/Donors" arguments="{settings: settings}" />
+        <f:render partial="Classic/Donors" arguments="{settings: settings, fromParents: 1}"/>
 
         <div class="content">
             <f:comment><!-- defines the content of the rightcol section (right column) --></f:comment>

ot_templating/Resources/Private/Layouts/Modern/Home.html

@@ -24,7 +24,8 @@
                     </f:if>
 
                     <f:comment><!-- Render the donors section defined in partial/Donors.html--></f:comment>
-                    <f:render partial="Modern/Donors" />
+                    <f:render partial="Modern/Donors" arguments="{settings: settings}" />
+                    <f:render partial="Modern/Donors" arguments="{settings: settings, fromParents: 1}"/>
                 </div>
             </div>
         </div>

ot_templating/Resources/Private/Layouts/Modern/Members.html

@@ -4,66 +4,73 @@
 <f:comment><!-- Special layout for the Members page --></f:comment>
 <f:layout name="Members" />
 
-<f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="Modern/Header" arguments="{_all}" />
+<section class="t-container st-effect-3">
 
-<div class="main">
+    <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
+    <f:render partial="Modern/Header" arguments="{_all}" />
 
-    <f:comment><!-- Central column --></f:comment>
-    <div class="content">
-        <f:comment><!-- All members --></f:comment>
-        <h2>Liste des adhérents</h2>
+    <section class="page-section-ptb">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12 mt-30">
 
-        <div class="ot-members">
-            <ot:members.getAll as="membersByInstrument"
-                               organizationId="{settings.organizationId}">
+                    <f:comment><!-- All members --></f:comment>
+                    <h2>Liste des adhérents</h2>
 
-                <f:if condition="{membersByInstrument -> f:count()} > 0">
-                    <f:then>
-                        <f:for each="{membersByInstrument}" as="members" key="instrument">
-                            <h3>
-                                <f:format.case
-                                        mode="upper"
-                                        value="{f:translate(key: 'member.instrument.{instrument}')}">
-                                </f:format.case>
-                            </h3>
-                            <ul class="ot-members-list">
-                                <f:for each="{members}" as="member">
-                                    <li class="ot-member">
-                                        <p class="ot-member-image">
-                                            <f:if condition="{member.image}">
-                                                <f:then>
-                                                    <img src="{member.image}/160x0"/>
-                                                </f:then>
-                                                <f:else>
-                                                    <f:if condition="{member.gender}=='MISTER'">
-                                                        <f:then>
-                                                            <f:image src="EXT:ot_templating/Resources/Public/media/man-default.jpg"/>
-                                                        </f:then>
-                                                        <f:else>
-                                                            <f:image src="EXT:ot_templating/Resources/Public/media/woman-default.jpg"/>
-                                                        </f:else>
-                                                    </f:if>
-                                                </f:else>
-                                            </f:if>
-                                        </p>
-                                        <p class="ot-member-name">
-                                            {member.fullName}
-                                        </p>
-                                    </li>
-                                </f:for>
-                            </ul>
-                        </f:for>
+                    <div class="ot-members">
+                        <ot:members.getAll as="membersByInstrument"
+                                           organizationId="{settings.organizationId}">
 
-                    </f:then>
-                    <f:else>
-                        <h5>Aucun adhérent</h5>
-                    </f:else>
-                </f:if>
-            </ot:members.getAll>
+                            <f:if condition="{membersByInstrument -> f:count()} > 0">
+                                <f:then>
+                                    <f:for each="{membersByInstrument}" as="members" key="instrument">
+                                        <h3>
+                                            <f:format.case
+                                                    mode="upper"
+                                                    value="{f:translate(key: 'member.instrument.{instrument}')}">
+                                            </f:format.case>
+                                        </h3>
+                                        <ul class="ot-members-list">
+                                            <f:for each="{members}" as="member">
+                                                <li class="ot-member">
+                                                    <p class="ot-member-image">
+                                                        <f:if condition="{member.image}">
+                                                            <f:then>
+                                                                <img src="{member.image}/160x0"/>
+                                                            </f:then>
+                                                            <f:else>
+                                                                <f:if condition="{member.gender}=='MISTER'">
+                                                                    <f:then>
+                                                                        <f:image src="EXT:ot_templating/Resources/Public/media/man-default.jpg"/>
+                                                                    </f:then>
+                                                                    <f:else>
+                                                                        <f:image src="EXT:ot_templating/Resources/Public/media/woman-default.jpg"/>
+                                                                    </f:else>
+                                                                </f:if>
+                                                            </f:else>
+                                                        </f:if>
+                                                    </p>
+                                                    <p class="ot-member-name">
+                                                        {member.fullName}
+                                                    </p>
+                                                </li>
+                                            </f:for>
+                                        </ul>
+                                    </f:for>
+
+                                </f:then>
+                                <f:else>
+                                    <h5>Aucun adhérent</h5>
+                                </f:else>
+                            </f:if>
+                        </ot:members.getAll>
+                    </div>
+                </div>
+            </div>
         </div>
-    </div>
-</div> <!-- /container -->
+    </section>
+
+    <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
+    <f:render partial="Modern/Footer" />
 
-<f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="Modern/Footer" />
+</section>

ot_templating/Resources/Private/Layouts/Modern/MembersCa.html

@@ -4,66 +4,72 @@
 <f:comment><!-- Special layout for the CA Members page --></f:comment>
 <f:layout name="MembersCa" />
 
-<f:comment><!-- Render the header defined in partial/header.html--></f:comment>
-<f:render partial="Modern/Header" arguments="{_all}" />
+<section class="t-container st-effect-3">
 
-<div class="main">
+    <f:comment><!-- Render the header defined in partial/header.html--></f:comment>
+    <f:render partial="Modern/Header" arguments="{_all}" />
 
-    <f:comment><!-- Central column --></f:comment>
-    <div class="content">
-        <f:comment><!-- All members --></f:comment>
-        <h2>Membres du CA</h2>
+    <section class="page-section-ptb">
+        <div class="container">
+            <div class="row">
+                <div class="col-sm-12 mt-30">
 
-        <div class="ot-members">
-            <ot:members.getAllCa as="membersByInstrument"
-                               organizationId="{settings.organizationId}">
-                <f:if condition="{membersByMission -> f:count()} > 0">
-                    <f:then>
-                        <f:for each="{membersByMission}" as="members" key="mission">
-                            <h3>
-                                <f:format.case
-                                        value="{f:translate(key: 'member.role.{mission}')}"
-                                        mode="upper">
-                                </f:format.case>
-                            </h3>
-                            <ul class="ot-members-list">
-                                <f:for each="{members}" as="member">
-                                    <li class="ot-member">
-                                        <p class="ot-member-image">
-                                            <f:if condition="{member.image}">
-                                                <f:then>
-                                                    <img src="{member.image}/160x0"/>
-                                                </f:then>
-                                                <f:else>
-                                                    <f:if condition="{member.gender}=='MISTER'">
-                                                        <f:then>
-                                                            <f:image src="EXT:ot_templating/Resources/Public/media/man-default.jpg"/>
-                                                        </f:then>
-                                                        <f:else>
-                                                            <f:image src="EXT:ot_templating/Resources/Public/media/woman-default.jpg"/>
-                                                        </f:else>
-                                                    </f:if>
-                                                </f:else>
-                                            </f:if>
-                                        </p>
-                                        <p class="ot-member-name">
-                                            {member.fullName}
-                                        </p>
-                                    </li>
-                                </f:for>
-                            </ul>
-                        </f:for>
+                    <f:comment><!-- All members --></f:comment>
+                    <h2>Membres du CA</h2>
 
-                    </f:then>
-                    <f:else>
-                        <h5>Aucun adhérent</h5>
-                    </f:else>
-                </f:if>
-            </ot:members.getAllCa>
-        </div>
-    </div>
+                    <div class="ot-members">
+                        <ot:members.getAllCa as="membersByInstrument"
+                                           organizationId="{settings.organizationId}">
+                            <f:if condition="{membersByMission -> f:count()} > 0">
+                                <f:then>
+                                    <f:for each="{membersByMission}" as="members" key="mission">
+                                        <h3>
+                                            <f:format.case
+                                                    value="{f:translate(key: 'member.role.{mission}')}"
+                                                    mode="upper">
+                                            </f:format.case>
+                                        </h3>
+                                        <ul class="ot-members-list">
+                                            <f:for each="{members}" as="member">
+                                                <li class="ot-member">
+                                                    <p class="ot-member-image">
+                                                        <f:if condition="{member.image}">
+                                                            <f:then>
+                                                                <img src="{member.image}/160x0"/>
+                                                            </f:then>
+                                                            <f:else>
+                                                                <f:if condition="{member.gender}=='MISTER'">
+                                                                    <f:then>
+                                                                        <f:image src="EXT:ot_templating/Resources/Public/media/man-default.jpg"/>
+                                                                    </f:then>
+                                                                    <f:else>
+                                                                        <f:image src="EXT:ot_templating/Resources/Public/media/woman-default.jpg"/>
+                                                                    </f:else>
+                                                                </f:if>
+                                                            </f:else>
+                                                        </f:if>
+                                                    </p>
+                                                    <p class="ot-member-name">
+                                                        {member.fullName}
+                                                    </p>
+                                                </li>
+                                            </f:for>
+                                        </ul>
+                                    </f:for>
+
+                                </f:then>
+                                <f:else>
+                                    <h5>Aucun adhérent</h5>
+                                </f:else>
+                            </f:if>
+                        </ot:members.getAllCa>
+                    </div>
+                </div>
 
-</div> <!-- /container -->
+            </div>
+        </div>
+    </section>
 
-<f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
-<f:render partial="Modern/Footer" />
+    <f:comment><!-- Render the footer defined in partial/footer.html--></f:comment>
+    <f:render partial="Modern/Footer" />
+</section>

ot_templating/Resources/Private/Partials/Classic/Donors.html

@@ -5,12 +5,22 @@
 
 <div class="ot-box ot-donors">
     <ot:donors.getAll as="donors"
-                      organizationId="{settings.organizationId}">
+                      organizationId="{settings.organizationId}"
+                      fromParents="{fromParents}">
+
         <f:if condition="{donors -> f:count()} > 0">
             <f:then>
                 <div class="donors-panel">
                     <header>
-                        <h3>Nos partenaires</h3>
+                        <f:if condition="{fromParents}==1">
+                            <f:then>
+                                <h3>Partenaires de notre réseau</h3>
+                            </f:then>
+                            <f:else>
+                                <h3>Nos partenaires</h3>
+                            </f:else>
+                        </f:if>
+
                     </header>
                     <div class="box-content">
                         <div class="donor-list {f:if(condition: '{staticDisplay} == 1', then: '', else: 'carousel')}">
@@ -25,27 +35,4 @@
             </f:then>
         </f:if>
     </ot:donors.getAll>
-
-    <ot:donors.getAll as="networkDonors"
-                      organizationId="{settings.organizationId}"
-                      fromParents="1">
-        <f:if condition="{networkDonors -> f:count()} > 0">
-            <f:then>
-                <div class="donors-panel">
-                    <header>
-                        <h3>Partenaires de notre réseau</h3>
-                    </header>
-                    <div class="box-content">
-                        <div class="donor-list {f:if(condition: '{settings.carousel} == 1', then: 'carousel', else: '')}">
-                            <f:for each="{networkDonors}" as="donor">
-                                <div class="donor-card">
-                                    <img src="{donor.logo}" alt="{donor.name}"/>
-                                </div>
-                            </f:for>
-                        </div>
-                    </div>
-                </div>
-            </f:then>
-        </f:if>
-    </ot:donors.getAll>
 </div>

ot_templating/Resources/Private/Partials/Modern/Donors.html

@@ -5,12 +5,22 @@
 
 <div class="ot-box ot-donors">
     <ot:donors.getAll as="donors"
-                      organizationId="{settings.organizationId}">
+                      organizationId="{settings.organizationId}"
+                      fromParents="{fromParents}">
+
         <f:if condition="{donors -> f:count()} > 0">
             <f:then>
                 <div class="donors-panel">
                     <header>
-                        <h3>Nos partenaires</h3>
+                        <f:if condition="{fromParents}==1">
+                            <f:then>
+                                <h3>Partenaires de notre réseau</h3>
+                            </f:then>
+                            <f:else>
+                                <h3>Nos partenaires</h3>
+                            </f:else>
+                        </f:if>
+
                     </header>
                     <div class="box-content">
                         <div class="donor-list {f:if(condition: '{staticDisplay} == 1', then: '', else: 'carousel')}">
@@ -25,27 +35,4 @@
             </f:then>
         </f:if>
     </ot:donors.getAll>
-
-    <ot:donors.getAll as="networkDonors"
-                      organizationId="{settings.organizationId}"
-                      fromParents="1">
-        <f:if condition="{networkDonors -> f:count()} > 0">
-            <f:then>
-                <div class="donors-panel">
-                    <header>
-                        <h3>Partenaires de notre réseau</h3>
-                    </header>
-                    <div class="box-content">
-                        <div class="donor-list {f:if(condition: '{settings.carousel} == 1', then: 'carousel', else: '')}">
-                            <f:for each="{networkDonors}" as="donor">
-                                <div class="donor-card">
-                                    <img src="{donor.logo}" alt="{donor.name}"/>
-                                </div>
-                            </f:for>
-                        </div>
-                    </div>
-                </div>
-            </f:then>
-        </f:if>
-    </ot:donors.getAll>
 </div>