separated styles from html, hidden delete button if only one field is added, added MANIFEST.in

Author: galij899

MANIFEST.in

@@ -0,0 +1,5 @@
+include LICENSE
+include README.MD
+include HISTORY.MD
+include requirements.txt
+recursive-include json_model_widget *

json_model_widget/static/json_model_widget/css/styles.css

@@ -0,0 +1,11 @@
+.form-block {
+    margin-left: 170px;
+}
+
+.jsonwidgetbutton {
+    padding: 10px 15px;
+}
+
+.cursor {
+    cursor: pointer;
+}

json_model_widget/templates/json_model_widget/json_model_widget.html

@@ -1,44 +1,28 @@
 {% load static %}
 
-<style>
-    .form-block {
-        margin-left: 170px;
-    }
-
-    .jsonwidgetbutton {
-        padding: 10px 15px;
-    }
-
-    .cursor {
-        cursor: pointer;
-    }
-</style>
+<link rel="stylesheet" type="text/css" href="{% static 'json_model_widget/css/styles.css' %}">
 
 <div class="form-block">
-
     <div id="fieldjson">
         {% for k,v in json.items %}
-        <p id="jsonrow{{ name }}{{ forloop.counter }}">
-            <select name="jsonkey{{ name }}">
-                {% for pair in col1 %}
-                <option value="{{ pair.id }}"
-                        {% if pair.id== k|add:
-                "0" %}selected{% endif %}>{{ pair }}</option>
-                {% endfor %}
-            </select>
-            <select name="jsonvalue{{ name }}">
-                {% for pair in col2 %}
-                <option value="{{ pair.id }}" {% if pair.id== v %}selected{% endif %}>{{ pair }}</option>
-                {% endfor %}
-            </select>
-            <img class="delete-row-button cursor" src="{% static 'json_model_widget/images/icon-deletepair.svg' %}"
-                 alt="False">
-        </p>
-
+            <p id="jsonrow{{ name }}{{ forloop.counter }}">
+                <select name="jsonkey{{ name }}">
+                    {% for pair in col1 %}
+                        <option value="{{ pair.id }}" {% if pair.id == k|add:0 %}selected{% endif %}>{{ pair }}</option>
+                    {% endfor %}
+                </select>
+                <select name="jsonvalue{{ name }}">
+                    {% for pair in col2 %}
+                        <option value="{{ pair.id }}" {% if pair.id == v|add:0 %}selected{% endif %}>{{ pair }}</option>
+                    {% endfor %}
+                </select>
+                <img class="delete-row-button cursor" src="{% static 'json_model_widget/images/icon-deletepair.svg' %}"
+                     alt="False">
+            </p>
         {% endfor %}
     </div>
 
-    <input class="jsonwidgetbutton" type="button" id="but" onclick="addrow()" value="Добавить пару"/>
+    <input class="jsonwidgetbutton" type="button" id="but" value="Добавить пару"/>
 
     <script type="text/javascript">
         if (!$) {
@@ -49,20 +33,35 @@
             $(this).parent('p').remove()
         })
 
+        $(".jsonwidgetbutton").on("click", addrow)
+
+        $(document).on('change click', '#fieldjson', function () {
+            console.log("kk")
+            if ($(this).children("p").length == 1) {
+                $(this).find('p:first > img').hide()
+            } else {
+                $(this).find('p:first > img').show()
+            }
+        })
+
+        $("#fieldjson").change()
+
         function addrow() {
-            console.log("ok");
-            $("#fieldjson").append(`<p><select name="jsonkey{{ name }}">
+            $("#fieldjson").append(`
+            <p><select name="jsonkey{{ name }}">
             {% for pair in col1 %}
                 <option value="{{ pair.id }}">{{ pair }}</option>
             {% endfor %}
-        </select>
-        <select name="jsonvalue{{ name }}">
-            {% for pair in col2 %}
-                <option value="{{ pair.id }}">{{ pair }}</option>
-            {% endfor %}
-        </select>
-        <img class="delete-row-button cursor" src="{% static 'json_model_widget/images/icon-deletepair.svg' %}" alt="False">
-        </p>`)
+            </select>
+            <select name="jsonvalue{{ name }}">
+                {% for pair in col2 %}
+                    <option value="{{ pair.id }}">{{ pair }}</option>
+                {% endfor %}
+            </select>
+            <img class="delete-row-button cursor" src="{% static 'json_model_widget/images/icon-deletepair.svg' %}" alt="False">
+            </p>`)
+
+            $("#fieldjson").change()
         };
     </script>
 

setup.py

@@ -8,17 +8,18 @@
 
 setup_args = dict(
     name='django-json-model-widget',
-    version='0.0.1',
+    version='0.0.4',
     description='Custom flat json field widget for model pairs',
     long_description_content_type="text/markdown",
     long_description=README + '\n\n' + HISTORY,
     license='MIT',
     packages=find_packages(),
+    include_package_data=True,
     author='Oleg Galichkin',
     author_email='galij899@yandex.ru',
     keywords=['django', 'django-admin', 'django-admin-widget'],
-    url='https://github.com/galij899',
-    download_url='https://pypi.org/project/'
+    url='https://github.com/galij899/django-json-model-widget',
+    download_url='https://pypi.org/project/django-json-model-widget/'
 )
 
 if __name__ == '__main__':