[Fmsystem-commits] [15359] Stable: Merge 15357:15358 from trunk

[sigurdne]

Revision: 15359
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15359
Author:   sigurdne
Date:     2016-07-01 13:23:25 +0000 (Fri, 01 Jul 2016)
Log Message:
-----------
Stable: Merge 15357:15358 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/jqtree.scss
    branches/Version-2_0-branch/phpgwapi/templates/portico/js/jqtree_jsmenu.js

Property Changed:
----------------
    branches/Version-2_0-branch/


Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356
   + /branches/dev-syncromind:13653
/branches/dev-syncromind-2:14937-15027,15165-15215,15223-15228,15230-15243,15245-15250,15254-15257
/branches/stavangerkommune:12743-12875,12986
/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358

Modified: branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/jqtree.scss
===================================================================
--- branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/jqtree.scss   
2016-07-01 13:22:33 UTC (rev 15358)
+++ branches/Version-2_0-branch/phpgwapi/js/jquery/jqTree/jqtree.scss   
2016-07-01 13:23:25 UTC (rev 15359)
@@ -1,10 +1,3 @@
-.jstree-icon {
-    background-image: url("../treeview/themes/default/32px.png");
-}
-.jstree-default.jstree-rtl .jstree-node {
-  background-image: 
url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAACAQMAAAB49I5GAAAABlBMVEUAAAAdHRvEkCwcAAAAAXRSTlMAQObYZgAAAAxJREFUCNdjAAMOBgAAGAAJMwQHdQAAAABJRU5ErkJggg==");
-}
-
 ul.jqtree-tree {
     list-style: none outside;
     margin-left: 0;

Modified: 
branches/Version-2_0-branch/phpgwapi/templates/portico/js/jqtree_jsmenu.js
===================================================================
--- branches/Version-2_0-branch/phpgwapi/templates/portico/js/jqtree_jsmenu.js  
2016-07-01 13:22:33 UTC (rev 15358)
+++ branches/Version-2_0-branch/phpgwapi/templates/portico/js/jqtree_jsmenu.js  
2016-07-01 13:23:25 UTC (rev 15359)
@@ -13,7 +13,7 @@
                        onCreateLi: function (node, $li)
                        {
                                // Add 'icon' span before title
-                               $li.find('.jqtree-title').before('<span 
class="jstree-icon"></span>');
+               //              $li.find('.jqtree-title').before('<span 
class="jstree-icon"></span>');
                                tree.tree('removeFromSelection', node);
                                if (typeof (current_node_id) != 'undefined' && 
current_node_id > 0 && node.id == current_node_id)
                                {