Merge branch 'hotfix/V8-3883_menu_and_user_toolbar_missing'

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

@@ -20,15 +20,21 @@
 
                         <f:comment><!-- menu logo --></f:comment>
                         <ul class="menu-logo">
-                            <f:if condition="{settings.structureLogoId}">
-                                <li>
-                                    <a href="{ot:rootPage.getUri()}" title="{settings.structureName}">
-                                        <img id="logo_img"
-                                             src="{ot:request.getOtEnvVar(argument: 'FILE_STORAGE_URL')}{settings.structureLogoId}/0x60"
-                                             alt="{settings.structureName}"/>
-                                    </a>
-                                </li>
-                            </f:if>
+                            <li>
+                                <f:if condition="{settings.structureLogoId}">
+                                    <f:then>
+                                        <a href="{ot:rootPage.getUri()}" title="{settings.structureName}">
+                                            <img id="logo_img"
+                                                 src="{ot:request.getOtEnvVar(argument: 'FILE_STORAGE_URL')}{settings.structureLogoId}/0x60"
+                                                 alt="{settings.structureName}"/>
+                                        </a>
+                                    </f:then>
+                                    <f:else>
+                                        <f:comment><!-- little hack to avoid some bugs with css structure --></f:comment>
+                                        <div style="height: 40px"></div>
+                                    </f:else>
+                                </f:if>
+                            </li>
                         </ul>
 
                         <f:comment><!-- menu links --></f:comment>

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

@@ -9,16 +9,16 @@
             <v:variable.set name="feuser" value="{ot:request.getFeUser()}"/>
 
             <li>
-                <span><f:translate key="welcome"/> <b>{feuser.username}</b>!</span>
+                <span><f:translate key="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:welcome"/> <b>{feuser.username}</b>!</span>
             </li>
             <li>
                 <a href="{ot:request.getOtEnvVar(argument: 'DASHBOARD_URL')}">
-                    <f:translate key="member-area-of-my-structure"/>
+                    <f:translate key="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:member-area-of-my-structure"/>
                 </a>
             </li>
             <li>
                 <f:link.page additionalParams="{logintype:'logout'}">
-                    <f:translate key="log-out"/>
+                    <f:translate key="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:log-out"/>
                 </f:link.page>
             </li>
         </f:then>
@@ -32,7 +32,7 @@
                            class="{f:if(condition: '{ot:loginFailed()}', then: 'trigger-on-load')}"
                            data-toggle="modal"
                            data-target="#loginModal">
-                            Se connecter
+                            <f:translate id="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:login"/>
                         </a>
                     </f:then>
                     <f:else>
@@ -40,7 +40,7 @@
                            target="_blank"
                            class="{f:if(condition: '{ot:loginFailed()}', then: 'trigger-on-load')}"
                         >
-                            <f:translate key="login"/>
+                            <f:translate id="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:login"/>
                         </a>
                     </f:else>
                 </f:if>