Browse Source

fix 404 on missing logo id

Olivier Massot 5 years ago
parent
commit
586d60cc9f

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

@@ -4,9 +4,11 @@
 <div id="topbar">
 <div id="topbar">
 
 
     <div class="topbar-logo">
     <div class="topbar-logo">
-        <a href="{ot:rootPage.getUri()}" title="{settings.structureName}">
-            <img src="{settings.structureLogoUrl}" alt="{settings.structureName}"/>
-        </a>
+        <f:if condition="{settings.structureLogoId}">
+            <a href="{ot:rootPage.getUri()}" title="{settings.structureName}">
+                <img src="{settings.structureLogoUrl}" alt="{settings.structureName}"/>
+            </a>
+        </f:if>
     </div>
     </div>
 
 
     <h1 class="topbar-title">{settings.structureName}</h1>
     <h1 class="topbar-title">{settings.structureName}</h1>

+ 9 - 7
ot_templating/Resources/Private/Partials/Modern/Menu.html

@@ -20,13 +20,15 @@
 
 
                         <f:comment><!-- menu logo --></f:comment>
                         <f:comment><!-- menu logo --></f:comment>
                         <ul class="menu-logo">
                         <ul class="menu-logo">
-                            <li>
-                                <a href="{ot:rootPage.getUri()}" title="{settings.structureName}">
-                                    <img id="logo_img"
-                                         src="{settings.structureLogoUrl}"
-                                         alt="{settings.structureName}"/>
-                                </a>
-                            </li>
+                            <f:if condition="{settings.structureLogoId}">
+                                <li>
+                                    <a href="{ot:rootPage.getUri()}" title="{settings.structureName}">
+                                        <img id="logo_img"
+                                             src="{settings.structureLogoUrl}"
+                                             alt="{settings.structureName}"/>
+                                    </a>
+                                </li>
+                            </f:if>
                         </ul>
                         </ul>
 
 
                         <f:comment><!-- menu links --></f:comment>
                         <f:comment><!-- menu links --></f:comment>