(html) Fix position of warning when JS is disabled

Fixes #3449
Alinto · Mar 15, 2016 · 68689b7 · 68689b7
1 parent ed9a51c
commit 68689b7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 13 deletions.
diff --git a/NEWS b/NEWS
@@ -16,6 +16,7 @@ Bug fixes
  - [web] properly null-terminate IS8601-formatted dates (#3539)
  - [web] display CC/BCC fields in message editor when initialized with values
  - [web] fixed message initialization in popup window (#3583)
+ - [web] fixed position of warning when JavaScript is disabled (#3449)
 
 3.0.2 (2016-03-04)
 ------------------

diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
@@ -33,6 +33,20 @@
       </head>
 
       <body var:ng-app="angularModule" var:class="bodyClasses">
+
+        <noscript>
+          <div layout="column" layout-align="center center" layout-fill="layout-fill">
+            <div class="md-padding">
+              <var:string label:value="noJavascriptError"/>
+            </div>
+            <div>
+              <a class="md-button" var:href="context.applicationURL">
+                <var:string label:value="noJavascriptRetry"/>
+              </a>
+            </div>
+          </div>
+        </noscript>
+
         <var:if condition="isCompatibleBrowser">
           <var:if condition="singleWindowModeEnabled">
             <div id="popupFrame" style="display: none;">
@@ -142,19 +156,6 @@
           <var:component className="SOGoBrowsersPanel"/>
         </var:if>
 
-        <noscript>
-          <div class="javascriptPopupBackground">
-          </div>
-          <div class="javascriptMessagePseudoWindow noJavascriptErrorMessage">
-            <var:string label:value="noJavascriptError"/>
-            <br/>
-            <br/>
-            <a class="button" var:href="page.context.uri">
-              <var:string label:value="noJavascriptRetry"/>
-            </a>
-          </div>
-        </noscript>
-
       </body>
     </html>
   </var:if>