mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 12:25:53 +00:00
forgot to check these files in with the previous batch...
This commit is contained in:
ben%netscape.com
parent
a3db0858de
commit
b585bc89ab
@ -247,53 +247,57 @@ Contributor(s): ______________________________________. -->
|
||||
<!-- Menu -->
|
||||
<menubar id="main-menubar"/>
|
||||
|
||||
<toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" persist="collapsed" grippytooltip="aTooltip" grippytooltiptext="&navigationBar.tooltip;">
|
||||
<toolbar class="toolbar-primary chromeclass-toolbar" id="nav-bar"
|
||||
persist="collapsed" grippytooltip="aTooltip" grippytooltiptext="&navigationBar.tooltip;">
|
||||
<menubutton class="menubutton-dual toolbar top" id="back-button" value="&backButton.label;"
|
||||
crop="right" observes="canGoBack" oncommand="gotoHistoryIndex(event);"
|
||||
tooltip="aTooltip"
|
||||
buttonaction="BrowserBack();" buttontooltiptext="&backButton.tooltip;">
|
||||
<menupopup oncreate="BrowserBackMenu(event);"/>
|
||||
</menubutton>
|
||||
<menubutton class="menubutton-dual toolbar top" id="forward-button"
|
||||
crop="right" observes="canGoForward" tooltip="aTooltip"
|
||||
oncommand="gotoHistoryIndex(event);" buttonaction="BrowserForward();"
|
||||
value="&forwardButton.label;" buttontooltiptext="&forwardButton.tooltip;">
|
||||
<menupopup oncreate="BrowserForwardMenu(event);"/>
|
||||
</menubutton>
|
||||
|
||||
<button class="button-toolbar-1 top" id="reload-button" crop="right" observes="canReload" value="&reloadButton.label;"
|
||||
tooltip="aTooltip" tooltiptext="&reloadButton.tooltip;"/>
|
||||
<button class="button-toolbar-1 top" id="stop-button" crop="right" observes="canStop" onclick="BrowserStop()" value="&stopButton.label;"
|
||||
tooltip="aTooltip" tooltiptext="&stopButton.tooltip;"/>
|
||||
|
||||
<toolbarseparator/>
|
||||
<box id="nav-bar-inner" autostretch="never" flex="1" style="min-width: 0px;">
|
||||
<menubutton class="menubutton-dual top toolbar" id="back-button" value="&backButton.label;"
|
||||
crop="right" observes="canGoBack" oncommand="gotoHistoryIndex(event);"
|
||||
tooltip="aTooltip"
|
||||
buttonaction="BrowserBack();" buttontooltiptext="&backButton.tooltip;">
|
||||
<menupopup oncreate="BrowserBackMenu(event);"/>
|
||||
</menubutton>
|
||||
<menubutton class="menubutton-dual top toolbar" id="forward-button"
|
||||
crop="right" observes="canGoForward" tooltip="aTooltip"
|
||||
oncommand="gotoHistoryIndex(event);" buttonaction="BrowserForward();"
|
||||
value="&forwardButton.label;" buttontooltiptext="&forwardButton.tooltip;">
|
||||
<menupopup oncreate="BrowserForwardMenu(event);"/>
|
||||
</menubutton>
|
||||
<button class="button-toolbar-1 top" id="reload-button" crop="right" observes="canReload" value="&reloadButton.label;"
|
||||
tooltip="aTooltip" tooltiptext="&reloadButton.tooltip;"/>
|
||||
<button class="button-toolbar-1 top" id="stop-button" crop="right" observes="canStop" onclick="BrowserStop()" value="&stopButton.label;"
|
||||
tooltip="aTooltip" tooltiptext="&stopButton.tooltip;"/>
|
||||
|
||||
<box id="urlbar-group" class="box-toolbar-group" flex="1">
|
||||
<box autostretch="never" valign="middle" flex="1">
|
||||
<image id="page-proxy-button" ondraggesture="nsDragAndDrop.startDrag(event, proxyIconDNDObserver);"/>
|
||||
<textfield autocomplete="true" timeout="300" class="plain chromeclass-location"
|
||||
searchSessionType="urlbar" id="urlbar" tooltip="aTooltip" tooltiptext="&locationBar.tooltip;"
|
||||
onkeypress="if( event.which == 13 ) { addToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>
|
||||
<box id="urlbar-group" class="box-toolbar-group chromeclass-location" flex="1">
|
||||
<box autostretch="never" valign="middle" flex="1" id="urlbar-container">
|
||||
<image id="page-proxy-button" ondraggesture="nsDragAndDrop.startDrag(event, proxyIconDNDObserver);"/>
|
||||
<textfield autocomplete="true" timeout="300" class="plain"
|
||||
searchSessionType="urlbar" id="urlbar" tooltip="aTooltip" tooltiptext="&locationBar.tooltip;"
|
||||
onkeypress="if( event.which == 13 ) { addToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>
|
||||
</box>
|
||||
<menubutton class="menubutton-icon plain" id="ubhist">
|
||||
<menubutton class="menubutton-icon" id="ubhist">
|
||||
<menupopup id="ubhist-popup" popupalign="topright" popupanchor="bottomright"
|
||||
oncreate="createUBHistoryMenu(event);" oncommand="executeUrlBarHistoryCommand(event.target);"/>
|
||||
oncreate="createUBHistoryMenu(event);" oncommand="executeUrlBarHistoryCommand(event.target);">
|
||||
<menuitem value=" "/>
|
||||
</menupopup>
|
||||
</menubutton>
|
||||
<button class="button-toolbar-3" id="search-button" value="&searchButton.label;"
|
||||
oncommand="OpenSearch('internet',false, document.getElementById('urlbar').value);"
|
||||
tooltip="aTooltip" tooltiptext="&searchButton.tooltip;"/>
|
||||
<button class="button-toolbar-3" id="go-button" value="&goButton.label;" oncommand="addToUrlbarHistory(); BrowserLoadURL();"
|
||||
tooltip="aTooltip" tooltiptext="&goButton.tooltip;"/>
|
||||
</box>
|
||||
|
||||
<button class="button-toolbar-3 chromeclass-location" id="search-button" value="&searchButton.label;"
|
||||
oncommand="OpenSearch('internet',false, document.getElementById('urlbar').value);"
|
||||
tooltip="aTooltip" tooltiptext="&searchButton.tooltip;"/>
|
||||
<button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
|
||||
</box>
|
||||
<button class="plain" id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')" tooltip="aTooltip" tooltiptext="&throbber.tooltip;"/>
|
||||
</toolbar>
|
||||
|
||||
<toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed" dragdroparea="innermostBox"
|
||||
ondragover="nsDragAndDrop.dragOver(event, personalToolbarObserver);"
|
||||
ondragdrop="nsDragAndDrop.drop(event, personalToolbarObserver);"
|
||||
ondraggesture="nsDragAndDrop.startDrag(event, personalToolbarObserver);"
|
||||
grippytooltip="aTooltip"
|
||||
grippytooltiptext="&personalBar.tooltip;">
|
||||
grippytooltip="aTooltip" grippytooltiptext="&personalBar.tooltip;"
|
||||
last-toolbar="true">
|
||||
|
||||
<!-- "Bookmarks" button on personal toolbar -->
|
||||
<menubutton class="button-toolbar bookmarkfolder" id="PersonalMenu"
|
||||
@ -383,6 +387,8 @@ Contributor(s): ______________________________________. -->
|
||||
ondragexit="nsDragAndDrop.dragExit(event, homeButtonObserver);"
|
||||
oncommand="BrowserHome(); event.preventBubble();"/>
|
||||
|
||||
<toolbarseparator/>
|
||||
|
||||
</box>
|
||||
|
||||
</toolbar>
|
||||
@ -401,8 +407,6 @@ Contributor(s): ______________________________________. -->
|
||||
|
||||
<!-- this box is temporary, pending XBLified <browser> -->
|
||||
<box id="browser" flex="1">
|
||||
<!-- type attribute is used by frame construction to locate iframes
|
||||
intended to hold (html) content -->
|
||||
<browser context="context" type="content-primary" id="content"
|
||||
src="about:blank" flex="1" tooltip="aHTMLTooltip"/>
|
||||
</box>
|
||||
@ -414,6 +418,6 @@ Contributor(s): ______________________________________. -->
|
||||
|
||||
</box>
|
||||
|
||||
<toolbox id="taskbar" class="chromeclass-extrachrome toolbox-bottom"/>
|
||||
<box id="taskbar" class="chromeclass-extrachrome toolbox-bottom"/>
|
||||
|
||||
</window>
|
||||
|
||||
@ -103,6 +103,7 @@ var personalToolbarObserver = {
|
||||
|
||||
var flavourList = { };
|
||||
flavourList["moz/toolbaritem"] = { width: 2, data: uri };
|
||||
flavourList["text/x-moz-url"] = { width: 2, data: homepage + " " + "[ TEMP TITLE ]" };
|
||||
flavourList["text/html"] = { width: 2, data: htmlString };
|
||||
flavourList["text/unicode"] = { width: 2, data: uri };
|
||||
return flavourList;
|
||||
@ -129,18 +130,14 @@ var personalToolbarObserver = {
|
||||
rdfContainer.RemoveElement(elementRes, true);
|
||||
else if (dropIndex == -1)
|
||||
{
|
||||
dump("*** element = " + element + "\n");
|
||||
// look up this URL's title in global history
|
||||
var potentialTitle = null;
|
||||
var historyDS = gRDFService.GetDataSource("rdf:history");
|
||||
var historyEntry = gRDFService.GetResource(element);
|
||||
var historyTitleProperty = gRDFService.GetResource(NC_RDF("Name"));
|
||||
var titleFromHistory = historyDS.GetTarget(historyEntry, historyTitleProperty, true);
|
||||
dump("*** titleFromHistory = " + titleFromHistory + "\n");
|
||||
if (titleFromHistory) {
|
||||
if (titleFromHistory)
|
||||
titleFromHistory = titleFromHistory.QueryInterface(Components.interfaces.nsIRDFLiteral);
|
||||
dump("*** titleFromHistory2 = " + titleFromHistory + "\n");
|
||||
}
|
||||
if (titleFromHistory)
|
||||
potentialTitle = titleFromHistory.Value;
|
||||
linkTitle = potentialTitle ? potentialTitle : element;
|
||||
@ -229,6 +226,7 @@ var contentAreaDNDObserver = {
|
||||
|
||||
var flavourList = { };
|
||||
flavourList["text/html"] = { width: 2, data: htmlstring };
|
||||
flavourList["text/x-moz-url"] = { width: 2, data: textstring + " " + "( TEMP TITLE )" };
|
||||
flavourList["text/unicode"] = { width: 2, data: textstring };
|
||||
return flavourList;
|
||||
},
|
||||
@ -352,10 +350,10 @@ var homeButtonObserver = {
|
||||
{
|
||||
var homepage = nsPreferences.getLocalizedUnicharPref("browser.startup.homepage", "about:blank");
|
||||
var flavourList = { };
|
||||
flavourList["text/unicode"] = { width: 2, data: homepage };
|
||||
flavourList["text/x-moz-url"] = { width: 2, data: homepage };
|
||||
var htmlString = "<a href=\"" + homepage + "\">" + homepage + "</a>";
|
||||
flavourList["text/x-moz-url"] = { width: 2, data: homepage + " " + "[ TEMP - Home Page ]" };
|
||||
flavourList["text/html"] = { width: 2, data: htmlString };
|
||||
flavourList["text/unicode"] = { width: 2, data: homepage };
|
||||
var htmlString = "<a href=\"" + homepage + "\">" + homepage + "</a>";
|
||||
return flavourList;
|
||||
},
|
||||
|
||||
|
||||
@ -499,10 +499,10 @@ END of Deprecated -->
|
||||
</menubar>
|
||||
|
||||
<statusbar id="status-bar" class="chromeclass-status">
|
||||
<statusbarpanel id="offline-status"/>
|
||||
<statusbarpanel class="statusbarpanel-icononly" id="offline-status"/>
|
||||
<progressmeter class="progressmeter-statusbar" statusbar="true" id="statusbar-icon" mode="normal" value="0"/>
|
||||
<statusbarpanel id="statusbar-display" value="&statusText.label;" crop="right" flex="1"/>
|
||||
<statusbarpanel id="security-button" tooltip="aTooltip"/>
|
||||
<statusbarpanel class="statusbarpanel-icononly" id="security-button" tooltip="aTooltip"/>
|
||||
</statusbar>
|
||||
|
||||
</overlay>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user