mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-29 15:52:07 +00:00
Bug #255447 --> Add RSS support to account central for thunderbird.
sr=bienvenu
This commit is contained in:
parent
8c6281ab3a
commit
17d22492d7
@ -5,9 +5,7 @@
|
||||
<!ENTITY newsSectionHdr.label "Newsgroups">
|
||||
<!ENTITY subscribeNewsLink.label "Manage newsgroup subscriptions">
|
||||
|
||||
<!ENTITY accountsSectionHdr.label "Accounts">
|
||||
<!ENTITY subscribeImapFolders.label "Manage folder subscriptions">
|
||||
|
||||
<!ENTITY accountsSectionHdr.label "Accounts"> <!ENTITY subscribeImapFolders.label "Manage folder subscriptions">
|
||||
<!ENTITY settingsLink.label "View settings for this account">
|
||||
<!ENTITY newAcctLink.label "Create a new account">
|
||||
|
||||
@ -16,3 +14,7 @@
|
||||
<!ENTITY filtersLink.label "Manage message filters">
|
||||
<!ENTITY junkSettings.label "Junk mail settings">
|
||||
<!ENTITY offlineLink.label "Offline settings">
|
||||
|
||||
|
||||
<!ENTITY rssSectionHdr.label "RSS News & Blogs">
|
||||
<!ENTITY subscibeRSS.label "Manage subscriptions">
|
@ -108,11 +108,13 @@ function OnInit()
|
||||
function ArrangeAccountCentralItems(server, protocolInfo, msgFolder)
|
||||
{
|
||||
try {
|
||||
var displayRssHeader = server.type == 'rss';
|
||||
|
||||
/***** Email header and items : Begin *****/
|
||||
|
||||
// Read Messages
|
||||
var canGetMessages = protocolInfo.canGetMessages;
|
||||
SetItemDisplay("ReadMessages", canGetMessages);
|
||||
SetItemDisplay("ReadMessages", canGetMessages && !displayRssHeader);
|
||||
|
||||
// Compose Messages link
|
||||
var showComposeMsgLink = protocolInfo.showComposeMsgLink;
|
||||
@ -122,7 +124,7 @@ function ArrangeAccountCentralItems(server, protocolInfo, msgFolder)
|
||||
var canControlJunkEmail = protocolInfo.canGetIncomingMessages && protocolInfo.canGetMessages && false; // && false, until ready for prime time
|
||||
SetItemDisplay("JunkSettingsMail", canControlJunkEmail);
|
||||
|
||||
var displayEmailHeader = canGetMessages || showComposeMsgLink || canControlJunkEmail;
|
||||
var displayEmailHeader = (canGetMessages || showComposeMsgLink || canControlJunkEmail) && !displayRssHeader;
|
||||
// Display Email header, only if any of the items are displayed
|
||||
SetItemDisplay("EmailHeader", displayEmailHeader);
|
||||
|
||||
@ -144,8 +146,15 @@ function ArrangeAccountCentralItems(server, protocolInfo, msgFolder)
|
||||
|
||||
/***** News header and items : End *****/
|
||||
|
||||
/***** RSS header and items : Begin *****/
|
||||
|
||||
SetItemDisplay("rssHeader", displayRssHeader);
|
||||
SetItemDisplay("SubscribeRSS", displayRssHeader);
|
||||
|
||||
/***** RSS header and items : End *****/
|
||||
|
||||
// If neither of above sections exist, collapse section separators
|
||||
if (!(displayNewsHeader || displayEmailHeader)) {
|
||||
if (!(displayNewsHeader || displayEmailHeader || displayRssHeader)) {
|
||||
CollapseSectionSeparators("MessagesSection.separator", false);
|
||||
}
|
||||
|
||||
@ -274,6 +283,10 @@ function CreateMsgFilters()
|
||||
// Open Subscribe dialog
|
||||
function Subscribe()
|
||||
{
|
||||
var server = GetSelectedServer();
|
||||
if (server && server.type == 'rss')
|
||||
window.parent.openSubscriptionsDialog(server);
|
||||
else
|
||||
window.parent.MsgSubscribe();
|
||||
}
|
||||
|
||||
|
@ -119,6 +119,19 @@
|
||||
</row>
|
||||
<separator id="JunkSettingsNews.separator" class="thin"/>
|
||||
|
||||
<row id="rssHeader" class="acctCentralTitleRow">
|
||||
<hbox class="acctCentralRowTitleBox">
|
||||
<description>&rssSectionHdr.label;</description>
|
||||
</hbox>
|
||||
</row>
|
||||
<separator id="rssHeader.separator" class="thin"/>
|
||||
<row id="SubscribeRSS" class="acctCentralRow">
|
||||
<hbox>
|
||||
<label class="acctCentralText acctCentralLinkText" value="&subscibeRSS.label;" onclick="Subscribe();"/>
|
||||
</hbox>
|
||||
</row>
|
||||
<separator id="SubscribeRSS.separator" class="thin"/>
|
||||
|
||||
<separator id="MessagesSection.separator1"/>
|
||||
<separator id="MessagesSection.separator2"/>
|
||||
<separator id="MessagesSection.separator3"/>
|
||||
|
@ -54,3 +54,7 @@
|
||||
<!ENTITY filtersLink.label "Manage message filters">
|
||||
<!ENTITY junkSettings.label "Junk mail settings">
|
||||
<!ENTITY offlineLink.label "Offline settings">
|
||||
|
||||
<!ENTITY rssSectionHdr.label "RSS News & Blogs">
|
||||
<!ENTITY subscibeRSS.label "Manage subscriptions">
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user