Author: ralfbecker
New Revision: 55160
URL: http://svn.stylite.de/viewvc/egroupware?rev=55160&view=rev
Log:
tree uses now png or svg images, still some do not yet exist as png or svg
Added:
trunk/pixelegg/images/dhtmlxtree/close.png
- copied, changed from r55159, trunk/pixelegg/images/dhtmlxtree/minus.png
trunk/pixelegg/images/dhtmlxtree/close.svg (with props)
trunk/pixelegg/images/dhtmlxtree/open.png
- copied, changed from r55159, trunk/pixelegg/images/dhtmlxtree/plus.png
trunk/pixelegg/images/dhtmlxtree/open.svg (with props)
Removed:
trunk/pixelegg/images/dhtmlxtree/but_cut.gif
trunk/pixelegg/images/dhtmlxtree/folderClosed.gif
trunk/pixelegg/images/dhtmlxtree/folderNoSelectClosed.gif
trunk/pixelegg/images/dhtmlxtree/folderNoSelectOpen.gif
trunk/pixelegg/images/dhtmlxtree/folderOpen.gif
trunk/pixelegg/images/dhtmlxtree/iconCheckAll.gif
trunk/pixelegg/images/dhtmlxtree/iconCheckDis.gif
trunk/pixelegg/images/dhtmlxtree/iconCheckGray.gif
trunk/pixelegg/images/dhtmlxtree/iconUncheckAll.gif
trunk/pixelegg/images/dhtmlxtree/iconUncheckDis.gif
trunk/pixelegg/images/dhtmlxtree/line.gif
trunk/pixelegg/images/dhtmlxtree/line1.gif
trunk/pixelegg/images/dhtmlxtree/line1_rtl.gif
trunk/pixelegg/images/dhtmlxtree/line2.gif
trunk/pixelegg/images/dhtmlxtree/line2_rtl.gif
trunk/pixelegg/images/dhtmlxtree/line3.gif
trunk/pixelegg/images/dhtmlxtree/line3_rtl.gif
trunk/pixelegg/images/dhtmlxtree/line4.gif
trunk/pixelegg/images/dhtmlxtree/line4_rtl.gif
trunk/pixelegg/images/dhtmlxtree/minus.gif
trunk/pixelegg/images/dhtmlxtree/minus.png
trunk/pixelegg/images/dhtmlxtree/minus1.gif
trunk/pixelegg/images/dhtmlxtree/minus2.gif
trunk/pixelegg/images/dhtmlxtree/minus2_rtl.gif
trunk/pixelegg/images/dhtmlxtree/minus3.gif
trunk/pixelegg/images/dhtmlxtree/minus3_rtl.gif
trunk/pixelegg/images/dhtmlxtree/minus4.gif
trunk/pixelegg/images/dhtmlxtree/minus4_rtl.gif
trunk/pixelegg/images/dhtmlxtree/minus5.gif
trunk/pixelegg/images/dhtmlxtree/minus5_rtl.gif
trunk/pixelegg/images/dhtmlxtree/minus_ar.gif
trunk/pixelegg/images/dhtmlxtree/plus.gif
trunk/pixelegg/images/dhtmlxtree/plus.png
trunk/pixelegg/images/dhtmlxtree/plus1.gif
trunk/pixelegg/images/dhtmlxtree/plus2.gif
trunk/pixelegg/images/dhtmlxtree/plus2_rtl.gif
trunk/pixelegg/images/dhtmlxtree/plus3.gif
trunk/pixelegg/images/dhtmlxtree/plus3_rtl.gif
trunk/pixelegg/images/dhtmlxtree/plus4.gif
trunk/pixelegg/images/dhtmlxtree/plus4_rtl.gif
trunk/pixelegg/images/dhtmlxtree/plus5.gif
trunk/pixelegg/images/dhtmlxtree/plus5_rtl.gif
trunk/pixelegg/images/dhtmlxtree/plus_ar.gif
trunk/pixelegg/images/dhtmlxtree/radio_off.gif
trunk/pixelegg/images/dhtmlxtree/radio_on.gif
Modified:
trunk/etemplate/js/et2_widget_tree.js
trunk/mail/inc/class.mail_tree.inc.php
— trunk/etemplate/js/et2_widget_tree.js (original)
+++ trunk/etemplate/js/et2_widget_tree.js Fri Feb 26 11:59:23 2016
@@ -78,7 +78,7 @@
“name”: “Image directory”,
“type”: “string”,
“default”: this.egw().webserverUrl + “/phpgwapi/templates/default/images/dhtmlxtree/”,
-
"description": "Directory for tree structure images, set on server-side to 'dhtmlx' subdir of templates image-directory"
},
"value": {
"type": "any",
@@ -100,7 +100,7 @@
“name”: “Standard images”,
“type”: “string”,
“default”: “”,
-
"description": "comma-separated names of icons for a leaf, closed and opend folder (default: leaf.gif,folderClosed.gif,folderOpen.gif), images with extension get loaded from image_path, just 'image' or 'appname/image' are allowed too"
-
"description": "comma-separated names of icons for a leaf, closed and opend folder (default: leaf.png,folderClosed.png,folderOpen.png), images with extension get loaded from image_path, just 'image' or 'appname/image' are allowed too"
},
"multimarking": {
"name": "multimarking",
@@ -207,6 +207,11 @@
{
widget.setImages.apply(widget, widget.options.std_images.split(’,’));
}
-
else
-
{
-
// calling setImages to get our png or svg default images
-
widget.setImages();
-
}
// Add in the callback so we can keep the two in sync
widget.input.AJAX_callback = function(dxmlObject) {
widget._dhtmlxtree_json_callback(JSON.parse(dxmlObject.xmlDoc.responseText), widget.input.lastLoadedXMLId);
@@ -243,10 +248,17 @@
// Enable/Disable highlighting
widget.input.enableHighlighting(widget.options.highlighting?true:false);
-
// show no more lines and left/down triangles instead of plus/minus
-
widget.input.enableTreeLines(false);
-
widget.input.setImageArrays('plus', 'plus.png', 'plus.png', 'plus.png', 'plus.png', 'plus.png');
-
widget.input.setImageArrays('minus', 'minus.png', 'minus.png', 'minus.png', 'minus.png', 'minus.png');
-
// if templates supplies open/close right/down arrows, show no more lines and use them instead of plus/minus
-
var open = egw.image('dhtmlxtree/open');
-
var close = egw.image('dhtmlxtree/close');
-
if (open && close)
-
{
-
widget.input.enableTreeLines(false);
-
open = this._rel_url(open);
-
widget.input.setImageArrays('plus', open, open, open, open, open);
-
close = this._rel_url(close);
-
widget.input.setImageArrays('minus', close, close, close, close, close);
-
}
},
/**
@@ -848,18 +860,18 @@
/**
- Set images for a specific node or all new nodes (default)
-
-
- If images contain an extension eg. “leaf.gif” they are asumed to be in image path (/phpgwapi/templates/default/images/dhtmlxtree/).
-
- If images contain an extension eg. “leaf” they are asumed to be in image path (/phpgwapi/templates/default/images/dhtmlxtree/).
- Otherwise they get searched via egw.image() in current app, phpgwapi or can be specified as “app/image”.
-
-
-
@param {string} _leaf leaf image, default “leaf.gif”
-
-
@param {string} _closed closed folder image, default “folderClosed.gif”
-
-
@param {string} _open opened folder image, default “folderOpen.gif”
-
-
@param {string} _leaf leaf image, default “leaf”
-
-
@param {string} _closed closed folder image, default “folderClosed”
-
-
@param {string} _open opened folder image, default “folderOpen”
-
@param {string} _id if not given, standard images for new nodes are set
*/
setImages: function(_leaf, _closed, _open, _id)
{
-
var images = [_leaf || 'leaf.gif', _closed || 'folderClosed.gif', _open || 'folderOpen.gif'];
-
var image_extensions = /\.(gif|png|jpe?g)/i;
-
var images = [_leaf || 'dhtmlxtree/leaf', _closed || 'dhtmlxtree/folderClosed', _open || 'dhtmlxtree/folderOpen'];
-
var image_extensions = /\.(gif|png|jpe?g|svg)/i;
for(var i=0; i < 3; ++i)
{
var image = images[i];
— trunk/mail/inc/class.mail_tree.inc.php (original)
+++ trunk/mail/inc/class.mail_tree.inc.php Fri Feb 26 11:59:23 2016
@@ -38,9 +38,9 @@
* @var array
*/
static $leafImages = array(
-
'folderNoSelectClosed' => "folderNoSelectClosed.gif",
-
'folderNoSelectOpen' => "folderNoSelectOpen.gif",
-
'folderOpen' => "folderOpen.gif",
-
'folderNoSelectClosed' => "folderNoSelectClosed.png",
-
'folderNoSelectOpen' => "folderNoSelectOpen.png",
-
'folderOpen' => "folderOpen.png",
'folderClosed' => "MailFolderClosed.png",
'folderLeaf' => "MailFolderPlain.png",
'folderHome' => "kfm_home.png",
Binary files - no diff available.
Binary file - no diff available.
Propchange: trunk/pixelegg/images/dhtmlxtree/close.svg
svn:mime-type = image/svg+xml
Binary files - no diff available.
Binary file - no diff available.
Propchange: trunk/pixelegg/images/dhtmlxtree/open.svg
svn:mime-type = image/svg+xml
Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140
eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs
