From 6dac2504dbbadd5830da919b467f4bad9574b64c Mon Sep 17 00:00:00 2001
From: TeNNoX <kai-manuel@web.de>
Date: Mon, 22 Sep 2014 17:43:06 +0100
Subject: [PATCH] Applied clean patch from bettertagoverview2

---
 CRM/Contact/Form/Edit/TagsAndGroups.php       | 42 +++++++--
 CRM/Core/BAO/Tag.php                          |  3 +-
 .../CRM/Contact/Form/Edit/TagsAndGroups.tpl   | 88 +++++++++++++------
 templates/CRM/Contact/Form/Edit/Tagtree.tpl   | 41 +++++++++
 templates/CRM/Tag/Form/Tagtree.tpl            |  2 +-
 5 files changed, 140 insertions(+), 36 deletions(-)
 create mode 100644 templates/CRM/Contact/Form/Edit/Tagtree.tpl

diff --git a/CRM/Contact/Form/Edit/TagsAndGroups.php b/CRM/Contact/Form/Edit/TagsAndGroups.php
index 8e09b3af29..539f7206cb 100644
--- a/CRM/Contact/Form/Edit/TagsAndGroups.php
+++ b/CRM/Contact/Form/Edit/TagsAndGroups.php
@@ -142,21 +142,30 @@ class CRM_Contact_Form_Edit_TagsAndGroups {
     }
 
     if ($type & self::TAG) {
+      // CODE FROM CRM/Tag/Form/Tag.php //
+      CRM_Core_Resources::singleton()
+        ->addScriptFile('civicrm', 'packages/jquery/plugins/jstree/jquery.jstree.js', 0, 'html-header', FALSE)
+        ->addStyleFile('civicrm', 'packages/jquery/plugins/jstree/themes/default/style.css', 0, 'html-header');
+
       $fName = 'tag';
       if ($fieldName) {
         $fName = $fieldName;
       }
       $form->_tagGroup[$fName] = 1;
+
+      // get the list of all the categories
+      $tags = new CRM_Core_BAO_Tag();
+      $tree = $tags->getTree('civicrm_contact', TRUE);
+
       $elements = array();
-      $tag = CRM_Core_BAO_Tag::getTags();
+      self::climbtree($form, $tree, $elements);
 
-      foreach ($tag as $id => $name) {
-        $elements[] = $form->createElement('checkbox', $id, NULL, $name);
-      }
-      if (!empty($elements)) {
-        $form->addGroup($elements, $fName, $tagName, '<br />');
-        $form->assign('tagCount', count($elements));
-      }
+      $form->addGroup($elements, $fName, $tagName, '<br />');
+      $form->assign('tagCount', count($elements));
+      $form->assign('tree', $tree);
+      $form->assign('tag', $tree);
+      $form->assign('entityID', $contactId);
+      $form->assign('entityTable', 'civicrm_contact');
 
       if ($isRequired) {
         $form->addRule($fName, ts('%1 is a required field.', array(1 => $tagName)), 'required');
@@ -164,11 +173,26 @@ class CRM_Contact_Form_Edit_TagsAndGroups {
 
       // build tag widget
       $parentNames = CRM_Core_BAO_Tag::getTagSet('civicrm_contact');
-
       CRM_Core_Form_Tag::buildQuickForm($form, $parentNames, 'civicrm_contact', $contactId, FALSE, TRUE);
     }
     $form->assign('tagGroup', $form->_tagGroup);
   }
+  
+  static function climbtree($form, $tree, &$elements) {
+    foreach ($tree as $tagID => $varValue) {
+      $tagAttribute = array(
+      'onclick' => "return changeRowColor(\"rowidtag_$tagID\")",
+      'id' => "tag_{$tagID}",
+      );
+
+      $elements[$tagID] = $form->createElement('checkbox', $tagID, '', '', $tagAttribute);
+
+      if (array_key_exists('children', $varValue)) {
+        self::climbtree($form, $varValue['children'], $elements);
+      }
+    }
+   return $elements;
+  }
 
   /**
    * set defaults for relevant form elements
diff --git a/CRM/Core/BAO/Tag.php b/CRM/Core/BAO/Tag.php
index 1b8e840aa2..065ef53d2a 100644
--- a/CRM/Core/BAO/Tag.php
+++ b/CRM/Core/BAO/Tag.php
@@ -84,7 +84,7 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
    * @param bool $excludeHidden
    */
   function buildTree($usedFor = NULL, $excludeHidden = FALSE) {
-    $sql = "SELECT id, parent_id, name, description FROM civicrm_tag";
+    $sql = "SELECT id, parent_id, name, description, is_selectable FROM civicrm_tag";
 
     $whereClause = array();
     if ($usedFor) {
@@ -109,6 +109,7 @@ class CRM_Core_BAO_Tag extends CRM_Core_DAO_Tag {
       $thisref['parent_id'] = $dao->parent_id;
       $thisref['name'] = $dao->name;
       $thisref['description'] = $dao->description;
+      $thisref['is_selectable'] = $dao->is_selectable;
 
       if (!$dao->parent_id) {
         $this->tree[$dao->id] = &$thisref;
diff --git a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
index 7db44d910a..bc40ef11a3 100644
--- a/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
+++ b/templates/CRM/Contact/Form/Edit/TagsAndGroups.tpl
@@ -23,6 +23,63 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
+{literal}
+<style>
+  #tagtree .highlighted > span {
+    background-color: #fefca6;
+  }
+  #tagtree .helpicon ins {
+    display: none;
+  }
+  #tagtree ins.jstree-icon {
+    cursor: pointer;
+  }
+</style>
+<script type="text/javascript">
+  (function($, _){{/literal}
+    var entityID={$entityID},
+      entityTable='{$entityTable}',
+      $form = $('form.{$form.formClass}');
+    {literal}
+
+    $(function() {
+      function highlightSelected() {
+        $("ul input:not(:checked)", '#tagtree').each(function () {
+          $(this).closest("li").removeClass('highlighted');
+        });
+        $("ul input:checked", '#tagtree').each(function () {
+          $(this).parents("li[id^=tag]").addClass('highlighted');
+        });
+      }
+      highlightSelected();
+
+      $("#tagtree input").change(function(){
+        highlightSelected();
+      });
+
+      //load js tree.
+      $("#tagtree").jstree({
+        plugins : ["themes", "html_data"],
+        themes: {
+          "theme": 'classic',
+          "dots": false,
+          "icons": false,
+          "url": CRM.config.resourceBase + 'packages/jquery/plugins/jstree/themes/classic/style.css'
+        }
+      });
+	  
+	  {/literal}
+      {if $permission neq 'edit'}
+        {literal}
+          $("#tagtree input").prop('disabled', true);
+        {/literal}
+      {/if}
+      {literal}
+    });
+  })(CRM.$, CRM._);
+  {/literal}
+</script>
+
 {if $title}
 <div class="crm-accordion-wrapper crm-tagGroup-accordion collapsed">
   <div class="crm-accordion-header">{$title}</div>
@@ -35,31 +92,12 @@
             {$form.group.html}
           </td>
       {/if}
-      {foreach key=key item=item from=$tagGroup}
-        {* $type assigned from dynamic.tpl *}
-        {if !$type || $type eq $key }
-          <td width={cycle name=tdWidth values="70%","30%"}><span class="label">{if $title}{$form.$key.label}{/if}</span>
-            <div id="crm-tagListWrap">
-              <table id="crm-tagGroupTable">
-                {foreach key=k item=it from=$form.$key}
-                  {if $k|is_numeric}
-                    <tr class={cycle values="'odd-row','even-row'" name=$key} id="crm-tagRow{$k}">
-                      <td>
-                        <strong>{$it.html}</strong><br />
-                        {if $item.$k.description}
-                          <div class="description">
-                            {$item.$k.description}
-                          </div>
-                        {/if}
-                      </td>
-                    </tr>
-                  {/if}
-                {/foreach}
-              </table>
-            </div>
-          </td>
-        {/if}
-      {/foreach}
+      
+	  <td width="70%"><span class="label">{if $title}{$form.$key.label}{/if}</span>
+		<div id="tagtree">
+			{include file="CRM/Contact/Form/Edit/Tagtree.tpl" level=1}
+		</div>
+	  </td>
     </tr>
     {if !$type || $type eq 'tag'}
       <tr><td>{include file="CRM/common/Tagset.tpl"}</td></tr>
diff --git a/templates/CRM/Contact/Form/Edit/Tagtree.tpl b/templates/CRM/Contact/Form/Edit/Tagtree.tpl
new file mode 100644
index 0000000000..f4bc62650d
--- /dev/null
+++ b/templates/CRM/Contact/Form/Edit/Tagtree.tpl
@@ -0,0 +1,41 @@
+{*
+ +--------------------------------------------------------------------+
+ | CiviCRM version 4.5                                                |
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
+ +--------------------------------------------------------------------+
+ | This file is a part of CiviCRM.                                    |
+ |                                                                    |
+ | CiviCRM is free software; you can copy, modify, and distribute it  |
+ | under the terms of the GNU Affero General Public License           |
+ | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+ |                                                                    |
+ | CiviCRM is distributed in the hope that it will be useful, but     |
+ | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+ | See the GNU Affero General Public License for more details.        |
+ |                                                                    |
+ | You should have received a copy of the GNU Affero General Public   |
+ | License and the CiviCRM Licensing Exception along                  |
+ | with this program; if not, contact CiviCRM LLC                     |
+ | at info[AT]civicrm[DOT]org. If you have questions about the        |
+ | GNU Affero General Public License or the licensing of CiviCRM,     |
+ | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+ +--------------------------------------------------------------------+
+*}
+{* This tpl runs recursively to build each level of the tag tree *}
+<ul class="tree-level-{$level}">
+  {foreach from=$tree item="node" key="id"}
+    <li id="tagli_{$id}">
+      <input name="tag[{$id}]" id="tag_{$id}" class="form-checkbox" type="checkbox" value="1" {if $node.is_selectable EQ 0}disabled=""{/if} {if $form.tag.value.$id EQ 1}checked="checked"{/if}/>
+      <span>
+        <label for="tag_{$id}" id="tagLabel_{$id}">{$node.name}</label>
+        {if $node.description}{help id=$id title=$node.name file="CRM/Tag/Form/Tagtree"}{/if}
+      </span>
+      {if $node.children}
+        {* Recurse... *}
+        {include file="CRM/Contact/Form/Edit/Tagtree.tpl" tree=$node.children level=$level+1}
+      {/if}
+    </li>
+  {/foreach}
+</ul>
diff --git a/templates/CRM/Tag/Form/Tagtree.tpl b/templates/CRM/Tag/Form/Tagtree.tpl
index 14fc903449..679dffbcb4 100644
--- a/templates/CRM/Tag/Form/Tagtree.tpl
+++ b/templates/CRM/Tag/Form/Tagtree.tpl
@@ -27,7 +27,7 @@
 <ul class="tree-level-{$level}">
   {foreach from=$tree item="node" key="id"}
     <li id="tag_{$id}">
-      <input name="tagList[{$id}]" id="check_{$id}" type="checkbox" {if $tagged[$id]}checked="checked"{/if}/>
+      <input name="tagList[{$id}]" id="check_{$id}" type="checkbox" {if $node.is_selectable EQ 0}disabled=""{/if} {if $tagged[$id]}checked="checked"{/if}/>
       <span>
         <label for="check_{$id}" id="tagLabel_{$id}">{$node.name}</label>
         {if $node.description}{help id=$id title=$node.name file="CRM/Tag/Form/Tagtree"}{/if}
-- 
2.25.1