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

[XForms] trunk and ff2 prefs off for xforms. Bug 350928, r=doronr+olli

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@224151 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
aaronr%us.ibm.com 2007-04-04 17:00:38 +00:00
parent 280e9e5604
commit fa260ff148
4 changed files with 59 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
mozilla/extensions/xforms/resources/content/xforms-prefs-ui.xul
View File

@ -37,38 +37,46 @@
<!DOCTYPE overlay [
<!ENTITY % xformsDTD SYSTEM "chrome://xforms/locale/xforms.dtd">
<!ENTITY % contentDTD SYSTEM "chrome://browser/locale/preferences/content.dtd">
<!ENTITY % securityDTD SYSTEM "chrome://browser/locale/preferences/security.dtd">
<!ENTITY % preferencesDTD SYSTEM "chrome://browser/locale/preferences/preferences.dtd">
%xformsDTD;
%contentDTD;
%securityDTD;
%preferencesDTD;
]>
<overlay id="XFormsContentPaneOverlayUI"
<overlay id="XFormsSecurityPaneOverlayUI"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefwindow id="BrowserPreferences">
<prefpane id="paneContent">
<prefwindow id="BrowserPreferences"
#ifdef USE_WIN_TITLE_STYLE
style="&prefWindow.styleWin;">
#else
#ifdef XP_MACOSX
style="&prefWindow.styleMac;">
#else
style="&prefWindow.styleGNOME;">
#endif
#endif
>
<preferences id="contentPreferences">
<prefpane id="paneSecurity">
<preferences id="securityPreferences">
<preference id="xforms.crossdomain.enabled" name="xforms.crossdomain.enabled" type="bool"/>
</preferences>
<groupbox id="contentGroupbox">
<grid id="contentGrid">
<rows id="contentRows-1">
<row insertafter="enableSoftwareInstallRow">
<vbox align="start">
<checkbox id="xformsCrossDomain" preference="xforms.crossdomain.enabled"
label="&xforms.crossdomain.ui.label;"
accesskey="&xforms.crossdomain.ui.accesskey;"
onsyncfrompreference="return gContentPane.updateButtons('xformsCrossDomainButton', 'xforms.crossdomain.enabled');"/>
</vbox>
<button id="xformsCrossDomainButton"
label="&allowedSitesXForms.label;"
accesskey="&allowedSitesXForms.accesskey;"
oncommand="loadXFormsPermission()"/>
</row>
</rows>
</grid>
<groupbox id="addonsPhishingGroup">
<hbox insertafter="addonInstallBox">
<checkbox id="xformsCrossDomain" preference="xforms.crossdomain.enabled"
flex="1"
label="&xforms.crossdomain.ui.label;"
accesskey="&xforms.crossdomain.ui.accesskey;"
onsyncfrompreference="return gContentPane.updateButtons('xformsCrossDomainButton', 'xforms.crossdomain.enabled');"/>
<button id="xformsCrossDomainButton"
label="&allowedSitesXForms.label;"
accesskey="&allowedSitesXForms.accesskey;"
oncommand="loadXFormsPermission()"/>
</hbox>
</groupbox>
</prefpane>
</prefwindow>

2
mozilla/extensions/xforms/resources/content/xforms-prefs.js
View File

@ -62,7 +62,7 @@ function XFormsUIClass() {
}
XFormsUIClass.prototype.pageLoad = function(aEvent) {
var pane = document.getElementById("paneContent");
var pane = document.getElementById("paneSecurity");
if (pane.loaded) {
xformsUI.loadOverlay();
} else {

28
mozilla/extensions/xforms/resources/content/xforms-prefs.xul
View File

@ -35,13 +35,33 @@
-
- ***** END LICENSE BLOCK ***** -->
<overlay id="XFormsContentPaneOverlay"
<!DOCTYPE overlay [
<!ENTITY % xformsDTD SYSTEM "chrome://xforms/locale/xforms.dtd">
<!ENTITY % securityDTD SYSTEM "chrome://browser/locale/preferences/security.dtd">
<!ENTITY % preferencesDTD SYSTEM "chrome://browser/locale/preferences/preferences.dtd">
%xformsDTD;
%securityDTD;
%preferencesDTD;
]>
<overlay id="XFormsSecurityPaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefwindow id="BrowserPreferences">
<prefpane id="paneContent">
<prefwindow id="BrowserPreferences"
#ifdef USE_WIN_TITLE_STYLE
style="&prefWindow.styleWin;">
#else
#ifdef XP_MACOSX
style="&prefWindow.styleMac;">
#else
style="&prefWindow.styleGNOME;">
#endif
#endif
>
<preferences id="contentPreferences">
<prefpane id="paneSecurity">
<preferences id="securityPreferences">
<preference id="xforms.crossdomain.enabled" name="xforms.crossdomain.enabled" type="bool"/>
</preferences>

3
mozilla/extensions/xforms/resources/locale/en-US/xforms.dtd
View File

@ -86,3 +86,6 @@
<!ENTITY xforms.date.day.label.field "&#34;Day&#34;">
<!ENTITY xforms.range.start.separator.field "<![CDATA[&#34; >> &#34;]]>">
<!ENTITY xforms.range.end.separator.field "<![CDATA[&#34; << &#34;]]>">
<!ENTITY prefWindow.styleWin "width: 42em; height: 42em;">
<!ENTITY prefWindow.styleGNOME "width: 42em; height: 40.5em;">