Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 06:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

- fixed missing html:div tag in am-main.xul

Browse Source 
- fix for #36771 - document.controls stopped containing hidden form elements - still the right fix because document.controls likely going away
- make the IMAP advanced dialog skinnable
This commit is contained in:
alecf%netscape.com 2000-04-21 23:51:19 +00:00
parent 77ab896a2a
commit 826b8000fd
4 changed files with 59 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
mailnews/base/prefs/resources/content/am-imap-advanced.xul
View File

@ -14,37 +14,44 @@
<keyset id="keyset"/>
<html:script src="am-imap-advanced.js"/>
<script src="am-imap-advanced.js"/>
<html:div>
<html:label for="serverDirectory">&serverDirectory.label;</html:label>
<box>
<text value="&serverDirectory.label;"/>
<html:input type="text" id="serverDirectory" name="serverDirectory"/>
</html:div>
</box>
<html:div>
<box>
<html:input type="checkbox" id="usingSubscription" name="usingSubscription"/>
<html:label for="usingSubscription">&usingSubscription.label;</html:label>
</html:div>
<html:div>
</box>
<box>
<html:input type="checkbox" id="dualUseFolders" name="dualUseFolders"/>
<html:label for="dualUseFolders">&dualUseFolders.label;</html:label>
</html:div>
<html:div>&namespaceDesc.label;</html:div>
<html:table style="padding-left: 10px">
<html:tr>
<html:td><html:label for="personalNamespace">&personalNamespace.label;</html:label></html:td>
<html:td><html:input type="text" id="personalNamespace" name="personalNamespace"/></html:td>
</html:tr>
<html:tr>
<html:td><html:label for="publicNamespace">&publicNamespace.label;</html:label></html:td>
<html:td><html:input type="text" id="publicNamespace" name="publicNamespace"/></html:td>
</html:tr>
<html:tr>
<html:td><html:label for="otherUsersNamespace">&otherUsersNamespace.label;</html:label></html:td>
<html:td><html:input type="text" id="otherUsersNamespace" name="otherUsersNamespace"/></html:td>
</html:tr>
</html:table>
<html:div class="separator" align="horizontal"/>
</box>
<html>&namespaceDesc.label;</html>
<grid style="padding-left: 10px">
<columns>
<column/>
<column/>
</columns>
<rows>
<row>
<text value="&personalNamespace.label;"/>
<box><html:input type="text" id="personalNamespace" name="personalNamespace"/></box>
</row>
<row>
<text value="&publicNamespace.label;"/>
<box><html:input type="text" id="publicNamespace" name="publicNamespace"/></box>
</row>
<row>
<text value="&otherUsersNamespace.label;"/>
<box><html:input type="text" id="otherUsersNamespace" name="otherUsersNamespace"/></box>
</row>
</rows>
</grid>
<separator class="groove"/>
<box id="okCancelButtons"/>
</window>

14
mailnews/base/prefs/resources/content/am-main.xul
View File

@ -28,7 +28,7 @@
</columns>
<rows>
<row>
<text value="&accountName.label;"/>
<text class="label" value="&accountName.label;"/>
<html:input type="text" size="30" name="server.prettyName" id="server.prettyName" flex="100%"/>
</row>
</rows>
@ -44,19 +44,19 @@
</columns>
<rows>
<row>
<text value="&name.label;"/>
<text class="label" value="&name.label;"/>
<html:input name="identity.fullName" type="text" size="30"/>
</row>
<row>
<text value="&email.label;"/>
<text class="label" value="&email.label;"/>
<html:input name="identity.email" type="text" maxwidth="200" size="30"/>
</row>
<row>
<text value="&replyTo.label;"/>
<text class="label" value="&replyTo.label;"/>
<html:input name="identity.replyTo" type="text" maxwidth="200" size="30"/>
</row>
<row>
<text value="&organization.label;"/>
<text class="label" value="&organization.label;"/>
<html:input name="identity.organization" type="text" size="30"/>
</row>
</rows>
@ -87,10 +87,10 @@
-->
<html:div>
<box>
<html:input name="identity.composeHtml" id="identity.composeHtml" type="checkbox"/>
<html:label for="identity.composeHtml">&useHtml.label;</html:label>
</html:div>
</box>
<box orient="horizontal">
<spring flex="100%"/>

29
mailnews/base/prefs/resources/content/am-server.js
View File

@ -110,17 +110,18 @@ function openImapAdvanced()
function getImapServer() {
var imapServer = new Array;
var controls = document.controls;
// boolean prefs, need to do special convertion
imapServer.dualUseFolders = (controls["imap.dualUseFolders"].value == "true" ? true : false);
imapServer.usingSubscription = (controls["imap.usingSubscription"].value == "true" ? true : false);
imapServer.dualUseFolders =
(document.getElementById("imap.dualUseFolders").value == "true" ?
true : false);
imapServer.usingSubscription =
(document.getElementById("imap.usingSubscription").value == "true" ? true : false);
// string prefs
imapServer.personalNamespace = controls["imap.personalNamespace"].value;
imapServer.publicNamespace = controls["imap.publicNamespace"].value;
imapServer.serverDirectory = controls["imap.serverDirectory"].value;
imapServer.otherUsersNamespace = controls["imap.otherUsersNamespace"].value;
imapServer.personalNamespace = document.getElementById("imap.personalNamespace").value;
imapServer.publicNamespace = document.getElementById("imap.publicNamespace").value;
imapServer.serverDirectory = document.getElementById("imap.serverDirectory").value;
imapServer.otherUsersNamespace = document.getElementById("imap.otherUsersNamespace").value;
return imapServer;
}
@ -129,14 +130,14 @@ function saveServerLocally(imapServer)
var controls = document.controls;
// boolean prefs, JS does the conversion for us
controls["imap.dualUseFolders"].value = imapServer.dualUseFolders;
controls["imap.usingSubscription"].value = imapServer.usingSubscription;
document.getElementById("imap.dualUseFolders").value = imapServer.dualUseFolders;
document.getElementById("imap.usingSubscription").value = imapServer.usingSubscription;
// string prefs
controls["imap.personalNamespace"].value = imapServer.personalNamespace;
controls["imap.publicNamespace"].value = imapServer.publicNamespace;
controls["imap.serverDirectory"].value = imapServer.serverDirectory;
controls["imap.otherUsersNamespace"].value = imapServer.otherUsersNamespace;
document.getElementById("imap.personalNamespace").value = imapServer.personalNamespace;
document.getElementById("imap.publicNamespace").value = imapServer.publicNamespace;
document.getElementById("imap.serverDirectory").value = imapServer.serverDirectory;
document.getElementById("imap.otherUsersNamespace").value = imapServer.otherUsersNamespace;
}

12
mailnews/base/prefs/resources/content/am-server.xul
View File

@ -101,12 +101,12 @@
onclick="openImapAdvanced(event);"/>
</box>
<html:input type="hidden" name="imap.dualUseFolders"/>
<html:input type="hidden" name="imap.usingSubscription"/>
<html:input type="hidden" name="imap.personalNamespace"/>
<html:input type="hidden" name="imap.publicNamespace"/>
<html:input type="hidden" name="imap.otherUsersNamespace"/>
<html:input type="hidden" name="imap.serverDirectory"/>
<html:input type="hidden" id="imap.dualUseFolders" name="imap.dualUseFolders"/>
<html:input type="hidden" id="imap.usingSubscription" name="imap.usingSubscription"/>
<html:input type="hidden" id="imap.personalNamespace" name="imap.personalNamespace"/>
<html:input type="hidden" id="imap.publicNamespace" name="imap.publicNamespace"/>
<html:input type="hidden" id="imap.otherUsersNamespace" name="imap.otherUsersNamespace"/>
<html:input type="hidden" id="imap.serverDirectory" name="imap.serverDirectory"/>
</box>
<!-- News -->