Merge branch 'dev-canned-responses'

Conflicts (resolved):
	skins/classic/includes/settingstabs.html
	skins/larry/includes/settingstabs.html

15 files changed, 259 insertions, 4 deletions

diff --git a/skins/classic/common.css b/skins/classic/common.css
index 90bf730b7..7d7c83f39 100644
--- a/skins/classic/common.css
+++ b/skins/classic/common.css
@@ -513,7 +513,8 @@ body.iframe .boxtitle
   margin: 3px -4px;
 }
 
-.popupmenu li a
+.popupmenu li a,
+.popupmenu li label
 {
   display: block;
   color: #a0a0a0;
@@ -523,6 +524,14 @@ body.iframe .boxtitle
   background: transparent;
 }
 
+.popupmenu li label.comment
+{
+  color: #999;
+  font-style: italic;
+  padding-top: 4px;
+  padding-bottom: 3px;
+}
+
 .popupmenu li a.active,
 .popupmenu li a.active:active,
 .popupmenu li a.active:visited
@@ -706,6 +715,24 @@ ul.treelist li div.expanded
   outline: none;
 }
 
+.propform div.prop
+{
+  margin-bottom: 0.5em;
+}
+
+.propform div.prop.block label
+{
+  display: block;
+  margin-bottom: 2px;
+}
+
+.propform div.prop.block input,
+.propform div.prop.block textarea
+{
+  width: 97%;
+}
+
+
 /***** roundcube webmail pre-defined classes *****/
 
 #rcmversion
diff --git a/skins/classic/images/mail_toolbar.png b/skins/classic/images/mail_toolbar.png
index 4a8431715..3ef003f23 100644
--- a/skins/classic/images/mail_toolbar.png
+++ b/skins/classic/images/mail_toolbar.png
diff --git a/skins/classic/mail.css b/skins/classic/mail.css
index 43367749c..7f150714d 100644
--- a/skins/classic/mail.css
+++ b/skins/classic/mail.css
@@ -171,6 +171,10 @@
   background-position: -480px -32px;
 }
 
+#messagetoolbar a.responses {
+  background-position: -512px 0;
+}
+
 #messagetoolbar select.mboxlist
 {
   position: relative;
diff --git a/skins/classic/settings.css b/skins/classic/settings.css
index 2433f5040..acd0b9fd0 100644
--- a/skins/classic/settings.css
+++ b/skins/classic/settings.css
@@ -34,6 +34,11 @@
   height: 18px;
 }
 
+#identities-table tbody tr.readonly td
+{
+  font-style: italic;
+}
+
 #subscription-table tr.virtual td
 {
   color: #666;
@@ -81,6 +86,7 @@
 }
 
 #identity-details table td.title,
+#response-details table td.title,
 #folder-details table td.title
 {
   font-weight: bold;
@@ -89,6 +95,14 @@
   white-space: nowrap;
 }
 
+#response-details table td.title
+{
+  text-align: left;
+  vertical-align: top;
+  width: 140px;
+  padding-top: 5px;
+}
+
 #bottomboxes
 {
   position: absolute;
@@ -149,6 +163,12 @@ body.iframe,
   float: right;
 }
 
+#formfooter .footerindent
+{
+  padding: 10px 0;
+  margin-left: 155px;
+}
+
 #quota
 {
   position: absolute;
diff --git a/skins/classic/templates/compose.html b/skins/classic/templates/compose.html
index 7d8aa1e43..74d25778b 100644
--- a/skins/classic/templates/compose.html
+++ b/skins/classic/templates/compose.html
@@ -40,6 +40,7 @@
         <span id="spellmenulink" onclick="rcmail_ui.show_popup('spellmenu');return false"></span>
     </span>
 <roundcube:endif />
+    <a href="#responses" class="button responses" label="responses" title="<roundcube:label name='insertresponse' />" id="responsesmenulink" unselectable="on" onmousedown="return false" onclick="rcmail_ui.show_popup('responsesmenu');return false">&nbsp;</a>
     <roundcube:container name="toolbar" id="compose-toolbar" />
     <roundcube:button name="messageoptions" id="composemenulink" type="link" class="button messagemenu" title="messageoptions" onclick="rcmail_ui.show_popup('composemenu', true);return false" content=" " />
 </div>
@@ -198,6 +199,16 @@
     </table>
 </div>
 
+<div id="responsesmenu" class="popupmenu">
+    <ul id="textresponsesmenu">
+        <li><label class="comment"><roundcube:label name="insertresponse" /></label></li>
+        <roundcube:object name="responseslist" id="responseslist" tagname="ul" itemclass="active" />
+        <li><label class="comment"><roundcube:label name="manageresponses" /></label></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>
+
 <div id="spellmenu" class="popupmenu selectable"></div>
 
 </form>
diff --git a/skins/classic/templates/responseedit.html b/skins/classic/templates/responseedit.html
new file mode 100644
index 000000000..67ba35bac
--- /dev/null
+++ b/skins/classic/templates/responseedit.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+
+</head>
+<body class="iframe">
+
+<div id="prefs-title" class="boxtitle"><roundcube:object name="steptitle" /></div>
+
+<div id="response-details" class="boxcontent">
+  <roundcube:object name="responseform" class="propform" size="60" textareacols="60" textarearows="18" />
+
+  <div id="formfooter">
+    <div class="footerindent">
+      <roundcube:button command="save" type="input" class="button mainaction" label="save" condition="!env:readonly" />
+    </div>
+  </div>
+</div>
+
+</body>
+</html>
diff --git a/skins/classic/templates/responses.html b/skins/classic/templates/responses.html
new file mode 100644
index 000000000..2459827b0
--- /dev/null
+++ b/skins/classic/templates/responses.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<script type="text/javascript" src="/functions.js"></script>
+<script type="text/javascript" src="/splitter.js"></script>
+<style type="text/css">
+#identities-list { width: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter-5 : 295" />px; }
+#identity-box { left: <roundcube:exp expression="!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305" />px;
+  <roundcube:exp expression="browser:ie ? ('width:expression((parseInt(this.parentNode.offsetWidth)-'.(!empty(cookie:identviewsplitter) ? cookie:identviewsplitter+5 : 305).')+\\'px\\');') : ''" />
+}
+</style>
+
+</head>
+<body>
+
+<roundcube:include file="/includes/taskbar.html" />
+<roundcube:include file="/includes/header.html" />
+<roundcube:include file="/includes/settingstabs.html" />
+
+<div id="mainscreen">
+
+<div id="identities-list">
+<div id="identity-title" class="boxtitle"><roundcube:label name="responses" /></div>
+<div class="boxlistcontent">
+<roundcube:object name="responsesList" id="identities-table" class="records-table" cellspacing="0" summary="Responses list" noheader="true" editIcon="" />
+</div>
+<div class="boxfooter">
+<roundcube:button command="add" type="link" title="newidentity" class="buttonPas addgroup" classAct="button addgroup" content=" " condition="config:identities_level:0<2" /><roundcube:button command="delete" type="link" title="delete" class="buttonPas delgroup" classAct="button delgroup" content=" " condition="config:identities_level:0<2" />
+</div>
+</div>
+
+<script type="text/javascript">
+  var identviewsplit = new rcube_splitter({id:'identviewsplitter', p1: 'identities-list', p2: 'identity-box', orientation: 'v', relative: true, start: 300 });
+  rcmail.add_onload('identviewsplit.init()');
+</script>
+
+<div id="identity-box">
+  <roundcube:object name="responseframe" id="identity-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
+</div>
+
+</div>
+
+</body>
+</html>
diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index 9f8f44536..8e2560198 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
diff --git a/skins/larry/images/listicons.png b/skins/larry/images/listicons.png
index e4ffef660..e2906d957 100644
--- a/skins/larry/images/listicons.png
+++ b/skins/larry/images/listicons.png
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index b65b08112..c5c00554c 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -621,6 +621,10 @@ table.messagelist.fixedcopy {
 	background-position: -24px -1116px;
 }
 
+.messagelist thead tr td.priority span.priority {
+	background-position: -24px -1845px;
+}
+
 .messagelist tr td.priority span.prio5 {
 	background-position: 0 -1905px;
 }
diff --git a/skins/larry/settings.css b/skins/larry/settings.css
index 6afa48c40..a769ac412 100644
--- a/skins/larry/settings.css
+++ b/skins/larry/settings.css
@@ -130,6 +130,14 @@
 	background-position: 6px -1819px;
 }
 
+#settings-sections span.responses a {
+	background-position: 6px -1972px;
+}
+
+#settings-sections span.responses.selected a {
+	background-position: 6px -1996px;
+}
+
 #sections-table #rcmrowgeneral td.section {
 	background-position: 6px -573px;
 }
@@ -206,6 +214,10 @@
 	text-overflow: ellipsis;
 }
 
+#identities-table tbody tr.readonly td {
+	font-style: italic;
+}
+
 #folder-details,
 #identity-details {
 	position: absolute;
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 7b5e61d48..2929713e1 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -1440,6 +1440,20 @@ body.iframe .footerleft.floating:before,
 	font-size: 12px;
 }
 
+.propform div.prop {
+	margin-bottom: 0.5em;
+}
+
+.propform div.prop.block label {
+	display: block;
+	margin-bottom: 0.3em;
+}
+
+.propform div.prop.block input,
+.propform div.prop.block textarea {
+	width: 95%;
+}
+
 fieldset.floating {
 	float: left;
 	margin-right: 10px;
@@ -1817,7 +1831,11 @@ ul.proplist li {
 }
 
 .toolbar a.button.download {
-	background-position: center -1906px;
+	background-position: center -1892px;
+}
+
+.toolbar a.button.responses {
+	background-position: center -1932px;
 }
 
 a.menuselector {
@@ -1924,6 +1942,7 @@ select.decorated option {
 }
 
 ul.toolbarmenu,
+ul.toolbarmenu ul,
 #rcmKSearchpane ul {
 	margin: 0;
 	padding: 0;
@@ -1943,13 +1962,13 @@ ul.toolbarmenu li,
 }
 
 .googie_list tr:first-child td,
-ul.toolbarmenu li:first-child,
+ul.toolbarmenu > li:first-child,
 select.decorated option:first-child {
 	border-top: 0;
 }
 
 .googie_list tr:last-child td,
-ul.toolbarmenu li:last-child,
+ul.toolbarmenu > li:last-child,
 select.decorated option:last-child {
 	border-bottom: 0;
 }
@@ -2003,6 +2022,11 @@ ul.toolbarmenu li label {
 	text-shadow: 0px 1px 1px #333;
 }
 
+ul.toolbarmenu li.separator label {
+	color: #bbb;
+	font-style: italic;
+}
+
 ul.toolbarmenu li a.icon {
 	color: #eee;
 	padding: 2px 6px;
@@ -2081,6 +2105,15 @@ ul.toolbarmenu li span.conversation {
 	background-position: 0 -1532px;
 }
 
+#snippetslist {
+	max-width: 200px;
+}
+
+#snippetslist li a {
+	overflow: hidden;
+	text-overflow: ellipsis;
+}
+
 #rcmKSearchpane {
 	border-radius: 0 0 4px 4px;
 	border-top: 0;
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
index 15c8e56ff..5a6285c68 100644
--- a/skins/larry/templates/compose.html
+++ b/skins/larry/templates/compose.html
@@ -30,6 +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" 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>
@@ -196,6 +197,16 @@
 
 <div id="spellmenu" class="popupmenu"></div>
 
+<div id="responsesmenu" class="popupmenu">
+    <ul class="toolbarmenu" id="textresponsesmenu">
+		<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" unselectable="on" /></li>
+		<li><roundcube:button command="responses" type="link" label="editresponses" classAct="active" /></li>
+	</ul>
+</div>
+
 <roundcube:include file="/includes/footer.html" />
 
 </body>
diff --git a/skins/larry/templates/responseedit.html b/skins/larry/templates/responseedit.html
new file mode 100644
index 000000000..8f180fe7f
--- /dev/null
+++ b/skins/larry/templates/responseedit.html
@@ -0,0 +1,22 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="iframe">
+
+<h1 class="boxtitle"><roundcube:object name="steptitle" /></h1>
+
+<div id="preferences-details" class="boxcontent">
+<roundcube:object name="responseform" class="propform" size="60" textareacols="60" textarearows="18" />
+</div>
+
+<div class="footerleft formbuttons">
+	<roundcube:button command="save" type="input" class="button mainaction" label="save" condition="!env:readonly" />
+</div>
+
+<roundcube:include file="/includes/footer.html" />
+
+</body>
+</html>
diff --git a/skins/larry/templates/responses.html b/skins/larry/templates/responses.html
new file mode 100644
index 000000000..fb40048c8
--- /dev/null
+++ b/skins/larry/templates/responses.html
@@ -0,0 +1,41 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+</head>
+<body class="noscroll">
+
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen" class="offset">
+
+<roundcube:include file="/includes/settingstabs.html" />
+
+<div id="settings-right">
+
+<div id="identitieslist" class="uibox listbox">
+<h2 class="boxtitle"><roundcube:label name="responses" /></h2>
+<div class="scroller withfooter">
+<roundcube:object name="responsesList" id="identities-table" class="listing" cellspacing="0" summary="Responses list" noheader="true" />
+</div>
+<div class="boxfooter">
+<roundcube:button command="add" type="link" title="savenewresponse" class="listbutton add disabled" classAct="listbutton add" innerClass="inner" content="+" /><roundcube:button command="delete" type="link" title="delete" class="listbutton delete disabled" classAct="listbutton delete" innerClass="inner" content="-" />
+</div>
+</div>
+
+<div id="identity-details" class="uibox contentbox">
+	<div class="iframebox">
+		<roundcube:object name="responseframe" id="preferences-frame" style="width:100%; height:100%" frameborder="0" src="/watermark.html" />
+	</div>
+	<roundcube:object name="message" id="message" class="statusbar" />
+</div>
+
+</div>
+
+</div>
+
+<roundcube:include file="/includes/footer.html" />
+
+</body>
+</html>