Ignore:
Timestamp:
01/28/07 01:52:59 (13 years ago)
Author:
ray
Message:

Ticket #923 colorPicker face lift & localisation

Location:
trunk/plugins/ExtendedFileManager
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/plugins/ExtendedFileManager/assets/manager.css

    r677 r700  
    1 html, body {  background-color: ButtonFace;  color: ButtonText; font: 11px Tahoma,Verdana,sans-serif; margin: 0; padding: 0;} 
     1html, body, .dialog {  background-color: ButtonFace;  color: ButtonText; font: 11px Tahoma,Verdana,sans-serif; margin: 0; padding: 0;} 
    22body { padding: 5px; } 
    33fieldset { padding: 0;} 
     
    2525th, td { padding-right:3px; text-align:left; font-family:small-caption,helvetica,sans-serif; } 
    2626.dirWidth {width: 59%} 
     27 
     28.buttonColor { 
     29  padding: 1px; 
     30  cursor: default; 
     31  border: 1px solid; 
     32  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; 
     33} 
  • trunk/plugins/ExtendedFileManager/extended-file-manager.js

    r681 r700  
    6161 
    6262    var editor = this;  // for nested functions 
    63     var outparam = null; 
     63    var outparam = {"editor" : this, param : null}; 
     64     
    6465    if (typeof image == "undefined") { 
    6566        image = this.getParentElement(); 
     
    6970 
    7071    if (image) { 
    71         outparam = { 
     72        outparam.param = { 
    7273            f_url    : Xinha.is_ie ? image.src : image.getAttribute("src"), 
    7374            f_alt    : image.alt, 
     
    8586 
    8687        // compress 'top right bottom left' syntax into one value if possible 
    87         outparam.f_border = shortSize(outparam.f_border); 
    88         outparam.f_padding = shortSize(outparam.f_padding); 
    89         outparam.f_margin = shortSize(outparam.f_margin); 
     88        outparam.param.f_border = shortSize(outparam.f_border); 
     89        outparam.param.f_padding = shortSize(outparam.f_padding); 
     90        outparam.param.f_margin = shortSize(outparam.f_margin); 
    9091 
    9192        // convert rgb() calls to rgb hex 
    92         outparam.f_backgroundColor = convertToHex(outparam.f_backgroundColor); 
    93         outparam.f_borderColor = convertToHex(outparam.f_borderColor); 
     93        outparam.param.f_backgroundColor = convertToHex(outparam.f_backgroundColor); 
     94        outparam.param.f_borderColor = convertToHex(outparam.f_borderColor); 
    9495 
    9596    } 
  • trunk/plugins/ExtendedFileManager/manager.php

    r681 r700  
    8181<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/popup.js"></script> 
    8282<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/dialog.js"></script> 
    83 <?php if (!empty($IMConfig['use_color_pickers'])) { ?><script type="text/javascript" src="../../popups/color_picker.js"></script><?php } ?> 
     83<?php if (!empty($IMConfig['use_color_pickers'])) { ?><script type="text/javascript" src="../../modules/ColorPicker/ColorPicker.js"></script><?php } ?> 
    8484<script type="text/javascript"> 
    8585/* <![CDATA[ */ 
Note: See TracChangeset for help on using the changeset viewer.