minor fixes

ot_templating/Classes/Domain/Repository/OrganizationRepository.php

@@ -66,7 +66,7 @@ class OrganizationRepository extends BaseApiRepository
      */
     public function findById($id) {
         $params = [];
-        $params['organization_id'] = $id;
+        $params['filter[where][id]'] = $id;
         $record = $this->getApiFirstRecord($this::URI, $params);
         $organization = $this->organizationFromJson($record);
         if($organization == null) {

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

@@ -13,7 +13,7 @@
             <div class="row">
                 <div class="col-xl-6 col-md-6">
                     <div class="footer-text">
-                        <p> &copy;<span id="copyright"> <script>document.getElementById('copyright').appendChild(document.createTextNode(new Date().getFullYear()))</script></span> - <a href="#"> Orchestre d'Harmonie de Cluses </a> - Tous droits réservés</p>
+                        <p> &copy;<span id="copyright"> <script>document.getElementById('copyright').appendChild(document.createTextNode(new Date().getFullYear()))</script></span> - <a href="#"> {settings.structureName} </a> - Tous droits réservés</p>
                     </div>
                 </div>
 

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

@@ -10,15 +10,17 @@
                         <li class="brand-free">
                             <strong>{settings.structureName}</strong> est membre de &nbsp;
 
-                            <a href="#"
-                               title="CMF"
-                               class="reseau"
-                               data-toggle="modal"
-                               data-target="#cmfModal">
-                                <img src="{settings.networkLogoUrl}"
-                                     alt="{settings.networkName}"
-                                     height="22px" />
-                            </a> &nbsp;
+                            <f:if condition="{settings.networkLogo} != ''">
+                                <a href="#"
+                                   title="{settings.networkName}"
+                                   class="reseau"
+                                   data-toggle="modal"
+                                   data-target="#cmfModal">
+                                    <img src="{settings.networkLogoUrl}"
+                                         alt="{settings.networkName}"
+                                         height="22px" />
+                                </a> &nbsp;
+                            </f:if>
 
                             <a href="#"
                                title="Opentalent"

ot_templating/Resources/Public/assets/Classic/script/main.js

@@ -82,10 +82,10 @@ $(document).ready(function(){
     $(function(){
         $(window).scroll(function() {
             if ($(this).scrollTop() >= menuTop) {
-                $('#menu').addClass('sticky');
+                $('#menu-container').addClass('sticky');
             }
             else if (($(this).scrollTop() < (menuTop - menuHeight)) || ($(this).scrollTop() === 0)) {
-                $('#menu').removeClass('sticky');
+                $('#menu-container').removeClass('sticky');
             }
         });
     });

ot_templating/Resources/Public/assets/Classic/style/module/_members.scss

@@ -18,7 +18,7 @@ $otmembers-background-color: $otmembers-background-color;
     @include flex;
     flex-direction: row;
     flex-wrap: wrap;
-    align-items: end;
+    align-items: start;
     justify-content: center;
     padding: 0;
   }
@@ -30,6 +30,13 @@ $otmembers-background-color: $otmembers-background-color;
     align-items: center;
   }
 
+  .ot-member-image {
+    height: 150px;
+    @include flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+
   .ot-member img {
     max-width: 120px;
     max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/module/_menu.scss

@@ -136,6 +136,7 @@ $submenu-item-height: 30px;
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
   //max-width: 60vw;
 }
 

ot_templating/Resources/Public/assets/Classic/style/style.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/theme-blue.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/theme-green.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/theme-grey.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/theme-light-blue.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/theme-light-red.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/theme-orange.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/theme-purple.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;

ot_templating/Resources/Public/assets/Classic/style/theme-red.css

@@ -292,6 +292,7 @@ ul.dropdown-left {
 #menu-container.sticky {
   position: fixed;
   top: 0;
+  z-index: 999;
 }
 
 #menu-container .toggle-menu {
@@ -1246,7 +1247,7 @@ header .slick-track {
   display: flex;
   flex-direction: row;
   flex-wrap: wrap;
-  align-items: end;
+  align-items: start;
   justify-content: center;
   padding: 0;
 }
@@ -1265,6 +1266,21 @@ header .slick-track {
   flex-direction: column;
   align-items: center;
 }
+.ot-members .ot-member-image {
+  height: 150px;
+  /* OLD - iOS 6-, Safari 3.1-6 */
+  display: -webkit-box;
+  /* OLD - Firefox 19- (buggy but mostly works) */
+  display: -moz-box;
+  /* TWEENER - IE 10 */
+  display: -ms-flexbox;
+  /* NEW - Chrome */
+  display: -webkit-flex;
+  /* NEW, Spec - Opera 12.1, Firefox 20+ */
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+}
 .ot-members .ot-member img {
   max-width: 120px;
   max-height: 150px;