mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Fixes for new XUL header display
This commit is contained in:
rhp%netscape.com
parent
4bf9335dd7
commit
664bb05282
@ -48,69 +48,69 @@ header[field=ORGANIZATION] { display: block; text-align:left; }
|
||||
* "X-" are turned off!
|
||||
*/
|
||||
|
||||
header[field=RETURN-PATH] { display: none; text-align:left; }
|
||||
header[field=RETURN-PATH] { display: block; text-align:left; }
|
||||
|
||||
header[field=STATUS] { display: none; text-align:left; }
|
||||
header[field=STATUS] { display: block; text-align:left; }
|
||||
|
||||
header[field=RECEIVED] { display: none; text-align:left; }
|
||||
header[field=RECEIVED] { display: block; text-align:left; }
|
||||
|
||||
header[field=MIME-VERSION] { display: none; text-align:left; }
|
||||
header[field=MIME-VERSION] { display: block; text-align:left; }
|
||||
|
||||
header[field=PRECEDENCE] { display: none; text-align: left; }
|
||||
header[field=PRECEDENCE] { display: block; text-align: left; }
|
||||
|
||||
header[field=CONTENT-BASE] { display: none; text-align:left; }
|
||||
header[field=CONTENT-BASE] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-LOCATION] { display: none; text-align:left; }
|
||||
header[field=CONTENT-LOCATION] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-ID] { display: none; text-align:left; }
|
||||
header[field=CONTENT-ID] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-DESCRIPTION] { display: none; text-align:left; }
|
||||
header[field=CONTENT-DESCRIPTION] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-DISPOSITION] { display: none; text-align:left; }
|
||||
header[field=CONTENT-DISPOSITION] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-ENCODING] { display: none; text-align:left; }
|
||||
header[field=CONTENT-ENCODING] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-LENGTH] { display: none; text-align:left; }
|
||||
header[field=CONTENT-LENGTH] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-NAME] { display: none; text-align:left; }
|
||||
header[field=CONTENT-NAME] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-TRANSFER-ENCODING] { display: none; text-align:left; }
|
||||
header[field=CONTENT-TRANSFER-ENCODING] { display: block; text-align:left; }
|
||||
|
||||
header[field=CONTENT-TYPE] { display: none; text-align:left; }
|
||||
header[field=CONTENT-TYPE] { display: block; text-align:left; }
|
||||
|
||||
header[field=DISTRIBUTION] { display: none; text-align:left; }
|
||||
header[field=DISTRIBUTION] { display: block; text-align:left; }
|
||||
|
||||
header[field=FCC] { display: none; text-align:left; }
|
||||
header[field=FCC] { display: block; text-align:left; }
|
||||
|
||||
header[field=FOLLOWUP-TO] { display: none; text-align:left; }
|
||||
header[field=FOLLOWUP-TO] { display: block; text-align:left; }
|
||||
|
||||
header[field=LINES] { display: none; text-align:left; }
|
||||
header[field=LINES] { display: block; text-align:left; }
|
||||
|
||||
header[field=MESSAGE-ID] { display: none; text-align:left; }
|
||||
header[field=MESSAGE-ID] { display: block; text-align:left; }
|
||||
|
||||
header[field=REFERENCES] { display: none; text-align:left; }
|
||||
header[field=REFERENCES] { display: block; text-align:left; }
|
||||
|
||||
header[field=REPLY-TO] { display: none; text-align:left; }
|
||||
header[field=REPLY-TO] { display: block; text-align:left; }
|
||||
|
||||
header[field=RESENT-COMMENTS] { display: none; text-align:left; }
|
||||
header[field=RESENT-COMMENTS] { display: block; text-align:left; }
|
||||
|
||||
header[field=RESENT-DATE] { display: none; text-align:left; }
|
||||
header[field=RESENT-DATE] { display: block; text-align:left; }
|
||||
|
||||
header[field=RESENT-FROM] { display: none; text-align:left; }
|
||||
header[field=RESENT-FROM] { display: block; text-align:left; }
|
||||
|
||||
header[field=RESENT-MESSAGE-ID] { display: none; text-align:left; }
|
||||
header[field=RESENT-MESSAGE-ID] { display: block; text-align:left; }
|
||||
|
||||
header[field=RESENT-SENDER] { display: none; text-align:left; }
|
||||
header[field=RESENT-SENDER] { display: block; text-align:left; }
|
||||
|
||||
header[field=RESENT-TO] { display: none; text-align:left; }
|
||||
header[field=RESENT-TO] { display: block; text-align:left; }
|
||||
|
||||
header[field=RESENT-CC] { display: none; text-align:left; }
|
||||
header[field=RESENT-CC] { display: block; text-align:left; }
|
||||
|
||||
header[field=SENDER] { display: none; text-align:left; }
|
||||
header[field=SENDER] { display: block; text-align:left; }
|
||||
|
||||
header[field=XREF] { display: none; text-align:left; }
|
||||
header[field=XREF] { display: block; text-align:left; }
|
||||
|
||||
header[field=APPROVED-BY] { display: none; text-align:left; }
|
||||
header[field=APPROVED-BY] { display: block; text-align:left; }
|
||||
|
||||
/**************************************************
|
||||
* These are all of the header extensions. For now,
|
||||
@ -118,35 +118,35 @@ header[field=APPROVED-BY] { display: none; text-align:left; }
|
||||
* all header display
|
||||
**************************************************/
|
||||
|
||||
header[field=X-SUN-CHARSET] { display: none; text-align:left; }
|
||||
header[field=X-SUN-CHARSET] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-SUN-CONTENT-LENGTH] { display: none; text-align:left; }
|
||||
header[field=X-SUN-CONTENT-LENGTH] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-SUN-DATA-DESCRIPTION] { display: none; text-align:left; }
|
||||
header[field=X-SUN-DATA-DESCRIPTION] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-SUN-DATA-NAME] { display: none; text-align:left; }
|
||||
header[field=X-SUN-DATA-NAME] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-SUN-DATA-TYPE] { display: none; text-align:left; }
|
||||
header[field=X-SUN-DATA-TYPE] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-SUN-ENCODING-INFO] { display: none; text-align:left; }
|
||||
header[field=X-SUN-ENCODING-INFO] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-PRIORITY] { display: none; text-align:left; }
|
||||
header[field=X-PRIORITY] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-MOZILLA-PARTURL] { display: none; text-align:left; }
|
||||
header[field=X-MOZILLA-PARTURL] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-MOZILLA-DRAFT-INFO] { display: none; text-align:left; }
|
||||
header[field=X-MOZILLA-DRAFT-INFO] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-ACCEPT-LANGUAGE] { display: none; text-align:left; }
|
||||
header[field=X-ACCEPT-LANGUAGE] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-MAILING-LIST] { display: none; text-align:left; }
|
||||
header[field=X-MAILING-LIST] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-MAILING-LOOP] { display: none; text-align:left; }
|
||||
header[field=X-MAILING-LOOP] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-LOOP] { display: none; text-align: left; }
|
||||
header[field=X-LOOP] { display: block; text-align: left; }
|
||||
|
||||
header[field=X-MAILER] { display: none; text-align:left; }
|
||||
header[field=X-MAILER] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-MOZILLA-STATUS] { display: none; text-align:left; }
|
||||
header[field=X-MOZILLA-STATUS] { display: block; text-align:left; }
|
||||
|
||||
header[field=X-MOZILLA-STATUS2] { display: none; text-align: left; }
|
||||
header[field=X-MOZILLA-STATUS2] { display: block; text-align: left; }
|
||||
|
||||
|
||||
@ -599,12 +599,11 @@ nsMimeXULEmitter::WriteXULTag(const char *tagName, const char *value)
|
||||
PR_FREEIF(l10nTagName);
|
||||
}
|
||||
|
||||
// UtilityWrite("<html:div>: </html:div>");
|
||||
UtilityWrite(": ");
|
||||
UtilityWrite("</headerdisplayname>");
|
||||
|
||||
// Now write out the actual value itself and move on!
|
||||
//
|
||||
UtilityWrite(": ");
|
||||
UtilityWrite(newValue);
|
||||
UtilityWrite("</header>");
|
||||
|
||||
@ -662,9 +661,18 @@ nsMimeXULEmitter::DumpAttachmentMenu()
|
||||
if ( (!mAttachArray) || (mAttachArray->Count() <= 0) )
|
||||
return NS_OK;
|
||||
|
||||
// RICHIE SHERRY - Hard coded string...evil...need to use string bundle when they work on
|
||||
// non UI threads.
|
||||
char *i18nString = nsnull;
|
||||
|
||||
if (mAttachArray->Count() == 1)
|
||||
i18nString = "Attachment";
|
||||
else
|
||||
i18nString = "Attachments";
|
||||
|
||||
char *buttonXUL = PR_smprintf(
|
||||
"<titledbutton src=\"chrome://messenger/skin/attach.gif\" value=\"%d Attachments\" align=\"right\" class=\"popup\" popup=\"attachmentPopup\"/>",
|
||||
mAttachArray->Count());
|
||||
"<titledbutton src=\"chrome://messenger/skin/attach.gif\" value=\"%d %s\" align=\"right\" class=\"popup\" popup=\"attachmentPopup\"/>",
|
||||
mAttachArray->Count(), i18nString);
|
||||
|
||||
if ( (!buttonXUL) || (!*buttonXUL) )
|
||||
return NS_OK;
|
||||
@ -737,7 +745,6 @@ nsMimeXULEmitter::OutputGenericHeader(const char *aHeaderVal)
|
||||
|
||||
if (val)
|
||||
{
|
||||
//UtilityWriteCRLF("<box align=\"vertical\" style=\"padding: 2px;\">");
|
||||
UtilityWriteCRLF("<box style=\"padding: 2px;\">");
|
||||
rv = WriteXULTag(aHeaderVal, val);
|
||||
UtilityWriteCRLF("</box>");
|
||||
@ -764,6 +771,7 @@ nsMimeXULEmitter::DumpSubjectFromDate()
|
||||
UtilityWriteCRLF("<spring flex=\"2\"/>");
|
||||
UtilityWriteCRLF("</box>");
|
||||
|
||||
|
||||
UtilityWriteCRLF("<box name=\"header-attachment\" align=\"horizontal\" flex=\"100%\">");
|
||||
UtilityWriteCRLF("<spring flex=\"1\"/>");
|
||||
|
||||
@ -784,25 +792,15 @@ nsresult
|
||||
nsMimeXULEmitter::DumpToCC()
|
||||
{
|
||||
UtilityWriteCRLF("<toolbar>");
|
||||
UtilityWriteCRLF("<box name=\"header-splitter2\" align=\"horizontal\" flex=\"100%\" >");
|
||||
|
||||
UtilityWriteCRLF("<box name=\"header-part2\" align=\"vertical\" flex=\"100%\" style=\"background-color: #FF0000; \" >");
|
||||
UtilityWriteCRLF("<spring flex=\"1\"/>");
|
||||
|
||||
OutputGenericHeader(HEADER_TO);
|
||||
|
||||
UtilityWriteCRLF("<spring flex=\"1\"/>");
|
||||
UtilityWriteCRLF("</box>");
|
||||
|
||||
UtilityWriteCRLF("<box name=\"header-part3\" align=\"vertical\" style=\"background-color: #00FF00; \">");
|
||||
UtilityWriteCRLF("<spring flex=\"1\"/>");
|
||||
UtilityWriteCRLF("<box name=\"header-part2\" align=\"vertical\" flex=\"100%\">");
|
||||
|
||||
OutputGenericHeader(HEADER_TO);
|
||||
OutputGenericHeader(HEADER_CC);
|
||||
OutputGenericHeader(HEADER_BCC);
|
||||
|
||||
UtilityWriteCRLF("<spring flex=\"1\"/>");
|
||||
UtilityWriteCRLF("</box>");
|
||||
|
||||
UtilityWriteCRLF("</box>");
|
||||
UtilityWriteCRLF("</toolbar>");
|
||||
return NS_OK;
|
||||
}
|
||||
@ -810,11 +808,36 @@ nsMimeXULEmitter::DumpToCC()
|
||||
nsresult
|
||||
nsMimeXULEmitter::DumpRestOfHeaders()
|
||||
{
|
||||
PRInt32 i;
|
||||
|
||||
if (mHeaderDisplayType != nsMimeHeaderDisplayTypes::AllHeaders)
|
||||
return NS_OK;
|
||||
|
||||
UtilityWriteCRLF("<toolbar>");
|
||||
|
||||
UtilityWriteCRLF("<box name=\"header-part3\" align=\"vertical\" flex=\"100%\">");
|
||||
|
||||
for (i=0; i<mHeaderArray->Count(); i++)
|
||||
{
|
||||
headerInfoType *headerInfo = (headerInfoType *)mHeaderArray->ElementAt(i);
|
||||
if ( (!headerInfo) || (!headerInfo->name) || (!(*headerInfo->name)) ||
|
||||
(!headerInfo->value) || (!(*headerInfo->value)))
|
||||
continue;
|
||||
|
||||
if ( (!PL_strcasecmp(HEADER_SUBJECT, headerInfo->name)) ||
|
||||
(!PL_strcasecmp(HEADER_DATE, headerInfo->name)) ||
|
||||
(!PL_strcasecmp(HEADER_FROM, headerInfo->name)) ||
|
||||
(!PL_strcasecmp(HEADER_TO, headerInfo->name)) ||
|
||||
(!PL_strcasecmp(HEADER_CC, headerInfo->name)) )
|
||||
continue;
|
||||
|
||||
UtilityWriteCRLF("<box style=\"padding: 2px;\">");
|
||||
WriteXULTag(headerInfo->name, headerInfo->value);
|
||||
UtilityWriteCRLF("</box>");
|
||||
}
|
||||
|
||||
UtilityWriteCRLF("</box>");
|
||||
|
||||
UtilityWriteCRLF("</toolbar>");
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user