From 4ea094c80f5a0e03d7ee923fe38c6bd9ccac3ce6 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Sat, 28 Oct 2017 16:33:05 +0200
Subject: [PATCH] Fix setting frame title, unify some title to use short label

---
 skins/elastic/templates/folders.html   | 2 +-
 skins/elastic/templates/responses.html | 2 +-
 skins/elastic/templates/settings.html  | 2 +-
 skins/elastic/ui.js                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/skins/elastic/templates/folders.html b/skins/elastic/templates/folders.html
index 23a0caa4e..463dced12 100644
--- a/skins/elastic/templates/folders.html
+++ b/skins/elastic/templates/folders.html
@@ -2,7 +2,7 @@
 <roundcube:include file="includes/menu.html" />
 <roundcube:include file="includes/settings-menu.html" />
 
-<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="folders" /></h1>
+<h1 class="voice"><roundcube:label name="folders" /></h1>
 
 <!-- folders list -->
 <div class="list listbox selected" aria-labelledby="aria-label-folderslist">
diff --git a/skins/elastic/templates/responses.html b/skins/elastic/templates/responses.html
index 3d043faae..e28b35629 100644
--- a/skins/elastic/templates/responses.html
+++ b/skins/elastic/templates/responses.html
@@ -2,7 +2,7 @@
 <roundcube:include file="includes/menu.html" />
 <roundcube:include file="includes/settings-menu.html" />
 
-<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="responses" /></h1>
+<h1 class="voice"><roundcube:label name="responses" /></h1>
 
 <!-- responses list -->
 <div class="list listbox selected" aria-labelledby="aria-label-responseslist">
diff --git a/skins/elastic/templates/settings.html b/skins/elastic/templates/settings.html
index a8b545e69..7128d23f8 100644
--- a/skins/elastic/templates/settings.html
+++ b/skins/elastic/templates/settings.html
@@ -2,7 +2,7 @@
 <roundcube:include file="includes/menu.html" />
 <roundcube:include file="includes/settings-menu.html" />
 
-<h1 class="voice"><roundcube:label name="settings" /> : <roundcube:label name="preferences" /></h1>
+<h1 class="voice"><roundcube:label name="preferences" /></h1>
 
 <div class="list listbox<roundcube:exp expression="!request:_action ? '' : ' selected'"/>" aria-labelledby="aria-label-prefsection">
 	<div class="header">
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index cfde1e182..9dbc5eacd 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -123,7 +123,7 @@ function rcube_elastic_ui()
         // Set content frame title in parent window (exclude ext-windows and dialog frames)
         if (is_framed && !rcmail.env.extwin && !parent.$('.ui-dialog:visible').length) {
             if (title = $('h1.voice:first').text()) {
-                parent.$('.header > .header-title', layout.content).text(title);
+                parent.$('#layout > .content > .header > .header-title').text(title);
             }
         }
         else {