diff --git a/Main/ChangeLog b/Main/ChangeLog.upstream
similarity index 100%
rename from Main/ChangeLog
rename to Main/ChangeLog.upstream
diff --git a/Misc/WebUI/ChangeLog b/Misc/WebUI/ChangeLog.upstream
similarity index 100%
rename from Misc/WebUI/ChangeLog
rename to Misc/WebUI/ChangeLog.upstream
diff --git a/Misc/WebUI/NGExtensions/NGLogging/ChangeLog b/Misc/WebUI/NGExtensions/NGLogging/ChangeLog.upstream
similarity index 100%
rename from Misc/WebUI/NGExtensions/NGLogging/ChangeLog
rename to Misc/WebUI/NGExtensions/NGLogging/ChangeLog.upstream
diff --git a/Misc/ZideStore/UI-X/ChangeLog b/Misc/ZideStore/UI-X/ChangeLog.upstream
similarity index 100%
rename from Misc/ZideStore/UI-X/ChangeLog
rename to Misc/ZideStore/UI-X/ChangeLog.upstream
diff --git a/OGoContentStore/ChangeLog b/OGoContentStore/ChangeLog.upstream
similarity index 100%
rename from OGoContentStore/ChangeLog
rename to OGoContentStore/ChangeLog.upstream
diff --git a/Protocols/iCalHTTP/ChangeLog b/Protocols/iCalHTTP/ChangeLog.upstream
similarity index 100%
rename from Protocols/iCalHTTP/ChangeLog
rename to Protocols/iCalHTTP/ChangeLog.upstream
diff --git a/SoObjects/Appointments/ChangeLog b/SoObjects/Appointments/ChangeLog.upstream
similarity index 100%
rename from SoObjects/Appointments/ChangeLog
rename to SoObjects/Appointments/ChangeLog.upstream
diff --git a/SoObjects/ChangeLog b/SoObjects/ChangeLog.upstream
similarity index 100%
rename from SoObjects/ChangeLog
rename to SoObjects/ChangeLog.upstream
diff --git a/SoObjects/Contacts/ChangeLog b/SoObjects/Contacts/ChangeLog.upstream
similarity index 100%
rename from SoObjects/Contacts/ChangeLog
rename to SoObjects/Contacts/ChangeLog.upstream
diff --git a/SoObjects/Mailer/ChangeLog b/SoObjects/Mailer/ChangeLog.upstream
similarity index 100%
rename from SoObjects/Mailer/ChangeLog
rename to SoObjects/Mailer/ChangeLog.upstream
diff --git a/SoObjects/SOGo/ChangeLog b/SoObjects/SOGo/ChangeLog.upstream
similarity index 100%
rename from SoObjects/SOGo/ChangeLog
rename to SoObjects/SOGo/ChangeLog.upstream
diff --git a/SoObjects/Sieve/ChangeLog b/SoObjects/Sieve/ChangeLog.upstream
similarity index 100%
rename from SoObjects/Sieve/ChangeLog
rename to SoObjects/Sieve/ChangeLog.upstream
diff --git a/UI/ChangeLog b/UI/ChangeLog.upstream
similarity index 100%
rename from UI/ChangeLog
rename to UI/ChangeLog.upstream
diff --git a/UI/Common/ChangeLog b/UI/Common/ChangeLog.upstream
similarity index 100%
rename from UI/Common/ChangeLog
rename to UI/Common/ChangeLog.upstream
diff --git a/UI/Contacts/ChangeLog b/UI/Contacts/ChangeLog.upstream
similarity index 100%
rename from UI/Contacts/ChangeLog
rename to UI/Contacts/ChangeLog.upstream
diff --git a/UI/MailPartViewers/ChangeLog b/UI/MailPartViewers/ChangeLog.upstream
similarity index 100%
rename from UI/MailPartViewers/ChangeLog
rename to UI/MailPartViewers/ChangeLog.upstream
diff --git a/UI/MailerUI/ChangeLog b/UI/MailerUI/ChangeLog.upstream
similarity index 100%
rename from UI/MailerUI/ChangeLog
rename to UI/MailerUI/ChangeLog.upstream
diff --git a/UI/MailerUI/UIxMailTree.m b/UI/MailerUI/UIxMailTree.m
index e64827674..20aa7eba0 100644
--- a/UI/MailerUI/UIxMailTree.m
+++ b/UI/MailerUI/UIxMailTree.m
@@ -242,7 +242,7 @@ static BOOL debugBlocks = NO;
}
break;
}
-
+
*_t = [_object davDisplayName];
*_icon = nil;
@@ -262,6 +262,10 @@ static BOOL debugBlocks = NO;
// TODO: use drafts icon for other SOGo folders
*_icon = @"tbtv_drafts_17x17.gif";
}
+
+ NSLog (@"title: '%@', ftype: '%@', class: '%@', icon: '%@'",
+ *_t,
+ ftype, NSStringFromClass([_object class]), *_icon);
return;
}
@@ -280,7 +284,7 @@ static BOOL debugBlocks = NO;
: nil;
[self getTitle:&n andIcon:&i forObject:_o];
-
+
md = [UIxMailTreeBlock blockWithName:nil
title:n iconName:i
link:[self treeNavigationLinkForObject:_o atDepth:_d]
@@ -323,6 +327,7 @@ static BOOL debugBlocks = NO;
/* build block */
[self getTitle:&title andIcon:&icon forObject:_object];
+
md = [UIxMailTreeBlock blockWithName:[_object nameInContainer]
title:title iconName:icon
link:[@"../" stringByAppendingString:
@@ -406,6 +411,7 @@ static BOOL debugBlocks = NO;
UIxMailTreeBlock *block;
id folder;
+ NSLog(@"activeName: %@", activeName);
folder = [folders objectAtIndex:i];
block = [activeName isEqualToString:[folder nameInContainer]]
? _activeChildBlock
diff --git a/UI/MainUI/ChangeLog b/UI/MainUI/ChangeLog.upstream
similarity index 100%
rename from UI/MainUI/ChangeLog
rename to UI/MainUI/ChangeLog.upstream
diff --git a/UI/SOGoUI/ChangeLog b/UI/SOGoUI/ChangeLog.upstream
similarity index 100%
rename from UI/SOGoUI/ChangeLog
rename to UI/SOGoUI/ChangeLog.upstream
diff --git a/UI/Scheduler/ChangeLog b/UI/Scheduler/ChangeLog.upstream
similarity index 100%
rename from UI/Scheduler/ChangeLog
rename to UI/Scheduler/ChangeLog.upstream
diff --git a/UI/Templates/ChangeLog b/UI/Templates/ChangeLog.upstream
similarity index 100%
rename from UI/Templates/ChangeLog
rename to UI/Templates/ChangeLog.upstream
diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index be1852629..5702e0864 100644
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -12,13 +12,13 @@
+
-
diff --git a/UI/WebServerResources/ChangeLog b/UI/WebServerResources/ChangeLog.upstream
similarity index 100%
rename from UI/WebServerResources/ChangeLog
rename to UI/WebServerResources/ChangeLog.upstream
diff --git a/UI/WebServerResources/mailer-toolbar.css b/UI/WebServerResources/mailer-toolbar.css
index eb775daf0..a753557de 100644
--- a/UI/WebServerResources/mailer-toolbar.css
+++ b/UI/WebServerResources/mailer-toolbar.css
@@ -28,11 +28,21 @@ div.tb_consumer { /* consumes the spaces taken by the toolbar */
text-align: center;
}
.tb_label {
- font-size: 11px;
+ font-size: medium;
+ font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+ color: #000000;
+ text-align: center;
+ padding-left: .5em;
+ padding-right: .5em;
+}
+
+.tb_label a:link, .tb_label a:hover {
+ font-size: medium;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
color: #000000;
text-align: center;
}
+
.tb_spacer {
width: 16px;
}
diff --git a/UI/WebServerResources/mailer.css b/UI/WebServerResources/mailer.css
index ae3b4e768..300f9448c 100644
--- a/UI/WebServerResources/mailer.css
+++ b/UI/WebServerResources/mailer.css
@@ -21,14 +21,14 @@
/* TODO: is the section below used in the mailer? */
.aptview_title {
- font-size: 10pt;
+ font-size: medium;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
color: #000000;
font-weight: bold;
}
.aptview_text {
- font-size: 10pt;
+ font-size: medium;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
color: #000000;
}
@@ -47,7 +47,7 @@
.anais_uids {
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: medium;
}
@@ -61,19 +61,19 @@
border-bottom-width: 1;
border-bottom-style: solid;
- background-color: #D4D0C8;
+ background-color: #DCDAD5;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: medium;
}
.foldercell {
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: medium;
width: 25%;
}
.contentcell {
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: medium;
}
.embedwhite_out {
border-width: 1;
@@ -113,17 +113,17 @@ td.titlecell {
padding-bottom: 2px;
white-space: nowrap;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: medium;
}
.whitesec_title {
- background-color: #D4D0C8;
+ background-color: #DCDAD5;
padding: 4px;
}
.treecell {
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: medium;
color: black;
vertical-align: bottom;
padding-left: 4px; /* move away from the icon */
@@ -134,10 +134,11 @@ td.titlecell {
/* mail tableview */
.tableview {
- font-size: 9pt;
+ font-size: medium;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
vertical-align: top;
}
+
.tableview td {
border-top-width: 1px;
border-top-color: white;
@@ -153,11 +154,11 @@ td.titlecell {
}
.tableview_highlight {
- font-size: 9pt;
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
vertical-align: top;
- background-color: #D4D0C8;
+ background-color: #DCDAD5;
}
+
.tableview_highlight td {
border-top-width: 1px;
border-bottom-width: 1px;
@@ -179,7 +180,7 @@ td.tbtv_navcell {
padding-left: 4px;
padding-right: 4px;
- background-color: #D4D0C8;
+ background-color: #DCDAD5;
}
td.tbtv_headercell {
@@ -194,7 +195,7 @@ td.tbtv_headercell {
padding-left: 4px;
padding-right: 4px;
- background-color: #D4D0C8;
+ background-color: #DCDAD5;
}
td.tbtv_actcell {
@@ -209,7 +210,7 @@ td.tbtv_actcell {
padding-left: 4px;
padding-right: 4px;
- background-color: #D4D0C8;
+ background-color: #DCDAD5;
}
td.tbtv_headercell a {
@@ -270,6 +271,11 @@ td.mailer_listcell_regular a {
text-decoration: none;
}
+tr.tableview td.mailer_listcell_regular {
+ border-top: 1px solid #fff;
+ border-bottom: 1px solid #fff;
+}
+
div.mailer_readicon {
/* TODO: use Thunderbird icon */
background-image: url(icon_read.gif);
@@ -342,7 +348,7 @@ pre.mailer_plaincontent {
/* attachment editor */
form#attachment_form {
- background-color: #D4D0C8;
+ background-color: #DCDAD5;
padding: 1px;
}
@@ -372,13 +378,13 @@ td.attachment_uplabel {
/* attachment link viewer */
div.linked_attachment_frame {
- background-color: #D4D0C8;
+ background-color: #DCDAD5;
padding: 4px;
}
div.linked_attachment_body {
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: medium;
padding: 4px;
border-width: 1;
@@ -397,7 +403,7 @@ div.linked_attachment_meta {
}
table.linked_attachment_meta {
font-family: Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: medium;
color: #444444;
font-style: italic;
}
@@ -414,7 +420,7 @@ table.linkbanner {
}
.linkbannerlinks {
- font-size: 10pt;
+ font-size: medium;
vertical-align: bottom;
text-align: left;
}