From a3644638aaf0418598196a870204e0b632a4c8ad Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 17 Apr 2015 06:28:40 -0400
Subject: [PATCH] Allow preference sections to define CSS class names

---
 skins/larry/templates/compose.html |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 7fa2165..3e2eaac 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -146,10 +146,12 @@
 		<label for="rcmcomposepriority"><roundcube:label name="priority" />
 			<roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" tabindex="4" /></label>
 	</span>
+	<roundcube:if condition="!in_array('mdn_default', (array)config:dont_override)" />
 	<span class="composeoption">
-		<label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" tabindex="4" /> <roundcube:label name="returnreceipt" /></label>
+		<label><roundcube:object name="mdnCheckBox" form="form" id="rcmcomposereceipt" tabindex="4" /> <roundcube:label name="returnreceipt" /></label>
 	</span>
-	<roundcube:if condition="config:smtp_server != ''" />
+	<roundcube:endif />
+	<roundcube:if condition="config:smtp_server != '' and !in_array('dsn_default', (array)config:dont_override)" />
 	<span class="composeoption">
 		<label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" tabindex="4" /> <roundcube:label name="dsn" /></label>
 	</span>
@@ -212,8 +214,8 @@
 		<li role="separator" class="separator" id=""><label><roundcube:label name="insertresponse" /></label></li>
 		<roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
 		<li role="separator" class="separator"><label><roundcube:label name="manageresponses" /></label></li>
-		<li role="menuitem"><roundcube:button command="save-response" type="link" label="newresponse" classAct="active" unselectable="on" /></li>
-		<li role="menuitem"><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li>
+		<roundcube:button command="save-response" type="link-menuitem" label="newresponse" classAct="active" unselectable="on" />
+		<roundcube:button command="responses" type="link-menuitem" label="editresponses" classAct="active" />
 	</ul>
 </div>
 

--
Gitblit v1.9.1