Bug 1545907 - remove grid usage from am-identity-edit.xul. r=mkmelin
This commit is contained in:
Khushil Mistry
Родитель
47c58f98e6
Коммит
992934ee00
|
|
@ -60,66 +60,69 @@
|
|||
<vbox flex="1" name="settings">
|
||||
<groupbox>
|
||||
<label class="header">&publicData.label;</label>
|
||||
|
||||
<grid>
|
||||
<columns>
|
||||
<column/>
|
||||
<column flex="1"/>
|
||||
</columns>
|
||||
<rows>
|
||||
<row align="center">
|
||||
<label value="&name.label;" control="identity.fullName" accesskey="&name.accesskey;"/>
|
||||
<hbox>
|
||||
<vbox>
|
||||
<hbox flex="1" align="center">
|
||||
<label value="&name.label;" control="identity.fullName"
|
||||
accesskey="&name.accesskey;"/>
|
||||
</hbox>
|
||||
<hbox flex="1" align="center">
|
||||
<label value="&email.label;" control="identity.email"
|
||||
accesskey="&email.accesskey;"/>
|
||||
</hbox>
|
||||
<hbox flex="1" align="center">
|
||||
<label value="&replyTo.label;" control="identity.replyTo"
|
||||
accesskey="&replyTo.accesskey;"/>
|
||||
</hbox>
|
||||
<hbox flex="1" align="center">
|
||||
<label value="&organization.label;" control="identity.organization"
|
||||
accesskey="&organization.accesskey;"/>
|
||||
</hbox>
|
||||
<hbox flex="1" align="center">
|
||||
<label value="&signatureText.label;" control="identity.htmlSigText"
|
||||
accesskey="&signatureText.accesskey;"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
<vbox flex="1">
|
||||
<textbox id="identity.fullName" size="30"/>
|
||||
</row>
|
||||
<row align="center">
|
||||
<label value="&email.label;" control="identity.email" accesskey="&email.accesskey;"/>
|
||||
<textbox id="identity.email" class="uri-element"/>
|
||||
</row>
|
||||
<row align="center">
|
||||
<label value="&replyTo.label;" control="identity.replyTo" accesskey="&replyTo.accesskey;"/>
|
||||
<textbox id="identity.replyTo" class="uri-element" placeholder="&replyTo.placeholder;"/>
|
||||
</row>
|
||||
<row align="center">
|
||||
<label value="&organization.label;" control="identity.organization" accesskey="&organization.accesskey;"/>
|
||||
<textbox id="identity.organization"/>
|
||||
</row>
|
||||
<separator class="thin"/>
|
||||
<row align="center">
|
||||
<label value="&signatureText.label;" control="identity.htmlSigText" accesskey="&signatureText.accesskey;"/>
|
||||
<checkbox id="identity.htmlSigFormat" label="&signatureHtml.label;" accesskey="&signatureHtml.accesskey;"/>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<checkbox id="identity.htmlSigFormat" label="&signatureHtml.label;"
|
||||
accesskey="&signatureHtml.accesskey;"/>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
||||
<hbox class="indent" flex="1">
|
||||
<html:textarea id="identity.htmlSigText" rows="4" cols="72" class="signatureBox"/>
|
||||
</hbox>
|
||||
<separator class="thin"/>
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox id="identity.attachSignature" label="&signatureFile.label;" flex="1"
|
||||
accesskey="&signatureFile.accesskey;"
|
||||
oncommand="setupSignatureItems();"/>
|
||||
</hbox>
|
||||
<hbox class="indent" flex="1" style="display: flex;align-items: stretch;">
|
||||
<html:textarea id="identity.htmlSigText" style="flex-grow: 1;" rows="4" class="signatureBox"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center" class="indent">
|
||||
<textbox id="identity.signature" datatype="nsIFile" flex="1" name="identity.signature"
|
||||
aria-labelledby="identity.attachSignature"
|
||||
observes="broadcaster_attachSignature" class="uri-element"/>
|
||||
<button class="push" name="browse" label="&choose.label;"
|
||||
accesskey="&choose.accesskey;"
|
||||
oncommand="selectFile()"
|
||||
observes="broadcaster_attachSignature"
|
||||
id="identity.sigbrowsebutton"/>
|
||||
</hbox>
|
||||
<hbox align="center">
|
||||
<checkbox id="identity.attachSignature" label="&signatureFile.label;"
|
||||
flex="1" accesskey="&signatureFile.accesskey;"
|
||||
oncommand="setupSignatureItems();"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox id="identity.attachVCard" label="&attachVCard.label;" flex="1"
|
||||
accesskey="&attachVCard.accesskey;"/>
|
||||
<button class="push" name="editVCard" label="&editVCard.label;"
|
||||
accesskey="&editVCard.accesskey;"
|
||||
oncommand="editVCard()"/>
|
||||
<label hidden="true" id="identity.escapedVCard"/>
|
||||
</hbox>
|
||||
<hbox align="center" class="indent">
|
||||
<textbox id="identity.signature" datatype="nsIFile"
|
||||
flex="1" name="identity.signature"
|
||||
aria-labelledby="identity.attachSignature"
|
||||
observes="broadcaster_attachSignature"
|
||||
class="uri-element"/>
|
||||
<button id="identity.sigbrowsebutton" class="push"
|
||||
label="&choose.label;" accesskey="&choose.accesskey;"
|
||||
oncommand="selectFile()" observes="broadcaster_attachSignature"/>
|
||||
</hbox>
|
||||
|
||||
<hbox align="center">
|
||||
<checkbox id="identity.attachVCard" label="&attachVCard.label;"
|
||||
flex="1" accesskey="&attachVCard.accesskey;"/>
|
||||
<button class="push" label="&editVCard.label;"
|
||||
accesskey="&editVCard.accesskey;" oncommand="editVCard()"/>
|
||||
<label id="identity.escapedVCard" hidden="true"/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
|
||||
<groupbox>
|
||||
|
|
@ -131,9 +134,8 @@
|
|||
<hbox align="center">
|
||||
<menulist id="identity.smtpServerKey" flex="1">
|
||||
<menupopup id="smtpPopup">
|
||||
<menuitem value=""
|
||||
label="&smtpDefaultServer.label;"
|
||||
id="useDefaultItem"/>
|
||||
<menuitem id="useDefaultItem" value=""
|
||||
label="&smtpDefaultServer.label;"/>
|
||||
<menuseparator/>
|
||||
<!-- list will be inserted here -->
|
||||
</menupopup>
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче