Skip to content

Commit

Permalink
Clean up display of header information
Browse files Browse the repository at this point in the history
  • Loading branch information
@slusarz
slusarz committed Apr 15, 2014
1 parent 69189d9 commit 74a4dbd
Show file tree
Hide file tree
Showing 4 changed files with 91 additions and 102 deletions.
2 changes: 1 addition & 1 deletion imp/js/dimpbase.js
View file
Expand Up @@ -1940,7 +1940,7 @@ var DimpBase = {

updateHeader: function(hdr, data, limit)
{
(hdr == 'from' ? $('previewMsg').select('.' + hdr) : [ $('msgHeadersContent').down('THEAD').down('.' + hdr) ]).each(function(elt) {
(hdr == 'from' ? $('previewMsg').select('.' + hdr) : [ $('msgHeaders').down('THEAD').down('.' + hdr) ]).each(function(elt) {
elt.replace(DimpCore.buildAddressLinks(data, elt.clone(false), limit));
});
},
Expand Down
135 changes: 73 additions & 62 deletions imp/templates/dynamic/mailbox.html.php
View file
Expand Up @@ -12,14 +12,14 @@
<div id="dimpmain_folder_top">
<div class="horde-buttonbar">
<ul class="rightFloat">
<li class="horde-nobutton">
<?php echo $this->actionButton(array('id' => 'button_other', 'title' => _("Other"), 'right' => true)) ?>
</li>
<?php if ($this->show_search): ?>
<li class="horde-nobutton" id="filter">
<?php echo $this->actionButton(array('id' => 'button_filter', 'title' => _("Filter"), 'right' => true)) ?>
</li>
<?php endif; ?>
<li class="horde-nobutton">
<?php echo $this->actionButton(array('id' => 'button_other', 'title' => _("Other"), 'right' => true)) ?>
</li>
</ul>
<ul>
<li class="horde-icon">
Expand Down Expand Up @@ -72,13 +72,24 @@
<div id="previewMsg" style="display:none">
<div class="msgHeaders">
<div id="msgHeadersColl">
<a id="preview_other"><span class="iconImg" title="<?php echo _("Other Options") ?>"></span></a>
<span class="date"></span>
<span class="iconImg" id="th_expand"></span>
<span class="subject allowTextSelection" title="<?php echo _("Expand Headers") ?>"></span>
<span class="fromcontainer"><?php echo _("from") ?>
<span class="from allowTextSelection"></span>
</span>
<ul class="rightFloat">
<li>
<div class="date"></div>
</li>
<li>
<a id="preview_other">
<span class="iconImg" title="<?php echo _("Other Options") ?>"></span>
</a>
</li>
</ul>
<ul>
<li>
<div class="iconImg" id="th_expand" title="<?php echo _("Expand Headers") ?>"></div>
<span class="subject allowTextSelection"></span>
<?php echo _("from") ?>
<span class="from"></span>
</li>
</ul>
</div>
<div id="msgHeaders" style="display:none">
<div class="dimpOptions">
Expand Down Expand Up @@ -107,59 +118,59 @@
</span>
</div>
</div>
<div id="msgHeadersContent">
<span class="iconImg" id="th_collapse"></span>
<p class="subject allowTextSelection" title="<?php echo _("Collapse Headers") ?>"></p>
<table>
<thead>
<tr id="msgHeaderFrom">
<td class="label"><?php echo _("From") ?>:</td>
<td class="from allowTextSelection"></td>
</tr>
<tr id="msgHeaderDate">
<td class="label"><?php echo _("Date") ?>:</td>
<td class="date allowTextSelection"></td>
</tr>
<tr id="msgHeaderTo">
<td class="label"><?php echo _("To") ?>:</td>
<td class="to allowTextSelection"></td>
</tr>
<tr id="msgHeaderCc">
<td class="label"><?php echo _("Cc") ?>:</td>
<td class="cc allowTextSelection"></td>
</tr>
<tr id="msgHeaderBcc">
<td class="label"><?php echo _("Bcc") ?>:</td>
<td class="bcc allowTextSelection"></td>
</tr>
<tr id="msgAtc" style="display:none">
<td class="label" id="partlist_toggle">
<span class="iconImg attachmentImg attachmentImage"></span>
<span class="iconImg" id="partlist_col"></span>
<span class="iconImg" id="partlist_exp" style="display:none"></span>
</td>
<td>
<div></div>
<div id="partlist" style="display:none"></div>
</td>
</tr>
<tr id="msgLogInfo" style="display:none">
<td class="label" id="msgloglist_toggle">
<span class="iconImg" id="msgloglist_col"></span>
<span class="iconImg" id="msgloglist_exp" style="display:none"></span>
</td>
<td>
<div>
<span class="msgLogLabel"><?php echo _("Message Log") ?></span>
</div>
<div id="msgloglist" style="display:none">
<ul></ul>
</div>
</td>
</tr>
</thead>
</table>
<div>
<span class="iconImg" id="th_collapse" title="<?php echo _("Collapse Headers") ?>"></span>
<span class="subject allowTextSelection"></span>
</div>
<table>
<thead>
<tr id="msgHeaderFrom">
<td class="label"><?php echo _("From") ?>:</td>
<td class="from allowTextSelection"></td>
</tr>
<tr id="msgHeaderDate">
<td class="label"><?php echo _("Date") ?>:</td>
<td class="date allowTextSelection"></td>
</tr>
<tr id="msgHeaderTo">
<td class="label"><?php echo _("To") ?>:</td>
<td class="to allowTextSelection"></td>
</tr>
<tr id="msgHeaderCc">
<td class="label"><?php echo _("Cc") ?>:</td>
<td class="cc allowTextSelection"></td>
</tr>
<tr id="msgHeaderBcc">
<td class="label"><?php echo _("Bcc") ?>:</td>
<td class="bcc allowTextSelection"></td>
</tr>
<tr id="msgAtc" style="display:none">
<td class="label" id="partlist_toggle">
<span class="iconImg attachmentImg attachmentImage"></span>
<span class="iconImg" id="partlist_col"></span>
<span class="iconImg" id="partlist_exp" style="display:none"></span>
</td>
<td>
<div></div>
<div id="partlist" style="display:none"></div>
</td>
</tr>
<tr id="msgLogInfo" style="display:none">
<td class="label" id="msgloglist_toggle">
<span class="iconImg" id="msgloglist_col"></span>
<span class="iconImg" id="msgloglist_exp" style="display:none"></span>
</td>
<td>
<div>
<span class="msgLogLabel"><?php echo _("Message Log") ?></span>
</div>
<div id="msgloglist" style="display:none">
<ul></ul>
</div>
</td>
</tr>
</thead>
</table>
</div>
</div>
<div id="messageBody" class="messageBody allowTextSelection"></div>
Expand Down
2 changes: 1 addition & 1 deletion imp/templates/dynamic/message.html.php
View file
Expand Up @@ -67,7 +67,7 @@
</div>
<?php endif; ?>
</div>
<div id="msgHeadersContent">
<div>
<div class="subject allowTextSelection"><?php echo $this->subject ?></div>
<table>
<thead>
Expand Down
54 changes: 16 additions & 38 deletions imp/themes/default/dynamic/screen.css
View file
Expand Up @@ -403,9 +403,6 @@ div.vpRowVert div.msgSubject {
margin: 0 0 -3px 0;
}

.msgHeaders table {
margin-top: -2px;
}
.msgHeaders table thead td.label {
display: block;
font-weight: bold;
Expand All @@ -416,7 +413,7 @@ div.vpRowVert div.msgSubject {
.msgfullread .msgHeaders table thead td.label {
padding-left: 3px;
}
.msgHeaders table thead td.subject {
.msgHeaders .subject {
font-weight: bold;
}
#msgHeaderAtc td.label a {
Expand Down Expand Up @@ -451,32 +448,21 @@ div.vpRowVert div.msgSubject {
cursor: pointer;
}

#msgHeadersContent {
overflow: hidden;
}
#msgHeadersContent p.subject {
font-size: 100%;
font-weight: bold;
}

/* Preview small header */
#msgHeadersColl span.date,
#msgHeadersColl span.from,
#msgHeadersColl span.subject {
overflow: hidden;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
#msgHeadersColl {
line-height: 20px;
}
#msgHeadersColl span.date {
float: right;
text-align: right;
#msgHeadersColl ul {
list-style: none;
overflow: hidden;
white-space: nowrap;
}
#msgHeadersColl span.subject {
font-weight: bold;
max-width: 60%;
#msgHeadersColl li {
float: left;
}
#msgHeadersColl span.fromcontainer {
padding-left: 5px;
#msgHeadersColl .from .horde-button {
line-height: 16px !important;
margin: 0;
}

/* Message body formatting. */
Expand All @@ -492,7 +478,7 @@ div.vpRowVert div.msgSubject {
max-height: 50px;
overflow-x: hidden;
overflow-y: auto;
padding-bottom: 8px;
padding-bottom: 5px;
}

/* Message Composition. */
Expand Down Expand Up @@ -771,10 +757,6 @@ span.attachmentImg {
text-decoration: underline;
}

#filter {
float: right;
}

#searchbar {
background-color: #ffa;
padding: 8px 10px;
Expand Down Expand Up @@ -1032,8 +1014,7 @@ div.msgSubject span.horde-tree-image {
#preview_other span.iconImg {
background-image: url("../graphics/plus.png");
cursor: pointer;
float: right;
margin: -2px 0 0 4px;
margin: 0 0 0 4px;
}
#th_expand, #partlist_col, #msgloglist_col {
background-image: url("../graphics/arrow_collapsed.png");
Expand All @@ -1045,11 +1026,8 @@ div.msgSubject span.horde-tree-image {
cursor: pointer;
margin: 2px 0 -2px;
}

#th_collapse, #th_expand {
float: left;
margin-bottom: -2px;
margin-top: 2px;
#th_collapse {
margin-top: 4px;
}

span.readonlyImg {
Expand Down

0 comments on commit 74a4dbd

Please sign in to comment.