summaryrefslogtreecommitdiff
path: root/skins/larry
diff options
context:
space:
mode:
Diffstat (limited to 'skins/larry')
-rw-r--r--skins/larry/images/buttons.pngbin50162 -> 38715 bytes
-rw-r--r--skins/larry/images/listicons.pngbin26384 -> 33661 bytes
-rw-r--r--skins/larry/mail.css9
-rw-r--r--skins/larry/settings.css12
-rw-r--r--skins/larry/styles.css42
-rw-r--r--skins/larry/templates/compose.html11
-rw-r--r--skins/larry/templates/responseedit.html22
-rw-r--r--skins/larry/templates/responses.html41
-rw-r--r--skins/larry/ui.js2
9 files changed, 133 insertions, 6 deletions
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
Binary files differ
diff --git a/skins/larry/images/listicons.png b/skins/larry/images/listicons.png
index e4ffef660..2527fe10d 100644
--- a/skins/larry/images/listicons.png
+++ b/skins/larry/images/listicons.png
Binary files differ
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index b65b08112..0c6166485 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;
}
@@ -642,7 +646,7 @@ table.messagelist.fixedcopy {
}
.messagelist thead tr td.flag span.flagged {
- background-position: -24px -1036px;
+ background-position: -22px -1036px;
}
.messagelist tr td.status span.msgicon:hover {
@@ -696,7 +700,7 @@ table.messagelist.fixedcopy {
}
.messagelist thead tr td.status span.status {
- background-position: -24px -1016px;
+ background-position: -23px -1017px;
}
.messagelist tr td div.collapsed {
@@ -768,6 +772,7 @@ table.messagelist.fixedcopy {
width: 100%;
bottom: 27px;
overflow: auto;
+ -webkit-overflow-scrolling: touch;
}
#messageheader,
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 4b238c163..0d7a50069 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 {
@@ -1906,6 +1924,9 @@ select.decorated option {
top: 32px;
left: 90px;
width: auto;
+ max-height: 70%;
+ overflow: -moz-scrollbars-vertical;
+ overflow-y: auto;
background: #444;
border: 1px solid #999;
z-index: 240;
@@ -1922,6 +1943,7 @@ select.decorated option {
}
ul.toolbarmenu,
+ul.toolbarmenu ul,
#rcmKSearchpane ul {
margin: 0;
padding: 0;
@@ -1940,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;
}
@@ -2000,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;
@@ -2078,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>
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index d558f16a2..0fd0241f7 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -473,7 +473,7 @@ function rcube_mail_ui()
function enable_command(p)
{
- if (p.command == 'reply-list') {
+ if (p.command == 'reply-list' && rcmail.env.reply_all_mode == 1) {
var label = rcmail.gettext(p.status ? 'replylist' : 'replyall');
if (rcmail.env.action == 'preview')
$('a.button.replyall').attr('title', label);