diff --git a/UI/Templates/MailerUI/UIxMailEditorAttach.wox b/UI/Templates/MailerUI/UIxMailEditorAttach.wox
deleted file mode 100644
index 8029dedf8..000000000
--- a/UI/Templates/MailerUI/UIxMailEditorAttach.wox
+++ /dev/null
@@ -1,101 +0,0 @@
-
-
-
- Attach ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 98d15c6b3..4d19b7efe 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -174,7 +174,7 @@ DIV#folderTreeContent
padding-left: 6px;
}
-table.titletable
+TABLE.titletable
{
height: 24px;
vertical-align: middle;
@@ -182,7 +182,7 @@ table.titletable
padding-left: 6px;
}
-table.titletable td.titlecell SELECT
+TABLE.titletable td.titlecell SELECT
{
display: -moz-popup;
border-top: 1px solid #fff;
@@ -268,7 +268,7 @@ IMG.mailerReadIcon
*/
}
-div.mailer_readicon
+DIV.mailer_readicon
{
/* TODO: use Thunderbird icon */
background-image: url(icon_read.gif);
@@ -276,7 +276,7 @@ div.mailer_readicon
background-position: 0px 4px;
}
-div.mailer_readicon a
+DIV.mailer_readicon a
{
width: 17px;
height: 17px;
@@ -284,7 +284,7 @@ div.mailer_readicon a
display: block;
}
-div.mailerUnreadIcon
+DIV.mailerUnreadIcon
{
/* TODO: use Thunderbird icon */
background-image: url(icon_unread.gif);
@@ -292,7 +292,7 @@ div.mailerUnreadIcon
background-position: 0px 4px;
}
-div.mailer_unreadicon a
+DIV.mailer_unreadicon a
{
width: 17px;
height: 17px;
@@ -302,36 +302,30 @@ div.mailer_unreadicon a
/* fields (key/value UI), eg used in mail viewer */
-table.mailer_fieldtable
+TABLE.mailer_fieldtable
{
top: 0px;
left: 0px;
padding-top: .5em;
overflow-y: auto;
overflow-x: hidden;
- height: 6.5em;
+ height: 7.5em;
border-bottom: 1px solid #808080;
background: #d4d0c8;
}
-div.mailer_mailcontent
+DIV.mailer_mailcontent
{
background-color: #fff;
position: absolute;
padding: .5em;
- margin-top: .5em;
- top: 10em;
+ top: 7.5em;
overflow: auto;
left: 0px;
right: 0px;
bottom: 0px;
}
-DIV#messageContent div.mailer_mailcontent
-{
- top: 6em;
-}
-
td.mailer_fieldname
{
white-space: nowrap;
@@ -419,24 +413,13 @@ td.attachment_uplabel
/* attachment link viewer */
-div.linked_attachment_frame
-{
- background-color: #dcdad5;
- padding: 4px;
-}
+DIV.linked_attachment_frame
+{ border: 0px; }
-div.linked_attachment_body
-{
- padding: 4px;
- border-width: 1px;
- border-style: solid;
- border-top-color: white;
- border-left-color: white;
- border-bottom-color: #808080;
- border-right-color: #808080;
-}
+DIV.linked_attachment_body
+{ border: 0px; }
-div.linked_attachment_meta
+DIV.linked_attachment_meta
{
color: #444444;
font-style: italic;
@@ -444,12 +427,27 @@ div.linked_attachment_meta
padding: 2px;
}
-table.linked_attachment_meta
+TABLE.linked_attachment_meta
{
color: #444444;
font-style: italic;
}
+DIV.bodyFields
+{
+ background: #efefef;
+ font-family: serif;
+ margin: 0.5em;
+}
+
+DIV.bodyFields SPAN.fieldName
+{ font-weight: bold; }
+
+DIV.bodyAdditionalFields
+{
+ background: #d4d0c8;
+}
+
DIV[datatype~="additional"] > A.node > SPAN.nodeName
{ color: #777;
font-style: italic; }
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 434753d48..1793aa300 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -51,62 +51,6 @@ function clearSearch(sender) {
return true;
}
-/* mail editor */
-
-function validateEditorInput(sender) {
- var errortext = "";
- var field;
-
- field = document.pageform.subject;
- if (field.value == "")
- errortext = errortext + labels.error_missingsubject + "\n";
-
- if (!UIxRecipientSelectorHasRecipients())
- errortext = errortext + labels.error_missingrecipients + "\n";
-
- if (errortext.length > 0) {
- alert(labels.error_validationfailed.decodeEntities() + ":\n"
- + errortext.decodeEntities());
- return false;
- }
- return true;
-}
-
-function clickedEditorSend(sender) {
- if (!validateEditorInput(sender))
- return false;
-
- document.pageform.action = "send";
- document.pageform.submit();
- // if everything is ok, close the window
- return true;
-}
-
-function clickedEditorAttach(sender) {
- var urlstr;
-
- urlstr = "viewAttachments";
- window.open(urlstr, "SOGo_attach",
- "width=320,height=320,resizable=1,scrollbars=1,toolbar=0," +
- "location=0,directories=0,status=0,menubar=0,copyhistory=0");
- return false; /* stop following the link */
-}
-
-function clickedEditorSave(sender) {
- document.pageform.action = "save";
- document.pageform.submit();
- refreshOpener();
- return true;
-}
-
-function clickedEditorDelete(sender) {
- document.pageform.action = "delete";
- document.pageform.submit();
- refreshOpener();
- window.close();
- return true;
-}
-
function openAddressbook(sender) {
var urlstr;
@@ -833,7 +777,9 @@ function onMenuViewMessageSource(event) {
if (rows.length > 0) {
var url = (ApplicationBaseURL + currentMailbox + "/"
+ rows[0].substr(4) + "/viewsource");
- window.open(url);
+ window.open(url, "",
+ "width=680,height=520,resizable=1,scrollbars=1,toolbar=0,"
+ + "location=0,directories=0,status=0,menubar=0,copyhistory=0");
}
preventDefault(event);
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 860d0e576..b4fe4f2f0 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -657,8 +657,8 @@ function drawCalendarEvent(eventData, sd, ed) {
if (!lasts)
lasts = 1;
- var eventDiv = newEventDIV(eventData[0], eventData[1], starts, lasts,
- null, null, title);
+ var eventDiv = newEventDIV(eventData[0], eventData[1], starts, lasts,
+ null, null, title);
siblings.push(eventDiv);
eventDiv.siblings = siblings;
var dayString = days[i].getDayString();
diff --git a/UI/WebServerResources/UIxMailEditorAttach.js b/UI/WebServerResources/UIxMailEditorAttach.js
deleted file mode 100644
index 8fbca8c1c..000000000
--- a/UI/WebServerResources/UIxMailEditorAttach.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- Copyright (C) 2005 SKYRIX Software AG
-
- This file is part of OpenGroupware.org.
-
- OGo is free software; you can redistribute it and/or modify it under
- the terms of the GNU Lesser General Public License as published by the
- Free Software Foundation; either version 2, or (at your option) any
- later version.
-
- OGo is distributed in the hope that it will be useful, but WITHOUT ANY
- WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
- License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with OGo; see the file COPYING. If not, write to the
- Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
- 02111-1307, USA.
-*/
-
-function updateAttachmentListInEditorWindow(sender) {
- var attachments;
-
- attachments = this.getAttachmentNames();
- window.opener.updateInlineAttachmentList(this, attachments);
-}
-
-function getAttachmentNames() {
- var e, s, names;
-
- e = document.getElementById('attachmentList');
- s = e.innerHTML;
- /* remove trailing delimiter */
- s = s.substr(0, s.length - 1);
- if (s == '') return null;
-
- /* probably no OS allows '/' in a file name */
- names = s.split('/');
- return names;
-}