Changeset 0852d9


Ignore:
Timestamp:
Oct 5, 2010, 3:33:18 PM (10 years ago)
Author:
rene <just@…>
Branches:
ng_0.6, ng_0.8, ng_0.9
Children:
213e1e
Parents:
dd1f45
Message:

changed layout of dialog

Location:
chrome
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_rdfAccountMismatchDialog.js

    rdd1f45 r0852d9  
    3333        // display the relevant help-tags
    3434        document.getElementById("rdfAccountMismatchDialog_vbox_" + vI_rdfAccountMismatchDialog.type).removeAttribute("hidden");
     35        document.getElementById("rdfAccountMismatchDialog_listhead_" + vI_rdfAccountMismatchDialog.type).removeAttribute("hidden");
    3536       
    3637        for (var i = 0; i < vI_rdfAccountMismatchDialog.mismatchItems.length; i++) {
    37             var label = document.createElement("label");
    38             label.setAttribute("id", "mismatchLine_" + i);
    39             label.setAttribute("class", "mismatchLine");
    40             label.setAttribute("type",vI_rdfAccountMismatchDialog.type);
    41             label.setAttribute("oldkey",vI_rdfAccountMismatchDialog.mismatchItems[i].oldkey);
    42             label.setAttribute("label",vI_rdfAccountMismatchDialog.mismatchItems[i].label);
    43             label.setAttribute("ext1",vI_rdfAccountMismatchDialog.mismatchItems[i].ext1);
    44             label.setAttribute("ext2",vI_rdfAccountMismatchDialog.mismatchItems[i].ext2);
    45             label.setAttribute("count",vI_rdfAccountMismatchDialog.mismatchItems[i].count);
    46             document.getElementById("rdfAccountMismatchDialog_groupbox").appendChild(label)
     38//             var label = document.createElement("label");
     39            var listitem = document.createElement("listitem");
     40            listitem.setAttribute("id", "mismatchLine_" + i);
     41            listitem.setAttribute("class", "mismatchLine");
     42            listitem.setAttribute("type",vI_rdfAccountMismatchDialog.type);
     43            listitem.setAttribute("oldkey",vI_rdfAccountMismatchDialog.mismatchItems[i].oldkey);
     44            listitem.setAttribute("label",vI_rdfAccountMismatchDialog.mismatchItems[i].label);
     45            listitem.setAttribute("ext1",vI_rdfAccountMismatchDialog.mismatchItems[i].ext1);
     46            listitem.setAttribute("ext2",vI_rdfAccountMismatchDialog.mismatchItems[i].ext2);
     47            listitem.setAttribute("count",vI_rdfAccountMismatchDialog.mismatchItems[i].count);
     48            document.getElementById("rdfAccountMismatchDialog_listbox").appendChild(listitem)
    4749        }
    4850    },
  • chrome/content/v_identity/vI_rdfAccountMismatchDialog.xml

    rdd1f45 r0852d9  
    3030   
    3131    <binding id="mismatch-line">
    32     <content>     
    33         <xul:label class="identityDesc-name" xbl:inherits="value=label,accesskey,crop" crop="end" flex="1"/>
    34         <xul:label class="identityDesc-ext1" xbl:inherits="value=ext1" crop="end" />
    35         <xul:label class="identityDesc-ext2" xbl:inherits="value=ext2" crop="end" />
    36         <xul:label class="identityDesc-count" xbl:inherits="value=count" crop="end" />
    37         <xul:menulist class="mismatchMenulist" >
    38             <xul:menupopup class="mismatchMenupopup" xbl:inherits="type" />
    39         </xul:menulist>
     32    <content allowevents="true">
     33        <xul:listcell>
     34            <xul:label class="identityDesc-name" xbl:inherits="value=label,accesskey,crop" crop="end" flex="1"/>
     35            <xul:label class="identityDesc-ext1" xbl:inherits="value=ext1" crop="end" />
     36            <xul:label class="identityDesc-ext2" xbl:inherits="value=ext2" crop="end" />
     37        </xul:listcell>
     38        <xul:listcell>
     39            <xul:label class="identityDesc-count" xbl:inherits="value=count" crop="end" />
     40        </xul:listcell>
     41        <xul:listcell>
     42            <xul:menulist class="mismatchMenulist" sizetopopup="always" hidden="true">
     43                <xul:menupopup class="mismatchMenupopup" xbl:inherits="type" />
     44            </xul:menulist>
     45        </xul:listcell>
    4046    </content>
    4147    <implementation>
     
    7581        document.getAnonymousElementByAttribute(this, "class", "mismatchMenupopup").appendChild(menuitem);
    7682        this.selectedItem = menuitem;
     83        this.removeAttribute("hidden");
    7784        ]]>
    7885    </constructor>
  • chrome/content/v_identity/vI_rdfAccountMismatchDialog.xul

    rdd1f45 r0852d9  
    2828<!DOCTYPE overlay SYSTEM "chrome://v_identity/locale/vI_rdfAccountMismatchDialog.dtd">
    2929
    30 <?xml-stylesheet href="chrome://v_identity/skin/v_identity.css" type="text/css"?>
    31 
    3230<dialog id="vI_rdfAccountMismatchDialog"
    3331    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     
    5553            <description class="widthXX">&vident.vI_rdfAccountMismatchDialog_smtp.desc;</description>
    5654        </vbox>
     55        <listbox id="rdfAccountMismatchDialog_listbox" suppressonselect="true" rows="5" >
     56        <listhead id="rdfAccountMismatchDialog_listhead_identity" hidden="true">
     57            <listheader label="&vident.vI_rdfAccountMismatchDialog_identity.old;" />
     58            <listheader label="&vident.vI_rdfAccountMismatchDialog_identity.count;" />
     59            <listheader label="&vident.vI_rdfAccountMismatchDialog_identity.new;" />
     60        </listhead>
     61        <listhead id="rdfAccountMismatchDialog_listhead_smtp" hidden="true">
     62            <listheader label="&vident.vI_rdfAccountMismatchDialog_smtp.old;" />
     63            <listheader label="&vident.vI_rdfAccountMismatchDialog_smtp.count;" />
     64            <listheader label="&vident.vI_rdfAccountMismatchDialog_smtp.new;" />
     65        </listhead>
     66        <listcols><listcol/><listcol/><listcol/></listcols>
     67        </listbox>
    5768    </groupbox>
    5869</dialog>
  • chrome/locale/en-US/v_identity/vI_rdfAccountMismatchDialog.dtd

    rdd1f45 r0852d9  
    22<!ENTITY vident.vI_rdfAccountMismatchDialog.removeRelation.label "remove Relation">
    33<!ENTITY vident.vI_rdfAccountMismatchDialog.dialogheader "Account Settings Correlation">
    4 <!ENTITY vident.vI_rdfAccountMismatchDialog_identity.desc "Some of the previously stored Identities don't match the current Identitiy-Settings. Please select if the stored id-relations should be removed or if you like to assign those to other stored Identities:">
     4<!ENTITY vident.vI_rdfAccountMismatchDialog_identity.desc "Some of the previously stored Identities don't match the current Identitiy-Settings. Please select if the following stored id-relations should be removed or assign those to existing Identities:">
    55<!ENTITY vident.vI_rdfAccountMismatchDialog_identity.caption "assign related Identities">
    6 <!ENTITY vident.vI_rdfAccountMismatchDialog_smtp.desc "Some of the previously stored SMTP-servers don't match the current SMTP-Settings. Please select if the stored SMTP-relations should be removed or if you like to assign those to other stored SMTP servers:">
     6<!ENTITY vident.vI_rdfAccountMismatchDialog_smtp.desc "Some of the previously stored SMTP-servers don't match the current SMTP-Settings. Please select if the folowing stored SMTP-relations should be removed or assign those to existing SMTP servers:">
    77<!ENTITY vident.vI_rdfAccountMismatchDialog_smtp.caption "assign related SMTP-server">
     8<!ENTITY vident.vI_rdfAccountMismatchDialog_identity.old "previous Identity (email / full Name)">
     9<!ENTITY vident.vI_rdfAccountMismatchDialog_identity.count "use-count">
     10<!ENTITY vident.vI_rdfAccountMismatchDialog_identity.new "new Identitiy (email / full Name)">
     11<!ENTITY vident.vI_rdfAccountMismatchDialog_smtp.old "previous SMTP (hostname / username)">
     12<!ENTITY vident.vI_rdfAccountMismatchDialog_smtp.count "use-count">
     13<!ENTITY vident.vI_rdfAccountMismatchDialog_smtp.new "new SMTP (hostname / username)">
Note: See TracChangeset for help on using the changeset viewer.