Explorar o código

fix networkLogo display

Olivier Massot %!s(int64=5) %!d(string=hai) anos
pai
achega
ce96533884

+ 1 - 0
ot_templating/Configuration/TypoScript/setup.txt

@@ -134,6 +134,7 @@ plugin.tx_ottemplating {
 
 
         # computed
         # computed
         structureLogoUrl = {$plugin.tx_ottemplating.settings.opentalent.fileStorageUrl}{$plugin.tx_ottemplating.settings.organization.logoid}/0x60
         structureLogoUrl = {$plugin.tx_ottemplating.settings.opentalent.fileStorageUrl}{$plugin.tx_ottemplating.settings.organization.logoid}/0x60
+        networkLogoUrl = /typo3conf/ext/ot_templating/Resources/Public/assets/media/{$plugin.tx_ottemplating.settings.network.logo}
 
 
         # Default values for flux parameters
         # Default values for flux parameters
         themeColor = blue
         themeColor = blue

+ 1 - 0
ot_templating/Resources/Private/Partials/Menu.html

@@ -13,6 +13,7 @@
         pageUid="{ot:rootPage.getId()}">
         pageUid="{ot:rootPage.getId()}">
 
 
     <ul id="menu">
     <ul id="menu">
+
         <f:for each="{mainMenu}" as="mainMenuItem">
         <f:for each="{mainMenu}" as="mainMenuItem">
 
 
             <li class="{mainMenuItem.class} delayed-collapsing">
             <li class="{mainMenuItem.class} delayed-collapsing">

+ 3 - 3
ot_templating/Resources/Private/Partials/Topbar.html

@@ -14,11 +14,11 @@
     <f:render partial="UserToolbar" arguments="{_all}" />
     <f:render partial="UserToolbar" arguments="{_all}" />
 
 
     <f:comment><!-- Si un networkLogo est définit, affiche le logo du réseau --></f:comment>
     <f:comment><!-- Si un networkLogo est définit, affiche le logo du réseau --></f:comment>
-    <f:if condition="{networkLogo} != ''">
+    <f:if condition="{settings.networkLogo} != ''">
         <f:then>
         <f:then>
             <div class="topbar-network-logo">
             <div class="topbar-network-logo">
-                <a href="{networkUrl}" target="_blank">
-                    <img src="{networkLogo}" alt="{networkName}" />
+                <a href="{settings.networkUrl}" target="_blank">
+                    <img src="{settings.networkLogoUrl}" alt="{networkName}" />
                 </a>
                 </a>
             </div>
             </div>
         </f:then>
         </f:then>

+ 12 - 0
ot_templating/Resources/Public/assets/style/common/module/topbar.scss

@@ -19,9 +19,21 @@ $main-title-weight: $main-title-weight;
 }
 }
 
 
 .topbar-logo img, .topbar-network-logo img {
 .topbar-logo img, .topbar-network-logo img {
+  margin: 6px;
+}
+
+.topbar-logo img {
   max-height: 95%;
   max-height: 95%;
 }
 }
 
 
+.topbar-network-logo {
+  margin-left: 6px;
+}
+
+.topbar-network-logo img {
+  max-height: 50px;
+}
+
 .topbar-title {
 .topbar-title {
   margin: 0 0.8em 0 0.8em;
   margin: 0 0.8em 0 0.8em;
   flex: 1;
   flex: 1;

+ 12 - 0
ot_templating/Resources/Public/assets/style/theme-blue.css

@@ -102,9 +102,21 @@ ul.dropdown-left {
 }
 }
 
 
 .topbar-logo img, .topbar-network-logo img {
 .topbar-logo img, .topbar-network-logo img {
+  margin: 6px;
+}
+
+.topbar-logo img {
   max-height: 95%;
   max-height: 95%;
 }
 }
 
 
+.topbar-network-logo {
+  margin-left: 6px;
+}
+
+.topbar-network-logo img {
+  max-height: 50px;
+}
+
 .topbar-title {
 .topbar-title {
   margin: 0 0.8em 0 0.8em;
   margin: 0 0.8em 0 0.8em;
   flex: 1;
   flex: 1;

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
ot_templating/Resources/Public/assets/style/theme-blue.css.map


Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio