Changeset 2d7c4a


Ignore:
Timestamp:
Aug 13, 2008, 11:55:40 AM (12 years ago)
Author:
rene <rene@…>
Branches:
master
Children:
4326ae
Parents:
2f2f81
Message:

changed Dialog layout, finalized. Now CompareMatrix? is partially hidden if dialog-window is to small, but querys are always shown.

Location:
chrome
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_Dialog.xul

    r2f2f81 r2d7c4a  
    2525   
    2626<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>   
    27 <?xml-stylesheet href="chrome://v_identity/skin/v_identity.css" type="text/css"?>
     27<?xml-stylesheet href="chrome://v_identity/skin/vI_Dialog.css" type="text/css"?>
    2828
    2929<!DOCTYPE overlay SYSTEM "chrome://v_identity/locale/v_identity.dtd">
     
    3333        title="Virtual Identity"
    3434    zlevel="6"
    35     onload="vI_htmlTextBox.init('vI_Dialog_browser', null, window.arguments[0], window.arguments[1]);"
    36     ondialogaccept="window.arguments[2].return = true;"
    37     ondialogcancel="window.close(); window.arguments[2].return = false;">
     35    onload="vI_Dialog.init(window.arguments[0]);"
     36    ondialogaccept="window.arguments[1].return = true;"
     37    ondialogcancel="window.close(); window.arguments[1].return = false;"
     38    persist="height width">
    3839
    3940    <script type="application/x-javascript"
     41        src="chrome://v_identity/content/vI_Dialog.js" />
     42    <script type="application/x-javascript"
    4043        src="chrome://v_identity/content/vI_htmlTextBox.js" />
    41    
    42     <browser id="vI_Dialog_browser" disablehistory="true" />
     44    <label id="vI_Dialog_title" />
     45    <label id="vI_Dialog_recLabel" />
     46    <label id="vI_Dialog_recipient" />
     47    <browser id="vI_Dialog_browser" disablehistory="true" flex="1" />
     48    <label id="vI_Dialog_query" />
    4349</dialog>
  • chrome/content/v_identity/vI_storage.js

    r2f2f81 r2d7c4a  
    445445
    446446    __getWarning : function(warningCase, recipient, compareMatrix) {
    447         return  "<h1> " +
    448                 vI.elements.strings.getString("vident." + warningCase + ".title") + "</h1>" +
    449             "<h2> " +
    450             "<span class='recLabel'>" +
    451                 vI.elements.strings.getString("vident." + warningCase + ".recipient") +
    452                 " (" + recipient.recType + "):</span>" +
    453             "<span class='recipient'>" +
    454                 recipient.recDesc.replace(/>/g,"&gt;").replace(/</g,"&lt;") + "</span></h2>" +
     447        var warning = { title: null, recLabel : null, recipient : null, warning : null, css: null, query : null };
     448        warning.title = vI.elements.strings.getString("vident." + warningCase + ".title")
     449        warning.recLabel = vI.elements.strings.getString("vident." + warningCase + ".recipient") +  " (" + recipient.recType + "):"
     450        warning.recipient = recipient.recDesc.replace(/>/g,"&gt;").replace(/</g,"&lt;")
     451        warning.warning =
    455452            "<table><thead><tr><th class='col1'/>" +
    456453                "<th class='col2'>" + vI.elements.strings.getString("vident." + warningCase + ".currentIdentity") + "</th>" +
     
    458455            "</tr></thead>" +
    459456            "<tbody>" + compareMatrix + "</tbody>" +
    460             "</table>" +
    461             "<div class='question'>" +
    462                 vI.elements.strings.getString("vident." + warningCase + ".query") +
    463                 "</div>"
     457            "</table>"
     458        warning.css = "vI_DialogBrowser.css";
     459        warning.query = vI.elements.strings.getString("vident." + warningCase + ".query")
     460        return warning;
    464461    },
    465462
     
    468465        var answer = window.openDialog("chrome://v_identity/content/vI_Dialog.xul",0,
    469466                    "chrome, dialog, modal, alwaysRaised, resizable=yes",
    470                      warning, "vI_DialogBrowser.css", retVar)
     467                     warning, retVar)
    471468        return retVar.return;
    472469    },
  • chrome/skin/classic/v_identity/v_identity.css

    r2f2f81 r2d7c4a  
    3939#upgradeWizard browser {
    4040    height:     185px;
    41 }
    42 
    43 #vi_Dialog browser {
    44     height:     300px;
    4541}
    4642
Note: See TracChangeset for help on using the changeset viewer.