custom template for abstract block, upgrade dependencies, some fixes

Author: raagin

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="django-streamfield",
-    version="1.2.0",
+    version="1.2.1",
     author="Yury Lapshinov",
     author_email="y.raagin@gmail.com",
     description="StreamField for native Django Admin or with Grappelli",

streamfield/__init__.py

@@ -1,2 +1,2 @@
 name = "streamfield"
-VERSION = '1.2.0'
+VERSION = '1.2.1'

streamfield/base.py

@@ -122,7 +122,6 @@ def _get_render_data(model_class, model_str, content, ctx):
         block_tmpl = model_class.block_template
     else:
         block_tmpl = 'streamblocks/%s.html' % model_str.lower()
-    print(block_tmpl)
     try:
         t = loader.get_template(block_tmpl)
     except loader.TemplateDoesNotExist:

streamfield/static/streamfield/css/streamfield_widget.css

@@ -43,6 +43,14 @@
     margin-left: 10px;
 }
 
+.streamfield_app .stream-block__option span {
+    margin: 0 0 0 5px
+}
+
+.streamfield_app .stream-block__option span + * {
+    margin: 0 0 0 3px;
+}
+
 /* Block content */
 .streamfield_app .stream-model-block .stream-model-block__content {
     padding: 20px;
@@ -148,6 +156,14 @@
     margin-left: 10px;
 }
 
+.streamfield_app .stream-model-block__content.abstract-block a img {
+    border: 3px solid #a6d1e0;
+}
+.streamfield_app .stream-model-block__content.abstract-block a:hover img {
+    border-color: #78adbf;   
+}
+
+
 /* add new block */
 .streamfield_app .stream-insert-new-block {
     text-align: right;

streamfield/static/streamfield/js/streamfield_widget.js

@@ -80,6 +80,9 @@
                     instance_admin_render_url: function(block, instance_id) {
                         return '/streamfield/admin-instance/' + this.model_name_lower(block) + '/' + instance_id;
                     },
+                    abstract_block_render_url: function(block) {
+                        return '/streamfield/abstract-block/' + this.model_name_lower(block) + '/';
+                    },
                     get_change_model_link: function(block, instance_id){
                         return this.block_admin_url(block) + instance_id + 
                                 '/change/?_popup=1&block_id=' + block.unique_id + 
@@ -94,9 +97,18 @@
                     getBlockContent: function(block, item_id) {
                         return this.blocks[this.instance_unique_id(block, item_id)];
                     },
+                    getAbstractBlockContent: function(block) {
+                        return this.blocks[block.model_name];
+                    },
                     updateAbstractBlock(block_unique_id) {
                         var block = _.find(this.stream, ['unique_id', block_unique_id]);
-                        this.$set(this.blocks, block.model_name, "");
+
+                        // change block content
+                        ax.get(this.abstract_block_render_url(block)).then(function (response) {
+                            app.$set(app.blocks, block.model_name, response.data);
+                        });
+                        
+                        // this.$set(this.blocks, block.model_name, "");
                     },
                     updateBlock: function(block_unique_id, instance_id) {
                         var block = _.find(this.stream, ['unique_id', block_unique_id]);