From 0eab3f16223a987bde1f9c97c754032b5298975f Mon Sep 17 00:00:00 2001
From: Mike Koch <mkoch227@gmail.com>
Date: Mon, 15 May 2017 12:58:34 -0400
Subject: [PATCH] Modal working

---
 admin/manage_custom_nav_elements.php          | 13 ++++---
 internal-api/js/manage-custom-nav-elements.js | 35 ++++++++++++++++---
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/admin/manage_custom_nav_elements.php b/admin/manage_custom_nav_elements.php
index 8f8514af..91bd30b8 100644
--- a/admin/manage_custom_nav_elements.php
+++ b/admin/manage_custom_nav_elements.php
@@ -111,7 +111,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                         <?php echo $language; ?>
                                     </label>
                                     <div class="col-md-8 col-sm-12">
-                                        <input type="text" name="text[<?php echo $language; ?>]" class="form-control"
+                                        <input type="text" name="text[]" class="form-control"
                                                data-text-language="<?php echo $language; ?>"
                                                id="text[<?php echo $language; ?>" placeholder="<?php echo $language; ?>">
                                     </div>
@@ -125,7 +125,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                             <?php echo $language; ?>
                                         </label>
                                         <div class="col-md-8 col-sm-12">
-                                            <input type="text" name="subtext[<?php echo $language; ?>]" class="form-control"
+                                            <input type="text" name="subtext[]" class="form-control"
                                                    data-subtext-language="<?php echo $language; ?>"
                                                    id="subtext[<?php echo $language; ?>" placeholder="<?php echo $language; ?>">
                                         </div>
@@ -147,13 +147,14 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             <div class="form-group" id="image-url-group">
                                 <label for="image-url" class="col-md-4 col-sm-12 control-label">Image URL [!]</label>
                                 <div class="col-md-8 col-sm-12">
-                                    <input type="text" class="form-control" placeholder="Image URL[!]">
+                                    <input type="text" name="image-url" class="form-control" placeholder="Image URL[!]">
                                 </div>
                             </div>
                             <div class="form-group" id="font-icon-group">
                                 <label for="font-icon" class="col-md-4 col-sm-12 control-label">Font Icon [!]</label>
                                 <div class="col-md-8 col-sm-12">
-                                    <span>Iconpicker</span>
+                                    <div class="btn btn-default iconpicker-container" data-toggle="iconpicker">
+                                    </div>
                                 </div>
                             </div>
                         </div>
@@ -183,7 +184,9 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
         <td><span>
                 <ul data-property="text" class="list-unstyled"></ul>
             </span></td>
-        <td><span data-property="subtext"></span></td>
+        <td><span>
+                <ul data-property="subtext" class="list-unstyled"></ul>
+            </span></td>
         <td><span data-property="image-or-font"></span></td>
         <td style="display: none"><span data-property="place-id"></span></td>
         <td><span data-property="place"></span></td>
diff --git a/internal-api/js/manage-custom-nav-elements.js b/internal-api/js/manage-custom-nav-elements.js
index 957d5a47..d8a44813 100644
--- a/internal-api/js/manage-custom-nav-elements.js
+++ b/internal-api/js/manage-custom-nav-elements.js
@@ -1,11 +1,36 @@
+var elements = [];
+
 $(document).ready(function() {
     loadTable();
 
     $(document).on('click', '[data-action="edit"]', function() {
-        var $tableRow = $(this).parent().parent();
+        var element = elements[$(this).parent().parent().find('[data-property="id"]').text()];
+        console.log(element);
         var $modal = $('#nav-element-modal');
 
-        $modal.find('select[name="place"]').val($tableRow.find('[data-property="place-id"]').text());
+        $modal.find('select[name="place"]').val(element.place).text();
+        var $textLanguages = $modal.find('[data-text-language]');
+        $.each($textLanguages, function() {
+            var language = $(this).data('text-language');
+
+            $(this).val(element.text[language]);
+        });
+
+        var $subtextLanguages = $modal.find('[data-subtext-language]');
+        $.each($subtextLanguages, function() {
+            var language = $(this).data('subtext-language');
+
+            $(this).val(element.subtext[language]);
+        });
+
+        if (element.imageUrl !== null) {
+            $modal.find('select[name="image-type"]').val('image-url');
+            $modal.find('input[name="image-url"]').val(element.imageUrl);
+        } else {
+            $modal.find('select[name="image-type"]').val('font-icon');
+            $('[data-toggle="iconpicker"]').iconpicker('setIcon', element.fontIcon);
+        }
+
 
         $modal.modal('show');
     })
@@ -43,15 +68,17 @@ function loadTable() {
                 $template.find('ul[data-property="text"]').html(text);
 
                 var subtext = '-';
-                if (this.place == 1) {
+                if (this.place === 1) {
                     subtext = '';
                     $.each(this.subtext, function(key, value) {
                         subtext += '<li><b>' + escape(key) + ':</b> ' + escape(value) + '</li>';
                     });
                 }
-                $template.find('ul[data-property="subtext"]').html(text);
+                $template.find('ul[data-property="subtext"]').html(subtext);
 
                 $('#table-body').append($template);
+
+                elements[this.id] = this;
             });
         },
         error: function(data) {