From 887b90923ebfd6d9eef51612b1f846576a40b075 Mon Sep 17 00:00:00 2001
From: haydenyoung <hayden@knowledgearc.com>
Date: Wed, 11 May 2016 11:52:14 +0800
Subject: [PATCH] Only show plugin options in JCar embed code popup when
 specific plugin is selected for id. Style id lookup field plugin drop down to
 match Joomla drop down style.

---
 .../admin/layouts/jcar/form/fields/idlookup.php        |  2 +-
 .../com_jcar/admin/views/item/tmpl/configuration.php   | 10 +++++++++-
 plugins/jcar/dspace/forms/configuration.xml            |  6 +++---
 plugins/jcar/oai/forms/configuration.xml               |  2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/components/com_jcar/admin/layouts/jcar/form/fields/idlookup.php b/components/com_jcar/admin/layouts/jcar/form/fields/idlookup.php
index 95854d1..09b43e4 100644
--- a/components/com_jcar/admin/layouts/jcar/form/fields/idlookup.php
+++ b/components/com_jcar/admin/layouts/jcar/form/fields/idlookup.php
@@ -1,7 +1,7 @@
 <?php
 defined('JPATH_BASE') or die;
 
-JHtml::_('jquery.framework');
+JHtml::_('formbehavior.chosen', 'select');
 
 $typeahead = JUri::root().'/media/com_jcar/js/typeahead.js/typeahead.bundle.min.js';
 
diff --git a/components/com_jcar/admin/views/item/tmpl/configuration.php b/components/com_jcar/admin/views/item/tmpl/configuration.php
index 61623d4..01c7b67 100644
--- a/components/com_jcar/admin/views/item/tmpl/configuration.php
+++ b/components/com_jcar/admin/views/item/tmpl/configuration.php
@@ -59,7 +59,7 @@
 
     <?php
     foreach ($this->form->getFieldset() as $field) :
-        $classnames = 'control-group';
+        /*$classnames = 'control-group';
         $rel = '';
         $showon = $this->form->getFieldAttribute($field->fieldname, 'showon');
 
@@ -68,6 +68,8 @@
             $showon = explode(':', $showon, 2);
             $classnames .= ' showon_'.implode(' showon_', explode(',', $showon[1]));
             $rel = ' rel="showon_'.$id.'['.$showon[0].']"';
+
+            echo $rel;
         endif;
     ?>
 
@@ -82,6 +84,12 @@
     </div>
 
     <?php
+    */
+        $html = $field->renderField();
+
+        $html = str_replace('"field":"jform[idLookupPlugin]"', '"field":"idLookupPlugin"', $html);
+
+        echo $html;
     endforeach;
     ?>
 
diff --git a/plugins/jcar/dspace/forms/configuration.xml b/plugins/jcar/dspace/forms/configuration.xml
index abfeb75..4c1d978 100644
--- a/plugins/jcar/dspace/forms/configuration.xml
+++ b/plugins/jcar/dspace/forms/configuration.xml
@@ -3,7 +3,7 @@
     <field
         name="rest_url"
         type="text"
-        showon="plugin:dspace"
+        showon="idLookupPlugin:dspace"
         label="PLG_JCAR_DSPACE_REST_URL_LABEL"
         description="PLG_JCAR_DSPACE_REST_URL_DESC"
         filter="string"
@@ -12,7 +12,7 @@
     <field
         name="rest_key"
         type="text"
-        showon="plugin:dspace"
+        showon="idLookupPlugin:dspace"
         label="PLG_JCAR_DSPACE_REST_KEY_LABEL"
         description="PLG_JCAR_DSPACE_REST_KEY_DESC"
         filter="string"
@@ -21,7 +21,7 @@
     <field
         name="rest_secret"
         type="text"
-        showon="plugin:dspace"
+        showon="idLookupPlugin:dspace"
         label="PLG_JCAR_DSPACE_REST_SECRET_LABEL"
         description="PLG_JCAR_DSPACE_REST_SECRET_DESC"
         filter="string"
diff --git a/plugins/jcar/oai/forms/configuration.xml b/plugins/jcar/oai/forms/configuration.xml
index 8f71601..34a2c35 100644
--- a/plugins/jcar/oai/forms/configuration.xml
+++ b/plugins/jcar/oai/forms/configuration.xml
@@ -3,7 +3,7 @@
     <field
         name="oai_url"
         type="text"
-        showon="plugin:oai"
+        showon="idLookupPlugin:oai"
         label="PLG_JCAR_OAI_REQUEST_URL_LABEL"
         description="PLG_JCAR_OAI_REQUEST_URL_DESC"
         filter="string"