219 + </hbox> |
219 + </hbox> |
220 + </vbox> |
220 + </vbox> |
221 + </hbox> |
221 + </hbox> |
222 + </panel> |
222 + </panel> |
223 + |
223 + |
224 + <panel id="editSharePopup" |
224 + <panel id="unsharePopup" |
225 + type="arrow" |
225 + type="arrow" |
226 + orient="vertical" |
226 + orient="vertical" |
227 + ignorekeys="true" |
227 + ignorekeys="true" |
228 + hidden="true" |
228 + hidden="true" |
229 + onpopupshown="SocialShareButton.panelShown(event);" |
229 + onpopupshown="SocialShareButton.panelShown(event);" |
230 + consumeoutsideclicks="true" |
230 + consumeoutsideclicks="true" |
231 + level="top"> |
231 + level="top"> |
232 + <row id="editSharePopupHeader" align="center"> |
232 + <!-- Note that 'label', 'accesskey', 'value' and 'aria-label' attributes |
|
233 + for many of these elements are supplied by the provider and filled |
|
234 + in at runtime |
|
235 + --> |
|
236 + <row id="unsharePopupHeader" align="center"> |
233 + <vbox align="center"> |
237 + <vbox align="center"> |
234 + <image id="socialUserPortrait" onclick="SocialUI.showProfile();" |
238 + <image id="socialUserPortrait" onclick="SocialUI.showProfile();"/> |
235 + aria-label="&social.sharePopup.portrait.arialabel;"/> |
|
236 + </vbox> |
239 + </vbox> |
237 + <vbox id="editSharePopupText"> |
240 + <vbox id="unsharePopupText"> |
238 + <button id="socialUserDisplayName" |
241 + <button id="socialUserDisplayName" pack="start" |
239 + oncommand="SocialUI.showProfile();"/> |
242 + oncommand="SocialUI.showProfile();"/> |
240 + <spacer flex="1"/> |
243 + <spacer flex="1"/> |
241 + <label id="socialUserRecommendedText" |
244 + <label id="socialUserRecommendedText"/> |
242 + value="&social.sharePopup.shared.label;"/> |
|
243 + </vbox> |
245 + </vbox> |
244 + </row> |
246 + </row> |
245 + <hbox id="editSharePopupBottomButtons" pack="end"> |
247 + <hbox id="unsharePopupBottomButtons" pack="end"> |
246 +#ifdef XP_UNIX |
248 +#ifdef XP_UNIX |
247 + <button id="editSharePopupUndoButton" |
249 + <button id="unsharePopupStopSharingButton" |
248 + class="editSharePopupBottomButton" |
250 + class="unsharePopupBottomButton" |
249 + label="&social.sharePopup.undo.label;" |
|
250 + accesskey="&social.sharePopup.undo.accesskey;" |
|
251 + command="Social:UnsharePage"/> |
251 + command="Social:UnsharePage"/> |
252 + <button id="editSharePopupOkButton" |
252 + <button id="unsharePopupContinueSharingButton" |
253 + class="editSharePopupBottomButton" |
253 + class="unsharePopupBottomButton" |
254 + default="true" |
254 + default="true" |
255 + autofocus="autofocus" |
255 + autofocus="autofocus" |
256 + label="&social.ok.label;" |
256 + oncommand="SocialShareButton.dismissUnsharePopup();"/> |
257 + accesskey="&social.ok.accesskey;" |
|
258 + oncommand="SocialShareButton.dismissSharePopup();"/> |
|
259 +#else |
257 +#else |
260 + <button id="editSharePopupOkButton" |
258 + <button id="unsharePopupContinueSharingButton" |
261 + class="editSharePopupBottomButton" |
259 + class="unsharePopupBottomButton" |
262 + default="true" |
260 + default="true" |
263 + autofocus="autofocus" |
261 + autofocus="autofocus" |
264 + label="&social.ok.label;" |
262 + oncommand="SocialShareButton.dismissUnsharePopup();"/> |
265 + accesskey="&social.ok.accesskey;" |
263 + <button id="unsharePopupStopSharingButton" |
266 + oncommand="SocialShareButton.dismissSharePopup();"/> |
264 + class="unsharePopupBottomButton" |
267 + <button id="editSharePopupUndoButton" |
|
268 + class="editSharePopupBottomButton" |
|
269 + label="&social.sharePopup.undo.label;" |
|
270 + accesskey="&social.sharePopup.undo.accesskey;" |
|
271 + command="Social:UnsharePage"/> |
265 + command="Social:UnsharePage"/> |
272 +#endif |
266 +#endif |
273 + </hbox> |
267 + </hbox> |
274 + </panel> |
268 + </panel> |
275 + |
269 + |
276 + <panel id="social-notification-panel" type="arrow" hidden="true" noautofocus="true"> |
270 + <panel id="social-notification-panel" |
|
271 + class="social-panel" |
|
272 + type="arrow" |
|
273 + hidden="true" |
|
274 + consumeoutsideclicks="true" |
|
275 + noautofocus="true"> |
277 + <box id="social-notification-box" flex="1"></box> |
276 + <box id="social-notification-box" flex="1"></box> |
278 + </panel> |
277 + </panel> |
279 + <panel id="social-flyout-panel" |
278 + <panel id="social-flyout-panel" |
|
279 + class="social-panel" |
280 + onpopupshown="SocialFlyout.onShown()" |
280 + onpopupshown="SocialFlyout.onShown()" |
281 + onpopuphidden="SocialFlyout.onHidden()" |
281 + onpopuphidden="SocialFlyout.onHidden()" |
282 + side="right" |
282 + side="right" |
283 + type="arrow" |
283 + type="arrow" |
284 + hidden="true" |
284 + hidden="true" |
667 + ondrop="homeButtonObserver.onDrop(event)" |
667 + ondrop="homeButtonObserver.onDrop(event)" |
668 + ondragexit="homeButtonObserver.onDragExit(event)" |
668 + ondragexit="homeButtonObserver.onDragExit(event)" |
669 + onclick="BrowserGoHome(event);" |
669 + onclick="BrowserGoHome(event);" |
670 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
670 + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> |
671 + |
671 + |
672 + <toolbaritem id="social-toolbar-button" |
672 + <toolbaritem id="social-toolbar-item" |
673 + class="toolbarbutton-1 chromeclass-toolbar-additional" |
673 + class="chromeclass-toolbar-additional" |
674 + removable="false" |
674 + removable="false" |
675 + pack="center" |
|
676 + title="&socialToolbar.title;" |
675 + title="&socialToolbar.title;" |
677 + hidden="true"> |
676 + hidden="true"> |
678 + <hbox id="social-toolbar-button-box" class="social-statusarea-container"> |
677 + <toolbarbutton id="social-provider-button" |
679 + <button id="social-provider-image" type="menu"> |
678 + class="toolbarbutton-1" |
680 + <menupopup id="social-statusarea-popup"> |
679 + type="menu"> |
681 + <hbox id="social-statusarea-user" pack="left" align="center"> |
680 + <menupopup id="social-statusarea-popup"> |
682 + <image id="social-statusarea-user-portrait"/> |
681 + <hbox id="social-statusarea-user" pack="start" align="center" |
683 + <vbox> |
682 + onclick="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"> |
684 + <label id="social-statusarea-notloggedin" |
683 + <image id="social-statusarea-user-portrait"/> |
685 + value="&social.notLoggedIn.label;"/> |
684 + <vbox> |
686 + <button id="social-statusarea-username" |
685 + <button id="social-statusarea-notloggedin" |
687 + oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();"/> |
686 + class="link" label="&social.notLoggedIn.label;"/> |
688 + </vbox> |
687 + <button id="social-statusarea-username" class="link"/> |
689 + </hbox> |
688 + </vbox> |
690 + <menuitem id="social-toggle-sidebar-menuitem" |
689 + </hbox> |
691 + type="checkbox" |
690 + <menuitem id="social-toggle-sidebar-menuitem" |
692 + autocheck="false" |
691 + type="checkbox" |
693 + command="Social:ToggleSidebar" |
692 + autocheck="false" |
694 + label="&social.toggleSidebar.label;" |
693 + command="Social:ToggleSidebar" |
695 + accesskey="&social.toggleSidebar.accesskey;"/> |
694 + label="&social.toggleSidebar.label;" |
696 + </menupopup> |
695 + accesskey="&social.toggleSidebar.accesskey;"/> |
697 + </button> |
696 + </menupopup> |
698 + <hbox id="social-status-iconbox" flex="1"> |
697 + </toolbarbutton> |
699 + </hbox> |
|
700 + </hbox> |
|
701 + </toolbaritem> |
698 + </toolbaritem> |
702 + |
699 + |
703 + <toolbaritem id="bookmarks-menu-button-container" |
700 + <toolbaritem id="bookmarks-menu-button-container" |
704 + class="chromeclass-toolbar-additional" |
701 + class="chromeclass-toolbar-additional" |
705 + removable="true" |
702 + removable="true" |
1268 + |
1265 + |
1269 +</window> |
1266 +</window> |
1270 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1267 diff --git a/browser/base/jar.mn b/browser/base/jar.mn |
1271 --- a/browser/base/jar.mn |
1268 --- a/browser/base/jar.mn |
1272 +++ b/browser/base/jar.mn |
1269 +++ b/browser/base/jar.mn |
1273 @@ -35,16 +35,18 @@ browser.jar: |
1270 @@ -36,16 +36,18 @@ browser.jar: |
1274 content/browser/abouthome/restore-large.png (content/abouthome/restore-large.png) |
|
1275 content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) |
1271 content/browser/abouthome/mozilla.png (content/abouthome/mozilla.png) |
1276 content/browser/abouthome/noise.png (content/abouthome/noise.png) |
1272 content/browser/abouthome/noise.png (content/abouthome/noise.png) |
1277 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1273 content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) |
1278 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
1274 content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) |
|
1275 content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) |
1279 * content/browser/browser.css (content/browser.css) |
1276 * content/browser/browser.css (content/browser.css) |
1280 * content/browser/browser.js (content/browser.js) |
1277 * content/browser/browser.js (content/browser.js) |
1281 * content/browser/browser.xul (content/browser.xul) |
1278 * content/browser/browser.xul (content/browser.xul) |
1282 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1279 +* content/browser/browser-kde.xul (content/browser-kde.xul) |
1283 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |
1280 +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde |