Merge branch 'dev-canned-responses'

Thomas Bruederli

2013-10-25 98b7b548a229600f7653cd67d9aae43675938143

 skins/larry/templates/compose.html

@@ -30,7 +30,7 @@
   <roundcube:endif />
   <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attach pressed" label="attach" title="addattachment" onclick="UI.show_uploadform();return false" />
   <roundcube:button command="insert-sig" type="link" class="button insertsig disabled" classAct="button insertsig" classSel="button insertsig pressed" label="signature" title="insertsignature" />
   <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" onmousedown="return false" onmouseup="UI.show_popup('responsesmenu');return false"><roundcube:label name="responses" /></a>
   <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="UI.show_popup('responsesmenu');return false"><roundcube:label name="responses" /></a>
   <roundcube:container name="toolbar" id="compose-toolbar" />
</div>
</div>
@@ -141,9 +141,11 @@
   <span class="composeoption">
      <label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> <roundcube:label name="returnreceipt" /></label>
   </span>
   <roundcube:if condition="config:smtp_server != ''" />
   <span class="composeoption">
      <label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /> <roundcube:label name="dsn" /></label>
   </span>
   <roundcube:endif />
   <roundcube:if condition="!config:no_save_sent_messages" />
   <span class="composeoption">
      <label><roundcube:label name="savesentmessagein" /> <roundcube:object name="storetarget" maxlength="30" style="max-width:12em" /></label>
@@ -200,8 +202,8 @@
      <li class="separator" id=""><label><roundcube:label name="insertresponse" /></label></li>
      <roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
      <li class="separator"><label><roundcube:label name="manageresponses" /></label></li>
      <li><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" /></li>
      <li><roundcube:button command="edit-responses" type="link" label="editresponses" classAct="active" /></li>
      <li><roundcube:button command="save-response" type="link" label="savenewresponse" classAct="active" unselectable="on" /></li>
      <li><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li>
   </ul>
</div>