From 74d4c7f9ada668d0bf53361a407b00be7d10488c Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 16 Dec 2011 14:23:04 -0500
Subject: [PATCH] Setup dialogs (using jquery UI) and compose form for Larry
---
skins/larry/googiespell.css | 94 ++++++
skins/larry/images/googiespell/indicator.gif | 0
skins/larry/images/googiespell/buttons.png | 0
skins/larry/templates/mail.html | 50 +++
skins/larry/images/googiespell/spellc.gif | 0
skins/larry/images/googiespell/ok.gif | 0
skins/larry/images/googiespell/change_lang.gif | 0
skins/larry/styles.css | 168 ++++++++--
skins/larry/images/buttons.png | 0
program/js/app.js | 2
skins/larry/mail.css | 236 ++++++++++++++
skins/larry/templates/compose.html | 159 ++++++++++
skins/larry/ui.js | 169 ++++++++++
13 files changed, 820 insertions(+), 58 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 46326ce..7753a41 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3360,7 +3360,7 @@
content = '<img src="'+this.env.loadingicon+'" alt="" class="uploading" />'+content;
if (this.env.cancelicon)
content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload" class="cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
- this.add2attachment_list(ts, { name:'', html:content, complete:false });
+ this.add2attachment_list(ts, { name:'', html:content, classname:'uploading', complete:false });
// upload progress support
if (this.env.upload_progress_time) {
diff --git a/skins/larry/googiespell.css b/skins/larry/googiespell.css
new file mode 100644
index 0000000..1e4d5df
--- /dev/null
+++ b/skins/larry/googiespell.css
@@ -0,0 +1,94 @@
+/***** modified styles for GoogieSpell *****/
+
+.googie_window {
+ font-size: 11px;
+ width: 185px;
+ margin: 0;
+ padding: 0;
+}
+
+.googie_edit_layer {
+ padding: 8px;
+ font-size: 9pt;
+ font-family: monospace;
+ background-color: #fff;
+ border: 0;
+}
+
+.googie_edit_layer span {
+ font-family: monospace;
+}
+
+.googie_list {
+ width: 100%;
+ margin: 0;
+ padding: 0;
+ border-spacing: 0;
+}
+
+.googie_list td {
+ min-width: 80px;
+ width: auto;
+}
+
+.googie_list td.googie_list_selected {
+ background: #4db0d2;
+}
+
+.googie_list_close {
+ font-size: 11px;
+ color: #b91414;
+}
+
+.googie_list_onhover .googie_list_close {
+ color: #fff;
+}
+
+.googie_list_revert {
+ font-size: 11px;
+ color: #b91414;
+}
+
+.googie_list_revert:hover {
+ color: #fff;
+}
+
+.googie_link {
+ color: #b91414;
+ text-decoration: underline;
+ cursor: pointer;
+ font-size: 9pt;
+ font-family: monospace;
+}
+
+.googie_check_spelling_link {
+ color: #0069A6;
+ font-size: 11px;
+ text-decoration: underline;
+ cursor: pointer;
+}
+
+.googie_no_style {
+ text-decoration: none;
+}
+
+.googie_check_spelling_ok,
+.googie_resume_editing {
+ color: green;
+ font-size: 11px;
+ cursor: pointer;
+ text-decoration: underline;
+}
+
+.googie_check_spelling_ok:hover,
+.googie_resume_editing:hover {
+ text-decoration: underline;
+}
+
+.googie_lang_3d_click img,
+.googie_lang_3d_on img {
+ vertical-align: middle;
+ cursor: pointer;
+ border: 0;
+}
+
diff --git a/skins/larry/images/buttons.png b/skins/larry/images/buttons.png
index f511755..c18f10f 100644
--- a/skins/larry/images/buttons.png
+++ b/skins/larry/images/buttons.png
Binary files differ
diff --git a/skins/larry/images/googiespell/buttons.png b/skins/larry/images/googiespell/buttons.png
new file mode 100644
index 0000000..f67a360
--- /dev/null
+++ b/skins/larry/images/googiespell/buttons.png
Binary files differ
diff --git a/skins/larry/images/googiespell/change_lang.gif b/skins/larry/images/googiespell/change_lang.gif
new file mode 100644
index 0000000..8145183
--- /dev/null
+++ b/skins/larry/images/googiespell/change_lang.gif
Binary files differ
diff --git a/skins/larry/images/googiespell/indicator.gif b/skins/larry/images/googiespell/indicator.gif
new file mode 100644
index 0000000..b556bb0
--- /dev/null
+++ b/skins/larry/images/googiespell/indicator.gif
Binary files differ
diff --git a/skins/larry/images/googiespell/ok.gif b/skins/larry/images/googiespell/ok.gif
new file mode 100644
index 0000000..d5a309f
--- /dev/null
+++ b/skins/larry/images/googiespell/ok.gif
Binary files differ
diff --git a/skins/larry/images/googiespell/spellc.gif b/skins/larry/images/googiespell/spellc.gif
new file mode 100644
index 0000000..6ed9360
--- /dev/null
+++ b/skins/larry/images/googiespell/spellc.gif
Binary files differ
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index 323f31b..3b8905c 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -302,7 +302,6 @@
}
.boxlistcontent thead tr td {
- font-size: 11px;
font-weight: bold;
background: #d6eaf3;
background: -moz-linear-gradient(left, #e3f2f6 0, #d6eaf3 14px, #d6eaf3 100%);
@@ -313,7 +312,8 @@
border-left: 1px solid #bbd3da;
}
-.boxlistcontent thead tr td a {
+.boxlistcontent thead tr td a,
+.boxlistcontent thead tr td span {
display: block;
padding: 8px 7px;
color: #69939e;
@@ -321,7 +321,6 @@
}
.boxlistcontent tbody tr td {
- font-size: 11px;
padding: 4px 7px;
border-bottom: 1px solid #ddd;
border-left: 1px dotted #bbd3da;
@@ -494,6 +493,7 @@
vertical-align: middle;
height: 18px;
width: 20px;
+ padding: 0;
background: url(images/listicons.png) -100px 0 no-repeat;
}
@@ -627,6 +627,9 @@
/* background: url(images/tree.gif) 0px 0px no-repeat; */
}
+#listoptions ul.proplist {
+ min-width: 16em;
+}
/**** message view ****/
@@ -655,7 +658,8 @@
}
#messageheader,
-#partheader {
+#partheader,
+#composeheaders {
position: relative;
padding: 3px 0;
background: #fff;
@@ -687,7 +691,6 @@
.headers-table td {
color: #666;
padding: 2px 8px;
- font-size: 11px;
}
.headers-table td.header {
@@ -796,7 +799,6 @@
#message-objects div a.button,
#messagebody span.part-notice a.button {
- font-size: 11px;
margin-left: 10px;
border: 1px solid #ccc;
box-shadow: 0 1px 1px 0 #e8e386;
@@ -872,6 +874,7 @@
#attachment-list li {
display: block;
+ position: relative;
background: url(images/filetypes.png) 0 0 no-repeat;
margin-bottom: 1px;
}
@@ -907,14 +910,13 @@
background-position: 0 -182px;
}
-
-#attachment-list li a {
+#attachment-list li a,
+#compose-attachments ul li {
display: block;
color: #333;
- font-size: 11px;
font-weight: bold;
padding: 8px 4px 3px 30px;
- text-shadow: 1px 1px 1px #fff;
+ text-shadow: 0px 1px 1px #fff;
text-decoration: none;
white-space: nowrap;
}
@@ -931,7 +933,217 @@
bottom: 0px;
}
-
#messagepartframe {
border: 0;
-}
\ No newline at end of file
+}
+
+
+/*** message composition ***/
+
+#composeview-left {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 250px;
+ bottom: 0;
+}
+
+#composeview-right {
+ position: absolute;
+ top: 0;
+ left: 262px;
+ right: 0;
+ bottom: 0;
+}
+
+#compose-content {
+ position: absolute;
+ top: 42px;
+ left: 0;
+ width: 100%;
+ bottom: 28px;
+ border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+ overflow: hidden;
+}
+
+#composeheaders {
+ border-radius: 4px 4px 0 0;
+ -webkit-box-shadow: 0 2px 3px 0 #999;
+ -moz-box-shadow: 0 2px 3px 0 #999;
+ box-shadow: 0 2px 3px 0 #999;
+}
+
+#composebuttons {
+ position: absolute;
+ top: 8px;
+ right: 8px;
+ width: auto;
+ white-space: nowrap;
+ z-index: 100;
+}
+
+.compose-headers {
+ width: 99%;
+ margin: 4px 0;
+}
+
+.compose-headers td {
+ padding: 4px 4px 4px 8px;
+}
+
+.compose-headers td.title {
+ width: 11%;
+ white-space: nowrap;
+}
+
+.compose-headers td.title label {
+ float: left;
+}
+
+.compose-headers td.title a.iconbutton {
+ float: right;
+ position: relative;
+ top: -2px;
+ width: 15px;
+}
+
+.compose-headers td.editfield {
+ width: 90%;
+ padding-left: 4px;
+}
+
+.compose-headers td.editfield a.iconlink {
+ margin-left: 0.5em;
+}
+
+.compose-headers td.formlinks {
+ padding: 0 4px;
+}
+
+.compose-headers td.top {
+ vertical-align: top;
+ padding-top: 10px;
+}
+
+.compose-headers td textarea,
+.compose-headers td input {
+ width: 100%;
+ resize: none;
+}
+
+#compose-cc, #compose-bcc, #compose-replyto, #compose-followupto {
+ display: none;
+}
+
+#composeoptionsbox {
+ padding: 4px 8px 0 8px;
+ background: #d2d2d2;
+ border-bottom: 1px solid #e8e8e8;
+ -webkit-box-shadow: 0 2px 3px 0 #999;
+ -moz-box-shadow: 0 2px 3px 0 #999;
+ box-shadow: 0 2px 3px 0 #999;
+ white-space: nowrap;
+}
+
+#composeoptions {
+ display: none;
+ padding: 2px 0;
+ white-space: normal;
+}
+
+.composeoption {
+ padding-right: 22px;
+ white-space: nowrap;
+}
+
+#composeoptions .composeoption {
+ display: inline-block;
+ padding: 4px 28px 4px 0;
+}
+
+#composeoptions .composeoption:last-child {
+ padding-right: 4px;
+}
+
+#composeoptionstoggle {
+ display: inline-block;
+ position: relative;
+ top: -1px;
+ left: 6px;
+ width: 20px;
+ height: 18px;
+ background: url(images/buttons.png) -3px -418px no-repeat;
+ text-decoration: none;
+}
+
+#composeoptionstoggle.enabled {
+ background-position: -28px -418px;
+}
+
+#composeview-bottom {
+ position: relative;
+ width: 100%;
+ height: 200px;
+}
+
+#composebodycontainer {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 260px;
+ bottom: 0;
+}
+
+#composebody {
+ position: absolute;
+ top: 24px;
+ left: 0;
+ bottom: 0;
+ width: 99%;
+ border: 0;
+ padding: 8px 0 8px 8px;
+ box-shadow: none;
+ resize: none;
+ font-family: monospace;
+ font-size: 9pt;
+}
+
+#compose-attachments {
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ width: 240px;
+ background: #f0f0f0;
+ padding: 8px;
+ overflow: auto;
+}
+
+#attachment-list li.uploading {
+ background: url(images/ajaxloader.gif) 2px 6px no-repeat;
+}
+
+#attachment-list li a.delete,
+#attachment-list li a.cancelupload {
+ position: absolute;
+ top: 6px;
+ right: 0;
+ width: 24px;
+ height: 18px;
+ padding: 0;
+ text-decoration: none;
+ text-indent: -1000px;
+ background: url(images/buttons.png) -7px -337px no-repeat;
+}
+
+#attachment-list li a.cancelupload {
+ background-position: -7px -377px;
+}
+
+#spellcheck-control {
+ margin: 6px 8px;
+ text-align: right;
+}
+
+
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 0aeb2fa..f5a4785 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -14,7 +14,7 @@
body {
font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
- font-size: 12px;
+ font-size: 11px;
color: #333;
background: url(images/linen.jpg) repeat #d1d5d8;
margin: 0;
@@ -66,9 +66,9 @@
input.button {
display: inline-block;
margin: 0 2px;
- padding: 4px 6px;
+ padding: 3px 5px;
color: #525252;
- text-shadow: 1px 1px 1px #fff;
+ text-shadow: 0px 1px 1px #fff;
border: 1px solid #c0c0c0;
border-radius: 4px;
background: #f7f7f7;
@@ -87,7 +87,7 @@
.formbuttons input.button {
color: #ddd;
font-size: 110%;
- text-shadow: 1px 1px 1px #333;
+ text-shadow: 0px 1px 1px #333;
padding: 4px 12px;
border-color: #465864;
border-radius: 5px;
@@ -97,14 +97,18 @@
background: -o-linear-gradient(top, rgba(123,123,123,1) 0%,rgba(96,96,96,1) 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, rgba(123,123,123,1) 0%,rgba(96,96,96,1) 100%); /* IE10+ */
background: linear-gradient(top, rgba(123,123,123,1) 0%,rgba(96,96,96,1) 100%); /* W3C */
+ box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
+ -o-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
+ -webkit-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
+ -moz-box-shadow: 0 1px 1px 0 #ccc, inset 0 1px 0 0 #888;
}
.formbuttons input.button:hover {
color: #f2f2f2;
- box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6);
- -moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6);
- -webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6);
- -o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6);
+ box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
+ -moz-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
+ -webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
+ -o-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.6), inset 0 1px 0 0 #888;
}
.formbuttons input.button:active {
@@ -129,12 +133,12 @@
input.button.mainaction:active {
color: #fff;
- background: rgba(42,46,49,1);
- background: -moz-linear-gradient(top, rgba(42,46,49,1) 0%, rgba(80,80,80,1) 100%);
- background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(42,46,49,1)), color-stop(100%,rgba(80,80,80,1)));
- background: -o-linear-gradient(top, rgba(42,46,49,1) 0%,rgba(80,80,80,1) 100%);
- background: -ms-linear-gradient(top, rgba(42,46,49,1) 0%,rgba(80,80,80,1) 100%);
- background: linear-gradient(top, rgba(42,46,49,1) 0%,rgba(80,80,80,1) 100%);
+ background: #515151;
+ background: -moz-linear-gradient(top, #515151 0%, #2c2c2c 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#515151), color-stop(100%,#2c2c2c));
+ background: -o-linear-gradient(top, #515151 0%, #2c2c2c 100%);
+ background: -ms-linear-gradient(top, #515151 0%, #2c2c2c 100%);
+ background: linear-gradient(top, #515151 0%, #2c2c2c 100%);
}
input.button[disabled],
@@ -154,7 +158,7 @@
margin: 0 2px;
padding: 2px 5px;
color: #525252;
- text-shadow: 1px 1px 1px #fff;
+ text-shadow: 0px 1px 1px #fff;
border: 1px solid #c6c6c6;
border-radius: 4px;
background: #f7f7f7;
@@ -170,6 +174,7 @@
text-decoration: none;
}
+label.disabled,
a.button.disabled {
color: #999;
}
@@ -257,8 +262,7 @@
.pagenav .countdisplay {
display: inline-block;
padding:0 0.5em;
- font-size: 11px;
- text-shadow: 1px 1px 1px #fff;
+ text-shadow: 0px 1px 1px #fff;
min-width: 20em;
}
@@ -277,13 +281,36 @@
}
a.iconbutton.searchoptions {
- background-position: -2px -337px;
+ background-position: -2px -317px;
}
a.iconbutton.reset {
- background-position: -25px -337px;
+ background-position: -25px -317px;
}
+a.iconbutton.cancel {
+ background-position: -7px -377px;
+}
+
+a.iconlink {
+ display: inline-block;
+ color: #888;
+ text-decoration: none;
+ padding: 2px 8px 2px 20px;
+ background: url(images/buttons.png) -1000px 0 no-repeat;
+}
+
+a.iconlink:hover {
+ text-decoration: underline;
+}
+
+a.iconlink.add {
+ background-position: -7px -357px;
+}
+
+a.iconlink.edit {
+ background-position: -7px -397px;
+}
/*** message bar ***/
@@ -349,7 +376,6 @@
background: url(images/linen_header.jpg) repeat #666;
border-bottom: 1px solid #4f4f4f;
padding: 2px 0 2px 10px;
- font-size: 11px;
color: #aaa;
}
@@ -423,7 +449,7 @@
display: inline-block;
font-size: 110%;
font-weight: normal;
- text-shadow: 1px 1px 1px black;
+ text-shadow: 0px 1px 1px black;
padding: 5px 0 0 34px;
height: 19px;
background: url(images/buttons.png) -1000px 0 no-repeat;
@@ -543,7 +569,7 @@
font-weight: bold;
padding: 10px 8px 8px 8px;
margin: 0;
- text-shadow: 1px 1px 1px #fff;
+ text-shadow: 0px 1px 1px #fff;
border-bottom: 1px solid #bbd3da;
white-space: nowrap;
}
@@ -560,7 +586,6 @@
.listing tbody td,
.listing li {
display: block;
- font-size: 11px;
border-top: 1px solid #fff;
border-bottom: 1px solid #bbd3da;
cursor: default;
@@ -573,7 +598,7 @@
.listing li a {
display: block;
color: #376572;
- text-shadow: 1px 1px 1px #fff;
+ text-shadow: 0px 1px 1px #fff;
text-decoration: none;
cursor: default;
padding: 7px 8px 5px 8px;
@@ -608,9 +633,15 @@
background-color: #c7e3ef;
}
-table.listing {
+table.listing,
+table.layout {
+ border: 0;
width: 100%;
border-spacing: 0;
+}
+
+table.layout td {
+ vertical-align: top;
}
.listbox .boxfooter {
@@ -734,12 +765,19 @@
font-size: 12px;
}
+fieldset.floating {
+ float: left;
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
+
table.propform {
width: 100%;
border-spacing: 0;
border-collapse: collapse;
}
+ul.proplist li,
table.propform td {
width: 80%;
padding: 4px 10px;
@@ -757,6 +795,16 @@
table.propform .mceLayout td {
padding: 0;
border-bottom: 0;
+}
+
+ul.proplist {
+ list-style: none;
+ margin: 0;
+ padding: 0;
+}
+
+ul.proplist li {
+ width: auto;
}
@@ -799,7 +847,7 @@
#login-form input.button {
color: #444;
- text-shadow: 1px 1px 1px #fff;
+ text-shadow: 0px 1px 1px #fff;
border-color: #f9f9f9;
background: #f9f9f9;
background: -moz-linear-gradient(top, rgba(249,249,249,1) 0%, rgba(226,226,226,1) 100%);
@@ -820,7 +868,7 @@
#login-form td.title {
color: #cecece;
- text-shadow: 1px 1px 1px black;
+ text-shadow: 0px 1px 1px black;
text-align: right;
padding-right: 1em;
}
@@ -893,7 +941,7 @@
text-overflow: ellipsis;
white-space: nowrap;
padding: 28px 2px 2px 2px;
- text-shadow: 1px 1px 1px #eee;
+ text-shadow: 0px 1px 1px #eee;
box-shadow: none;
-moz-box-shadow: none;
-webkit-box-shadow: none;
@@ -971,9 +1019,19 @@
background-position: center -850px;
}
+.toolbar a.button.attach {
+ background-position: center -890px;
+}
+
+.toolbar a.button.spellcheck {
+ background-position: center -930px;
+}
+
+
/*** popup menus ***/
-.popupmenu {
+.popupmenu,
+#rcmKSearchpane {
display: none;
position: absolute;
top: 32px;
@@ -989,15 +1047,17 @@
-o-box-shadow: 0 2px 6px 0 #333;
}
-ul.toolbarmenu {
+ul.toolbarmenu,
+#rcmKSearchpane ul {
margin: 0;
padding: 0;
list-style: none;
}
-ul.toolbarmenu li {
+.googie_list td,
+ul.toolbarmenu li,
+#rcmKSearchpane ul li {
color: #fff;
- font-size: 11px;
white-space: nowrap;
min-width: 130px;
margin: 0;
@@ -1005,28 +1065,35 @@
border-bottom: 1px solid #333;
}
+.googie_list tr:first-child td,
ul.toolbarmenu li:first-child {
border-top: 0;
}
+.googie_list tr:last-child td,
ul.toolbarmenu li:last-child {
border-bottom: 0;
}
+.googie_list td span,
ul.toolbarmenu li a {
display: block;
color: #666;
- text-shadow: 1px 1px 1px #333;
+ text-shadow: 0px 1px 1px #333;
text-decoration: none;
min-height: 14px;
padding: 6px 10px 6px 10px;
}
+.googie_list td span,
ul.toolbarmenu li a.active {
color: #fff;
+ cursor: default;
}
-ul.toolbarmenu li a.active:hover {
+.googie_list td.googie_list_onhover,
+ul.toolbarmenu li a.active:hover,
+#rcmKSearchpane ul li.selected {
background-color: #00aad6;
background: -moz-linear-gradient(top, #00aad6 0%, #008fc9 100%);
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#00aad6), color-stop(100%,#008fc9));
@@ -1043,7 +1110,35 @@
display: block;
color: #fff;
padding: 4px 8px;
- text-shadow: 1px 1px 1px #333;
+ text-shadow: 0px 1px 1px #333;
+}
+
+#rcmKSearchpane {
+ border-radius: 0 0 4px 4px;
+ border-top: 0;
+}
+
+#rcmKSearchpane ul li {
+ text-shadow: 0px 1px 1px #333;
+ text-decoration: none;
+ min-height: 14px;
+ padding: 6px 10px 6px 10px;
+ border: 0;
+}
+
+.popupdialog {
+ display: none;
+ padding: 10px;
+}
+
+.popupdialog .formbuttons {
+ margin: 20px 0 4px 0;
+}
+
+.hint {
+ margin: 4px 0;
+ color: #999;
+ text-shadow: 0px 1px 1px #fff;
}
.splitter {
@@ -1084,10 +1179,9 @@
-o-box-shadow: 0 2px 6px 0 #333;
z-index: 250;
color: #ccc;
- font-size: 11px;
white-space: nowrap;
opacity: 0.92;
- text-shadow: 1px 1px 1px #333;
+ text-shadow: 0px 1px 1px #333;
}
#rcmdraglayer:after {
diff --git a/skins/larry/templates/compose.html b/skins/larry/templates/compose.html
new file mode 100644
index 0000000..1fe740c
--- /dev/null
+++ b/skins/larry/templates/compose.html
@@ -0,0 +1,159 @@
+<roundcube:object name="doctype" value="html5" />
+<html>
+<head>
+<title><roundcube:object name="pagetitle" /></title>
+<roundcube:include file="/includes/links.html" />
+<link rel="stylesheet" type="text/css" href="/googiespell.css" />
+</head>
+<body>
+
+<roundcube:include file="/includes/header.html" />
+
+<div id="mainscreen">
+
+<div id="composeview-left">
+
+<!-- inline address book -->
+
+</div>
+
+<div id="composeview-right">
+
+<!-- toolbar -->
+<div id="messagetoolbar" class="fullwidth">
+<div id="mailtoolbar" class="toolbar">
+ <roundcube:button command="spellcheck" type="link" class="button spellcheck disabled" classAct="button spellcheck" classSel="button spellcheck pressed" label="checkspelling" />
+ <roundcube:button name="addattachment" type="link" class="button attach" classAct="button attach" classSel="button attach pressed" label="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="insertsignature" />
+ <roundcube:container name="toolbar" id="compose-toolbar" />
+</div>
+</div>
+
+<form name="form" action="./" method="post" id="compose-content" class="uibox">
+
+<!-- message headers -->
+<div id="composeheaders">
+
+<table class="headers-table compose-headers">
+<tbody>
+ <tr>
+ <td class="title"><label for="_from"><roundcube:label name="from" /></label></td>
+ <td class="editfield">
+ <roundcube:object name="composeHeaders" part="from" form="form" id="_from" tabindex="1" />
+ <a href="#identities" onclick="return rcmail.command('identities')" class="iconlink edit"><roundcube:label name="editidents" /></a>
+ </td>
+ </tr><tr>
+ <td class="title top"><label for="_to"><roundcube:label name="to" /></label></td>
+ <td class="editfield"><roundcube:object name="composeHeaders" part="to" form="form" id="_to" cols="70" rows="1" tabindex="2" /></td>
+ </tr><tr id="compose-cc">
+ <td class="title top">
+ <label for="_cc"><roundcube:label name="cc" /></label>
+ <a href="#cc" onclick="return UI.hide_header_row('cc');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
+ </td>
+ <td class="editfield"><roundcube:object name="composeHeaders" part="cc" form="form" id="_cc" cols="70" rows="1" tabindex="3" /></td>
+ </tr><tr id="compose-bcc">
+ <td class="title top">
+ <label for="_bcc"><roundcube:label name="bcc" /></label>
+ <a href="#bcc" onclick="return UI.hide_header_row('bcc');" class="iconbutton cancel"title="<roundcube:label name='delete' />" />x</a>
+ </td>
+ <td colspan="2" class="editfield"><roundcube:object name="composeHeaders" part="bcc" form="form" id="_bcc" cols="70" rows="1" tabindex="4" /></td>
+ </tr><tr id="compose-replyto">
+ <td class="title top">
+ <label for="_replyto"><roundcube:label name="replyto" /></label>
+ <a href="#replyto" onclick="return UI.hide_header_row('replyto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
+ </td>
+ <td class="editfield"><roundcube:object name="composeHeaders" part="replyto" form="form" id="_replyto" size="70" tabindex="5" /></td>
+ </tr><tr id="compose-followupto">
+ <td class="title top">
+ <label for="_followupto"><roundcube:label name="followupto" /></label>
+ <a href="#followupto" onclick="return UI.hide_header_row('followupto');" class="iconbutton cancel" title="<roundcube:label name='delete' />" />x</a>
+ </td>
+ <td class="editfield"><roundcube:object name="composeHeaders" part="followupto" form="form" id="_followupto" size="70" tabindex="7" /></td>
+ </tr><tr>
+ <td></td>
+ <td class="formlinks">
+ <a href="#cc" onclick="return UI.show_header_row('cc')" id="cc-link" class="iconlink add"><roundcube:label name="addcc" /></a>
+ <a href="#bcc" onclick="return UI.show_header_row('bcc')" id="bcc-link" class="iconlink add"><roundcube:label name="addbcc" /></a>
+ <a href="#reply-to" onclick="return UI.show_header_row('replyto')" id="replyto-link" class="iconlink add"><roundcube:label name="addreplyto" /></a>
+ <a href="#followup-to" onclick="return UI.show_header_row('followupto')" id="followupto-link" class="iconlink add"><roundcube:label name="addfollowupto" /></a>
+ </td>
+ </tr><tr>
+ <td class="title"><label for="compose-subject"><roundcube:label name="subject" /></label></td>
+ <td class="editfield"><roundcube:object name="composeSubject" id="compose-subject" form="form" tabindex="8" /></td>
+ </tr>
+</tbody>
+</table>
+
+<div id="composebuttons" class="formbuttons">
+ <roundcube:button type="input" command="send" class="button mainaction" label="sendmessage" tabindex="10" />
+ <roundcube:button type="input" command="savedraft" class="button" label="savemessage" tabindex="10" />
+ <roundcube:button type="input" command="list" class="button" label="cancel" tabindex="11" />
+</div>
+
+</div>
+
+<!-- (collapsable) message options -->
+<div id="composeoptionsbox">
+ <span class="composeoption">
+ <label><roundcube:label name="options" /></label>
+ <a href="#options" id="composeoptionstoggle"> </a>
+ </span>
+
+ <div id="composeoptions">
+ <span class="composeoption">
+ <label><roundcube:label name="editortype" />
+ <roundcube:object name="editorSelector" editorid="compose-body" tabindex="12" /></label>
+ </span>
+ <span class="composeoption">
+ <label><label for="rcmcomposepriority"><roundcube:label name="priority" />
+ <roundcube:object name="prioritySelector" form="form" id="rcmcomposepriority" /></label>
+ </span>
+ <span class="composeoption">
+ <label><roundcube:object name="receiptCheckBox" form="form" id="rcmcomposereceipt" /> <roundcube:label name="returnreceipt" /></label>
+ </span>
+ <span class="composeoption">
+ <label><roundcube:object name="dsnCheckBox" form="form" id="rcmcomposedsn" /> <roundcube:label name="dsn" /></label>
+ </span>
+ <span class="composeoption">
+ <label><roundcube:label name="savesentmessagein" /> <roundcube:object name="storetarget" maxlength="30" style="max-width:12em" /></label>
+ </span>
+ <roundcube:container name="composeoptions" id="composeoptions" />
+ </div>
+</div>
+
+<!-- message compose body -->
+<div id="composeview-bottom">
+ <div id="composebodycontainer">
+ <div id="spellcheck-control"></div>
+ <roundcube:object name="composeBody" id="composebody" form="form" cols="70" rows="20" tabindex="9" />
+ </div>
+ <div id="compose-attachments" class="rightcol">
+ <div style="text-align:center; margin-bottom:20px">
+ <roundcube:button name="addattachment" type="input" class="button" classSel="button pressed" label="addattachment" onclick="UI.show_uploadform();return false" />
+ </div>
+ <roundcube:object name="composeAttachmentList" id="attachment-list" cancelIcon="/images/0.gif" />
+ </div>
+</div>
+
+</form>
+
+<div id="mailview-bottom" class="uibox">
+ <roundcube:object name="message" id="message" class="statusbar" />
+</div>
+
+</div><!-- end mailview-right -->
+
+</div><!-- end mainscreen -->
+
+<div id="upload-dialog" class="propform popupdialog" title="<roundcube:label name='addattachment' />">
+ <roundcube:object name="composeAttachmentForm" id="uploadform" attachmentFieldSize="40" buttons="no" />
+ <div class="formbuttons">
+ <roundcube:button command="send-attachment" type="input" class="button mainaction" label="upload" />
+ <roundcube:button name="close" type="input" class="button" label="cancel" onclick="UI.show_uploadform()" />
+ </div>
+</div>
+
+<roundcube:include file="/includes/footer.html" />
+
+</body>
+</html>
diff --git a/skins/larry/templates/mail.html b/skins/larry/templates/mail.html
index 87e690b..9f4b756 100644
--- a/skins/larry/templates/mail.html
+++ b/skins/larry/templates/mail.html
@@ -127,9 +127,53 @@
</ul>
</div>
-
-<div id="listoptions" class="popupdialog">
-
+<div id="listoptions" class="propform popupdialog">
+<roundcube:if condition="!in_array('list_cols', (array)config:dont_override)" />
+ <fieldset class="floating">
+ <legend><roundcube:label name="listcolumns" /></legend>
+ <ul class="proplist">
+ <li><label class="disabled"><input type="checkbox" name="list_col[]" value="threads" checked="checked" disabled="disabled" /> <roundcube:label name="threads" /></label></li>
+ <li><label class="disabled"><input type="checkbox" name="list_col[]" value="subject" checked="checked" disabled="disabled" /> <roundcube:label name="subject" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="from" /> <roundcube:label name="fromto" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="replyto" /> <roundcube:label name="replyto" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="cc" /> <roundcube:label name="cc" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="date" /> <roundcube:label name="date" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="size" /> <roundcube:label name="size" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="status" /> <roundcube:label name="readstatus" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="attachment" /> <roundcube:label name="attachment" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="flag" /> <roundcube:label name="flag" /></label></li>
+ <li><label><input type="checkbox" name="list_col[]" value="priority" /> <roundcube:label name="priority" /></label></li>
+ </ul>
+ </fieldset>
+ <roundcube:endif />
+ <roundcube:if condition="!in_array('message_sort_col', (array)config:dont_override)" />
+ <fieldset class="floating">
+ <legend><roundcube:label name="listsorting" /></legend>
+ <ul class="proplist">
+ <li><label><input type="radio" name="sort_col" value="" /> <roundcube:label name="nonesort" /></label></li>
+ <li><label><input type="radio" name="sort_col" value="arrival" /> <roundcube:label name="arrival" /></label></li>
+ <li><label><input type="radio" name="sort_col" value="date" /> <roundcube:label name="sentdate" /></label></li>
+ <li><label><input type="radio" name="sort_col" value="subject" /> <roundcube:label name="subject" /></label></li>
+ <li><label><input type="radio" name="sort_col" value="from" /> <roundcube:label name="fromto" /></label></li>
+ <li><label><input type="radio" name="sort_col" value="cc" /> <roundcube:label name="cc" /></label></li>
+ <li><label><input type="radio" name="sort_col" value="size" /> <roundcube:label name="size" /></label></li>
+ </ul>
+ </fieldset>
+ <roundcube:endif />
+ <roundcube:if condition="!in_array('message_sort_order', (array)config:dont_override)" />
+ <fieldset class="floating">
+ <legend><roundcube:label name="listorder" /></legend>
+ <ul class="proplist">
+ <li><label><input type="radio" name="sort_ord" value="ASC" /> <roundcube:label name="asc" /></label></li>
+ <li><label><input type="radio" name="sort_ord" value="DESC" /> <roundcube:label name="desc" /></label></li>
+ </ul>
+ </fieldset>
+ <roundcube:endif />
+ <br style="clear:both" />
+ <div class="formbuttons">
+ <roundcube:button command="menu-save" id="listmenusave" type="input" class="button mainaction" label="save" />
+ <roundcube:button command="menu-open" id="listmenucancel" type="input" class="button" label="cancel" />
+ </div>
</div>
<roundcube:include file="/includes/footer.html" />
diff --git a/skins/larry/ui.js b/skins/larry/ui.js
index a995610..ef4b65a 100644
--- a/skins/larry/ui.js
+++ b/skins/larry/ui.js
@@ -1,5 +1,14 @@
/**
* Roundcube functions for default skin interface
+ *
+ * Copyright (c) 2011, The Roundcube Dev Team
+ *
+ * The contents are subject to the Creative Commons Attribution-ShareAlike
+ * 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.
+ *
+ * $Id$
*/
@@ -21,11 +30,15 @@
var me = this;
var mailviewsplit;
+ var compose_headers = {};
// export public methods
this.init = init;
this.show_popup = show_popup;
this.set_searchmod = set_searchmod;
+ this.show_uploadform = show_uploadform;
+ this.show_header_row = show_header_row;
+ this.hide_header_row = hide_header_row;
/**
*
@@ -33,11 +46,16 @@
function init()
{
if (rcmail.env.task == 'mail') {
- rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
- rcmail.addEventListener('menu-open', function(){ show_popup('listoptions'); });
+ rcmail.addEventListener('menu-open', show_listoptions);
rcmail.addEventListener('menu-save', save_listoptions);
-// rcmail.addEventListener('aftersend-attachment', 'uploadmenu', rcmail_ui);
-// rcmail.addEventListener('aftertoggle-editor', 'resize_compose_body_ev', rcmail_ui);
+ rcmail.addEventListener('aftersend-attachment', show_uploadform);
+ rcmail.addEventListener('aftertoggle-editor', function(){ window.setTimeout(function(){ layout_composeview() }, 100); });
+
+ var dragmenu = $('#dragmessagemenu');
+ if (dragmenu.length) {
+ rcmail.gui_object('message_dragmenu', 'dragmessagemenu');
+ popups.dragmessagemenu = dragmenu;
+ }
var previewframe = $('#mailpreviewframe').is(':visible');
$('#mailpreviewtoggle').addClass(previewframe ? 'enabled' : 'closed').click(function(e){ toggle_preview_pane(e); return false });
@@ -46,6 +64,19 @@
if (rcmail.env.action == 'show' || rcmail.env.action == 'preview') {
layout_messageview();
+ }
+ else if (rcmail.env.action == 'compose') {
+ layout_composeview();
+
+ $('#composeoptionstoggle').click(function(){
+ $(this).toggleClass('enabled');
+ $('#composeoptions').toggle();
+ layout_composeview();
+ return false;
+ });
+
+ new rcube_splitter({ id:'composesplitterv', p1:'#composeview-left', p2:'#composeview-right',
+ orientation:'v', relative:true, start:248, min:150, size:12 }).init();
}
else if (rcmail.env.action == 'list' || !rcmail.env.action) {
mailviewsplit = new rcube_splitter({ id:'mailviewsplitter', p1:'#mailview-top', p2:'#mailview-bottom',
@@ -113,6 +144,9 @@
if (rcmail.env.task == 'mail' && (rcmail.env.action == 'show' || rcmail.env.action == 'preview')) {
layout_messageview();
}
+ if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
+ layout_composeview();
+ }
}
/**
@@ -139,6 +173,28 @@
{
if (splitter)
$('#quicksearchbar input').css('width', (splitter.pos - 70) + 'px');
+ }
+
+
+ function layout_composeview()
+ {
+ var body = $('#composebody'),
+ bottom = $('#composeview-bottom'),
+ w, h;
+
+ bottom.css('height', (bottom.parent().height() - bottom.position().top) + 'px');
+
+ w = body.parent().width() - 8;
+ h = body.parent().height() - 36;
+ body.width(w).height(h);
+
+ if (window.tinyMCE && tinyMCE.get('composebody')) {
+ $('#composebody_tbl').width((w+6)+'px').height('');
+ $('#composebody_ifr').width((w+6)+'px').height((h-54)+'px');
+ }
+ else {
+ $('#googie_edit_layer').height(h+'px');
+ }
}
@@ -320,9 +376,55 @@
/**
*
*/
+ function show_listoptions()
+ {
+ var $dialog = $('#listoptions');
+
+ // close the dialog
+ if ($dialog.is(':visible')) {
+ $dialog.dialog('close');
+ return;
+ }
+
+ // set form values
+ $('input[name="sort_col"][value="'+rcmail.env.sort_col+'"]').prop('checked', true);
+ $('input[name="sort_ord"][value="DESC"]').prop('checked', rcmail.env.sort_order == 'DESC');
+ $('input[name="sort_ord"][value="ASC"]').prop('checked', rcmail.env.sort_order != 'DESC');
+ $('input[name="view"][value="thread"]').prop('checked', rcmail.env.threading ? true : false);
+ $('input[name="view"][value="list"]').prop('checked', rcmail.env.threading ? false : true);
+
+ // list columns
+ var found, cols = $('input[name="list_col[]"]');
+ for (var i=0; i < cols.length; i++) {
+ if (cols[i].value != 'from') {
+ found = $.inArray(cols[i].value, rcmail.env.coltypes) != -1;
+ }
+ else {
+ found = ($.inArray('from', rcmail.env.coltypes) != -1
+ || $.inArray('to', rcmail.env.coltypes) != -1);
+ }
+ $(cols[i]).prop('checked', found);
+ }
+
+ $dialog.dialog({
+ modal: true,
+ resizable: false,
+ closeOnEscape: true,
+ title: null,
+ close: function() {
+ $dialog.dialog('destroy').hide();
+ },
+ width: 650
+ }).show();
+ }
+
+
+ /**
+ *
+ */
function save_listoptions()
{
- show_popupmenu('listoptions', false);
+ $('#listoptions').dialog('close');
var sort = $('input[name="sort_col"]:checked').val(),
ord = $('input[name="sort_ord"]:checked').val(),
@@ -381,6 +483,63 @@
}
});
}
+
+
+ function show_uploadform()
+ {
+ var $dialog = $('#upload-dialog');
+
+ // close the dialog
+ if ($dialog.is(':visible')) {
+ $dialog.dialog('close');
+ return;
+ }
+
+ $dialog.dialog({
+ modal: true,
+ resizable: false,
+ closeOnEscape: true,
+ title: $dialog.attr('title'),
+ close: function() {
+ try { $('#upload-dialog form').get(0).reset(); }
+ catch(e){ } // ignore errors
+
+ $dialog.dialog('destroy').hide();
+ },
+ width: 480
+ }).show();
+
+ if (!document.all)
+ $('input[type=file]', $dialog).click();
+ }
+
+ /**
+ *
+ */
+ function show_header_row(which)
+ {
+ if (compose_headers[which])
+ $('#_' + which).val(compose_headers[which]);
+ $('#compose-' + which).show();
+ $('#' + which + '-link').hide();
+ this.resize_compose_body();
+ return false;
+ }
+
+ /**
+ *
+ */
+ function hide_header_row(which)
+ {
+ // copy and clear field value
+ var field = $('#_' + which);
+ compose_headers[which] = field.val();
+ field.val('');
+
+ $('#compose-' + which).hide();
+ $('#' + which + '-link').show();
+ this.resize_compose_body();
+ }
}
--
Gitblit v1.9.1