зеркало из https://github.com/mozilla/gecko-dev.git
Remove extra box. Tweak some formatting. First pass at personal toolbar popups.
This commit is contained in:
Родитель
4661727893
Коммит
f7912edc3f
|
@ -102,58 +102,25 @@ Contributor(s): ______________________________________. -->
|
|||
<html:script language="javascript">
|
||||
var gBookmarkPopup = null;
|
||||
</html:script>
|
||||
|
||||
<popup id="bookmark-popup" popupanchor='bottomleft'
|
||||
oncreate="BookmarkPopupFillTree(window,document.popupElement);">
|
||||
<window xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
width="200" height="200" align="vertical"
|
||||
style="border: thin solid black; width:100%;height:100%">
|
||||
<box align="horizontal">
|
||||
<spring flex="50%"/>
|
||||
<titledbutton class="borderless" value="close" onclick="window.close();"/>
|
||||
<spring flex="50%"/>
|
||||
</box>
|
||||
<html:script src="chrome://bookmarks/content/bookmark-popup.js" />
|
||||
<tree id="bmpopuptree" context="contextual"
|
||||
flex="100%" style="height: 100%"
|
||||
datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch"
|
||||
onclick="return opener.BookmarkPopupSingleClick(window,event.target.parentNode.parentNode);">
|
||||
|
||||
<popupset>
|
||||
<popup id="bookmark-popup" popupanchor='bottomleft'
|
||||
oncreate="dump(document.popupElement);"
|
||||
datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" ref="NC:BookmarksRoot">
|
||||
<template>
|
||||
<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
|
||||
<treechildren>
|
||||
<treeitem uri="..." type="rdf:http://home.netscape.com/NC-rdf#type">
|
||||
<treerow>
|
||||
<treecell>
|
||||
<html:hr width="75%" align="center" size="1" />
|
||||
</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
<rule iscontainer="true">
|
||||
<menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</rule>
|
||||
<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
|
||||
<menuseparator uri="..." />
|
||||
</rule>
|
||||
|
||||
<rule>
|
||||
<treechildren>
|
||||
<treeitem uri="..." type="rdf:http://home.netscape.com/NC-rdf#type">
|
||||
<treerow>
|
||||
<treecell>
|
||||
<treeindentation />
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
|
||||
align="left" class="borderless"/>
|
||||
</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
|
||||
</rule>
|
||||
</template>
|
||||
|
||||
<treecol id="NameColumn"
|
||||
rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
|
||||
</tree>
|
||||
</window>
|
||||
</popup>
|
||||
|
||||
</popupset>
|
||||
|
||||
<broadcaster id="canReload"/>
|
||||
<broadcaster id="canStop"/>
|
||||
|
@ -560,13 +527,12 @@ Contributor(s): ______________________________________. -->
|
|||
<spring flex="100%"/>
|
||||
</menubar>
|
||||
|
||||
<!-- sidebar/toolbar/content/status/tasks -->
|
||||
<box align="vertical" flex="100%">
|
||||
<!-- sidebar/toolbar/content/status -->
|
||||
<box id="sidebarparent" align="horizontal" flex="100%">
|
||||
<!-- toolbar/content/status -->
|
||||
<box id="sidebarbox" />
|
||||
<splitter id="sidebarsplitter" collapse="before" persist="hidden"/>
|
||||
<splitter id="sidebarsplitter" collapse="before" persist="state hidden"
|
||||
onclick="sidebarSaveState(this)"/>
|
||||
<box id="appcontent" align="vertical" flex="100%">
|
||||
<toolbox id="main-toolbox">
|
||||
<toolbar class="main-bar" chromeclass="toolbar">
|
||||
|
@ -619,7 +585,8 @@ Contributor(s): ______________________________________. -->
|
|||
</titledbutton>
|
||||
</toolbar>
|
||||
<toolbar class="main-bar" chromeclass="toolbar"
|
||||
datasources="rdf:bookmarks" id="PersonalToolbar" ref="NC:PersonalToolbarFolder"
|
||||
datasources="rdf:bookmarks" id="PersonalToolbar"
|
||||
ref="NC:PersonalToolbarFolder"
|
||||
ondraggesture="return BeginDragPersonalToolbar(event);"
|
||||
ondragdrop="return DropPersonalToolbar(event);"
|
||||
ondragover="return DragOverPersonalToolbar(event);"
|
||||
|
@ -630,22 +597,26 @@ Contributor(s): ______________________________________. -->
|
|||
<!-- Rules for content hanging _directly_ off the toolbar -->
|
||||
<rule parent="toolbar" iscontainer="true">
|
||||
<menu uri="...">
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
|
||||
align="left" />
|
||||
</menu>
|
||||
</rule>
|
||||
<rule parent="toolbar">
|
||||
<titledbutton uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
|
||||
<titledbutton uri="..." align="left"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</rule>
|
||||
|
||||
<!-- Recursive rules for nested folders -->
|
||||
<rule iscontainer="true">
|
||||
<menupopup>
|
||||
<menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
|
||||
<menu uri="..." align="left"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
|
||||
<menuitem align="left" uri="..."
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" />
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
|
@ -654,23 +625,21 @@ Contributor(s): ______________________________________. -->
|
|||
value="&homeButton.label;"
|
||||
defaultURL="&defaultHomepage.url;"
|
||||
onclick="BrowserHome(); event.preventBubble();"/>
|
||||
<titledbutton id="netscape-button" align="left" value="&netscapeButton.label;"
|
||||
<titledbutton id="netscape-button" align="left"
|
||||
value="&netscapeButton.label;"
|
||||
onclick="window.content.location.href='&myNetscape.url;'; event.preventBubble();"/>
|
||||
<spring flex="100%"/>
|
||||
</toolbar>
|
||||
</toolbox>
|
||||
|
||||
|
||||
<!-- type attribute is used by frame construction to locate iframes
|
||||
intended to hold (html) content -->
|
||||
<!-- id's use is a mystery -->
|
||||
<html:iframe type="content-primary" id="content" src="about:blank"
|
||||
flex="100%" />
|
||||
|
||||
<box align="horizontal" id="status-bar" chromeclass="status">
|
||||
|
||||
<titledbutton value="¬ifCom.label;" onclick="doTests()" context="context"/>
|
||||
|
||||
<titledbutton value="¬ifCom.label;" onclick="doTests()"
|
||||
context="context"/>
|
||||
<box id="state-box" align="horizontal" flex="100%">
|
||||
<box align="vertical" style="width:100px">
|
||||
<spring flex="100%"/>
|
||||
|
@ -682,7 +651,6 @@ Contributor(s): ______________________________________. -->
|
|||
</progressmeter>
|
||||
<spring flex="100%"/>
|
||||
</box>
|
||||
|
||||
<titledbutton id="statusText" align="left" flex="100%"
|
||||
value="&statusText.label;"
|
||||
style="font-family:sans-serif;font-size:2.5mm">
|
||||
|
@ -691,7 +659,6 @@ Contributor(s): ______________________________________. -->
|
|||
</titledbutton>
|
||||
|
||||
<spring flex="100%"/>
|
||||
|
||||
<titledbutton align="left" value="&buildId.label;"
|
||||
style="font-family:sans-serif;font-size:2.5mm;"/>
|
||||
|
||||
|
@ -704,8 +671,6 @@ Contributor(s): ______________________________________. -->
|
|||
</box><!-- status -->
|
||||
</box><!-- toolbar/content/status -->
|
||||
</box><!-- sidebar and tools/content/status -->
|
||||
|
||||
<toolbox id="taskbox"/>
|
||||
</box><!-- all but menus -->
|
||||
|
||||
</window>
|
||||
|
|
|
@ -102,58 +102,25 @@ Contributor(s): ______________________________________. -->
|
|||
<html:script language="javascript">
|
||||
var gBookmarkPopup = null;
|
||||
</html:script>
|
||||
|
||||
<popup id="bookmark-popup" popupanchor='bottomleft'
|
||||
oncreate="BookmarkPopupFillTree(window,document.popupElement);">
|
||||
<window xmlns:html="http://www.w3.org/TR/REC-html40"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
width="200" height="200" align="vertical"
|
||||
style="border: thin solid black; width:100%;height:100%">
|
||||
<box align="horizontal">
|
||||
<spring flex="50%"/>
|
||||
<titledbutton class="borderless" value="close" onclick="window.close();"/>
|
||||
<spring flex="50%"/>
|
||||
</box>
|
||||
<html:script src="chrome://bookmarks/content/bookmark-popup.js" />
|
||||
<tree id="bmpopuptree" context="contextual"
|
||||
flex="100%" style="height: 100%"
|
||||
datasources="rdf:bookmarks rdf:files rdf:ftp rdf:localsearch rdf:internetsearch"
|
||||
onclick="return opener.BookmarkPopupSingleClick(window,event.target.parentNode.parentNode);">
|
||||
|
||||
<popupset>
|
||||
<popup id="bookmark-popup" popupanchor='bottomleft'
|
||||
oncreate="dump(document.popupElement);"
|
||||
datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" ref="NC:BookmarksRoot">
|
||||
<template>
|
||||
<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
|
||||
<treechildren>
|
||||
<treeitem uri="..." type="rdf:http://home.netscape.com/NC-rdf#type">
|
||||
<treerow>
|
||||
<treecell>
|
||||
<html:hr width="75%" align="center" size="1" />
|
||||
</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
<rule iscontainer="true">
|
||||
<menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</rule>
|
||||
<rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
|
||||
<menuseparator uri="..." />
|
||||
</rule>
|
||||
|
||||
<rule>
|
||||
<treechildren>
|
||||
<treeitem uri="..." type="rdf:http://home.netscape.com/NC-rdf#type">
|
||||
<treerow>
|
||||
<treecell>
|
||||
<treeindentation />
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
|
||||
align="left" class="borderless"/>
|
||||
</treecell>
|
||||
</treerow>
|
||||
</treeitem>
|
||||
</treechildren>
|
||||
<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" oncommand="OpenBookmarkURL(event.target, 'BookmarksMenu')" />
|
||||
</rule>
|
||||
</template>
|
||||
|
||||
<treecol id="NameColumn"
|
||||
rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
|
||||
</tree>
|
||||
</window>
|
||||
</popup>
|
||||
|
||||
</popupset>
|
||||
|
||||
<broadcaster id="canReload"/>
|
||||
<broadcaster id="canStop"/>
|
||||
|
@ -560,13 +527,12 @@ Contributor(s): ______________________________________. -->
|
|||
<spring flex="100%"/>
|
||||
</menubar>
|
||||
|
||||
<!-- sidebar/toolbar/content/status/tasks -->
|
||||
<box align="vertical" flex="100%">
|
||||
<!-- sidebar/toolbar/content/status -->
|
||||
<box id="sidebarparent" align="horizontal" flex="100%">
|
||||
<!-- toolbar/content/status -->
|
||||
<box id="sidebarbox" />
|
||||
<splitter id="sidebarsplitter" collapse="before" persist="hidden"/>
|
||||
<splitter id="sidebarsplitter" collapse="before" persist="state hidden"
|
||||
onclick="sidebarSaveState(this)"/>
|
||||
<box id="appcontent" align="vertical" flex="100%">
|
||||
<toolbox id="main-toolbox">
|
||||
<toolbar class="main-bar" chromeclass="toolbar">
|
||||
|
@ -619,7 +585,8 @@ Contributor(s): ______________________________________. -->
|
|||
</titledbutton>
|
||||
</toolbar>
|
||||
<toolbar class="main-bar" chromeclass="toolbar"
|
||||
datasources="rdf:bookmarks" id="PersonalToolbar" ref="NC:PersonalToolbarFolder"
|
||||
datasources="rdf:bookmarks" id="PersonalToolbar"
|
||||
ref="NC:PersonalToolbarFolder"
|
||||
ondraggesture="return BeginDragPersonalToolbar(event);"
|
||||
ondragdrop="return DropPersonalToolbar(event);"
|
||||
ondragover="return DragOverPersonalToolbar(event);"
|
||||
|
@ -630,22 +597,26 @@ Contributor(s): ______________________________________. -->
|
|||
<!-- Rules for content hanging _directly_ off the toolbar -->
|
||||
<rule parent="toolbar" iscontainer="true">
|
||||
<menu uri="...">
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
|
||||
<titledbutton value="rdf:http://home.netscape.com/NC-rdf#Name"
|
||||
align="left" />
|
||||
</menu>
|
||||
</rule>
|
||||
<rule parent="toolbar">
|
||||
<titledbutton uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
|
||||
<titledbutton uri="..." align="left"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</rule>
|
||||
|
||||
<!-- Recursive rules for nested folders -->
|
||||
<rule iscontainer="true">
|
||||
<menupopup>
|
||||
<menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
|
||||
<menu uri="..." align="left"
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name"/>
|
||||
</menupopup>
|
||||
</rule>
|
||||
<rule>
|
||||
<menupopup>
|
||||
<menuitem uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name" align="left" />
|
||||
<menuitem align="left" uri="..."
|
||||
value="rdf:http://home.netscape.com/NC-rdf#Name" />
|
||||
</menupopup>
|
||||
</rule>
|
||||
</template>
|
||||
|
@ -654,23 +625,21 @@ Contributor(s): ______________________________________. -->
|
|||
value="&homeButton.label;"
|
||||
defaultURL="&defaultHomepage.url;"
|
||||
onclick="BrowserHome(); event.preventBubble();"/>
|
||||
<titledbutton id="netscape-button" align="left" value="&netscapeButton.label;"
|
||||
<titledbutton id="netscape-button" align="left"
|
||||
value="&netscapeButton.label;"
|
||||
onclick="window.content.location.href='&myNetscape.url;'; event.preventBubble();"/>
|
||||
<spring flex="100%"/>
|
||||
</toolbar>
|
||||
</toolbox>
|
||||
|
||||
|
||||
<!-- type attribute is used by frame construction to locate iframes
|
||||
intended to hold (html) content -->
|
||||
<!-- id's use is a mystery -->
|
||||
<html:iframe type="content-primary" id="content" src="about:blank"
|
||||
flex="100%" />
|
||||
|
||||
<box align="horizontal" id="status-bar" chromeclass="status">
|
||||
|
||||
<titledbutton value="¬ifCom.label;" onclick="doTests()" context="context"/>
|
||||
|
||||
<titledbutton value="¬ifCom.label;" onclick="doTests()"
|
||||
context="context"/>
|
||||
<box id="state-box" align="horizontal" flex="100%">
|
||||
<box align="vertical" style="width:100px">
|
||||
<spring flex="100%"/>
|
||||
|
@ -682,7 +651,6 @@ Contributor(s): ______________________________________. -->
|
|||
</progressmeter>
|
||||
<spring flex="100%"/>
|
||||
</box>
|
||||
|
||||
<titledbutton id="statusText" align="left" flex="100%"
|
||||
value="&statusText.label;"
|
||||
style="font-family:sans-serif;font-size:2.5mm">
|
||||
|
@ -691,7 +659,6 @@ Contributor(s): ______________________________________. -->
|
|||
</titledbutton>
|
||||
|
||||
<spring flex="100%"/>
|
||||
|
||||
<titledbutton align="left" value="&buildId.label;"
|
||||
style="font-family:sans-serif;font-size:2.5mm;"/>
|
||||
|
||||
|
@ -704,8 +671,6 @@ Contributor(s): ______________________________________. -->
|
|||
</box><!-- status -->
|
||||
</box><!-- toolbar/content/status -->
|
||||
</box><!-- sidebar and tools/content/status -->
|
||||
|
||||
<toolbox id="taskbox"/>
|
||||
</box><!-- all but menus -->
|
||||
|
||||
</window>
|
||||
|
|
Загрузка…
Ссылка в новой задаче