X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FAdmin%2FForm%2FNavigation.php;h=dcf689c4b1471685a9f0613939f2a580414d41de;hb=09385110dfce99ca8f4c5efc26759640721bbde6;hp=37c08225363439d29d2ae95c5f17e11319e0855a;hpb=c47cf540db18aa99bf53542cbfa0d1719d525495;p=civicrm-core.git

diff --git a/CRM/Admin/Form/Navigation.php b/CRM/Admin/Form/Navigation.php
index 37c0822536..dcf689c4b1 100644
--- a/CRM/Admin/Form/Navigation.php
+++ b/CRM/Admin/Form/Navigation.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.7                                                |
+ | CiviCRM version 5                                                  |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2017                                |
+ | Copyright CiviCRM LLC (c) 2004-2018                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2017
+ * @copyright CiviCRM LLC (c) 2004-2018
  */
 
 /**
@@ -67,6 +67,9 @@ class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
     );
 
     $this->add('text', 'url', ts('Url'), CRM_Core_DAO::getAttribute('CRM_Core_DAO_Navigation', 'url'));
+
+    $this->add('text', 'icon', ts('Icon'), array('class' => 'crm-icon-picker', 'title' => ts('Choose Icon'), 'allowClear' => TRUE));
+
     $permissions = array();
     foreach (CRM_Core_Permission::basicPermissions(TRUE, TRUE) as $id => $vals) {
       $permissions[] = array('id' => $id, 'label' => $vals[0], 'description' => (array) CRM_Utils_Array::value(1, $vals));
@@ -106,7 +109,7 @@ class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
    * @return array
    */
   public function setDefaultValues() {
-    $defaults = $this->_defaults;
+    $defaults = parent::setDefaultValues();
     if (isset($this->_id)) {
       //Take parent id in object variable to calculate the menu
       //weight if menu parent id changed
@@ -134,6 +137,10 @@ class CRM_Admin_Form_Navigation extends CRM_Admin_Form {
       $params['current_parent_id'] = $this->_currentParentID;
     }
 
+    if (!empty($params['icon'])) {
+      $params['icon'] = 'crm-i ' . $params['icon'];
+    }
+
     $navigation = CRM_Core_BAO_Navigation::add($params);
 
     // also reset navigation