From cc8bee636f5f513a91a0e0b7317e4a42dd84ed98 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Fri, 24 Feb 2017 17:40:04 +0100
Subject: [PATCH] Improved error.html template

---
 skins/elastic/styles/styles.less   |  2 +-
 skins/elastic/templates/error.html | 34 +++++++++++-------------------
 skins/elastic/ui.js                | 16 ++++++++------
 3 files changed, 22 insertions(+), 30 deletions(-)
diff --git a/skins/elastic/styles/styles.less b/skins/elastic/styles/styles.less
index ff51823b9..7ca098b62 100644
--- a/skins/elastic/styles/styles.less
+++ b/skins/elastic/styles/styles.less
@@ -10,7 +10,7 @@
 .task-login #content {
 	text-align: center;
 	width: 100%;
-	background: url(images/watermark.jpg) center -20px no-repeat;
+	background: url(../images/watermark.jpg) center -20px no-repeat;
 }
 
 #login-form {
diff --git a/skins/elastic/templates/error.html b/skins/elastic/templates/error.html
index 1bd03c315..59b6211b8 100644
--- a/skins/elastic/templates/error.html
+++ b/skins/elastic/templates/error.html
@@ -1,28 +1,18 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-	<title><roundcube:object name="pagetitle" /></title>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0" id="viewport" />
-	<link rel="shortcut icon" href="/images/favicon.ico"/>
-	<link rel="stylesheet" href="/semantic-ui/semantic.min.css">
-	<link rel="stylesheet" type="text/css" href="/styles.css" />
-</head>
-<roundcube:if condition="!env:extwin &amp;&amp; !env:framed" />
-<body class="task-<roundcube:var name="env:task" />">
-<roundcube:else />
-<body class="iframe task-<roundcube:var name="env:task" />">
-<roundcube:endif />
-
-<div id="layout">
+<roundcube:include file="/includes/layout.html" />
 
 <roundcube:if condition="!env:framed" />
 	<roundcube:include file="/includes/menu.html" />
+	<div id="content" class="content selected" role="main">
+		<div class="header">
+			<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
+			<a class="button icon back-list-button" href="#back"><span class="inner"><roundcube:label name="back" /></span></a>
+		</div>
 <roundcube:endif />
 
-<div id="content" class="content selected">
-	$__page_content
-</div>
+$__page_content
+
+<roundcube:if condition="!env:framed" />
+	</div>
+<roundcube:endif />
 
-</div>
-</body>
-</html>
+<roundcube:include file="/includes/footer.html" />
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 110b9dd1a..37a6cf434 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -214,13 +214,15 @@ function rcube_elastic_ui()
     }
 
     // Intercept jQuery-UI dialogs to re-style them
-    $.widget('ui.dialog', $.ui.dialog, {
-      open: function() {
-        this._super();
-        dialog_open(this);
-        return this;
-      }
-    });
+    if ($.ui) {
+      $.widget('ui.dialog', $.ui.dialog, {
+        open: function() {
+          this._super();
+          dialog_open(this);
+          return this;
+        }
+      });
+    }
 
     // window resize handler
     function resize()
