7 files changed, 109 insertions, 16 deletions
diff --git a/skins/larry/print.css b/skins/larry/print.css
index d3a6cd802..4b67bcc07 100644
--- a/skins/larry/print.css
+++ b/skins/larry/print.css
@@ -143,3 +143,66 @@ p.image-attachment .attachment-links {
 	display: none;
 }
 
+/* contact print */
+#contact-details fieldset {
+	color: #666;
+	border: 1px solid #999;
+	margin-top: 5px;
+}
+
+#contact-details fieldset.contactfieldgroup {
+	border: 0;
+	padding: 0;
+	margin: 0;
+}
+
+#contact-details div.row {
+	padding: 2px 0;
+}
+
+#contact-details .contactfieldlabel {
+	display: inline-block;
+	vertical-align: top;
+	width: 150px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
+#contact-details .contactfieldcontent {
+	display: inline-block;
+	vertical-align: top;
+	font-weight: bold;
+}
+
+#contact-details #contactphoto {
+	float: left;
+	margin: 5px 15px 5px 3px;
+	width: 112px;
+	border: 0;
+	padding: 0;
+}
+
+#contact-details #contactpic {
+	width: 112px;
+	background: white;
+}
+
+#contact-details #contactpic img {
+	max-width: 112px;
+	visibility: inherit;
+}
+
+#contact-details #contacthead {
+	border: 0;
+	margin: 0 16em 0 0;
+	padding: 0;
+}
+
+#contact-details #contacthead > legend {
+	display: none;
+}
+
+#contact-details #contacthead .names span.namefield {
+	font-size: 140%;
+	font-weight: bold;
+}
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 51dfba717..c8c9a038a 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -3081,3 +3081,7 @@ ul.toolbarmenu li span.copy {
 	line-height: 16px !important;
 	vertical-align: text-top !important;
 }
+
+_:not(), _:-moz-handler-blocked, .mozilla .mce-btn-small i {
+	line-height: 20px !important;
+}
+\ No newline at end of file
diff --git a/skins/larry/templates/about.html b/skins/larry/templates/about.html
index b0d36d177..9cc646b7d 100644
--- a/skins/larry/templates/about.html
+++ b/skins/larry/templates/about.html
@@ -14,7 +14,7 @@
 <roundcube:object name="aboutcontent" />
 
 <h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2>
-<p class="copyright">Copyright &copy; 2005-2014, The Roundcube Dev Team</p>
+<p class="copyright">Copyright &copy; 2005-2015, The Roundcube Dev Team</p>
 <p class="license">This program is free software; you can redistribute it and/or modify
 it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a>
 as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.<br/>
diff --git a/skins/larry/templates/addressbook.html b/skins/larry/templates/addressbook.html
index 62bca3c84..7f358f51d 100644
--- a/skins/larry/templates/addressbook.html
+++ b/skins/larry/templates/addressbook.html
@@ -23,6 +23,7 @@
 
 	<span class="spacer"></span>
 	<roundcube:button command="compose" type="link" class="button compose disabled" classAct="button compose" classSel="button compose pressed" label="compose" title="writenewmessage" />
+	<roundcube:button command="print" type="link" class="button print disabled" classAct="button print" classSel="button print pressed" label="print" title="printcontact" />
 	<roundcube:button command="advanced-search" type="link" class="button search disabled" classAct="button search" classSel="button search pressed" label="advanced" title="advsearch" />
 	<roundcube:container name="toolbar" id="addressbooktoolbar" />
 
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 04a987f89..3e2eaac6a 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>
diff --git a/skins/larry/templates/contactprint.html b/skins/larry/templates/contactprint.html
new file mode 100644
index 000000000..f3f169ec2
--- /dev/null
+++ b/skins/larry/templates/contactprint.html
@@ -0,0 +1,20 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<link rel="shortcut icon" href="/images/favicon.ico"/>
+<link rel="stylesheet" type="text/css" href="/print.css" />
+</head>
+<body>
+
+<div id="header"><roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" /></div>
+
+<div id="contact-details" class="boxcontent">
+	<div id="contactphoto"><roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" placeholderGroup="/images/contactgroup.png" /></div>
+	<roundcube:object name="contacthead" id="contacthead" />
+	<br style="clear:both" />
+	<roundcube:object name="contactdetails" />
+</div>
+
+</body>
+</html>
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index fb7ca318c..a4c29fd9e 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -1,5 +1,3 @@
-// @license http://creativecommons.org/publicdomain/zero/1.0/legalcode CC0
-
 /**
  * Roundcube functions for default skin interface
  *
@@ -9,6 +7,8 @@
  * License. It is allowed to copy, distribute, transmit and to adapt the work
  * by keeping credits to the original autors in the README file.
  * See http://creativecommons.org/licenses/by-sa/3.0/ for details.
+ *
+ * @license magnet:?xt=urn:btih:90dc5c0be029de84e523b9b3922520e79e0e6f08&dn=cc0.txt CC0-1.0
  */
 
 function rcube_mail_ui()
@@ -277,19 +277,22 @@ function rcube_mail_ui()
           orientation:'v', relative:true, start:266, min:180, size:12 }).init();
       }
       else if (rcmail.env.action == 'edit-prefs') {
-        $('<a href="#toggle"></a>')
+        var legend = $('#preferences-details fieldset.advanced legend'),
+          toggle = $('<a href="#toggle"></a>')
             .text(env.toggleoptions)
             .attr('title', env.toggleoptions)
-            .addClass('advanced-toggle')
-            .appendTo('#preferences-details fieldset.advanced legend');
-
-          $('#preferences-details fieldset.advanced legend').click(function(e){
-            var collapsed = $(this).hasClass('collapsed'),
-              toggle = $('.advanced-toggle', this).html(collapsed ? '&#9650;' : '&#9660;');
-            $(this)
-              .toggleClass('collapsed')
-              .closest('fieldset').children('.propform').toggle()
-          }).addClass('collapsed')
+            .addClass('advanced-toggle');
+
+        legend.click(function(e) {
+          toggle.html($(this).hasClass('collapsed') ? '&#9650;' : '&#9660;');
+
+          $(this).toggleClass('collapsed')
+            .closest('fieldset').children('.propform').toggle()
+        }).append(toggle).addClass('collapsed')
+
+        // this magically fixes incorrect position of toggle link created above in Firefox 3.6
+        if (bw.mz)
+          legend.parents('form').css('display', 'inline');
       }
     }
     /***  addressbook task  ***/