diff options
Diffstat (limited to '')
| -rw-r--r-- | browser/base/content/appmenu-viewcache.inc.xhtml | 135 |
1 files changed, 65 insertions, 70 deletions
diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml index 6d838bd9d6..9633c7d79d 100644 --- a/browser/base/content/appmenu-viewcache.inc.xhtml +++ b/browser/base/content/appmenu-viewcache.inc.xhtml @@ -3,14 +3,11 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. <html:template id="appMenu-viewCache"> - <!-- This is a placeholder app menu which should be replaced with the "real" - Proton app menu before the Proton pref starts getting enabled. --> - <panelview id="appMenu-protonMainView" class="PanelUI-subView" + <panelview id="appMenu-mainView" class="PanelUI-subView" lockpanelvertical="true"> <vbox class="panel-subview-body"> - <vbox id="appMenu-proton-addon-banners"/> - <toolbarbutton id="appMenu-proton-update-banner" class="panel-banner-item subviewbutton" - oncommand="PanelUI._onBannerItemSelected(event)" + <vbox id="appMenu-addon-banners"/> + <toolbarbutton id="appMenu-update-banner" class="panel-banner-item subviewbutton" wrap="true" hidden="true"/> <toolbaritem id="appMenu-fxa-status2" @@ -19,7 +16,7 @@ <html:div id="appMenu-fxa-text" data-l10n-id="appmenu-fxa-sync-and-save-data2"/> <toolbarbutton id="appMenu-fxa-label2" class="subviewbutton" - oncommand="gSync.toggleAccountPanel(this, event)"> + > <vbox flex="1"> <label id="appMenu-header-title" crop="end"/> @@ -33,7 +30,6 @@ data-l10n-id="appmenuitem-profiles" data-l10n-args='{ "profilename": "" }' closemenu="none" - oncommand="gProfiles.updateView(this)" hidden="true"/> <toolbarseparator id="appMenu-fxa-separator" class="proton-zap"/> <toolbarbutton id="appMenu-new-tab-button2" @@ -56,12 +52,12 @@ class="subviewbutton subviewbutton-nav" data-l10n-id="library-bookmarks-menu" closemenu="none" - oncommand="BookmarkingUI.showSubView(this);"/> + /> <toolbarbutton id="appMenu-history-button" class="subviewbutton subviewbutton-nav" data-l10n-id="appmenuitem-history" closemenu="none" - oncommand="PanelUI.showSubView('PanelUI-history', this)"/> + /> <toolbarbutton id="appMenu-downloads-button" class="subviewbutton" data-l10n-id="appmenuitem-downloads" @@ -70,7 +66,6 @@ <toolbarbutton id="appMenu-passwords-button" class="subviewbutton" data-l10n-id="appmenuitem-passwords" - oncommand="LoginHelper.openPasswordManager(window, { entryPoint: 'mainmenu' })" /> <toolbarbutton id="appMenu-extensions-themes-button" class="subviewbutton" @@ -119,13 +114,6 @@ class="subviewbutton subviewbutton-iconic" data-l10n-id="appmenuitem-fullscreen" type="checkbox" -# Note that we're custom-handling this click to make sure the panel disappears -# before entering fullscreen, as it does some odd moving about on the screen -# in the middle of the fullscreen transition otherwise. - oncommand=" - this.closest('panel').hidePopup(); - setTimeout(() => BrowserCommands.fullScreen(), 0); - " tooltip="dynamic-shortcut-tooltip"> <observes element="View:FullScreen" attribute="checked"/> </toolbarbutton> @@ -137,12 +125,12 @@ #ifdef XP_MACOSX key="key_preferencesCmdMac" #endif - oncommand="openPreferences()"/> + /> <toolbarbutton id="appMenu-more-button2" class="subviewbutton subviewbutton-nav" data-l10n-id="appmenuitem-more-tools" closemenu="none" - oncommand="PanelUI.showMoreToolsPanel(this);"/> + /> <toolbarbutton id="appMenu-report-broken-site-button" class="subviewbutton subviewbutton-nav" data-l10n-id="appmenuitem-report-broken-site" @@ -153,7 +141,7 @@ class="subviewbutton subviewbutton-nav" data-l10n-id="appmenuitem-help" closemenu="none" - oncommand="PanelUI.showSubView('PanelUI-helpView', this)"/> + /> #ifndef XP_MACOSX <toolbarseparator/> <toolbarbutton id="appMenu-quit-button2" @@ -171,16 +159,16 @@ data-l10n-id="appmenu-recently-closed-tabs" class="subviewbutton subviewbutton-nav" closemenu="none" - oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedTabs', this)"/> + /> <toolbarbutton id="appMenuRecentlyClosedWindows" data-l10n-id="appmenu-recently-closed-windows" class="subviewbutton subviewbutton-nav" closemenu="none" - oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedWindows', this)"/> + /> <toolbarbutton id="appMenuSearchHistory" data-l10n-id="appmenu-search-history" class="subviewbutton" - oncommand="PlacesCommandHook.searchHistory()"/> + /> <toolbarbutton id="appMenu-restoreSession" data-l10n-id="appmenu-restore-session" class="subviewbutton" @@ -206,7 +194,7 @@ <toolbarbutton id="PanelUI-historyMore" class="subviewbutton panel-subview-footer-button" data-l10n-id="appmenu-manage-history" - oncommand="PlacesCommandHook.showPlacesOrganizer('History'); CustomizableUI.hidePanelForNode(this);"/> + /> </panelview> <panelview id="PanelUI-profiles" flex="1"> @@ -217,10 +205,10 @@ <hbox id="this-profile-buttons"> <toolbarbutton id="profiles-edit-this-delete-button" class="subviewbutton toolbarbutton-1" - oncommand="switchToTabHavingURI('about:profilemanager', true)"/> + /> <toolbarbutton id="profiles-delete-this-profile-button" class="subviewbutton toolbarbutton-1" - oncommand="switchToTabHavingURI('about:profilemanager', true)"/> + /> </hbox> </vbox> <toolbarseparator/> @@ -230,15 +218,15 @@ class="subviewbutton" data-l10n-id="appmenu-close-profile" data-l10n-args='{ "profilename": "" }' - oncommand=""/> + /> <toolbarbutton id="profiles-create-profile-button" class="subviewbutton" data-l10n-id="appmenu-create-profile" - oncommand="switchToTabHavingURI('about:profilemanager', true)"/> + /> <toolbarbutton id="profiles-manage-profiles-button" class="subviewbutton" data-l10n-id="appmenu-manage-profiles" - oncommand="switchToTabHavingURI('about:profilemanager', true)"/> + /> </vbox> </panelview> @@ -262,12 +250,12 @@ <toolbarbutton id="panelMenu_searchBookmarks" data-l10n-id="bookmarks-search" class="subviewbutton" - oncommand="PlacesCommandHook.searchBookmarks();"/> + /> <toolbarbutton id="panelMenu_viewBookmarksToolbar" class="subviewbutton" data-l10n-id="bookmarks-tools-toolbar-visibility-panel" data-l10n-args='{ "isVisible": false }' - oncommand="BookmarkingUI.toggleBookmarksToolbar('bookmark-tools');"/> + /> <toolbarseparator/> <html:h2 id="panelMenu_recentBookmarks" data-l10n-id="bookmarks-recent-bookmarks-panel-subheader" @@ -460,8 +448,6 @@ <toolbarbutton id="PanelUI-remotetabs-syncnow" align="center" class="subviewbutton" - oncommand="gSync.doSync();" - onmouseover="gSync.refreshSyncButtonsTooltip();" closemenu="none"> <hbox flex="1"> <image class="syncNowBtn"/> @@ -476,7 +462,7 @@ <toolbarbutton id="PanelUI-remotetabs-view-managedevices" class="subviewbutton" data-l10n-id="appmenuitem-fxa-manage-account" - oncommand="gSync.openDevicesManagementPage('syncedtabs-menupanel');"> + > <observes element="sidebar-box" attribute="positionend"/> </toolbarbutton> <toolbarseparator id="PanelUI-remotetabs-separator"/> @@ -503,7 +489,7 @@ <toolbarbutton class="PanelUI-remotetabs-button" id="PanelUI-remotetabs-tabsdisabledpane-button" data-l10n-id="appmenu-remote-tabs-opensettings" - oncommand="gSync.openPrefs('synced-tabs');"/> + /> </hbox> </vbox> </hbox> @@ -517,7 +503,7 @@ <toolbarbutton id="PanelUI-remotetabs-connect-device-button" class="PanelUI-remotetabs-button" data-l10n-id="appmenu-remote-tabs-connectdevice" - oncommand="gSync.openConnectAnotherDevice('synced-tabs');"/> + /> </vbox> </hbox> </deck> @@ -535,7 +521,7 @@ <toolbarbutton class="PanelUI-remotetabs-button" id="PanelUI-remotetabs-setupsync-button" data-l10n-id="appmenu-remote-tabs-sign-into-sync" - oncommand="gSync.openPrefs('synced-tabs');"/> + /> </vbox> <!-- When Sync is not enabled --> <vbox id="PanelUI-remotetabs-syncdisabled" @@ -548,7 +534,7 @@ <toolbarbutton class="PanelUI-remotetabs-button" id="PanelUI-remotetabs-syncdisabled-button" data-l10n-id="appmenu-remote-tabs-turn-on-sync" - oncommand="gSync.openPrefs('synced-tabs');"/> + /> </vbox> <!-- When Sync needs re-authentication --> <vbox id="PanelUI-remotetabs-reauthsync" @@ -561,7 +547,7 @@ <toolbarbutton class="PanelUI-remotetabs-button" id="PanelUI-remotetabs-reauthsync-button" data-l10n-id="appmenu-remote-tabs-sign-into-sync" - oncommand="gSync.openPrefs('synced-tabs');"/> + /> </vbox> <!-- When Sync needs verification --> <vbox id="PanelUI-remotetabs-unverified" @@ -574,7 +560,7 @@ <toolbarbutton class="PanelUI-remotetabs-button" id="PanelUI-remotetabs-unverified-button" data-l10n-id="appmenu-remote-tabs-opensettings" - oncommand="gSync.openPrefs('synced-tabs');"/> + /> </vbox> </hbox> </vbox> @@ -585,7 +571,7 @@ <toolbarbutton id="fxa-manage-account-button" align="center" class="subviewbutton" - oncommand="gSync.clickFxAMenuHeaderButton(this);"> + > <vbox flex="1"> <label id="fxa-menu-header-title" crop="end" @@ -599,8 +585,6 @@ <toolbarbutton id="PanelUI-fxa-menu-syncnow-button" align="center" class="subviewbutton" - oncommand="gSync.doSyncFromFxaMenu(this);" - onmouseover="gSync.refreshSyncButtonsTooltip();" closemenu="none"> <hbox flex="1"> <image id="PanelUI-appMenu-fxa-image-last-synced" @@ -617,43 +601,34 @@ <toolbarbutton id="PanelUI-fxa-menu-setup-sync-button" class="subviewbutton" data-l10n-id="appmenu-fxa-setup-sync" - oncommand="gSync.openPrefsFromFxaMenu('sync_settings', this);"/> + /> <!-- The `Connect Another Device` button is disabled by default until the user logs into Sync. --> <toolbarbutton id="PanelUI-fxa-menu-connect-device-button" class="subviewbutton" data-l10n-id="fxa-menu-connect-another-device" disabled="true" - oncommand="gSync.openConnectAnotherDeviceFromFxaMenu(this);"/> + /> <toolbarbutton id="PanelUI-fxa-menu-sendtab-button" class="subviewbutton subviewbutton-nav" data-l10n-id="fxa-menu-send-tab-to-device" data-l10n-args='{"tabCount":1}' closemenu="none" - oncommand="gSync.showSendToDeviceViewFromFxaMenu(this);"/> + /> <toolbarbutton id="PanelUI-fxa-menu-sync-prefs-button" class="subviewbutton" data-l10n-id="fxa-menu-sync-settings" hidden="true" - oncommand="gSync.openPrefsFromFxaMenu('sync_settings', this);"/> + /> <toolbarseparator id="PanelUI-sign-out-separator" /> <toolbarbutton id="PanelUI-fxa-menu-account-signout-button" class="subviewbutton" data-l10n-id="fxa-menu-sign-out" - oncommand="gSync.disconnect();" hidden="true"/> </vbox> <!-- updateCTAPanel will control if we show this panel --> - <vbox id="PanelUI-fxa-cta-menu"> - <toolbarbutton id="PanelUI-fxa-menu-sync-button" class="subviewbutton subviewbutton-iconic" - oncommand="gSync.openPrefsFromFxaButton('sync_cta', this);"> - <vbox flex="1"> - <label id="fxa-menu-header-title" crop="end" data-l10n-id="fxa-menu-sync-title" /> - <label id="cta-menu-header-description" crop="end" data-l10n-id="fxa-menu-sync-description" /> - </vbox> - </toolbarbutton> + <vbox id="PanelUI-fxa-cta-menu" hidden="true"> <toolbarseparator id="PanelUI-products-separator" /> - <toolbarbutton id="PanelUI-fxa-menu-monitor-button" class="subviewbutton subviewbutton-iconic" - oncommand="gSync.openMonitorLink(this)"> + <toolbarbutton id="PanelUI-fxa-menu-monitor-button" class="fxa-cta-button subviewbutton subviewbutton-iconic"> <vbox flex="1"> <hbox align="center"> <image class="PanelUI-fxa-menu-monitor-button ctaMenuLogo" role="presentation" /> @@ -662,8 +637,7 @@ <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-monitor-description" /> </vbox> </toolbarbutton> - <toolbarbutton id="PanelUI-fxa-menu-relay-button" class="subviewbutton subviewbutton-iconic" - oncommand="gSync.openRelayLink(this)"> + <toolbarbutton id="PanelUI-fxa-menu-relay-button" class="fxa-cta-button subviewbutton subviewbutton-iconic"> <vbox flex="1"> <hbox align="center"> <image class="PanelUI-fxa-menu-relay-button ctaMenuLogo" role="presentation" /> @@ -672,8 +646,7 @@ <label id="cta-menu-header-description" crop="end" data-l10n-id="appmenuitem-relay-description" /> </vbox> </toolbarbutton> - <toolbarbutton id="PanelUI-fxa-menu-vpn-button" class="subviewbutton subviewbutton-iconic" - oncommand="gSync.openVPNLink(this)"> + <toolbarbutton id="PanelUI-fxa-menu-vpn-button" class="fxa-cta-button subviewbutton subviewbutton-iconic"> <vbox flex="1"> <hbox align="center"> <image class="PanelUI-fxa-menu-vpn-button ctaMenuLogo" role="presentation" /> @@ -715,7 +688,7 @@ <toolbarbutton id="PanelUI-fxa-menu-sendtab-not-configured-button" class="PanelUI-fxa-signin-button" data-l10n-id="appmenuitem-fxa-sign-in" - oncommand="gSync.openPrefsFromFxaMenu('send_tab', this);"/> + /> </vbox> </panelview> @@ -726,7 +699,15 @@ <toolbarbutton id="PanelUI-fxa-menu-sendtab-connect-device-button" class="PanelUI-fxa-signin-button" data-l10n-id="appmenu-remote-tabs-connectdevice" - oncommand="gSync.openConnectAnotherDeviceFromFxaMenu(this);"/> + /> + </vbox> + </panelview> + + <!-- This panelview holds the list of "inactive" tabs for devices --> + <panelview id="PanelUI-fxa-menu-inactive-tabs" class="PanelUI-subView PanelUI-remotetabs-clientcontainer"> + <label itemtype="client"> + </label> + <vbox class="panel-subview-body"> </vbox> </panelview> @@ -736,16 +717,16 @@ class="subviewbutton subviewbutton-nav" data-l10n-id="library-bookmarks-menu" closemenu="none" - oncommand="BookmarkingUI.showSubView(this);"/> + /> <toolbarbutton id="appMenu-library-history-button" class="subviewbutton subviewbutton-nav" data-l10n-id="appmenuitem-history" closemenu="none" - oncommand="PanelUI.showSubView('PanelUI-history', this)"/> + /> <toolbarbutton id="appMenu-library-downloads-button" class="subviewbutton" data-l10n-id="appmenuitem-downloads" - oncommand="DownloadsPanel.showDownloadsHistory();"/> + /> </vbox> </panelview> @@ -762,15 +743,29 @@ <button id="reset-pbm-panel-cancel-button" class="footer-button" data-l10n-id="reset-pbm-panel-cancel-button" - oncommand="ResetPBMPanel.onCancel(this)"></button> + ></button> <button slot="primary" id="reset-pbm-panel-confirm-button" class="footer-button" data-l10n-id="reset-pbm-panel-confirm-button" - oncommand="ResetPBMPanel.onConfirm(this)"></button> + ></button> </html:moz-button-group> </vbox> </panelview> + <panelview id="content-analysis-panel" class="PanelUI-subView" role="document" mainview-with-header="true"> + <vbox id="content-analysis-panel-container" role="alertdialog" aria-labelledby="content-analysis-header"> + <hbox class="panel-header"> + <html:h1 id="content-analysis-header" data-l10n-id="content-analysis-panel-title"/> + </hbox> + <description id="content-analysis-panel-description"> + <html:a is="moz-support-link" + data-l10n-name="info" + class="learnMore" + support-page="data-loss-prevention"/> + </description> + </vbox> + </panelview> + #include ../../components/reportbrokensite/content/reportBrokenSitePanel.inc.xhtml </html:template> |