From 09915f14307f179bb0744889c06147448d1ceb6f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 28 Oct 2009 17:14:39 +0000
Subject: Specify toolbar container in compose template (#1486247)

---
 CHANGELOG                            | 1 +
 skins/default/templates/compose.html | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 7d6e32e3c..a6c6bff0d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Specify toolbar container in compose template (#1486247)
 - Fix $_SERVER['HTTPS'] check for SSL forcing on IIS (#1486243)
 - Avoid unnecessary page loads for selected tab (#1486032)
 - Fix quota indicator issues by content generation on client-size (#1486197, #1486220)
diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index a5d7dcc71..d2b36e045 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -21,6 +21,7 @@
       <roundcube:button command="spellcheck" type="link" class="buttonPas spellcheck" classAct="button spellcheck" classSel="button spellcheckSel" title="checkspelling" content=" " />
       <roundcube:button command="add-attachment" type="link" class="buttonPas attach" classAct="button attach" classSel="button attachSel" title="addattachment" content=" " />
       <roundcube:button command="savedraft" type="link" class="buttonPas savedraft" classAct="button savedraft" classSel="button savedraftSel" title="savemessage" content=" " />
+      <roundcube:container name="toolbar" id="compose-toolbar" />
     </td>
     <td id="priority-selector">
       <label for="rcmcomposepriority"><roundcube:label name="priority" />:</label>&nbsp;<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" />
-- 
cgit v1.2.3