WIP on master

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

@@ -34,57 +34,10 @@
 
         </f:then>
         <f:else>
-
-<!--            <f:if condition="{ot:request.isCustomDomain()}">-->
-<!--                <f:then>-->
-<!--                    <f:comment>&lt;!&ndash; Because crossdomain auth could not be achieved properly until now,-->
-<!--                                    the login popup is shown for websites with custom domains &ndash;&gt;</f:comment>-->
-<!--                    <f:comment>&lt;!&ndash; Popup de login &ndash;&gt;</f:comment>-->
-
-<!--                    <a href="#" id="login-btn">-->
-<!--                        <i class="fas fa-power-off"></i> Se connecter-->
-<!--                    </a>-->
-
-<!--                    <div id="login-popup" class="<f:if condition='{ot:loginFailed()}==1' then='show'></f:if>">-->
-<!--                        <form id="login_form" class="popup-form" action="" method="POST" enctype="multipart/form-data" >-->
-
-<!--                            <f:comment>&lt;!&ndash; Just for typo3 to indentify it as a login request &ndash;&gt;</f:comment>-->
-<!--                            <input type="hidden" name="logintype" value="login" />-->
-
-<!--                            <input type="text"-->
-<!--                                   class="form-control {f:if(then: 'is-invalid', condition: '{usernameErrors}')}"-->
-<!--                                   placeholder="Nom d'utilisateur"-->
-<!--                                   name="user"-->
-<!--                                   required="1" />-->
-
-<!--                            <input type="password"-->
-<!--                                   class="form-control {f:if(then: 'is-invalid', condition: '{passwordErrors}')}"-->
-<!--                                   name="pass"-->
-<!--                                   placeholder="Mot de passe"-->
-<!--                                   required="1" />-->
-
-<!--                            <input type="submit" id="login-button" value="Se connecter" />-->
-
-<!--                            <f:if condition="{ot:loginFailed()}==1">-->
-<!--                                <f:then>-->
-<!--                                    <div class="login-errormsg alert">-->
-<!--                                        La tentative de connexion a échoué...<br/>-->
-<!--                                        Êtes-vous sûr d'avoir bien renseigné vos identifiants?-->
-<!--                                    </div>-->
-<!--                                </f:then>-->
-<!--                            </f:if>-->
-<!--                        </form>-->
-<!--                    </div>-->
-
-<!--                </f:then>-->
-<!--                <f:else>-->
-                    <a href="{ot:request.getOtEnvVar(argument: 'LOGIN_PAGE_URL')}" target="_blank">
-                        <i class="fas fa-power-off"></i>
-                        <f:translate key="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:login"/>
-                    </a>
-<!--                </f:else>-->
-<!--            </f:if>-->
-
+            <a href="{ot:request.getOtEnvVar(argument: 'LOGIN_PAGE_URL')}" target="_blank">
+                <i class="fas fa-power-off"></i>
+                <f:translate key="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:login"/>
+            </a>
         </f:else>
 
     </f:security.ifAuthenticated>

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

@@ -24,26 +24,12 @@
         </f:then>
         <f:else>
             <li>
-<!--                <f:if condition="{ot:request.isCustomDomain()}">-->
-<!--                    <f:then>-->
-<!--                        <f:comment>&lt;!&ndash; Because crossdomain auth could not be achieved properly until now,-->
-<!--                                    the login popup is shown for websites with custom domains &ndash;&gt;</f:comment>-->
-<!--                        <a href="#"-->
-<!--                           class="{f:if(condition: '{ot:loginFailed()}', then: 'trigger-on-load')}"-->
-<!--                           data-toggle="modal"-->
-<!--                           data-target="#loginModal">-->
-<!--                            <f:translate id="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:login"/>-->
-<!--                        </a>-->
-<!--                    </f:then>-->
-<!--                    <f:else>-->
-                        <a href="{ot:request.getOtEnvVar(argument: 'LOGIN_PAGE_URL')}"
-                           target="_blank"
-                           class="{f:if(condition: '{ot:loginFailed()}', then: 'trigger-on-load')}"
-                        >
-                            <f:translate id="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:login"/>
-                        </a>
-<!--                    </f:else>-->
-<!--                </f:if>-->
+                <a href="{ot:request.getOtEnvVar(argument: 'LOGIN_PAGE_URL')}"
+                   target="_blank"
+                   class="{f:if(condition: '{ot:loginFailed()}', then: 'trigger-on-load')}"
+                >
+                    <f:translate id="LLL:EXT:ot_templating/Resources/Private/Language/locallang.xlf:login"/>
+                </a>
             </li>
         </f:else>
     </f:security.ifAuthenticated>