From 7152f59f04fc2ecfc0bcfb9a50758c3757c119f8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 1 Jan 2012 18:52:30 +0000
Subject: - Fix so editor selector is hidden when 'htmleditor' is listed in
 'dont_override'

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

(limited to 'skins')

diff --git a/skins/default/templates/compose.html b/skins/default/templates/compose.html
index 2dcf8b0c1..4921bbf0f 100644
--- a/skins/default/templates/compose.html
+++ b/skins/default/templates/compose.html
@@ -112,10 +112,12 @@
             </div>
             <div id="compose-editorfooter">
                 <span id="spellcheck-control" style="margin-right:10px"></span>
+                <roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
                 <span>
                     <label><roundcube:label name="editortype" /></label>
                     <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" />
                 </span>
+                <roundcube:endif />
             </div>
         </div>
     </div>
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index aad516d14..67d94f631 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -109,10 +109,12 @@
 	</span>
 	
 	<div id="composeoptions">
+		<roundcube:if condition="!in_array('htmleditor', (array)config:dont_override)" />
 		<span class="composeoption">
 			<label><roundcube:label name="editortype" />
 				<roundcube:object name="editorSelector" editorid="composebody" tabindex="12" /></label>
 		</span>
+		<roundcube:endif />
 		<span class="composeoption">
 			<label><label for="rcmcomposepriority"><roundcube:label name="priority" />
 				<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></label>
-- 
cgit v1.2.3