Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for search panel appearance, 28103 r=german, a=jevering

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@62461 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ben%netscape.com 2000-03-09 07:46:00 +00:00
parent f57345a2c0
commit b539c7afc3
7 changed files with 58 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/xpfe/browser/resources/content/navigator.xul
View File

@ -374,7 +374,7 @@ Contributor(s): ______________________________________. -->
<box align="vertical" flex="1%">
<spring style="height: 4px;"/>
<box id="searchbutton" align="horizontal" style="width: 100%;">
<titledbutton id="search-button" value="&searchButton.label;"
<titledbutton id="search-button" class="toolbar-non-iconic" value="&searchButton.label;"
onclick="OpenSearch('internet',false, document.getElementById('urlbar').value);"
/>
</box>

23
mozilla/xpfe/browser/resources/skin/navigator.css
View File

@ -99,29 +99,6 @@ box#searchbutton {
list-style-image:url("chrome://global/skin/scroll-down.gif");
}
#search-button {
background-color: #99CCCC;
padding: 2px;
border: 1px outset #99CCCC;
-moz-border-radius: 4px;
}
#search-button:active {
padding: 3px 1px 1px 3px;
border: 1px inset #CCFFFF;
}
#search-button:hover {
background-color: #CCFFFF;
border: 1px outset #CCFFFF;
}
#search-button:hover:active {
background-color: #CCFFFF;
border: 1px inset #CCFFFF;
}
#action-popup {
list-style-image:url("chrome://global/skin/scroll-down.gif");
background-color: #99CCCC;

6
mozilla/xpfe/components/search/resources/locale/en-US/search-panel.dtd
View File

@ -19,14 +19,14 @@
- Contributor(s):
-->
<!ENTITY search.button.label "Search">
<!ENTITY search.button.label "SEARCH">
<!ENTITY search.results.tab "Apply">
<!ENTITY search.advanced.tab "Settings for ">
<!ENTITY allengines.label "All categories combined">
<!ENTITY within.label "within">
<!ENTITY whenSearching.label "When searching ">
<!ENTITY useTheseProviders.label "use these providers:">
<!ENTITY engine.column.label "Provider Name">
<!ENTITY useTheseProviders.label "use these engines:">
<!ENTITY engine.column.label "Engine Name">
<!ENTITY checkbox.column.label "Use">
<!ENTITY stop.button.label "Stop">
<!ENTITY explain.label "Explain Text...">

21
mozilla/xpfe/components/search/resources/search-panel.js
View File

@ -131,13 +131,6 @@ function SearchPanelStartup()
//set to default value 'the web'
//hack: hardcoded postion in here replace with a function that finds the entry 'the web'
// set the category name on the advanced panel
var categoryText = categoryList.options[ categoryList.selectedIndex ].text;
var textElement = document.getElementById( "categoryNameText" );
textElement.setAttribute( "value", categoryText );
//set the category name on the settings button
settingsButton.value = settingsButtonText + categoryText;
for( var i = 0; i < categoryList.options.length; i++ )
{
if( ( lastCategoryName == "" && categoryList.options[i].value == "NC:SearchEngineRoot" ) ||
@ -145,6 +138,14 @@ function SearchPanelStartup()
categoryList.selectedIndex = i;
}
}
// set the category name on the advanced panel
var categoryText = categoryList.options[ categoryList.selectedIndex ].text;
var textElement = document.getElementById( "categoryNameText" );
textElement.setAttribute( "value", categoryText );
//set the category name on the settings button
settingsButton.value = settingsButtonText + categoryText + "...";
if( lastCategoryName == "" )
lastCategoryName = "NC:SearchEngineRoot";
else
@ -467,14 +468,14 @@ function doSearch()
engineURIs[engineURIs.length] = treeItem.getAttribute( "id" );
}
else {
dump("*** multiple search engines present, selecting the netscape search engine\n");
dump("*** multiple engines present, none selected, selecting the netscape search engine\n");
for( var i = 0; i < treeChildrenNode.childNodes.length; i++ )
{
var currItem = treeChildrenNode.childNodes[i];
dump("*** the current URI is = " + currItem.getAttribute("id") + "\n");
if( currItem.getAttribute("id").indexOf("Open_Directory") != -1 ) {
if( currItem.getAttribute("id").indexOf("NetscapeSearchMain") != -1 ) {
engineURIs[engineURIs.length] = treeItem.getAttribute("id");
engineURIs[engineURIs.length] = currItem.getAttribute("id");
break;
}
}

16
mozilla/xpfe/components/search/resources/search-panel.xul
View File

@ -30,32 +30,20 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
align="vertical"
class="dialog"
onload="SearchPanelStartup();"
onunload="SearchPanelShutdown();">
<html:script src="chrome://global/content/strres.js"/>
<html:script src="chrome://search/content/search-panel.js" />
<tabcontrol align="vertical">
<box align="horizontal">
<spring style="width: 5px;"/>
<tabbox flex="100%">
<tab flex="1" onclick="switchTab(0);" style="display: none;">&search.results.tab;</tab>
<tab flex="1" onclick="switchTab(1);" style="display: none;">&search.advanced.tab;</tab>
</tabbox>
<spring style="width: 5px;"/>
</box>
<tabpanel style="display:none;"/>
</tabcontrol>
<deck id="advancedDeck" flex="100%" style="border:none;">
<!-- results panel -->
<box align="vertical" flex="100%">
<box align="horizontal" class="spaced">
<html:input id="sidebar-search-text" flex="1" onkeyup="if (event.which == 13) { return doSearch(); }" />
<titledbutton id="searchbutton" value="&search.button.label;" onclick="return doSearch();" class="dialog push"/>
<titledbutton id="stopbutton" value="&stop.button.label;" onclick="return doStop();" class="dialog push" style="display:none;"/>
<titledbutton id="searchbutton" value="&search.button.label;" onclick="return doSearch();" class="toolbar-non-iconic"/>
<titledbutton id="stopbutton" value="&stop.button.label;" onclick="return doStop();" class="toolbar-non-iconic" style="display:none;"/>
</box>
<box align="horizontal" class="spaced">
<html:label for="">&within.label;</html:label>

27
mozilla/xpfe/components/search/resources/search.css
View File

@ -35,7 +35,8 @@ treecol.checkboxColumn {
}
box.spaced {
padding-bottom: 5px;
padding-top: 5px;
paddimg-bottom: 2px;
}
box#engineTabs {
@ -64,3 +65,27 @@ titledbutton.engine[loading="true"] {
titledbutton.iconic {
list-style-image: url("resource:/res/rdf/document.gif") ! important ;
}
treeitem > treerow.searchresult > treecell > titledbutton {
cursor: pointer;
}
treeitem > treerow.searchresult > treecell {
color: black;
text-decoration: none;
}
treeitem > treerow.searchresult > treecell:hover {
color: blue;
text-decoration: underline;
}
treeitem > treerow.searchresult > treecell > titledbutton:active {
color: red;
text-decoration: underline;
}
/*undo regular search tree selection look*/
treeitem[selected="true"] > treerow.searchresult {
background-color: transparent;
}

15
mozilla/xpfe/global/resources/skin/global.css
View File

@ -317,6 +317,21 @@ titledbutton.button32[disabled="true"]:active {
background-image:url("chrome://global/skin/button32-bg-disabled.gif");
}
/* non-iconic toolbar button (e.g. search) */
titledbutton.toolbar-non-iconic {
background-color: #99CCCC;
padding: 2px;
margin: 0px 2px 0px 2px;
border: 1px outset #99CCCC;
-moz-border-radius: 4px;
font-weight: bold;
}
titledbutton.toolbar-non-iconic:active {
padding: 3px 1px 1px 3px;
border: 1px inset #CCFFFF;
}
/**
* Throbber
*/